“liting 6 years ago
parent
commit
1efbcb65af
5 changed files with 54 additions and 52 deletions
  1. 2 2
      src/css/thinkTank.css
  2. 1 1
      src/js/thinkTank.js
  3. 4 2
      src/js/thinkTank/policyList.js
  4. 2 2
      webpack.config.js
  5. 45 45
      webpack/entry.config.js

+ 2 - 2
src/css/thinkTank.css

@@ -37,8 +37,8 @@ width:600px;height:195px;border-bottom: 5px solid #2D83CE}
 .searchs button{width: 64px;height: 40px;position: absolute;right: 5px;background: url(../../img/think_search.png) no-repeat center center;border: none;}
 .searchs button:focus{outline: none;}
 .list_text {font-size: 16px;}
-.list_text .orange{margin-bottom: 12px;color: #f68705;text-align: center;font-weight: bold;}
-.list_text .bulr{margin-top:12px ;margin-bottom: 0px;color: #2a6597;text-align: center;font-weight: bold;line-height: 40px;}
+.list_text .orange{margin-bottom: 12px;color: #f68705;text-align: center;font-weight: bold;text-overflow: ellipsis;-o-text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}
+.list_text .bulr{margin-top:12px ;margin-bottom: 0px;color: #2a6597;text-align: center;font-weight: bold;line-height: 40px;width: 230px;text-overflow: ellipsis;-o-text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}
 .list_text .text_on{width: 210px;margin: 0 auto;font-size: 14px;font-family: "simsun";color:#787878;line-height: 23px;
 text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 3;}
 

+ 1 - 1
src/js/thinkTank.js

@@ -197,7 +197,7 @@ $(function() {
     //智者数据交互
     function loadDate(pageNo) {
 		$('.loading').show();
-		$('.pagination_box').show()	
+		$('.pagination_box').show();
         $.ajax({
             method: "get",
             dataType: "json",

+ 4 - 2
src/js/thinkTank/policyList.js

@@ -49,6 +49,7 @@ $(function () {
 	}
 	function loadDate(pageNo) {
 		$('.loading').show();
+		$('.pagination_box').css('display', 'block')
 		$.ajax({
 			method: "get",
 			dataType: "json",
@@ -63,6 +64,7 @@ $(function () {
 				console.log(data)
 				var theArr = [];
 				thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
+				console.log(thePageLength)
 				if (data.data && data.data.list) {
 					for (let i = 0; i < data.data.list.length; i++) {
 						let thisdata = data.data.list[i];
@@ -96,10 +98,10 @@ $(function () {
 				$('.loading').hide().stop(true,true);
 				$('.policy ul').empty();
 				$('.policy ul').append(theArr.join(''));
-				if (data.data.list.length === 0) {
+				if (data.data&&data.data.list.length< 1) {
                     $('.pagination_box').css('display', 'none')
                 };
-				if (data.data.list.length === 0) {
+				if (data.data.list.length == 0) {
 					$('.policy ul').html('<div class="imgbg"></div>')
 				};
 				$('.totalCount').html("共 " + thePageLength + " 页 " + data.data.totalCount + " 条数据");

+ 2 - 2
webpack.config.js

@@ -317,7 +317,7 @@ module.exports = (function () {
         }));
     }
 
-    let staticHost = 'http://192.168.1.166';
+    let staticHost = 'http://192.168.1.105';
     switch (argv.env.deploy) {
         case 'test':
             staticHost = 'http://statics.jishutao.com';
@@ -349,7 +349,7 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            host: '192.168.1.166',
+            host: '192.168.1.105',
             port: 80,
             allowedHosts: ['127.0.0.1','192.168.1.222','192.168.1.123'],
             headers: {

+ 45 - 45
webpack/entry.config.js

@@ -49,185 +49,185 @@ module.exports = {
         'newMenu/militaryProject': './src/js/newMenu/continueHigh.js'
     },
     watch: {
-        'index': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'index': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/newMenu/index.js'
         ],
-         'aboutUs': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+         'aboutUs': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/aboutUs.js'
         ], 
-        'APPaboutUs': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'APPaboutUs': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/APPaboutUs.js'
         ],  
-        'contactUs': ['webpack-dev-server/client?http://192.168.1.166',
+        'contactUs': ['webpack-dev-server/client?http://192.168.1.105',
             'webpack/hot/only-dev-server',
             './src/js/contactUs.js'
         ],
-        'toPayment': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'toPayment': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/toPayment.js'
         ],
-        'service': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'service': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/service.js'
         ],
-        'register': ['webpack-dev-server/client?http://192.168.1.166',
+        'register': ['webpack-dev-server/client?http://192.168.1.105',
             'webpack/hot/only-dev-server',
             './src/js/register.js'
         ],
-        'member': ['webpack-dev-server/client?http://192.168.1.166',
+        'member': ['webpack-dev-server/client?http://192.168.1.105',
             'webpack/hot/only-dev-server',
             './src/js/member.js'
         ],
-        'technologyTrading': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'technologyTrading': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading.js'
         ],
-        'thinkTank': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'thinkTank': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank.js'
         ],
-        'financialIndex': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'financialIndex': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/financialIndex.js'
         ],
-        'technologyTrading/achievement': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'technologyTrading/achievement': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievement.js'
         ],
-        'technologyTrading/demand': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'technologyTrading/demand': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demand.js'
         ],
-        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievementDetail.js'
         ],
-        'technologyTrading/assessMent': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'technologyTrading/assessMent': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/assessMent.js'
          ],   
-        'technologyTrading/achievementOrder': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'technologyTrading/achievementOrder': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievementOrder.js'
         ],
-        'technologyTrading/demandOrder': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'technologyTrading/demandOrder': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demandOrder.js'
         ],
-        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demandDetail.js'
         ],
-        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'thinkTank/policyDetail': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyDetail.js'
         ],
-        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'thinkTank/thinkerDetail': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/thinkerDetail.js'
         ],
-        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'thinkTank/policyList': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyList.js'
         ],
-        'financial/investmentInstitution': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'financial/investmentInstitution': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/financial/investmentInstitution.js'
         ],
-        'financial/investmentDetail': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'financial/investmentDetail': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/financial/investmentDetail.js'
         ],
-        'service/highTechCognizance': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'service/highTechCognizance': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/service/highTechCognizance.js'
         ],
-        'service/propertyRight': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'service/propertyRight': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/service/propertyRight.js'
         ],
-		'service/projectDetails': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+		'service/projectDetails': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/service/projectDetails.js'
         ],
-        'service/purpose': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'service/purpose': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/service/purpose.js'
         ],
         // newsApp 
-        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/newsDetailApp.js'
         ],
