Ver código fonte

Accept Merge Request #243 修改BUG : (test -> prod)

Merge Request: 修改BUG
Created By: @浅川
Accepted By: @浅川
URL: https://coding.net/t/aft/p/AFT/git/merge/243
浅川 8 anos atrás
pai
commit
b5e80eff1a
23 arquivos alterados com 301 adições e 259 exclusões
  1. 3 3
      src/main/java/com/goafanti/common/controller/PortalController.java
  2. 2 1
      src/main/java/com/goafanti/common/controller/WebpageController.java
  3. 1 1
      src/main/resources/props/config_local.properties
  4. 15 14
      src/main/webapp/WEB-INF/views/common.html
  5. 5 5
      src/main/webapp/WEB-INF/views/portal/financial/index.html
  6. 1 5
      src/main/webapp/WEB-INF/views/portal/financial/investmentDetail.html
  7. 1 1
      src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html
  8. 113 108
      src/main/webapp/WEB-INF/views/portal/index.html
  9. 1 1
      src/main/webapp/WEB-INF/views/portal/member.html
  10. 1 1
      src/main/webapp/WEB-INF/views/portal/news/newsDetail.html
  11. 1 1
      src/main/webapp/WEB-INF/views/portal/search/subscriberOrg.html
  12. 1 1
      src/main/webapp/WEB-INF/views/portal/search/subscriberUser.html
  13. 8 8
      src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html
  14. 20 41
      src/main/webapp/WEB-INF/views/portal/service/propertyRight.html
  15. 11 8
      src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html
  16. 16 13
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html
  17. 6 5
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html
  18. 16 12
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html
  19. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html
  20. 56 10
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html
  21. 9 5
      src/main/webapp/WEB-INF/views/portal/thinkTank/index.html
  22. 12 13
      src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html
  23. 1 1
      src/main/webapp/WEB-INF/views/user/subscriberDetail.html

