liting2017 6 years ago
parent
commit
1276db6266

BIN
img/Logo11.png


BIN
img/Logo111.png


BIN
img/Logo1111.png


BIN
img/newMenu/serves_14.jpg


BIN
img/newMenu/service_27.jpg


BIN
img/newMenu/service_28.png


+ 3 - 3
src/css/newMenu/header.css

@@ -100,21 +100,21 @@
     bottom: 30px!important;
 }
 .navHeader .logo_right {
-	/* margin-top: 15px;
+	margin-top: 15px;
 	float: left;
 	padding-left: 20px;
 	width: 150px;
 	height: 70px;
 	background: url("../../../img/index/index_xuan.png") no-repeat center center;
     margin-left: 10px;
-    background-size:100% 100%;  */
+    background-size:100% 100%; 
 }
 
 .navHeader .nav {
     float: left;
     vertical-align: top;
     margin-top: 16px;
-	padding-left: 110px;
+	padding-left: 16px;
 }
 
 .navHeader .nav>ul>li {

+ 1 - 1
src/js/newMenu/shopList.js

@@ -226,7 +226,7 @@ $(function(){
               list.push({
                 commodityId:id,
                 commodityQuantity:number,
-                commodityType:type=='1'?1:0,
+                commodityType:type,
                 orderChannel:1
               })  
           };

+ 2 - 2
webpack.config.js

@@ -360,7 +360,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.0.190';
+    let staticHost = 'http://192.168.0.188';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -392,7 +392,7 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.190',
+            host: '192.168.0.188',
             port: 80,
             allowedHosts: ['127.0.0.1','192.168.0.99'],
             headers: {

+ 52 - 52
webpack/entry.config.js

@@ -57,213 +57,213 @@ module.exports = {
         // 'newMenu/app/safeguardApp': './src/js/newMenu/app/safeguardApp.js'
     },
     watch: {
-        'index': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'index': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/index.js'
         ],
-         'aboutUs': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+         'aboutUs': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/aboutUs.js'
         ], 
-        // 'APPaboutUs': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'APPaboutUs': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/APPaboutUs.js'
         // ],  
-        'contactUs': ['webpack-dev-server/client?http://192.168.0.190',
+        'contactUs': ['webpack-dev-server/client?http://192.168.0.188',
             'webpack/hot/only-dev-server',
             './src/js/contactUs.js'
         ],
-        // 'toPayment': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'toPayment': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/toPayment.js'
         // ],
-        // 'service': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'service': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/service.js'
         // ],
-        'register': ['webpack-dev-server/client?http://192.168.0.190',
+        'register': ['webpack-dev-server/client?http://192.168.0.188',
             'webpack/hot/only-dev-server',
             './src/js/register.js'
         ],
-        // 'member': ['webpack-dev-server/client?http://192.168.0.190',
+        // 'member': ['webpack-dev-server/client?http://192.168.0.188',
         //     'webpack/hot/only-dev-server',
         //     './src/js/member.js'
         // ],
-        // 'technologyTrading': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'technologyTrading': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/technologyTrading.js'
         // ],
-        'thinkTank': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'thinkTank': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank.js'
         ],
-        // 'financialIndex': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'financialIndex': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/financialIndex.js'
         // ],
-        // 'technologyTrading/achievement': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'technologyTrading/achievement': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/technologyTrading/achievement.js'
         // ],
-        // 'technologyTrading/demand': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'technologyTrading/demand': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/technologyTrading/demand.js'
         // ],
-        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievementDetail.js'
         ],
-        // 'technologyTrading/assessMent': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'technologyTrading/assessMent': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/technologyTrading/assessMent.js'
         //  ],   
-        // 'technologyTrading/achievementOrder': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'technologyTrading/achievementOrder': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/technologyTrading/achievementOrder.js'
         // ],
-        // 'technologyTrading/demandOrder': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'technologyTrading/demandOrder': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/technologyTrading/demandOrder.js'
         // ],
-        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demandDetail.js'
         ],
-        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyDetail.js'
         ],
-        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/thinkerDetail.js'
         ],
-        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyList.js'
         ],
-        // 'financial/investmentInstitution': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'financial/investmentInstitution': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/financial/investmentInstitution.js'
         // ],
-        // 'financial/investmentDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'financial/investmentDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/financial/investmentDetail.js'
         // ],
-        // 'service/highTechCognizance': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'service/highTechCognizance': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/service/highTechCognizance.js'
         // ],
-        // 'service/propertyRight': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'service/propertyRight': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/service/propertyRight.js'
         // ],
-		// 'service/projectDetails': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+		// 'service/projectDetails': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/service/projectDetails.js'
         // ],
-        // 'service/purpose': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'service/purpose': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         //     'webpack/hot/only-dev-server',
         //     './src/js/service/purpose.js'
         // ],
         // newsApp 
-        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/newsDetailApp.js'
         ],
-        'news/appCognizance': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'news/appCognizance': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/appCognizance.js'
         ],
-        'news/agreement': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'news/agreement': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/agreement.js'
         ],
         /* 2018-06 新版科技需求 */
-        'newMenu/demand': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/demand': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/demand.js'
         ],
-        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/achievement.js'
         ],
-        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/achievementList.js'
         ],
-        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/demandList.js'
         ],
-        'newMenu/services': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/services': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/services.js'
         ],
-        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/serviceList.js'
         ],
-        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/serviceDetails.js'
         ],
-        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/shopList.js'
         ],
-        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/patentList.js'
         ],
-        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/tradingIndex.js'
         ],
-        'newMenu/patent': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/patent': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/patent.js'
         ],
-        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/companyProfile.js'
         ],
-        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/continueHigh.js'
         ],
-        // 'newMenu/continueHighApp': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'newMenu/continueHighApp': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         // 'webpack/hot/only-dev-server',
         // './src/js/newMenu/continueHighApp.js'
         // ],
-        // 'newMenu/militaryProjectApp': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'newMenu/militaryProjectApp': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         // 'webpack/hot/only-dev-server',
         // './src/js/newMenu/continueHighApp.js'
         // ],
-        // 'newMenu/practicalPatentApp': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'newMenu/practicalPatentApp': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         // 'webpack/hot/only-dev-server',
         // './src/js/newMenu/continueHighApp.js'
         // ],
-        'newMenu/safeguarding': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/safeguarding': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/safeguarding.js'
         ],
-        // 'newMenu/app/assessment': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'newMenu/app/assessment': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         // 'webpack/hot/only-dev-server',
         // './src/js/newMenu/app/assessment.js'
         // ],
-        // 'newMenu/app/trusteeship': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'newMenu/app/trusteeship': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         // 'webpack/hot/only-dev-server',
         // './src/js/newMenu/app/trusteeship.js'
         // ],
-        // 'newMenu/app/safeguardApp': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        // 'newMenu/app/safeguardApp': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
         // 'webpack/hot/only-dev-server',
         // './src/js/newMenu/app/safeguardApp.js'
         // ]