Browse Source

合并代码

wanghui 8 years ago
parent
commit
d9f15ee297

+ 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

+ 6 - 5
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=""/>
@@ -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>

+ 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">

+ 5 - 23
src/main/webapp/WEB-INF/views/portal/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 + '/index.css'}" rel="stylesheet">
 </head>
@@ -22,12 +22,6 @@
 			<li data-index=3><a href=""><img
 					th:src="${portalHost+'/img/index_banner04.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>
@@ -52,33 +46,21 @@
 	</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">
+			<div class="coupon_cont lf"  onclick="_MEIQIA('showPanel')">
 					<h2>注册即送代金券1000元</h2>
 					<p>立即领取</p>
-				</a>
 			</div>
-			<div class="coupon_cont lf">
-				<a
-					href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+			<div class="coupon_cont lf"  onclick="_MEIQIA('showPanel')">
 					<h2>做高新,送软著</h2>
 					<p>立即领取</p>
-				</a>
 			</div>
-			<div class="coupon_cont lf">
-				<a
-					href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+			<div class="coupon_cont lf" onclick="_MEIQIA('showPanel')">
 					<h2>买专利,享九折</h2>
 					<p>立即领取</p>
-				</a>
 			</div>
-			<div class="coupon_cont lf">
-				<a
-					href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+			<div class="coupon_cont lf"  onclick="_MEIQIA('showPanel')">
 					<h2>百元做软著</h2>
 					<p>立即领取</p>
-				</a>
 			</div>
 		</div>
 		<div class="title">

+ 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="" />

+ 2 - 2
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">

+ 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"> 

+ 5 - 5
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>
@@ -71,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>
@@ -80,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>
@@ -109,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>
@@ -128,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">

+ 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>

File diff suppressed because it is too large
+ 52 - 10
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html