ws2z3gr2017 преди 7 години
родител
ревизия
34663c4be2

+ 2 - 2
src/css/Technologytrading.css

@@ -45,7 +45,7 @@ background-size: 1200px 215px;margin:0 auto;position: relative;}
 
 /*li*/
 .container{width: 1200px;}
-.industry{background: #ffffff;overflow: hidden;margin-bottom: 30px;}
+.industry{background: #ffffff;overflow: hidden;}
 .industry_left{float: left;width: 300px;height:1000px;text-align: center;
     padding-top: 40px;background: #2a9ee2;}
 
@@ -115,7 +115,7 @@ body{background: #f5f5f5;}
 .channel ul li:nth-child(2n+1){background: url(../../img/Technology_25.png)no-repeat center;}
 .channel ul li:nth-child(2n){background: url(../../img/Technology_26.png)no-repeat center;margin-top: 50px;}
 .checkd{display:block;}
-#bottom{margin-top: -150px;}
+#bottom{margin-top: -150px; clear: both;}
 
 
 

+ 5 - 78
src/js/Technologytrading.js

@@ -42,85 +42,12 @@ import '../css/Technologytrading.css';
             }
         })
     })
-})();
-$(function(){
-    var industry = $('.industry').innerHeight();
+     var industry = $('.industry').innerHeight();
     $('.industry_left').height(industry)
-})
-//var theKeyword, theMode, theFieldA, theFieldB;
-//var thePageNo = 1,
-//    thePageLength = 1,
-//    pageSize = 12;
-//var categoryObj = {
-//    "0": "绮惧搧鎶�鏈浆璁�",
-//    "1": "绮惧搧鍒涗笟闇�姹�",
-//};
-//function loadDate(pageNo) {
-//    $.ajax({
-//        method: "get",
-//        dataType: "json",
-//        url: globalConfig.context + "/portal/search/demandList",
-//        data: {
-//            pageNo: pageNo || 1,
-//            pageSize: pageSize,
-//            keyword: theKeyword,
-//            sign: 0,
-//            demandType: theMode != 999 ? theMode : undefined,
-//            industryCategoryA: theFieldA != 999 ? theFieldA : undefined,
-//            industryCategoryB: theFieldB != 999 ? theFieldB : undefined,
-//        },
-//        success: function (data) {
-//            var theArr = [];
-//            if (data.data && data.data.list) {
-//                for (let i = 0; i < data.data.list.length; i++) {
-//                    let thisdata = data.data.list[i];
-//                    theArr.push([
-////                      '<li>',
-////                      '<img src="../img/Technology_21.png" alt="" />',//鍥剧墖鍦板潃淇敼
-////                    	'<div class="details_text">',
-////                    	'<p>琛屼笟 <span title="' + getIndustryCategory(thisdata.industryCategoryA, thisdata.industryCategoryB) + '">'+ getIndustryCategory(thisdata.industryCategoryA, thisdata.industryCategoryB) +'</span></p>',
-////                      '<p>浠锋牸 <span>'+thisdata.budgetCost+'</span></p>',
-////                   	'<p>绠�浠� <b>' + thisdata.problemDes + '</b></p>',
-////                   	'<a href="#">浜嗚В璇︽儏</a>',
-////                      '</div>',
-////                      '<div class="details_fix">',
-////                      '<p>涓撳埄鍚� <span>' + thisdata.name + '</span></p>',
-////                      '<p>鎵�鏈変汉 <span>'++'</span></p>	',  //鎵�鏈変汉
-////                      '</div>',
-////                      '</li>',
-//                    ].join(''));
-//                };
-//            };
-//            $('#demandList').empty();
-//            $('#demandList').append(theArr.join(''));
-//
-//            $('.totalCount').html("鍏�" + data.data.totalCount + "鏉℃暟鎹�");
-//            thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
-//            var pageArr = [],
-//                firstNo = 1,
-//                endNo = 3;//5
-//            if (thePageNo > 3) {
-//                firstNo = thePageNo - 2;
-//                endNo = Math.min((Number(thePageNo) + 2), thePageLength);
-//            } else {
-//                endNo = Math.min(thePageLength, 3);//5
-//            };
-//            for (let i = firstNo; i <= endNo; i++) {
-//                if (i == thePageNo) {
-//                    pageArr.push(
-//                        '<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'
-//                    );
-//                } else {
-//                    pageArr.push(
-//                        '<li class="pageNumber"><a href="#" value=' + i + ' >' + i + '</a></li>'
-//                    );
-//                }
-//            };
-//            $('.pageNumber').remove();
-//            $('.pagePre').after(pageArr.join(''));
-//        },
-//    });
-//}
+})();
+
+   
+
 
 
 

