Browse Source

Merge remote-tracking branch 'origin/master' into prod

wanghui 8 years ago
parent
commit
95c7bf4eb4

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

@@ -53,7 +53,7 @@ session.validate.timespan=18000000
 
 app.name=AFT
 
-static.host=//aftts.hnzhiming.com/1.0.39
+static.host=//aftts.hnzhiming.com/1.0.35
 
 upload.path=/data/aft/public/upload
 upload.private.path=/data/aft/private/upload

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

@@ -59,12 +59,13 @@
 					<!-- <li th:classappend="${subM=='international'}? 'active'"><a th:href="${basePath + '/portal/international/internationalIndex.html'}">国际业务</a></li> -->
 				</ul>
 			</li>
-			<li th:classappend="${mainM=='bigShot'}? 'active'">
-				<a th:href="${basePath + '/portal/scienceTechnology/bigShot.html'}">大咖说</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(2*75)+'px;left:-'+(2*75/2-74.25/2)+'px;'}">
-					<li th:classappend="${subM=='star'}? 'active'"><a th:href="${basePath + '/portal/scienceTechnology/star.html'}">科技明星</a></li>
-					<li th:classappend="${subM=='lecture'}? 'active'"><a th:href="${basePath + '/portal/scienceTechnology/lecture.html'}">科技讲堂</a></li>
-					<!-- <li><a href="#">众筹专区</a></li> -->
+			<li th:classappend="${mainM=='service'}? 'active'">
+				<a th:href="${basePath + '/portal/service/serviceIndex.html'}">服务汇</a>
+				<ul class="secondary_navigation_nav" th:style="${'width:'+(3*75)+'px;left:-'+(3*75/2-74.25/2)+'px;'}">
+					<li th:classappend="${subM=='highTech'}? 'active'"><a th:href="${basePath + '/portal/highTech/authentication.html'}">高企认定</a></li>
+					<!-- <li><a th:href="${basePath + '/portal/highTech/authentication.html'}">科技项目</a></li> -->
+					<li th:classappend="${subM=='ipr'}? 'active'"><a th:href="${basePath + '/portal/ipr/service.html'}">知识产权</a></li>
+					<li th:classappend="${subM=='evaluate'}? 'active'"><a th:href="${basePath + '/portal/evaluation/index.html'}">技术评估</a></li>
 				</ul>
 			</li>
 			<li th:classappend="${mainM=='activityIndex'}? 'active'">
@@ -90,13 +91,12 @@
 					<li><a th:href="${basePath + '/portal/international/internationalIndex.html#internationalExpert'}">国际专家</a></li>
 				</ul>
 			</li>
-			<li th:classappend="${mainM=='service'}? 'active'">
-				<a th:href="${basePath + '/portal/service/serviceIndex.html'}">服务汇</a>
-				<ul class="secondary_navigation_nav" th:style="${'width:'+(3*75)+'px;left:-'+(3*75/2-74.25/2)+'px;'}">
-					<li th:classappend="${subM=='highTech'}? 'active'"><a th:href="${basePath + '/portal/highTech/authentication.html'}">高企认定</a></li>
-					<!-- <li><a th:href="${basePath + '/portal/highTech/authentication.html'}">科技项目</a></li> -->
-					<li th:classappend="${subM=='ipr'}? 'active'"><a th:href="${basePath + '/portal/ipr/service.html'}">知识产权</a></li>
-					<li th:classappend="${subM=='evaluate'}? 'active'"><a th:href="${basePath + '/portal/evaluation/index.html'}">技术评估</a></li>
+			<li th:classappend="${mainM=='bigShot'}? 'active'">
+				<a th:href="${basePath + '/portal/scienceTechnology/bigShot.html'}">大咖说</a>
+				<ul class="secondary_navigation_nav" th:style="${'width:'+(2*75)+'px;left:-'+(2*75/2-74.25/2)+'px;'}">
+					<li th:classappend="${subM=='star'}? 'active'"><a th:href="${basePath + '/portal/scienceTechnology/star.html'}">科技明星</a></li>
+					<li th:classappend="${subM=='lecture'}? 'active'"><a th:href="${basePath + '/portal/scienceTechnology/lecture.html'}">科技讲堂</a></li>
+					<!-- <li><a href="#">众筹专区</a></li> -->
 				</ul>
 			</li>
 			<li th:classappend="${mainM=='news'}? 'active'">

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

@@ -57,9 +57,9 @@
 			class="glyphicon glyphicon-chevron-left"></span></a> <a class="carousel-control right" href="#myCarousel" data-slide="next"><span
 			class="glyphicon glyphicon-chevron-right"></span></a>
 	</div>
