liting2017 7 jaren geleden
bovenliggende
commit
289dc684a3
6 gewijzigde bestanden met toevoegingen van 35 en 35 verwijderingen
  1. 0 6
      src/css/public.css
  2. 2 0
      src/js/news/agreement.js
  3. 3 0
      src/js/news/appCognizance.js
  4. 1 0
      template/index.html
  5. 1 1
      webpack.config.js
  6. 28 28
      webpack/entry.config.js

+ 0 - 6
src/css/public.css

@@ -734,12 +734,6 @@ header .nav_right .head_login {
 .head_login:focus {
 	text-decoration: none;
 }
-
-.head_login {
-	margin-left: 5px;
-}
-
-
 /*忘记密码页面*/
 
 #forget {

+ 2 - 0
src/js/news/agreement.js

@@ -1,2 +1,4 @@
 import '../../css/news/agreement.css';
+import '../../css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
 

+ 3 - 0
src/js/news/appCognizance.js

@@ -1,4 +1,7 @@
 import '../../css/news/appCognizance.css';
+import '../../css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
+import '../public.js';
 
 $(function(){
 	var colorArr=['#e22e2e','#2542ef','#10d4f1','#f9750b','#0bf964'];

+ 1 - 0
template/index.html

@@ -38,6 +38,7 @@
 			<li data-index=1 ><a href=""><img src="../img/index_banner02.jpg" alt=""/></a></li>
 			<li data-index=2 ><a href=""><img src="../img/index_banner03.jpg" alt=""/></a></li>
 			<li data-index=3 ><a href=""><img src="../img/index_banner04.jpg" alt=""/></a></li>
+			<li data-index=4 ><a href=""><img src="../img/index_banner05.jpg" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img src="../img/index_next.png" alt=""/>

+ 1 - 1
webpack.config.js

@@ -217,7 +217,7 @@ module.exports = (function () {
 
     //let staticHost = 'http://aftts.hnzhiming.com';
     //let staticHost = 'http://afts.hnzhiming.com';
-    let staticHost = 'http://127.0.0.1:80';
+    let staticHost = 'http://127.0.0.1';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://static.jishutao.com';

+ 28 - 28
webpack/entry.config.js

@@ -31,117 +31,117 @@ module.exports = {
         'news/agreement': './src/js/news/agreement.js'
     },
     watch: {
-        'index': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'index': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/index.js'
         ],
-         'aboutUs': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+         'aboutUs': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/aboutUs.js'
         ], 
-        'APPaboutUs': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'APPaboutUs': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/APPaboutUs.js'
         ],  
-        'contactUs': ['webpack-dev-server/client?http://127.0.0.1:80',
+        'contactUs': ['webpack-dev-server/client?http://127.0.0.1',
             'webpack/hot/only-dev-server',
             './src/js/contactUs.js'
         ],
-        'toPayment': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'toPayment': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/toPayment.js'
         ],
-        'service': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'service': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/service.js'
         ],
-        'register': ['webpack-dev-server/client?http://127.0.0.1:80',
+        'register': ['webpack-dev-server/client?http://127.0.0.1',
             'webpack/hot/only-dev-server',
             './src/js/register.js'
         ],
-        'member': ['webpack-dev-server/client?http://127.0.0.1:80',
+        'member': ['webpack-dev-server/client?http://127.0.0.1',
             'webpack/hot/only-dev-server',
             './src/js/member.js'
         ],
-        'technologyTrading': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'technologyTrading': ['webpack-dev-server/client?http://127.0.0.1', // 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
+        'thinkTank': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank.js'
         ],
-        'financialIndex': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'financialIndex': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/financialIndex.js'
         ],
-        'technologyTrading/achievement': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'technologyTrading/achievement': ['webpack-dev-server/client?http://127.0.0.1', // 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
+        'technologyTrading/demand': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demand.js'
         ],
-        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievementDetail.js'
         ],
-        'technologyTrading/assessMent': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'technologyTrading/assessMent': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/assessMent.js'
          ],   
-        'technologyTrading/achievementOrder': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'technologyTrading/achievementOrder': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievementOrder.js'
         ],
-        'technologyTrading/demandOrder': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'technologyTrading/demandOrder': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demandOrder.js'
         ],
-        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demandDetail.js'
         ],
-        'thinkTank/policyDetail': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'thinkTank/policyDetail': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyDetail.js'
         ],
-        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/thinkerDetail.js'
         ],
-        'thinkTank/policyList': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'thinkTank/policyList': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyList.js'
         ],
-        'financial/investmentInstitution': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'financial/investmentInstitution': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/financial/investmentInstitution.js'
         ],
-        'financial/investmentDetail': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'financial/investmentDetail': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/financial/investmentDetail.js'
         ],
-        'service/highTechCognizance': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'service/highTechCognizance': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/service/highTechCognizance.js'
         ],
-        'service/propertyRight': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'service/propertyRight': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/service/propertyRight.js'
         ],
 
         // newsApp 
-        'news/newsDetailApp': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'news/newsDetailApp': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/newsDetailApp.js'
         ],
-        'news/appCognizance': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'news/appCognizance': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/appCognizance.js'
         ],
-        'news/agreement': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+        'news/agreement': ['webpack-dev-server/client?http://127.0.0.1', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/agreement.js'
         ]