+ 3 - 3
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -166,7 +166,7 @@ public class PortalController extends BaseController {
 		List<DemandListBo> redemandlist = new ArrayList<DemandListBo>();
 
 		if (demandlist.size() >= 5) {
-			int idx = (int) new Random().nextInt(demandlist.size() - 4);
+			int idx =  new Random().nextInt(demandlist.size() - 4);
 			redemandlist.add(demandlist.get(idx));
 			redemandlist.add(demandlist.get(idx + 1));
 			redemandlist.add(demandlist.get(idx + 2));
@@ -376,7 +376,7 @@ public class PortalController extends BaseController {
 		List<AchievementListBo> boutiqueachievement = achievementService.getAchievement(1);
 		List<AchievementListBo> reboutiqueachievement = new ArrayList<AchievementListBo>();
 		if (boutiqueachievement.size() >= 4) {
-			int index = (int) new Random().nextInt(boutiqueachievement.size() - 3);
+			int index =  new Random().nextInt(boutiqueachievement.size() - 3);
 			reboutiqueachievement.add(boutiqueachievement.get(index));
 			reboutiqueachievement.add(boutiqueachievement.get(index + 1));
 			reboutiqueachievement.add(boutiqueachievement.get(index + 2));
@@ -403,7 +403,7 @@ public class PortalController extends BaseController {
 		List<AchievementListBo> reachievementlist = new ArrayList<AchievementListBo>();
 
 		if (achievementlist.size() >= 5) {
-			int idx = (int) new Random().nextInt(achievementlist.size() - 4);
+			int idx =  new Random().nextInt(achievementlist.size() - 4);
 			reachievementlist.add(achievementlist.get(idx));
 			reachievementlist.add(achievementlist.get(idx + 1));
 			reachievementlist.add(achievementlist.get(idx + 2));

+ 2 - 1
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -111,7 +111,8 @@ public class WebpageController extends BaseController {
 	@RequestMapping(value = "/user/logout", method = RequestMethod.GET)
 	public String userLogout(HttpServletRequest request, ModelAndView modelview) {
 		TokenManager.logout();
-		return userLogin(request, modelview);
+		//return userLogin(request, modelview);
+		return "redirect:/portal/index";
 	}
 
 	@RequestMapping(value = "/user/signIn", method = RequestMethod.GET)

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//sb.jishutao.com/1.0.43
+static.host=//sb.jishutao.com/1.0.44
 portal.host=//sf.jishutao.com/portal/2.0.1
 avatar.host=//sb.jishutao.com
 avatar.upload.host=//sb.jishutao.com/upload

+ 15 - 14
src/main/webapp/WEB-INF/views/common.html

@@ -73,7 +73,9 @@
   				</ul>
   			</div>
   			<div class="nav_right" th:if="${!isLogin}">
-  				<a th:href="${basePath + '/user/signIn.html'}">注册</a>
+  				<a th:href="${basePath + '/user/signIn.html'}">
+  					<img th:src="${portalHost+'/img/index_resiter.png'}" alt="" />
+  				</a>
   				<a href="javascript:;"  class="head_login">登录</a>
   				<a href="">关于我们</a>
   			</div>
@@ -119,12 +121,12 @@
 					<div class="text_center" id="qrCode">
 						<div class="cont_left">
 							<img th:src="${portalHost+'/img/dizhi.jpg'}" alt="" />
-							<p>湖南省长沙市营盘东路19号金山大厦</p>
+							<p>湖南省长沙市营盘东路19号金山大厦八楼</p>
 						</div>
 						<div class="cont_center">
 							<img th:src="${portalHost+'/img/dianhua.jpg'}" alt="" />
 							<p>合作电话:0731-85202685</p>
-							<p>400-8800-962八楼</p>
+							<p>400-8800-962</p>
 						</div>		
 						<div class="cont_rightapp">
 							<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt=""/>
@@ -179,7 +181,7 @@
 						<p>实名认证</p>
 					</a>
 				</li>
-				<li th:if="${!isLogin}"><a href=""> <img
+				<li th:classappend="${!isLogin}? 'head_login'"><a href=""> <img
 						th:src="${portalHost+'/img/index_fix1.png'}" alt="" />
 						<p>发布需求</p>
 				</a></li>
@@ -187,7 +189,7 @@
 						th:src="${portalHost+'/img/index_fix1.png'}" alt="" />
 						<p>发布需求</p>
 				</a></li>
-				<li th:if="${!isLogin}"><a href=""> <img
+				<li th:classappend="${!isLogin}? 'head_login'"><a href=""> <img
 						th:src="${portalHost+'/img/index_fix2.png'}" alt="" />
 						<p>发布技术</p>
 				</a></li>
@@ -195,8 +197,7 @@
 						th:src="${portalHost+'/img/index_fix2.png'}" alt="" />
 						<p>发布技术</p>
 				</a></li>
-				<li><a
-					href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+				<li><a onclick="_MEIQIA('showPanel')">
 						<img th:src="${portalHost+'/img/index_fix3.png'}" alt="" />
 						<p>联系客服</p>
 				</a></li>
@@ -214,14 +215,14 @@
 			<div class="login_mian">
 				<div class="login_left">
 					<div class="login_ewm">
-						<img th:src="${portalHost+'/img/login_ewm.png'}" alt="二维码" />
+						<img th:src="${portalHost+'/img/erweima.jpg'}" alt="二维码" />
 					</div>
-					<p>扫描二维码下载官方</p>
-					<p>技淘APP</p>
+					<p>扫描二维码关注</p>
+					<p>技淘公众号</p>
 				</div>
 				<div class="login_right">
 					<h5>
-						用户登录<a href="">免费注册有好礼呦!!</a>
+						用户登录<a href="/user/signIn.html">免费注册有好礼呦!!</a>
 					</h5>
 					<form id="form_login">
 						<div class="login_uesr">
@@ -235,12 +236,12 @@
 						</div>
 						<div class="login_check">
 							 <label for="checks" class="lab_check"> 
-								<input type="checkbox" name="type" id="checks" value="0" />专家
+								<input type="checkbox" name="type" id="checks" value="0" />专家登录
 							</label> 
 							<label for="checkst" class="lab_checkno"> 
-								<input type="checkbox" name="type" id="checkst" value="1"/>企业
+								<input type="checkbox" name="type" id="checkst" value="1"/>企业登录
 							</label> 
-							<u><a href="">忘记密码?</a></u>
+							<!-- <u><a href="">忘记密码?</a></u> -->
 						</div>
 						<input type="submit" value="登 陆" class="login_submit" />
 					</form>

+ 5 - 5
src/main/webapp/WEB-INF/views/portal/financial/index.html

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>科技金融</title>
+<title>科技金融--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/financialIndex.css'}" rel="stylesheet">
 </head>
@@ -49,7 +49,7 @@
 	<div id="finance_tab_one">
 		<div id="fund_begin">
 			<div class="script">
-				<h1>找资金从这里开始</h1>
+				<h1>找资金&nbsp;&nbsp;从这里开始</h1>
 			</div>
 			<div class="classify">
 				<div>
@@ -94,7 +94,7 @@
 				</div>
 			</div>
 			<div class="begin">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即加入</a>
+					<a onclick="_MEIQIA('showPanel')">立即加入</a>
 			</div>
 		</div>
 		<div id="member">
@@ -141,7 +141,7 @@
 	<div id="finance_tab_two">
 		<div id="fund_begin_two">
 			<div class="script">
-				<h1>找项目从这里开始</h1>
+				<h1>找项目&nbsp;&nbsp;从这里开始</h1>
 			</div>
 			<div class="classify">
 				<div>
@@ -186,7 +186,7 @@
 				</div>
 			</div>
 			<div class="begin">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即加入</a>
+					<a onclick="_MEIQIA('showPanel')">立即加入</a>
 			</div>
 		</div>
 		<div id="member_two">

+ 1 - 5
src/main/webapp/WEB-INF/views/portal/financial/investmentDetail.html

@@ -12,12 +12,8 @@
 	</header>
 	<!--banner-->
   	<div class="carouselt">
-		<ul class="ct-img-big clear">
+		<ul class="ct-img-big1 clear">
 			<li data-index=0 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a href=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
 		</ul>
 		<a class="btn btn-next" href="">
 			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/financial/investmentInstitution.html

@@ -12,7 +12,7 @@
 	</header>
 	<!--banner-->
   	<div class="carouselt">
-		<ul class="ct-img-big clear">
+		<ul class="ct-img-bi clear">
 			<li data-index=0 ><a href=""><img th:src="${portalHost + '/img/investmentDetail_banner01.jpg'}" alt=""/></a></li>
 			<li data-index=1 ><a href=""><img th:src="${portalHost + '/img/investmentDetail_banner01.jpg'}" alt=""/></a></li>
 			<li data-index=2 ><a href=""><img th:src="${portalHost + '/img/investmentDetail_banner01.jpg'}" alt=""/></a></li>

+ 113 - 108
src/main/webapp/WEB-INF/views/portal/index.html

@@ -3,101 +3,89 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>首页</title>
+<title>首页--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/index.css'}" rel="stylesheet">
 </head>
-<body>  	
-  	<header>
+<body>
+	<header>
 		<div th:replace="common::nav('','')"></div>
 	</header>
 	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a href=""><img th:src="${portalHost+'/img/index_banner01.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/index_banner02.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/index_banner03.jpg'}" alt=""/></a></li>
+			<li data-index=0><a href=""><img
+					th:src="${portalHost+'/img/index_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=1><a href=""><img
+					th:src="${portalHost+'/img/index_banner02.jpg'}" alt="" /></a></li>
+			<li data-index=2><a href=""><img
+					th:src="${portalHost+'/img/index_banner03.jpg'}" alt="" /></a></li>
+			<li data-index=3><a href=""><img
+					th:src="${portalHost+'/img/index_banner04.jpg'}" alt="" /></a></li>
+		</ul>
+		<ul class="ct-img-small clear">
+
 		</ul>
-		<a class="btn btn-next" href="">
-			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
-		</a>
-		<a class="btn btn-pre" href="">
-			<img th:src="${portalHost+'/img/index_pre.png'}" alt=""/>
-		</a>
 	</div>
 	<div class="index_activity">
 		<div class="container">
 			<ul>
-				<li>
-					<strong>6900条</strong>
-					<p>需求数</p>
-				</li>
-				<li>
-					<strong>20万</strong>
-					<p>成果数</p>
-				</li>
-				<li>
-					<strong>2万个</strong>
-					<p>专家数</p>
-				</li>
-				<li>
-					<strong>1200笔</strong>
-					<p>专利交易</p>
-				</li>
-				<li>
-					<strong>12000家</strong>
-					<p>客户数</p>
-				</li>
-				<li>
-					<strong>68场</strong>
-					<p>技术对接场次</p>
-				</li>
+				<li><strong>6835条</strong>
+					<p>需求数</p></li>
+				<li><strong>204628条</strong>
+					<p>成果数</p></li>
+				<li><strong>21426个</strong>
+					<p>专家数</p></li>
+				<li><strong>853笔</strong>
+					<p>专利交易</p></li>
+				<li><strong>12495家</strong>
+					<p>客户数</p></li>
+				<li><strong>68场</strong>
+					<p>技术对接场次</p></li>
 			</ul>
-		</div> 		
-  	</div>
- 	<div id="active">
+		</div>
+	</div>
+	<div id="active">
 		<div class="coupon rf">
-			<div class="coupon_cont lf">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>注册即送代金券1000元</h2>
-				<p>立即领取</p>
-				</a>				
+			<div class="coupon_cont lf"  onclick="_MEIQIA('showPanel')">
+					<h2>注册即送代金券1000元</h2>
+					<p>立即领取</p>
 			</div>
-			<div class="coupon_cont lf">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>做高新,送软著</h2>
-				<p>立即领取</p>
-				</a>						
+			<div class="coupon_cont lf"  onclick="_MEIQIA('showPanel')">
+					<h2>做高新,送软著</h2>
+					<p>立即领取</p>
 			</div>
-			<div class="coupon_cont lf">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>买专利,享九折</h2>
-				<p>立即领取</p>
-				</a>						
+			<div class="coupon_cont lf" onclick="_MEIQIA('showPanel')">
+					<h2>买专利,享九折</h2>
+					<p>立即领取</p>
 			</div>
-			<div class="coupon_cont lf">
-				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
-				<h2>百元做软著</h2>
-				<p>立即领取</p>
-				</a>								
+			<div class="coupon_cont lf"  onclick="_MEIQIA('showPanel')">
+					<h2>百元做软著</h2>
+					<p>立即领取</p>
 			</div>
 		</div>
 		<div class="title">
 			<p>强势放价</p>
-		</div>
+		</div>      
 		<div class="line"></div>
 	</div>
 	<div id="product">
-		<div class="caption">精品成果<a th:href="${basePath + '/portal/technologyTrading/achievement.html'}">MORE+</a></div>
+		<div class="caption">
+			精品成果<a
+				th:href="${basePath + '/portal/technologyTrading/achievement.html'}">MORE+</a>
+		</div>
 		<div class="content">
 			<div class="con_hover">
-				<img th:src="${portalHost + '/img/search_txt.png'}" alt="" />
-				<p>详情</p>
+				<a href="#"> <img th:src="${portalHost + '/img/search_txt.png'}"
+					alt="" />
+					<p>详情</p>
+				</a>
 			</div>
 			<div class="cont cont_top1">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=66b56b38-4e12-4089-892f-12f43d15387d&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=66b56b38-4e12-4089-892f-12f43d15387d&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_one.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product1.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_one.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product1.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>军民两用无人飞行器系统</h2>
@@ -106,10 +94,11 @@
 				</a>
 			</div>
 			<div class="cont cont_bottom1">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=03120e15-6eb2-4066-9d04-ca59278fba8d&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=03120e15-6eb2-4066-9d04-ca59278fba8d&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_two.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product2.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_two.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product2.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>新型炭纳米管-石墨烯交联网络高导热薄膜</h2>
@@ -118,10 +107,11 @@
 				</a>
 			</div>
 			<div class="cont cont_top2">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=73e9d01d-fc19-4585-a6e3-9ae4c9c274c6&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=73e9d01d-fc19-4585-a6e3-9ae4c9c274c6&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_three.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product3.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_three.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product3.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>基于原位氧化吸附热敏染料废水处理技术</h2>
@@ -130,10 +120,11 @@
 				</a>
 			</div>
 			<div class="cont cont_bottom2">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=4ce4132f-3749-46da-843b-d4448c78a65b&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=4ce4132f-3749-46da-843b-d4448c78a65b&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_four.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product4.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_four.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product4.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>智能网联驾驶技术</h2>
@@ -142,10 +133,11 @@
 				</a>
 			</div>
 			<div class="cont cont_top3">
-				<a th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=3ffb74be-fb8c-48df-9e29-31cc721ec44e&type=1'}">
+				<a
+					th:href="${basePath + '/portal/technologyTrading/achievementDetail?id=3ffb74be-fb8c-48df-9e29-31cc721ec44e&type=1'}">
 					<div class="img">
-						<img th:src="${portalHost+'/img/index_five.png'}" alt=""/>
-						<img th:src="${portalHost+'/img/product5.jpg'}" alt=""/>
+						<img th:src="${portalHost+'/img/index_five.png'}" alt="" /> <img
+							th:src="${portalHost+'/img/product5.jpg'}" alt="" />
 					</div>
 					<div class="text">
 						<h2>MR-PET高端医学影像装备的关键技术与关键部</h2>
@@ -156,15 +148,21 @@
 		</div>
 	</div>
 	<div id="policy">
-		<div class="captions">智政 <a th:href="${basePath + '/portal/thinkTank/policyList.html'}">MORE+</a></div>
+		<div class="captions">
+			智&nbsp;&nbsp;&nbsp;&nbsp;政  <a
+				th:href="${basePath + '/portal/thinkTank/policyList.html'}">MORE+</a>
+		</div>
 		<div class="pol_cont">
 			<div class="pol_left">
-				<img th:src="${portalHost+'/img/policy.jpg'}" alt=""/>
+				<img th:src="${portalHost+'/img/policy.jpg'}" alt="" />
 				<div class="pol_left_cont">
 					<h3>解读习近平总书记在中央财经领导小组第十六次会议上关于知识产权工作的重要论述</h3>
 					<p>“要调动拥有知识产权的自然人和法人的积极性和主动性,提升产权意识,自觉运用法律武器依法维权。</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116557327490236416'}">MORE+</a></div>
+						<div class="more rf">
+							<a
+								th:href="${basePath + '/portal/news/newsDetail?id=116557327490236416'}">MORE+</a>
+						</div>
 						<div class="data">2017-09-18</div>
 					</div>
 				</div>
@@ -174,7 +172,10 @@
 					<h3>国务院知识产权局印发《“十三五”国家知识产权保护和运用规划重点任务分工方案》</h3>
 					<p>中央组织部、中央编办、中央综治办、中央网信办,国务院知识产权战略实施工作部际联席会议各成员单位,民政部、食品药品监管总局</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116558483981484032'}">MORE+</a></div>
+						<div class="more rf">
+							<a
+								th:href="${basePath + '/portal/news/newsDetail?id=116558483981484032'}">MORE+</a>
+						</div>
 						<div class="data">2017-09-18</div>
 					</div>
 				</div>
@@ -182,15 +183,21 @@
 					<h3>科技部发布国家重点研发计划智能机器人等重点专项2017年度项目申报指南</h3>
 					<p>各省、自治区、直辖市及计划单列市科技厅(委、局),新疆生产建设兵团科技局,国务院各有关部门科技主管司局,各有关单位</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116557895017316352'}">MORE+</a></div>
+						<div class="more rf">
+							<a
+								th:href="${basePath + '/portal/news/newsDetail?id=116557895017316352'}">MORE+</a>
+						</div>
 						<div class="data">2017-09-18</div>
 					</div>
 				</div>
-				<div class="pol_right_sm pol_act">				
+				<div class="pol_right_sm pol_act">
 					<h3>开展湖南省2017年高新技术企业认定工作的通知</h3>
 					<p>申报条件:(一)在中国境内(不含港、澳、台地区)注册的企业,近三年内通过自主研发、受让、受赠、并购等方式</p>
 					<div class="pol_bottom">
-						<div class="more rf"><a th:href="${basePath + '/portal/news/newsDetail?id=116548420894081024'}">MORE+</a></div>
+						<div class="more rf">
+							<a
+								th:href="${basePath + '/portal/news/newsDetail?id=116548420894081024'}">MORE+</a>
+						</div>
 						<div class="data">2017-09-18</div>
 					</div>
 				</div>
@@ -200,61 +207,57 @@
 	<div class="need_main">
 		<div id="need">
 			<div class="caption">精品需求</div>
-			<span class="more"><a th:href="${basePath + '/portal/technologyTrading/demand.html'}">MORE+</a></span>
+			<span class="more"><a
+				th:href="${basePath + '/portal/technologyTrading/demand.html'}">MORE+</a></span>
 			<div class="carousel">
 				<span class="need_prev"><</span>
 				<div class="need_imgs">
 					<ul>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=cdee3d8f-affe-45b0-9fd2-542cb2ed16fa&type=1'}">
-								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />	
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=cdee3d8f-affe-45b0-9fd2-542cb2ed16fa&type=1'}">
+								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />
 								<p>新型纳米涂料技术</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=b17c5768-327d-4d90-8557-e4f21af050b0&type=1'}">
+						</a></li>
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=b17c5768-327d-4d90-8557-e4f21af050b0&type=1'}">
 								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
 								<p>汽车空调的辅助制冷装置</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=e6b9869a-15aa-437a-afdd-0c289acd8cbf&type=1'}">
+						</a></li>
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=e6b9869a-15aa-437a-afdd-0c289acd8cbf&type=1'}">
 								<img th:src="${portalHost+'/img/need_img1.jpg'}" alt="" />
 								<p>高性能铅炭电池</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=9b815c37-9748-4224-9770-07df8f35a6d9&type=1'}">
+						</a></li>
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=9b815c37-9748-4224-9770-07df8f35a6d9&type=1'}">
 								<img th:src="${portalHost+'/img/need_img2.jpg'}" alt="" />
 								<p>ABS板材改性工程塑料的配方及研究</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
-						<li>
-							<a th:href="${basePath + '/portal/technologyTrading/demandDetail?id=5335f8d9-0e4d-4263-8d99-8faf92de5f1d&type=1'}">
+						</a></li>
+						<li><a
+							th:href="${basePath + '/portal/technologyTrading/demandDetail?id=5335f8d9-0e4d-4263-8d99-8faf92de5f1d&type=1'}">
 								<img th:src="${portalHost+'/img/need_img3.jpg'}" alt="" />
 								<p>机械领域新型产品或技术</p>
 								<div class="need_black">
 									<img th:src="${portalHost+'/img/search_txt.png'}" alt="" />
 									<p>详情</p>
 								</div>
-							</a>
-						</li>
+						</a></li>
 					</ul>
 				</div>
 				<span class="need_next">></span>
@@ -265,7 +268,9 @@
 		<div th:replace="common::copyright"></div>
 		<div th:replace="common::login"></div>
 	</footer>
-	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
+	<div class="smg">
+		<input type="text" name="msg" value="" id="msg" />
+	</div>
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
 		<script type="text/javascript" th:src="${portalHost + '/index.js'}"></script>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/member.html

@@ -34,7 +34,7 @@
 			</div>
 			<img th:src="${portalHost + '/img/member_4.png'}" alt="黄金会员" class="gold" />
 			<img th:src="${portalHost + '/img/member_7.jpg'}" alt="钻石会员" class="diamond" />
-			<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即申请</a>	
+			<a onclick="_MEIQIA('showPanel')">立即申请</a>	
 		</div>
 		<div class="shadow">
 			<img th:src="${portalHost + '/img/shadow7.png'}" alt="" />

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/news/newsDetail.html

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>新闻详情</title>
+<title>新闻详情--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/thinkTank/policyDetail.css'}" rel="stylesheet">
 </head>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/search/subscriberOrg.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
 <head th:replace="common::header(~{::title},~{::link})">
-	<title>伙伴搜索页面</title>
+	<title>伙伴搜索页面--我的技术和科技服务交易平台</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/search/subscriberOrg.css'}" rel="stylesheet">
 </head>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/search/subscriberUser.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
 <head th:replace="common::header(~{::title},~{::link})">
-	<title>行家搜索页面</title>
+	<title>行家搜索页面--我的技术和科技服务交易平台</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/search/subscriberUser.css'}" rel="stylesheet">
 </head>

+ 8 - 8
src/main/webapp/WEB-INF/views/portal/service/highTechCognizance.html

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>高企认定</title>
+<title>高企认定--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/service/highTechCognizance.css'}" rel="stylesheet">
 </head>
@@ -123,7 +123,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="problem_bottom"><a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">我要咨询</a></div>
+			<div class="problem_bottom"><a onclick="_MEIQIA('showPanel')">我要咨询</a></div>
 		</div>
 	</div>
 	<div id="all_policy">
@@ -184,7 +184,7 @@
 	        </div>
 	        <div class="field_8">
 	        	<img th:src="${portalHost+'/img/hightech14.png'}" alt="" />
-	            <div>高新技术改造传统产业</div>
+	            <div>先进制造与自动化</div>
 	        </div>
 	    </div>
 	</div>
@@ -225,15 +225,15 @@
 			<h3>技淘技术服务保障 最贴心 最权威的技术团队为您随时守候</h3>
 			<div class="ensureleft">
 				<h4>精英保障</h4>
-				<p>资深精英团队全程为您独家定制构建方案,详细解说各项政策, 为企业解决每一项疑问和问题,尽最大可能一次通过</p>
+				<p>资深精英团队全程为您独家定制构建方案,详细解说各项政策,为企业解决每一项疑问和问题,尽最大可能一次通过</p>
 			</div>
 			<div class="ensurecenter">
-				<h4>精英保障</h4>
-				<p>资深精英团队全程为您独家定制构建方案,详细解说各项政策, 为企业解决每一项疑问和问题,尽最大可能一次通过</p>
+				<h4>技术保障</h4>
+				<p>技术专业团队全程会您提供最高效、最优质的服务,拥有完整的资料整理流程和申报流程,更是提高成功率的保障</p>
 			</div>
 			<div class="ensureright">
-				<h4>精英保障</h4>
-				<p>资深精英团队全程为您独家定制构建方案,详细解说各项政策, 为企业解决每一项疑问和问题,尽最大可能一次通过</p>
+				<h4>售后保障</h4>
+				<p>后期跟踪企业项目数据,进行后端信息资源更新及对接,协助企业建立科技管理系统,解决企业后顾之忧</p>
 			</div>
 		</div>
 	</div>

+ 20 - 41
src/main/webapp/WEB-INF/views/portal/service/propertyRight.html

@@ -3,21 +3,9 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>知识产权</title>
+<title>知识产权--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/service/propertyRight.css'}" rel="stylesheet">
-<script th:inline="javascript">
-	/* var isLogin = [[${isLogin}]];
-	if(isLogin){
-		跳转  globalConfig.context+'/user/account/services.html#contract'
-	}else{
-		$('#msg').val('请先登录')
-		$('.smg').fadeIn(300);
-		setTimeout(function(){
-    		$('.smg').fadeOut(500)
-    	},2000)
-	}	 */	
-</script>
 </head>
 <body>
 	<header>
@@ -104,14 +92,14 @@
   				</ul>
   			</div>
   			<div class="propery_welfare">
-  				<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+  					<a onclick="_MEIQIA('showPanel')">
   					<img th:src="${portalHost+'/img/property_money.png'}"/>
   				</a>
   			</div>  			
   		</div> 
   		<div class="welfare_href">
-  			<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即申请</a>
-  			<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">专利征集</a>
+  			<a onclick="_MEIQIA('showPanel')">立即申请</a>
+  			<a onclick="_MEIQIA('showPanel')">专利征集</a>
   		</div> 		
   	</div>
   	<div class="propery_star"></div>  		 	
@@ -120,36 +108,27 @@
   			<h4>软件著作权</h4>
 	  		<div class="copyright_left">
 	  			<img th:src="${portalHost+'/img/property_05.png'}" alt="" />
-				<p>
-					迎国庆 大放价
-				</p>
-				<p>
-					百元做软著  限时限量 先到先得
-				</p>
-				<p>
-					够量100个  够时 2017年  10月 1 号
-				</p>
+	  				<a onclick="_MEIQIA('showPanel')">立即申请</a>
 			</div>
 	  		<div class="copyright_right">
 	  			<h6>软著动态</h6>
 	  			<div id="slide">
-	  			<ol id="slide1">
-	  				<li>湖南永蓝检测技术股份有限公司  <span>2017/5/10</span></li>
-	  				<li>湖南力本种业科技有限公司  <span>2017/5/10</span></li>
-	  				<li>中核二七二铀业有限责任公司  <span>2017/5/18</span></li>
-	  				<li>湖南开创致远信息技术有限公司  <span>2017/5/24</span></li>
-	  				<li>湖南网鑫高科科技有限公司  <span>2017/6/2</span></li>
-	  				<li>株洲中车时代投资有限公司  <span>2017/6/9</span></li>
-	  				<li>邵阳市三才科技发展有限公司  <span>2017/5/24</span></li>
-	  				<li>长沙加美乐素化工有限公司   <span>2017/5/22</span></li>
-	  				<li>湖南华豪科技发展有限公司  <span>2017/5/26</span></li>
-	  				<li>湖南省第六工程有限公司 <span> 2017/5/26</span></li>
-	  			</ol>
-	  			<div id="slide2">
-	  					
-	  			</div>	
+		  			<ol id="slide1">
+		  				<li>湖南永蓝检测技术股份有限公司  <span>2017/5/10</span></li>
+		  				<li>湖南力本种业科技有限公司  <span>2017/5/10</span></li>
+		  				<li>中核二七二铀业有限责任公司  <span>2017/5/18</span></li>
+		  				<li>湖南开创致远信息技术有限公司  <span>2017/5/24</span></li>
+		  				<li>湖南网鑫高科科技有限公司  <span>2017/6/2</span></li>
+		  				<li>株洲中车时代投资有限公司  <span>2017/6/9</span></li>
+		  				<li>邵阳市三才科技发展有限公司  <span>2017/5/24</span></li>
+		  				<li>长沙加美乐素化工有限公司   <span>2017/5/22</span></li>
+		  				<li>湖南华豪科技发展有限公司  <span>2017/5/26</span></li>
+		  				<li>湖南省第六工程有限公司 <span> 2017/5/26</span></li>
+		  			</ol>
+		  			<div id="slide2">
+		  					
+		  			</div>	
 	  			</div>
-	  			<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即申请</a>
 	  		</div>
   		</div>
   		<div class="outtime"> 

+ 11 - 8
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>科技服务</title>
+<title>科技服务--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/service.css'}" rel="stylesheet">
 </head>
@@ -18,12 +18,15 @@
 			<li data-index=1 ><a href=""><img th:src="${portalHost+'/img/service_banner01.jpg'}" alt=""/></a></li>
 			<li data-index=2 ><a href=""><img th:src="${portalHost+'/img/service_banner01.jpg'}" alt=""/></a></li>
 		</ul>
-		<a class="btn btn-next" href="">
+		<!-- <a class="btn btn-next" href="">
 			<img th:src="${portalHost+'/img/index_next.png'}" alt=""/>
 		</a>
 		<a class="btn btn-pre" href="">
 			<img th:src="${portalHost+'/img/index_pre.png'}" alt=""/>
-		</a>
+		</a> -->
+		<ul class="ct-img-small clear">
+
+		</ul>
 	</div>
 	<!--主体内容区域开始-->
   	<div class="service_main">
@@ -39,7 +42,7 @@
 							<img th:src="${portalHost+'/img/tech_tyhs.png'}" alt=""/>
 							<img th:src="${portalHost+'/img/tech_ty.png'}" alt=""/>
 						</span>
-						<h3>专业诊断保障</h3>
+						<h3>专业诊断保障</h3>
 						<p>专家一对一服务,为客户科学诊项目,构建方案,详解政策,可帮助企业进行精准诊断,为企业尽可能增加申报成功率,尽可能达到一次通过。</p>
 					</div>
 					<div>
@@ -68,7 +71,7 @@
 							<p>做高新,送软著</p>
 						</div>
 						<div class="img_bottom">
-							<p><a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即领取</a></p>
+							<p>	<a onclick="_MEIQIA('showPanel')">立即领取</a></p>
 						</div>
 					</div>
 					<div>
@@ -77,7 +80,7 @@
 							<p>认证即送千元代金券</p>
 						</div>
 						<div class="img_bottom">
-							<p><a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即领取</a></p>
+							<p><a onclick="_MEIQIA('showPanel')">立即领取</a></p>
 						</div>
 					</div>
 					<div>
@@ -106,7 +109,7 @@
   					</div>
   					<div class="Intellectual_left">
   						<h4>买专利 ,享九折</h4>
-  						<span><a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即领取</a></span>
+  						<span><a onclick="_MEIQIA('showPanel')">立即领取</a></span>
   					</div>
   					<div class="Intellectual_left">
   						<h4>专利产权,政府扶持</h4>
@@ -125,7 +128,7 @@
   					<a th:href="${basePath+'/portal/thinkTank/policyList.html'}">了解政策</a>
   				</li>  				
   			</ul>
-  			<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">立即咨询</a>
+  			<a onclick="_MEIQIA('showPanel')">立即咨询</a>
   		</div>
   	</div>
   	<div class="customer">

+ 16 - 13
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head th:replace="common::header(~{::title},~{::link})">
-	<title>科技交易</title>
+	<title>科技交易--我的技术和科技服务交易平台</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/technologyTrading/achievement.css'}" rel="stylesheet">
 </head>
@@ -13,18 +13,21 @@
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=1><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=2><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+		</ul>
+		<!-- <a class="btn btn-next" href=""> <img
+			th:src="${portalHost + '/img/index_next.png'}" alt="" />
+		</a> <a class="btn btn-pre" href=""> <img
+			th:src="${portalHost + '/img/index_pre.png'}" alt="" />
+		</a>-->
+		<ul class="ct-img-small clear">
+
 		</ul>
-		<a class="btn btn-next" src="">
-			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
-		</a>
-		<a class="btn btn-pre" src="">
-			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
-		</a>
 	</div>
 	
 	<!--主体内容区域开始-->
@@ -97,7 +100,7 @@
 								<li value="0"><span>完全转让</span></li>
 								<li value="1"><span>许可转让</span></li>
 								<li value="2"><span>技术入股</span></li>
-								<li value="3"><span>5年独占许可转让</span></li>
+								<li value="3"><span>合作开发</span></li>
 							</ul>
 						</div>
 					</div>

+ 6 - 5
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>科技成果详情</title>
+<title>科技成果详情--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/achievementDetail.css'}" rel="stylesheet">
 </head>
@@ -25,7 +25,7 @@
 				</div>-->				
 				<div class="detail_toptitle">
 					<a href="/portal/technologyTrading/index.html">技术交易&nbsp;&nbsp;></a> <a href="/portal/technologyTrading/achievement.html">技术专利&nbsp;&nbsp;></a> <a href="#"
-						class="a_detail">专利详情</a>
+						class="a_detail">详情</a>
 				</div>
 			</div>
 			<div class="detail_center">
@@ -145,11 +145,12 @@
 			<li><a href=""><img th:src="${portalHost + '/img/index_fix2.png'}" alt="" />
 					<p>发布技术</p>
 			</a></li>
-			<li><a
-				href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+			<li>	
+				<a onclick="_MEIQIA('showPanel')">
 					<img th:src="${portalHost + '/img/index_fix3.png'}" alt="" />
 					<p>联系客服</p>
-			</a></li>
+				</a>
+			</li>
 			<li><a href="" class="pendent_box"> <img th:src="${portalHost + '/img/index_fix4.png'}" alt="" />
 					<p>返回顶部</p>
 			</a></li>

+ 16 - 12
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head th:replace="common::header(~{::title},~{::link})">
-<title>科技交易</title>
+<title>科技交易--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/demand.css'}" rel="stylesheet">
 </head>
@@ -14,18 +14,22 @@
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></a></li>
-			<li data-index=1 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></a></li>
-			<li data-index=2 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></a></li>
-			<li data-index=3 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></a></li>
-			<li data-index=4 ><a src=""><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></a></li>
+			<li data-index=0><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=1><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+			<li data-index=2><a href=""><img
+					th:src="${portalHost + '/img/technology_trading_banner01.jpg'}" alt="" /></a></li>
+		</ul>
+		<!-- <a class="btn btn-next" href=""> <img
+			th:src="${portalHost + '/img/index_next.png'}" alt="" />
+		</a> <a class="btn btn-pre" href=""> <img
+			th:src="${portalHost + '/img/index_pre.png'}" alt="" />
+		</a> -->
+
+		<ul class="ct-img-small clear">
+
 		</ul>
-		<a class="btn btn-next" src="">
-			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
-		</a>
-		<a class="btn btn-pre" src="">
-			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
-		</a>
 	</div>
 	<!--主体内容区域开始-->
   	<div class="contant">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html

@@ -4,7 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head th:replace="common::header(~{::title},~{::link})">
-<title>科技需求详情</title>
+<title>科技需求详情--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/demandDetail.css'}" rel="stylesheet">
 </head>

Diferenças do arquivo suprimidas por serem muito extensas
+ 56 - 10
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html


+ 9 - 5
src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head th:replace="common::header(~{::title},~{::link})">
-	<title>智库咨询</title>
+	<title>智库咨询--我的技术和科技服务交易平台</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/thinkTank.css'}" rel="stylesheet">
 </head>
@@ -26,23 +26,27 @@
 		</a>
 	</div>
 	<!--主体内容区域开始-->
-	<div class="container ">
-		<div class="row zizone">
+	<div id="zizone">
+	<div class="row zizone">
 			<div class="col-md-6 zone_left actives">
-				<img th:src="${portalHost + '/img/think_blur1.png'}" alt="" />
+				<!-- <img th:src="${portalHost + '/img/think_blur1.png'}" alt="" /> -->
+				<div class="img-left"></div>
 				<div class="img_right">
 					<h4>智政</h4>
 					<p>专业解读您所需的锦囊妙计</p>
 				</div>
 			</div>
 			<div class="col-md-6  zone_right">
-				<img th:src="${portalHost + '/img/think_bai1.png'}" alt="" />
+				<div class="img-right"></div>
+				<!-- <img th:src="${portalHost + '/img/think_bai1.png'}" alt="" /> -->
 				<div class="img_right">
 					<h4>智者</h4>
 					<p>您困惑中的指明灯</p>
 				</div>
 			</div>
 		</div>
+	</div>
+	<div class="container ">
 		<!--搜索-->
 		<div class="zizone_search">
 			<div class="search_left">

+ 12 - 13
src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head th:replace="common::header(~{::title},~{::link})">
-	<title>智政</title>
+	<title>智政--我的技术和科技服务交易平台</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/thinkTank/policyList.css'}" rel="stylesheet">
 </head>
@@ -12,20 +12,21 @@
 		<div th:replace="common::nav('thinkTank','policyList')"></div>
 	</header>
 	<!--banner-->
-  	<div class="carouselt">
+	<div class="carouselt">
 		<ul class="ct-img-big clear">
-			<li data-index=0 ><img th:src="${portalHost + '/img/highTech_slide_1.jpg'}" alt=""/></li>
-			<li data-index=1 ><img th:src="${portalHost + '/img/highTech_slide_2.jpg'}" alt=""/></li>
-			<li data-index=2 ><img th:src="${portalHost + '/img/highTech_slide_3.jpg'}" alt=""/></li>
-			<li data-index=3 ><img th:src="${portalHost + '/img/highTech_slide_4.jpg'}" alt=""/></li>
-			<li data-index=4 ><img th:src="${portalHost + '/img/highTech_slide_5.jpg'}" alt=""/></li>
+			<li data-index=0 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
+			<li data-index=1 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
+			<li data-index=2 ><img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt=""/></li>
 		</ul>
-		<a class="btn btn-next" href="">
+		<!-- <a class="btn btn-next" href="">
 			<img th:src="${portalHost + '/img/index_next.png'}" alt=""/>
 		</a>
 		<a class="btn btn-pre" href="">
 			<img th:src="${portalHost + '/img/index_pre.png'}" alt=""/>
-		</a>
+		</a> -->
+		<ul class="ct-img-small clear">
+
+		</ul>
 	</div>
 	<!--主体内容区域开始-->
     <div class="main_top">
@@ -34,11 +35,9 @@
 	            <ul class="detail_toptitle">
 	            	<li><img th:src="${portalHost + '/img/detail_home.jpg'}" alt="" /></li>
 	            	<li>></li> 
-	                <li><a href="#">智库咨询</a></li>
+	                 <li><a th:href="${basePath + '/portal/thinkTank/index.html'}">智库咨询</a></li>
 	                <li>></li>               
-	                <li><a href="#">智政</a></li>
-	                <li>></li>
-	                <li class="that"><a href="#" >智政资讯 </a></li>
+	                <li><a th:href="${basePath + '/portal/thinkTank/policyList.html'}">智政</a></li>
 	            </ul>
 	            <div class="portal-content">
 					<div class="search-criteria row">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/subscriberDetail.html

@@ -60,7 +60,7 @@
 			<div th:if="${showflg} == 0 ">
 				<div class="detailcenter_">
 					<img th:src="${portalHost+ '/img/all_null.png'}" alt="" />
-				</div>
+				</div> 
 			</div>
 
 			<div class="detailcenter_right">