-
 	<div class="container evaluate">
 		<a href="/portal/highTech/evaluate/evaluate.html">免费诊断</a>
+		<a href='javascript:;' onclick="window.open('http://wpa.qq.com/msgrd?v=3&uin=2035994611&site=qq&menu=yes', '_blank', 'height=502, width=644,toolbar=no,scrollbars=no,menubar=no,status=no');">高企认定申请</a>
 	</div>
 	<div class="container">
 		<div class="title">

+ 11 - 10
src/main/webapp/WEB-INF/views/portal/index.html

@@ -69,13 +69,15 @@
 							<li><a
 								th:href="${basePath + '/portal/search/subscriberUser.html'}">行家</a></li>
 						</ol></li>
-					<li><a
-						th:href="${basePath + '/portal/scienceTechnology/bigShot.html'}">大咖说</a>
+						<li><a
+						th:href="${basePath + '/portal/service/serviceIndex.html'}">服务汇</a>
 						<ol class="next_nav">
 							<li><a
-								th:href="${basePath + '/portal/scienceTechnology/star.html'}">科技明星</a></li>
+								th:href="${basePath + '/portal/highTech/authentication.html'}">高企认定</a></li>
+							<li><a th:href="${basePath + '/portal/ipr/service.html'}">知识产权</a></li>
 							<li><a
-								th:href="${basePath + '/portal/scienceTechnology/lecture.html'}">科技讲堂</a></li>
+								th:href="${basePath + '/portal/evaluation/index.html'}">技术评估</a></li>
+
 						</ol></li>
 					<li><a
 						th:href="${basePath + '/portal/activity/activityIndex.html'}">活动圈</a>
@@ -110,16 +112,15 @@
 							<li><a
 								th:href="${basePath + '/portal/international/internationalIndex.html#internationalExpert'}">国际专家</a></li>
 						</ol></li>
-					<li><a
-						th:href="${basePath + '/portal/service/serviceIndex.html'}">服务汇</a>
+						<li><a
+						th:href="${basePath + '/portal/scienceTechnology/bigShot.html'}">大咖说</a>
 						<ol class="next_nav">
 							<li><a
-								th:href="${basePath + '/portal/highTech/authentication.html'}">高企认定</a></li>
-							<li><a th:href="${basePath + '/portal/ipr/service.html'}">知识产权</a></li>
+								th:href="${basePath + '/portal/scienceTechnology/star.html'}">科技明星</a></li>
 							<li><a
-								th:href="${basePath + '/portal/evaluation/index.html'}">技术评估</a></li>
-
+								th:href="${basePath + '/portal/scienceTechnology/lecture.html'}">科技讲堂</a></li>
 						</ol></li>
+					
 					<li><a th:href="${basePath + '/portal/news/newsIndex.html'}">策源地</a>
 						<ol class="next_nav">
 							<li><a

+ 8 - 6
src/main/webapp/WEB-INF/views/user/msignIn.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-	<head th:replace="common::header(~{::title},~{::link})">
+<head th:replace="common::header(~{::title},~{::link})">
 		<meta charset="UTF-8">		
 		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 		<title>手机注册</title>
@@ -44,12 +44,12 @@
 				      </div>
 			    </div>
 			    <div class="form-group">
-				      <label for="photo" class="col-xs-3 control-label text-right"><span class="con_text">验证</span>码:</label>
+				      <label for="phott" class="col-xs-3 control-label text-right"><span class="con_text">验证</span>码:</label>
 				      <div class="col-xs-6">
-				         <input type="text" class="form-control" id="photo"  placeholder="请输入图中验证码" required="required">			         
+				         <input type="text" class="form-control" id="phott"  placeholder="请输入图中验证码" required="required">			         
 				      </div>	
 				      <div class="col-xs-3 vcode">
-				     	<img src={vCodeUrl} />
+				     	<img th:src="${basePath+'/open/getVCode'}"/>
 				      </div>
 			    </div>
 			    <div class="form-group">
@@ -147,7 +147,9 @@
 		<footer class="text-center">
 				Copyright © 2016-2017 阿凡提 版权所有
 		</footer>
-		<script type="text/javascript" th:src="${portalHost+'/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${portalHost+'/app_login.js'}"></script>
+		<div th:replace="common::footer(~{::script})">
+			<script type="text/javascript" th:src="${portalHost+'/vendors.js'}"></script>
+			<script type="text/javascript" th:src="${portalHost+'/app_login.js'}"></script>
+		</div>
 	</body>
 </html>