Browse Source

Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/main/webapp/WEB-INF/views/portal/index.html
wanghui 8 years ago
parent
commit
8b75e61603

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

@@ -215,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">
@@ -236,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>

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

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

@@ -46,7 +46,17 @@
 	</div>
 	<div id="active">
 		<div class="coupon rf">
+<<<<<<< HEAD
 			<div class="coupon_cont lf"  onclick="_MEIQIA('showPanel')">
+=======
+		<div class='yujiazai'></div>
+		<div class='yujiazai'></div>
+		<div class='yujiazai'></div>
+		<div class='yujiazai'></div>
+			<div class="coupon_cont lf">
+				<a
+					href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+>>>>>>> refs/remotes/origin/dev
 					<h2>注册即送代金券1000元</h2>
 					<p>立即领取</p>
 			</div>

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

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

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

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

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

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

+ 4 - 0
src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html

@@ -54,6 +54,10 @@
 							<h5>冷焰火喷发设备的电子控制装置</h5>
 							<a href="javascript:;">2017-09-20</a>
 						</div>
+						<div val='2b70a9ab-4ddf-4f75-8e43-125825f651e0' typ='1'>
+							<h5>低钛高碳铬铁生产工艺</h5>
+							<a href="javascript:;">2017-03-06</a>
+						</div>
 					</div>
 					<img th:src="${portalHost + '/img/technology_text.png'}" alt="" />
 					<!-- <span>更 多</span> -->

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

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