-        'news/appCognizance': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'news/appCognizance': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/news/appCognizance.js'
         ],
-        'news/agreement': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'news/agreement': ['webpack-dev-server/client?http://192.168.1.105', // 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.1.166', // WebpackDevServer host and port
+        'newMenu/demand': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/demand.js'
         ],
-        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/achievement': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/achievement.js'
         ],
-        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/achievementList': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/achievementList.js'
         ],
-        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/demandList': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/demandList.js'
         ],
-        'newMenu/services': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/services': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/services.js'
         ],
-        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/serviceList': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/serviceList.js'
         ],
-        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/serviceDetails': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/serviceDetails.js'
         ],
-        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/shopList': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/shopList.js'
         ],
-        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/patentList': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/patentList.js'
         ],
-        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/tradingIndex': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/tradingIndex.js'
         ],
-        'newMenu/patent': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/patent': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/patent.js'
         ],
-        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/companyProfile': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/companyProfile.js'
         ],
-        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/continueHigh': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/practicalPatent': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/continueHigh.js'
         ],
-        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.1.166', // WebpackDevServer host and port
+        'newMenu/militaryProject': ['webpack-dev-server/client?http://192.168.1.105', // WebpackDevServer host and port
         'webpack/hot/only-dev-server',
         './src/js/newMenu/continueHigh.js'
         ]