liting2017 6 years ago
parent
commit
00a5167f6a
5 changed files with 46 additions and 41 deletions
  1. 5 1
      src/css/newMenu/public.css
  2. 2 0
      src/js/public.js
  3. 2 3
      src/js/search.js
  4. 2 2
      webpack.config.js
  5. 35 35
      webpack/entry.config.js

+ 5 - 1
src/css/newMenu/public.css

@@ -44,7 +44,11 @@ table { border-collapse: collapse; border-spacing: 0; }
 img{
 	vertical-align: middle;
 }
-
+body>a{
+	position: absolute;
+	left: -100px;
+	bottom: -100px;
+}
 .container{
 	width: 1200px!important;
 	margin:  0 auto;

+ 2 - 0
src/js/public.js

@@ -4,6 +4,8 @@ $(function(){
 	if($('.carousel-inner div').length<=1){
 		$('#myCarousel').removeClass('slide');
 	}
+	//百度统计图片处理
+
 	$(".index_blur").html("×");
 	$(".pub_fix").after("<div class='right_cebian'>侧边导航</div>");
 	$(".index_blur").click(function(){

+ 2 - 3
src/js/search.js

@@ -39,6 +39,7 @@ $(function(){
         })
     };
 	function loadDate(pageNo) {
+        $('footer').show();
 		$.ajax({
             method: "get",
             dataType: "json",
@@ -99,14 +100,12 @@ $(function(){
                         }
                     contHtml+='</ul>';
                     $(".cont").html(contHtml);
-                    $('footer').show();
                     }else{
-                    	$(".cont").html(noLength);
+                        $(".cont").html(noLength);
                     }
                 }else{
                     return;
                 }
-           
             //分页部分的处理
             $('.pagination_box').css('display', 'block');
                 $('.inp').css('display', 'block');

+ 2 - 2
webpack.config.js

@@ -438,7 +438,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';
@@ -470,7 +470,7 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.0.190',
+            host: '192.168.0.188',
             port: 80,
             allowedHosts: ['192.168.0.190', '192.168.0.99', '192.168.0.20'],
             headers: {

+ 35 - 35
webpack/entry.config.js

@@ -40,145 +40,145 @@ module.exports = {
         'newMenu/adviser': './src/js/newMenu/adviser.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'
         ],
-        'search': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'search': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/search.js'
         ],
-        'facilitator': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'facilitator': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/facilitator/facilitator.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'
         ],
-        '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'
         ],
-        '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'
         ],
-        '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'
         ],
-        '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/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'
         ],
         // 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/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'
         ],
-        'evaluation/evaluate': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'evaluation/evaluate': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/evaluate.js'
         ],
-        'newMenu/adviserList': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/adviserList': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviserList.js'
         ],
-        'newMenu/adviserDetail': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/adviserDetail': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviserDetail.js'
         ],
-        'newMenu/adviser': ['webpack-dev-server/client?http://192.168.0.190', // WebpackDevServer host and port
+        'newMenu/adviser': ['webpack-dev-server/client?http://192.168.0.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/adviser.js'
         ],