Browse Source

代码合并

ws2z3gr2017 7 years ago
parent
commit
dc9ccb053d
2 changed files with 3 additions and 51 deletions
  1. 3 3
      src/css/technologyTrading/achievement.css
  2. 0 48
      webpack/entry.config.js

+ 3 - 3
src/css/technologyTrading/achievement.css

@@ -5,8 +5,8 @@
 .container{width: 1200px;}
 /*主体内容顶部*/
 
-.achievement_header{margin-top: 20px;border-bottom: 1px solid #cccccc;overflow:hidden;padding-bottom: 20px;}
-.achievement_header p{float: left;font-size: 16px;color: #696464;margin-right: 10px;line-height: 34px;}
+.achievement_header{margin-top: 20px;border-bottom: 1px solid #cccccc;overflow:hidden;}
+.achievement_header p{float: left;font-size: 16px;color: #696464;margin-right: 10px;line-height: 34px;margin-bottom: 20px;}
 .achievement_header ul{float: left;}
 .achievement_header ul li{float: left;display: none;;font-size: 16px;color:#5c5c5c;height: 34px;line-height: 34px;border:1px solid #CCCCCC;text-align: center;padding-left: 10px;padding-right: 10px;margin-right: 15px;}
 .achievement_header .text_replace{float: left; }
@@ -22,7 +22,7 @@
 .totalCount {float: right;line-height: 74px; margin-right: 20px; color: #999;} 
  
  .search-criteria {margin-bottom: 15px;}    
-.search-select ul li{float: left;margin-right: 0px;margin-bottom: 10px; height: 30px; line-height: 30px; padding: 0 16px;font-size: 12px;}
+.search-select ul li{float: left;margin-right: 0px;margin-bottom: 10px; height: 30px; line-height: 30px; padding: 0 16px;font-size: 12px;border: 1px solid transparent;}
 .search-select  ul li.active{background: #ffb200;}
 .search-select  ul li.active span{color:#ffffff}
 .search-select  ul li span { font-size: 12px; line-height: 26px;color: #666; }        

+ 0 - 48
webpack/entry.config.js

@@ -1,51 +1,4 @@
 module.exports = {
-<<<<<<< HEAD
-  prod: {
-    'index': './src/js/index.js',  
-    'service': './src/js/service.js',
-    'register': './src/js/register.js',
-    'technologyTrading': './src/js/technologyTrading.js',
-    'thinkTank': './src/js/thinkTank.js',
-    'technologyFinancial': './src/js/technologyFinancial.js',
-    'technologyTrading/achievement': './src/js/technologyTrading/achievement.js',
-    'technologyTrading/demand': './src/js/technologyTrading/demand.js',
-  },
-  watch: {
-    'index': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './src/js/index.js'
-    ],  
-     'service': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './src/js/service.js'
-    ],
-    'register': ['webpack-dev-server/client?http://127.0.0.1:80',
-      'webpack/hot/only-dev-server',
-      './src/js/register.js'
-    ],
-   'technologyTrading': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-    'webpack/hot/only-dev-server',
-    './src/js/technologyTrading.js'
-    ],
-   'thinkTank': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-   'webpack/hot/only-dev-server',
-    './src/js/thinkTank.js'
-    ],
-    'technologyFinancial': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-   'webpack/hot/only-dev-server',
-    './src/js/technologyFinancial.js'
-    ],
-    'technologyTrading/achievement': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-    'webpack/hot/only-dev-server',
-    './src/js/technologyTrading/achievement.js'
-    ],
-    'technologyTrading/demand': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-    'webpack/hot/only-dev-server',
-    './src/js/technologyTrading/demand.js'
-    ],
-  }
-}
-=======
     prod: {
         'index': './src/js/index.js',
         'service': './src/js/service.js',
@@ -116,4 +69,3 @@ module.exports = {
         ]
     }
 };
->>>>>>> 4ace6e92cdaa32f477668bc26ce75518a81d55d6