+ 1 - 1
src/js/index.js

@@ -2,7 +2,7 @@ import '../css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
 import '../css/public.css'; 
 import '../css/index_home.css';
-import './public.js'
+import './public.js';
 
 $(function(){
 	var k=0;

+ 2 - 0
src/js/register.js

@@ -3,6 +3,8 @@ import 'bootstrap/dist/js/bootstrap.js';
 import '../css/public.css';
 import '../css/register.css';
 import './public.js';
+
+
 $(function(){
     //查看技淘网协议
     var hht=$(window).height();

+ 8 - 7
src/js/service.js

@@ -1,10 +1,11 @@
-//import '../css/bootstrap.less';
-//import 'bootstrap/dist/js/bootstrap.js';
-//import '../css/public.css';
-//import '../css/service.css';
-//import '../css/main_banner.css';
-//import './public.js';
-//import './main_banner.js'
+import '../css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
+import '../css/public.css';
+import '../css/service.css';
+import '../css/main_banner.css';
+import './public.js';
+import './main_banner.js'
+
 (function(){     
     $("#office").click(function(){
         $(this).removeClass("that").addClass("that");

+ 12 - 302
template/Technologytrading.html

@@ -9,24 +9,11 @@
 	<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
-    <link rel="stylesheet" href="../src/css/bootstrap.css" />
+   <link rel="stylesheet" href="../src/css/bootstrap.css" />
     <link rel="stylesheet" href="../src/css/public.css" />
     <link rel="stylesheet" href="../src/css/main_banner.css" />
     <link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>
-=======
-<<<<<<< HEAD
-    <!--<link rel="stylesheet" href="../src/css/bootstrap.css" />-->
-    <!--<link rel="stylesheet" href="../src/css/public.css" />-->
-	<!--<link rel="stylesheet" href="../src/css/main_banner.css"/>-->
-    <!--<link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>-->
-=======
-    <!--<link rel="stylesheet" href="../src/css/bootstrap.css" />
-    <link rel="stylesheet" href="../src/css/public.css" />
-    <link rel="stylesheet" href="../src/css/main_banner.css" />
-    <link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>-->
->>>>>>> 350a3be7ae6655de28f2d85f388298e0857a8e16
->>>>>>> 3f034bf88b36b4026efb6faf31c6ceba61bbe447
+
 </head>
 <body>  	
   	<header>
@@ -66,7 +53,6 @@
 		</a>
 	</div>
   	<!--主体内容区域开始-->
-<<<<<<< HEAD
  	<div id="technology">
 		<div class="technolo">
 			<div class="technolo_left">
@@ -264,264 +250,13 @@
 						</li>
 
 					</ul>
-				</div>
-				<!--<div class="main_details checked_no">-->
-					<!--<ul id="demandList_attorn">-->
-						<!--<li>-->
-							<!--<img src="../img/Technology_21.png" alt="" />-->
-							<!--<div class="details_text">-->
-								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
-								<!--<p>价格 <span>10000</span></p>-->
-								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
-								<!--<a href="#">了解详情</a>-->
-							<!--</div>-->
-							<!--<div class="details_fix">-->
-								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
-								<!--<p>所有人 <span> 胡海峰</span></p>-->
-
-							<!--</div>-->
-						<!--</li>-->
-						<!--<li>-->
-							<!--<img src="../img/Technology_21.png" alt="" />-->
-							<!--<div class="details_text">-->
-								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
-								<!--<p>价格 <span>10000</span></p>-->
-								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
-								<!--<a href="#">了解详情</a>-->
-							<!--</div>-->
-							<!--<div class="details_fix">-->
-								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
-								<!--<p>所有人 <span> 胡海峰</span></p>-->
-
-							<!--</div>-->
-						<!--</li>-->
-						<!--<li>-->
-							<!--<img src="../img/Technology_21.png" alt="" />-->
-							<!--<div class="details_text">-->
-								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
-								<!--<p>价格 <span>10000</span></p>-->
-								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
-								<!--<a href="#">了解详情</a>-->
-							<!--</div>-->
-							<!--<div class="details_fix">-->
-								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
-								<!--<p>所有人 <span> 胡海峰</span></p>-->
-
-							<!--</div>-->
-						<!--</li>-->
-						<!--<li>-->
-							<!--<img src="../img/Technology_21.png" alt="" />-->
-							<!--<div class="details_text">-->
-								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
-								<!--<p>价格 <span>10000</span></p>-->
-								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
-								<!--<a href="#">了解详情</a>-->
-							<!--</div>-->
-							<!--<div class="details_fix">-->
-								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
-								<!--<p>所有人 <span> 胡海峰</span></p>-->
-							<!--</div>-->
-						<!--</li>-->
-
-					<!--</ul>-->
-				<!--</div>-->
-				<!--<div class="main_details checked_no">-->
-					<!--<ul id="demandList_nedd">-->
-						<!--<li>-->
-							<!--<img src="../img/Technology_21.png" alt="" />-->
-							<!--<div class="details_text">-->
-								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
-								<!--<p>价格 <span>10000</span></p>-->
-								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
-								<!--<a href="#">了解详情</a>-->
-							<!--</div>-->
-							<!--<div class="details_fix">-->
-								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
-								<!--<p>所有人 <span> 胡海峰</span></p>-->
-							<!--</div>-->
-						<!--</li>-->
-						<!--<li>-->
-							<!--<img src="../img/Technology_21.png" alt="" />-->
-							<!--<div class="details_text">-->
-								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
-								<!--<p>价格 <span>10000</span></p>-->
-								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
-								<!--<a href="#">了解详情</a>-->
-							<!--</div>-->
-							<!--<div class="details_fix">-->
-								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
-								<!--<p>所有人 <span> 胡海峰</span></p>-->
-
-							<!--</div>-->
-						<!--</li>-->
-						<!--<li>-->
-							<!--<img src="../img/Technology_21.png" alt="" />-->
-							<!--<div class="details_text">-->
-								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
-								<!--<p>价格 <span>10000</span></p>-->
-								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
-								<!--<a href="#">了解详情</a>-->
-							<!--</div>-->
-							<!--<div class="details_fix">-->
-								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
-								<!--<p>所有人 <span> 胡海峰</span></p>-->
-
-							<!--</div>-->
-						<!--</li>-->
-						<!--<li>-->
-							<!--<img src="../img/Technology_21.png" alt="" />-->
-							<!--<div class="details_text">-->
-								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
-								<!--<p>价格 <span>10000</span></p>-->
-								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
-								<!--<a href="#">了解详情</a>-->
-							<!--</div>-->
-							<!--<div class="details_fix">-->
-								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
-								<!--<p>所有人 <span> 胡海峰</span></p>-->
-
-							<!--</div>-->
-						<!--</li>-->
-						<!--<li>-->
-							<!--<img src="../img/Technology_21.png" alt="" />-->
-							<!--<div class="details_text">-->
-								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
-								<!--<p>价格 <span>10000</span></p>-->
-								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
-								<!--<a href="#">了解详情</a>-->
-							<!--</div>-->
-							<!--<div class="details_fix">-->
-								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
-								<!--<p>所有人 <span> 胡海峰</span></p>-->
-							<!--</div>-->
-						<!--</li>-->
-
-					<!--</ul>-->
-				<!--</div>-->
-				<div class="pagination_box">
-=======
- 	<!--行业分类-->
- 	<div class="industry">
- 		<div class="container">
-	 		<div class="industry_left">
-	 			<h3>行业分类</h3>
-	 			<ul>
-	 				<li><a href="">医学类</a></li>
-	 				<li><a href="">教育咨询</a></li>
-	 				<li><a href="">航天航空</a></li>
-	 				<li><a href="">医学类</a></li>
-	 				<li><a href="">教育咨询</a></li>
-	 				<li><a href="">航天航空</a></li>
-	 				<li><a href="">医学类</a></li>
-	 				<li><a href="">教育咨询</a></li>
-	 				<li><a href="">航天航空</a></li>
-	 			</ul>
-	 		</div>
-	 		<div class="industry_right">
-	 			<div class="title_details">
-					<ol>
-						<li class="act" value="999">专利交易</li>
-						<li value="0">精品技术转让</li>
-						<li value="1">精品创业需求</li>
-					</ol>	 				
-	 			</div>
-	 			<div class="main_details">
-	 				<ul id="demandList">
-	 					<li>
-	 						<img src="../img/Technology_21.png" alt="" />	 						
-	 						<div class="details_text">
-	 							<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
-	 							<p>价格 <span>10000</span></p>
-	 							<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
-	 							<a href="#">了解详情</a>
-	 						</div>
-	 						<div class="details_fix">
-	 							<p>专利名 <span> 医疗四分局王死哦风景</span></p>
-	 							<p>所有人 <span> 胡海峰</span></p>	 							
-	 						</div>
-	 					</li>
-	 					<li>
-	 						<img src="../img/Technology_21.png" alt="" />	 						
-	 						<div class="details_text">
-	 							<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
-	 							<p>价格 <span>10000</span></p>
-	 							<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
-	 							<a href="#">了解详情</a>
-	 						</div>
-	 						<div class="details_fix">
-	 							<p>专利名 <span> 医疗四分局王死哦风景</span></p>
-	 							<p>所有人 <span> 胡海峰</span></p>
-	 							
-	 						</div>
-	 					</li>
-	 					<li>
-	 						<img src="../img/Technology_21.png" alt="" />	 						
-	 						<div class="details_text">
-	 							<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
-	 							<p>价格 <span>10000</span></p>
-	 							<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
-	 							<a href="#">了解详情</a>
-	 						</div>
-	 						<div class="details_fix">
-	 							<p>专利名 <span> 医疗四分局王死哦风景</span></p>
-	 							<p>所有人 <span> 胡海峰</span></p>
-	 							
-	 						</div>
-	 					</li>
-	 					<li>
-	 						<img src="../img/Technology_21.png" alt="" />	 						
-	 						<div class="details_text">
-	 							<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
-	 							<p>价格 <span>10000</span></p>
-	 							<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
-	 							<a href="#">了解详情</a>
-	 						</div>
-	 						<div class="details_fix">
-	 							<p>专利名 <span> 医疗四分局王死哦风景</span></p>
-	 							<p>所有人 <span> 胡海峰</span></p>
-	 							
-	 						</div>
-	 					</li>
-	 					<li>
-	 						<img src="../img/Technology_21.png" alt="" />	 						
-	 						<div class="details_text">
-	 							<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
-	 							<p>价格 <span>10000</span></p>
-	 							<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
-	 							<a href="#">了解详情</a>
-	 						</div>
-	 						<div class="details_fix">
-	 							<p>专利名 <span> 医疗四分局王死哦风景</span></p>
-	 							<p>所有人 <span> 胡海峰</span></p>	 							
-	 						</div>
-	 					</li>	 					
-	 					
-	 				</ul>
-	 			</div>	
-	 			<div class="pagination_box">
->>>>>>> 350a3be7ae6655de28f2d85f388298e0857a8e16
-					<nav aria-label="Page navigation" class="clearfix">
-						<ul class="pagination">
-							<li class="pagePre">
-								<a href="#" aria-label="Previous">
-									<span aria-hidden="true">&laquo;</span>
-								</a>
-							</li>
-							<li class="pageNumber"><a href="#" value="1">1</a></li>
-							<li class="pageNext">
-								<a href="#" aria-label="Next">
-									<span aria-hidden="true">&raquo;</span>
-								</a>
-							</li>
-						</ul>
-						<span class="totalCount">共0条数据</span>
-					</nav>
-				</div>
-<<<<<<< HEAD
+				</div>			
+				<div class="pagination_box"></div>
 			</div>
 		</div>
-	</div>
-	<div class="channel">
+	<div>
+ 	<!--行业分类--> 
+ 	<div class="channel">
 		<div class="container">
 			<h5>快速通道</h5>
 			<ul>
@@ -533,23 +268,7 @@
 			</ul>
 		</div>
 	</div>
-=======
-	 		</div>
- 		</div>
- 	</div>
- 	<div class="channel">
- 		<div class="container">
- 			<h5>快速通道</h5>
- 			<ul>
- 				<li><a href="">技术评估</a></li>
- 				<li><a href="">专利申请</a></li>
- 				<li><a href="">专利征集</a></li>
- 				<li><a href="">发布技术</a></li>
- 				<li><a href="">发布需求</a></li>
- 			</ul>
- 		</div>
- 	</div>
->>>>>>> 350a3be7ae6655de28f2d85f388298e0857a8e16
+
   	<!--主体内容区域结束-->
 	<div id="bottom">
 		<div class="bottom">
@@ -649,12 +368,12 @@
 				<form action="" method="post">
 					<div class="login_uesr">
 						<label for="uesname"><img src="../img/login_use.png"/></label>
-						<input type="text" name="uesname" id="Lo_user" value="用户名/邮箱/手机" />
+						<input type="text" name="uesname" id="Lo_user" placeholder="用户名/邮箱/手机" />
 						<img src="../img/login_del.png" class="log_del"/>
 					</div>
 					<div class="login_pass">
 						<label for="pass"><img src="../img/login_password.png"/></label>
-						<input type="text" name="pass" id="Lo_pass" value="请输入密码" />
+						<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
 					</div>
 					<div class="login_check">
 						<label for="checks" class="lab_check">
@@ -675,20 +394,11 @@
 	</div>
 	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 </body>
-<<<<<<< HEAD
+
 <script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
-=======
-<<<<<<< HEAD
-<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>-->
-<!--<script type="text/javascript" src="../src/js/service.js"></script>-->
-<!--<script type="text/javascript" src="../src/js/public.js"></script>-->
-<!--<script type="text/javascript" src="../src/js/Technologytrading.js"></script>-->
-=======
-<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
->>>>>>> 3f034bf88b36b4026efb6faf31c6ceba61bbe447
 <script type="text/javascript" src="../src/js/Technologytrading.js"></script>
 <script type="text/javascript" src="../src/js/public.js"></script>
 <script type="text/javascript" src="../src/js/main_banner.js" ></script>
 
->>>>>>> 350a3be7ae6655de28f2d85f388298e0857a8e16
+
 </html>

+ 2 - 2
template/index.html

@@ -402,12 +402,12 @@
 			<form  id="form_login">
 				<div class="login_uesr">
 					<label for="uesname"><img src="../img/login_use.png"/></label>
-					<input type="text" name="uesname" id="Lo_user" value="用户名/邮箱/手机" />
+					<input type="text" name="uesname" id="Lo_user" placeholder="用户名/邮箱/手机" />
 					<img src="../img/login_del.png" class="log_del"/>
 				</div>
 				<div class="login_pass">
 					<label for="pass"><img src="../img/login_password.png"/></label>
-					<input type="text" name="pass" id="Lo_pass" value="请输入密码" />
+					<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
 				</div>
 				<div class="login_check">
 					<label for="checks" class="lab_check">

+ 2 - 2
template/register.html

@@ -236,12 +236,12 @@
 			<form action="" method="post">
 				<div class="login_uesr">
 					<label for="uesname"><img src="../img/login_use.png"/></label>
-					<input type="text" name="uesname" id="Lo_user" value="用户名/邮箱/手机" />
+					<input type="text" name="uesname" id="Lo_user" placeholder="用户名/邮箱/手机" />
 					<img src="../img/login_del.png" class="log_del"/>
 				</div>
 				<div class="login_pass">
 					<label for="pass"><img src="../img/login_password.png"/></label>
-					<input type="text" name="pass" id="Lo_pass" value="请输入密码" />
+					<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
 				</div>
 				<div class="login_check">
 					<label for="checks" class="lab_check">

+ 2 - 2
template/service.html

@@ -441,12 +441,12 @@
 			<form action="" method="post">
 				<div class="login_uesr">
 					<label for="uesname"><img src="../img/login_use.png"/></label>
-					<input type="text" name="uesname" id="Lo_user" value="用户名/邮箱/手机" />
+					<input type="text" name="uesname" id="Lo_user" placeholder="用户名/邮箱/手机" />
 					<img src="../img/login_del.png" class="log_del"/>
 				</div>
 				<div class="login_pass">
 					<label for="pass"><img src="../img/login_password.png"/></label>
-					<input type="text" name="pass" id="Lo_pass" value="请输入密码" />
+					<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
 				</div>
 				<div class="login_check">
 					<label for="checks" class="lab_check">

+ 2 - 2
template/thinktank.html

@@ -153,12 +153,12 @@
 				<form action="" method="post">
 					<div class="login_uesr">
 						<label for="uesname"><img src="../img/login_use.png"/></label>
-						<input type="text" name="uesname" id="Lo_user" value="用户名/邮箱/手机" />
+						<input type="text" name="uesname" id="Lo_user" placeholder="用户名/邮箱/手机" />
 						<img src="../img/login_del.png" class="log_del"/>
 					</div>
 					<div class="login_pass">
 						<label for="pass"><img src="../img/login_password.png"/></label>
-						<input type="text" name="pass" id="Lo_pass" value="请输入密码" />
+						<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
 					</div>
 					<div class="login_check">
 						<label for="checks" class="lab_check">

+ 8 - 5
webpack.config.js

@@ -16,7 +16,7 @@ let isWatch = argv.env.watch == 'watch';
 let isDev = isWatch || argv.env.deploy == 'dev';
 
 module.exports = (function () {
-    let plugins = [
+    let plugins =[
         //把入口文件里面的数组打包成verdors.js
         // new ImageminPlugin({
         //     disable: isDev,
@@ -26,10 +26,10 @@ module.exports = (function () {
         //         optimizationLevel: 9
         //     }
         // }),
-       new webpack.optimize.CommonsChunkPlugin({
+        new webpack.optimize.CommonsChunkPlugin({
             name: 'vendors'
         }),
-         new ExtractTextPlugin({
+        new ExtractTextPlugin({
             filename: "[name].css",
             disable: false,
             allChunks: true
@@ -37,7 +37,7 @@ module.exports = (function () {
         new webpack.ProvidePlugin({
             $: "jquery",
             jQuery: "jquery"
-        }),
+        }),       
         new HtmlWebpackPlugin({
             title: '首页',
             filename: 'html/index.html',
@@ -63,7 +63,7 @@ module.exports = (function () {
             chunks: ['Technologytrading', 'vendors']
         }),
         new HtmlWebpackPlugin({
-            title: '科技交易',
+            title: '科技智库',
             filename: 'html/thinktank.html',
             template: './template/thinktank.html',
             chunks: ['thinktank', 'vendors']
@@ -91,6 +91,9 @@ module.exports = (function () {
         case 'test':
             staticHost = 'http://static.jishutao.com';
             break;
+        case 'stage':
+            staticHost = 'http://aftts.hnzhiming.com';
+            break;
         case 'prod':
             staticHost = 'http://s.jishutao.com';
             break;

+ 6 - 6
webpack/entry.config.js

@@ -21,13 +21,13 @@ module.exports = {
       'webpack/hot/only-dev-server',
       './src/js/register.js'
     ],
-     'Technologytrading': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './src/js/Technologytrading.js'
+  '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:80', // WebpackDevServer host and port
-      'webpack/hot/only-dev-server',
-      './src/js/thinktank.js'
+   'thinktank': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+   'webpack/hot/only-dev-server',
+    './src/js/thinktank.js'
     ],
   }
 }