liting2017 7 yıl önce
ebeveyn
işleme
d45731184d

+ 1 - 1
package.json

@@ -12,7 +12,7 @@
     "buildtest": "node bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
     "pro": "node bin/clean.js && webpack --progress --colors --env.deploy prod",
-    "dev": "webpack-dev-server --port 89 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
+    "dev": "webpack-dev-server --port 80 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"
   },
   "repository": {
     "type": "git",

+ 1 - 3
src/css/news/appCognizance.css

@@ -2,8 +2,7 @@
 	padding: 0;
 	margin: 0;
 	font-size: 62.5%;
-	box-sizing: border-box;
-	-webkit-box-sizing: border-box;
+	outline: 0 none;
 }
 
 .container {
@@ -30,7 +29,6 @@
 	width: 3px;
 	height: 18px;
 	margin-top: 13.5px;
-	margin-top: ;
 	float: left;
 	margin-right: 10px;
 }

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

@@ -127,7 +127,7 @@ position: absolute;top:-10px;left:-10px;}
 .achievementList>ul>li>ol>li>.progressBar .percentagePic{position: absolute;top:0;left: 0;width: 0px;height: 6px;display: inline-block;background: #f68705;z-index: 12;}
 .achievementList>ul>li>ol>li>.progressBar .percentage{position: absolute;left: 110px;top: 0;height: 14px;line-height: 14px;}
 .achievementList>ul>li>ol>li>.progressBar .txt{position: absolute;top: 20px;left:82px ;width:50px;height: 20px;line-height: 20px;}
-
+.consultation{float: right!important;}
 
 
 

+ 1 - 1
src/css/technologyTrading/demand.css

@@ -20,7 +20,7 @@ display: inline-block;background: #4498E3;color:#fff;font-size:16px;}
 .demandList>ul>li>div{height:50px;width:1100px;line-height: 50px;margin: 0 auto;border-bottom:1px dashed #CDCDCD;padding-left: 50px;color:#F68B0E;
 font-size: 16px;}
 .demandList>ul>li>ol{height:85px;padding-top: 20px;line-height: 45px;}
-
+.consultation{float: right!important;}
 
 
 

+ 9 - 11
src/js/news/appCognizance.js

@@ -15,6 +15,7 @@ $(function(){
 	var ids=https.substr(indexs+1,https.length);
 	//数据获取
 	function DataList(){
+		
 		$.ajax({
 			type:"get",
 			dataType:'json',
@@ -32,26 +33,23 @@ $(function(){
 				var promiseLsit=[];          //服务承诺
 				var guaranteeList=[];        //服务保障
 				if(data.data&&data.data.list){
+					let theData=data.data.list
 					for(var i=0;i<data.data.list.length;i++){
-//						describeList=theData.describeList.map((item,index)=>
-//							<div><p>{item}<p></div>
-//						)
-
 						describeList.push([
-							
-						  ]).join('');
+							"<div><p>"+i+'. '+theData[i].keyword+"</p></div>",
+						  ].join(','));
 						dataList.push([
 							
-						  ]).join('');
+						  ].join(','));
 						specificationList.push([
 							
-						  ]).join('');
+						  ].join(','));
 						promiseLsit.push([
 							
-						  ]).join('');
+						  ].join(','));
 						guaranteeList.push([
 							
-						  ]).join('');
+						  ].join(','));
 					}
 					$('#describe').html(describeList);
 					$('#data').html(dataList);
@@ -62,7 +60,7 @@ $(function(){
 			}
 		});
 	};
-	DataList();
+	//DataList();
 })
 
 

+ 1 - 1
src/js/technologyTrading/achievement.js

@@ -103,7 +103,7 @@ function loadDate(pageNo) {
 						'<li>行业:<span>' + (thisdata.fieldA?getIndustryCategory(thisdata.fieldA, thisdata.fieldB):"未知行业") + '</span></li>',					
 						'<li>交易方式:<span>' + (thisdata.transferMode ? transferModeObj[thisdata.transferMode] : "当面交易") + '</span></li>',
 						'<li>成熟度:<span>'+(thisdata.maturityS?thisdata.maturityS:"通过小试")+'</span></li>',
-						'<li val="'+thisdata.id+'" typ="'+thisdata.ownerType+'">技术方:<span>'+(thisdata.ownerName?thisdata.ownerName:"佚名")+'</span>',
+						//'<li val="'+thisdata.id+'" typ="'+thisdata.ownerType+'">技术方:<span>'+(thisdata.ownerName?thisdata.ownerName:"佚名")+'</span>',
 //						'<div class="progressBar">',
 //						'<p class="bjtxt"></p>',
 //						'<span class="percentagePic" style="width:'+percentage+'px"></span>',

+ 1 - 1
src/js/technologyTrading/demand.js

@@ -77,7 +77,7 @@ $(function(){
 //							'<li title=' + thisdata.name + '>' + (thisdata.name?thisdata.name:"未知名称") + '</li>',
 //							'<li>' + (thisdata.demandType ? categoryObj[thisdata.demandType] : '类型未知') + '</li>',
 							'<li>预算:<span>'+ (thisdata.budgetCost ? (thisdata.budgetCost + '万元') : '价格面议') + '</span></li>',
-							'<li val="'+thisdata.id+'" typ="'+thisdata.demandType+'">技术方:<span>'+(thisdata.employerName?thisdata.employerName:"佚名")+'</span></li>',
+							//'<li val="'+thisdata.id+'" typ="'+thisdata.demandType+'">技术方:<span>'+(thisdata.employerName?thisdata.employerName:"佚名")+'</span></li>',
 							'<li class="consultation"><a>我要咨询</a></li>',
 						    '</ol>',
 						    '<input type="hidden" class="demandId" value="' + thisdata.id + '">',

+ 1 - 0
template/news/appCognizance.html

@@ -7,6 +7,7 @@
 		<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
         <title>高新认定</title>
+       
 	</head>
 	<body>
 		<div class="container">

+ 1 - 1
webpack.config.js

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

+ 27 - 27
webpack/entry.config.js

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