liliang4869 7 anni fa
parent
commit
6907893805

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/aboutUs.html

@@ -8,9 +8,9 @@
 <link th:href="${portalHost + '/aboutUs.css'}" rel="stylesheet">
 </head>
 <body>
-	<header>
+
 		<div th:replace="common::nav('','aboutUs')"></div>
-	</header>
+
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">

+ 2 - 2
src/main/webapp/WEB-INF/views/portal/contactUs.html

@@ -9,9 +9,9 @@
 <script type="text/javascript" src="http://api.map.baidu.com/api?key=&v=1.1&services=true"></script>
 </head>
 <body>
-	<header>
+	
 		<div th:replace="common::nav('','')"></div>
-	</header>
+
 	<!--banner-->
   	<div class="carouselt">
 		<ul class="ct-img-big clear">

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

@@ -15,9 +15,9 @@
 <link th:href="${portalHost+'/index.css'}" rel="stylesheet">
 </head>
 <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>

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

@@ -1,71 +1,71 @@
-<!DOCTYPE html>
-<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>
-	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-	<link th:href="${portalHost + '/member.css'}" rel="stylesheet">
-</head>
-
-<body>
-	<header>
-		<div th:replace="common::nav('','')"></div>
-	</header>
-	<!--主体内容区域开始-->
-	<div class="member">
-		<div class="member_contant">
-			<h3>申请会员获得更多增值服务</h3>
-			<div class="member_main">
-				<div class="member_on">
-					<h5><img th:src="${portalHost + '/img/member_1.jpg'}" alt="" />提供的专属服务</h5>
-					<div class="member_business_list" id="member1business">
-					</div>
-					<ul class="member_left" id="member1cost">
-					</ul>
-				</div>
-				<div class="partingline"></div>
-				<div class="member_on">
-					<h5 class="blur"><img th:src="${portalHost + '/img/member_2.jpg'}" alt="" />提供的专属服务</h5>
-					<div class="member_business_list" id="member2business">
-					</div>
-					<ul id="member2cost">
-					</ul>
-				</div>
-			</div>
-			<img th:src="${portalHost + '/img/member_4.png'}" alt="黄金会员" class="gold" />
-			<img th:src="${portalHost + '/img/member_7.jpg'}" alt="钻石会员" class="diamond" />
-			<a onclick="_MEIQIA('showPanel')">立即申请</a>	
-		</div>
-		<div class="shadow">
-			<img th:src="${portalHost + '/img/shadow7.png'}" alt="" />
-		</div>
-	</div>
-	<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-					<h4 class="modal-title" id="myModalLabel">会员订单提交</h4>
-				</div>
-				<div class="modal-body" id="modal-content">
-				</div>
-				<div class="modal-footer">
-					<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-					<button type="button" class="btn btn-primary" id="submitOrder">提交订单</button>
-				</div>
-			</div>
-		</div>
-	</div>
-	<!--主体内容区域结束-->
-	<footer>
-		<div th:replace="common::copyright"></div>
-		<div th:replace="common::login"></div>
-	</footer>
-	<div class="msg"><span></span></div>
-	<div th:replace="common::footer(~{::script})">
-		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${portalHost + '/member.js'}"></script>
-	</div>
-</body>
-
+<!DOCTYPE html>
+<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>
+	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
+	<link th:href="${portalHost + '/member.css'}" rel="stylesheet">
+</head>
+
+<body>
+	
+		<div th:replace="common::nav('','')"></div>
+
+	<!--主体内容区域开始-->
+	<div class="member">
+		<div class="member_contant">
+			<h3>申请会员获得更多增值服务</h3>
+			<div class="member_main">
+				<div class="member_on">
+					<h5><img th:src="${portalHost + '/img/member_1.jpg'}" alt="" />提供的专属服务</h5>
+					<div class="member_business_list" id="member1business">
+					</div>
+					<ul class="member_left" id="member1cost">
+					</ul>
+				</div>
+				<div class="partingline"></div>
+				<div class="member_on">
+					<h5 class="blur"><img th:src="${portalHost + '/img/member_2.jpg'}" alt="" />提供的专属服务</h5>
+					<div class="member_business_list" id="member2business">
+					</div>
+					<ul id="member2cost">
+					</ul>
+				</div>
+			</div>
+			<img th:src="${portalHost + '/img/member_4.png'}" alt="黄金会员" class="gold" />
+			<img th:src="${portalHost + '/img/member_7.jpg'}" alt="钻石会员" class="diamond" />
+			<a onclick="_MEIQIA('showPanel')">立即申请</a>	
+		</div>
+		<div class="shadow">
+			<img th:src="${portalHost + '/img/shadow7.png'}" alt="" />
+		</div>
+	</div>
+	<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+		<div class="modal-dialog" role="document">
+			<div class="modal-content">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+					<h4 class="modal-title" id="myModalLabel">会员订单提交</h4>
+				</div>
+				<div class="modal-body" id="modal-content">
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+					<button type="button" class="btn btn-primary" id="submitOrder">提交订单</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!--主体内容区域结束-->
+	<footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+	</footer>
+	<div class="msg"><span></span></div>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/member.js'}"></script>
+	</div>
+</body>
+
 </html>

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

@@ -8,9 +8,9 @@
 <link th:href="${portalHost + '/thinkTank/policyDetail.css'}" rel="stylesheet">
 </head>
 <body>
-	<header>
+
 		<div th:replace="common::nav('news','newsDetail')"></div>
-	</header>
+
 	<div id="policyDetail">
 		<div id="policy_content">
 			<div class="content_left" th:each="newsDetail:${newsDetail}">

+ 104 - 104
src/main/webapp/WEB-INF/views/portal/service/projectDetails.html

@@ -1,104 +1,104 @@
-<!DOCTYPE html>
-<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>
-	     <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
-	    <link rel="stylesheet" th:href="${portalHost +'/service/projectDetails.css'}"/>
-	</head>
-	<body>
-	<input id="demand_id" type="hidden" th:value="${projectDetail.id}">
-		<header>
-		<div th:replace="common::nav('service','highTechCognizance')"></div>
-	</header>
-		<div id="counselor_title">
-			<div class="line"></div>
-			<div class="zi">
-                >
-                <a href="#">服务项目</a>
-                >
-                <a href="#" class="a_detail">服务详情</a>
-			</div>
-		</div>
-		<div id='det_content'>
-			<div id='content_left'>
-				<div class="title" th:text="${projectDetail.name}">
-				</div>
-				<div class="cont_img">
-					<img th:src="${projectDetail.maxLogo}?${avatarUploadHost+projectDetail.maxLogo}:${avatarUploadHost+ '/default/bigimg_null.png'}" alt="" />
-				</div>
-				<div class="guanzhu">
-					<div class="loves">                       
-                       <span class="box_love"></span>
-                       <span class="dem_number" th:text="${projectDetail.countInterest}"></span>
-                       <span>关注</span>
-                       <input type="hidden" th:isInterester="${projectDetail.interest}" id="isInterester">
-                    </div>
-				</div>
-				<div class="guige">
-					<h5>
-						服务规格
-					</h5>
-					<div class="guigeone" th:if="${#lists.size(projectDetail.projectSize) ge 1}" th:text="${projectDetail.projectSize[0]}">
-					</div>
-					<div class="guigetwo"  th:if="${#lists.size(projectDetail.projectSize) ge 2}" th:text="${projectDetail.projectSize[1]}">
-					</div>
-					<div class="guigethree" th:if="${#lists.size(projectDetail.projectSize) ge 3}" th:text="${projectDetail.projectSize[2]}">
-					</div>
-				</div>
-				<div id="cont">
-					<div class="miaoshu">
-						<div class="lineB">
-							项目描述
-						</div>
-						<div th:utext="${projectDetail.introduce}">
-						</div>
-					</div>
-					<div class="jiazi">
-						<div class="lineB">
-							项目价值
-						</div>
-						<div th:utext="${projectDetail.valueEffect}">
-						</div>
-					</div>
-					<div class="ziliao">
-						<div class="lineB">
-							所需资料
-						</div>
-						<div th:utext="${projectDetail.clientSize}">
-						</div>
-					</div>
-				</div>
-				<div class="lianxi">
-					<div class="fuwu">
-						我要服务
-					</div>
-					<div class="dianhua">
-						一键电话
-					</div>
-				</div>
-			</div>
-			<div id='content_right'>
-				<div class="fine">
-                    <div class="fine_title">推荐项目</div>
-                    <div class="pointer" th:each="recommend:${recommend}">
-                        <img  th:src="${recommend.minLogoUrl}!=null?${avatarUploadHost+recommend.minLogoUrl}:${avatarUploadHost+ '/default/zhuanliimg_null.png'}" alt=""/>
-                        <p th:text="${recommend.name}"></p>
-                        <input type="hidden" th:isInterester="${recommend.id}" id="projectId">
-                    </div>
-                </div>
-			</div>
-		</div>
-		<footer>
-		<div th:replace="common::copyright"></div>
-		<div th:replace="common::login"></div>
-		<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
-	</footer>
-	<div class="msg"><span></span></div>
-	<div th:replace="common::footer(~{::script})">
-		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript" th:src="${portalHost + '/service/projectDetails.js'}"></script>
-	</div>
-	</body>
-</html>
+<!DOCTYPE html>
+<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>
+	     <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
+	    <link rel="stylesheet" th:href="${portalHost +'/service/projectDetails.css'}"/>
+	</head>
+	<body>
+	<input id="demand_id" type="hidden" th:value="${projectDetail.id}">
+		<header>
+		<div th:replace="common::nav('service','highTechCognizance')"></div>
+	</header>
+		<div id="counselor_title">
+			<div class="line"></div>
+			<div class="zi">
+                >
+                <a href="#">服务项目</a>
+                >
+                <a href="#" class="a_detail">服务详情</a>
+			</div>
+		</div>
+		<div id='det_content'>
+			<div id='content_left'>
+				<div class="title" th:text="${projectDetail.name}">
+				</div>
+				<div class="cont_img">
+					<img th:src="${projectDetail.maxLogo}?${avatarUploadHost+projectDetail.maxLogo}:${avatarUploadHost+ '/default/bigimg_null.png'}" alt="" />
+				</div>
+				<div class="guanzhu">
+					<div class="loves">                       
+                       <span class="box_love"></span>
+                       <span class="dem_number" th:text="${projectDetail.countInterest}"></span>
+                       <span>关注</span>
+                       <input type="hidden" th:isInterester="${projectDetail.interest}" id="isInterester">
+                    </div>
+				</div>
+				<div class="guige">
+					<h5>
+						服务规格
+					</h5>
+					<div class="guigeone" th:if="${#lists.size(projectDetail.projectSize) ge 1}" th:text="${projectDetail.projectSize[0]}">
+					</div>
+					<div class="guigetwo"  th:if="${#lists.size(projectDetail.projectSize) ge 2}" th:text="${projectDetail.projectSize[1]}">
+					</div>
+					<div class="guigethree" th:if="${#lists.size(projectDetail.projectSize) ge 3}" th:text="${projectDetail.projectSize[2]}">
+					</div>
+				</div>
+				<div id="cont">
+					<div class="miaoshu">
+						<div class="lineB">
+							项目描述
+						</div>
+						<div th:utext="${projectDetail.introduce}">
+						</div>
+					</div>
+					<div class="jiazi">
+						<div class="lineB">
+							项目价值
+						</div>
+						<div th:utext="${projectDetail.valueEffect}">
+						</div>
+					</div>
+					<div class="ziliao">
+						<div class="lineB">
+							所需资料
+						</div>
+						<div th:utext="${projectDetail.clientSize}">
+						</div>
+					</div>
+				</div>
+				<div class="lianxi">
+					<div class="fuwu">
+						我要服务
+					</div>
+					<div class="dianhua">
+						一键电话
+					</div>
+				</div>
+			</div>
+			<div id='content_right'>
+				<div class="fine">
+                    <div class="fine_title">推荐项目</div>
+                    <div class="pointer" th:each="recommend:${recommend}">
+                        <img  th:src="${recommend.minLogoUrl}!=null?${avatarUploadHost+recommend.minLogoUrl}:${avatarUploadHost+ '/default/zhuanliimg_null.png'}" alt=""/>
+                        <p th:text="${recommend.name}"></p>
+                        <input type="hidden" th:isInterester="${recommend.id}" id="projectId">
+                    </div>
+                </div>
+			</div>
+		</div>
+		<footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+		<input type="hidden" th:isLogin="${!isLogin}" id="isLogin" />
+	</footer>
+	<div class="msg"><span></span></div>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${portalHost + '/service/projectDetails.js'}"></script>
+	</div>
+	</body>
+</html>

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


+ 1 - 2
src/main/webapp/WEB-INF/views/portal/service/serviceList.html

@@ -11,9 +11,8 @@
 <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet"><link th:href="${portalHost+'/newMenu/serviceList.css'}" rel="stylesheet"></head>
 
 <body>
-   	<header>
+
 		<div th:replace="common::nav('','')"></div>
-	</header>
   
     <div class="container">
         <div class="industry">

+ 0 - 2
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -9,9 +9,7 @@
 </head>
 
 <body>
-   <header>
    <div th:replace="common::nav('','achievement')"></div>
-   </header>
     <!-- search -->
     <div class="container">
         

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

@@ -8,9 +8,8 @@
 <link th:href="${portalHost + '/technologyTrading/achievementDetail.css'}" rel="stylesheet">
 </head>
 <body>
-	<header>
+
 		<div th:replace="common::nav('technologyTrading','achievement')"></div>
-	</header>
 	<!--主体内容区域开始-->
 	<div id="all_achievement">
 		<div class="detail">

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


+ 137 - 139
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementOrder.html

@@ -1,139 +1,137 @@
-<!DOCTYPE html>
-<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>
-<link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
-<link
-	th:href="${portalHost + '/technologyTrading/achievementOrder.css'}"
-	rel="stylesheet">
-</head>
-<body>
-	<header>
-		<div th:replace="common::nav('technologyTrading','achievement')"></div>
-	</header>
-	<!--主体内容区域开始-->
-	<div id="all_achievement">
-		<div class="detail">
-			<div id="order_title">订单确认</div>
-			<div id="order_cont">
-				<div class="order_cont">
-					<div class="order_left"
-						th:each="achievementdetail:${achievementdetail}">
-						<div>
-							<h4>产品名称:</h4>
-							<p th:text="${achievementdetail.name}"></p>
-						</div>
-						<div>
-							<h4>产品类型:</h4>
-							<p th:text="${achievementdetail.categoryS}?${achievementdetail.categoryS}:暂无分类信息">发明专利</p>
-						</div>
-						<div>
-							<h4>交易方式:</h4>
-							<p th:text="${achievementdetail.transferModeS}?${achievementdetail.transferModeS}:暂无"></p>
-						</div>
-						<div>
-							<h4>技术持有人:</h4>
-							<p th:text="${achievementdetail.ownerName}?${achievementdetail.ownerName}:陈灿"></p>
-						</div>
-						<div>
-							<h4>技术购买人:</h4>
-							<p th:text="${userData != null}?${userData.nickname}:暂无"></p>
-						</div>
-					</div>
-					<div class="order_right">
-						<div class="order_right_p">
-							<h4>交易金额:</h4>
-							<p th:text="${achievementdetail.transferPrice}?${achievementdetail.transferPrice}:暂无"></p>
-							<span onclick="_MEIQIA('showPanel')">立即议价</span>
-						</div>
-						<div>
-							<h4>电话:</h4>
-							<p th:text="${achievementdetail.ownerMobile}?${achievementdetail.ownerMobile}:073184121803"></p>
-						</div>
-						<div>
-							<h4 >电话:</h4>
-							<p th:text="${userData != null}?${userData.mobile}:暂无"></p>
-						</div>
-					</div>
-				</div>
-				<div class="order_button">
-					<div th:val="${achievementdetail.id}" id='id_'>加入订单</div>
-					<div>去支付</div>
-				</div>
-				<div class="order_text">加入订单,技术所有人很快就会联系你呦~,技淘祝您交易成功!</div>
-			</div>
-			<div id="order_flow">
-				<h3>交易流程</h3>
-				<div>
-					<img th:src="${portalHost+'/img/order_2.png'}" alt="" />
-				</div>
-			</div>
-			<div class="detail_bottom">
-				<div class="line">猜你喜欢</div>
-				<div class="main_introduce">
-					<ul>
-						<li th:each="reachievementlist:${reachievementlist}"><img
-							th:src="${portalHost+'/img/detail_img4.jpg'}" alt="" />
-							<div class="list_text">
-								<p>
-									行业:<span
-										th:text="${reachievementlist.fieldAS}?${reachievementlist.fieldAS}:暂无分类信息"></span>
-								</p>
-								<p>
-									名称:<span
-										th:text="${reachievementlist.name}?${reachievementlist.name}:未知"></span>
-								</p>
-								<p>
-									类型:<span
-										th:text="${reachievementlist.ownerTypeS}?${reachievementlist.ownerTypeS}:个人所有"></span>
-								</p>
-								<p>
-									交易方式:<span
-										th:text="${reachievementlist.transferModeS}?${reachievementlist.transferModeS}:暂无"></span>
-								</p>
-								<p class="likeId" th:text="${reachievementlist.id}"></p>
-								<p class="likeType" th:text="${reachievementlist.ownerType}"></p>
-								<a href="#">了解详情</a>
-							</div></li>
-					</ul>
-				</div>
-			</div>
-		</div>
-	</div>
-	<!--主体内容区域结束-->
-	<div class="pub_fix">
-		<span class="index_blur"></span>
-		<ul class="ret_top">
-			<li><a href=""> <img
-					th:src="${portalHost + '/img/index_fix1.png'}" alt="" />
-					<p>发布需求</p>
-			</a></li>
-			<li><a href=""><img
-					th:src="${portalHost + '/img/index_fix2.png'}" alt="" />
-					<p>发布技术</p> </a></li>
-			<li><a onclick="_MEIQIA('showPanel')"> <img
-					th:src="${portalHost + '/img/index_fix3.png'}" alt="" />
-					<p>联系客服</p>
-			</a></li>
-			<li><a href="" class="pendent_box"> <img
-					th:src="${portalHost + '/img/index_fix4.png'}" alt="" />
-					<p>返回顶部</p>
-			</a></li>
-		</ul>
-		<span class="index_orange"></span>
-	</div>
-	<footer>
-		<div th:replace="common::copyright"></div>
-		<div th:replace="common::login"></div>
-	</footer>
-	<div th:replace="common::footer(~{::script})">
-		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-		<script type="text/javascript"
-			th:src="${portalHost + '/technologyTrading/achievementOrder.js'}"></script>
-	</div>
-	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
-</body>
-
-</html>
+<!DOCTYPE html>
+<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>
+<link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
+<link
+	th:href="${portalHost + '/technologyTrading/achievementOrder.css'}"
+	rel="stylesheet">
+</head>
+<body>
+		<div th:replace="common::nav('technologyTrading','achievement')"></div>
+	<!--主体内容区域开始-->
+	<div id="all_achievement">
+		<div class="detail">
+			<div id="order_title">订单确认</div>
+			<div id="order_cont">
+				<div class="order_cont">
+					<div class="order_left"
+						th:each="achievementdetail:${achievementdetail}">
+						<div>
+							<h4>产品名称:</h4>
+							<p th:text="${achievementdetail.name}"></p>
+						</div>
+						<div>
+							<h4>产品类型:</h4>
+							<p th:text="${achievementdetail.categoryS}?${achievementdetail.categoryS}:暂无分类信息">发明专利</p>
+						</div>
+						<div>
+							<h4>交易方式:</h4>
+							<p th:text="${achievementdetail.transferModeS}?${achievementdetail.transferModeS}:暂无"></p>
+						</div>
+						<div>
+							<h4>技术持有人:</h4>
+							<p th:text="${achievementdetail.ownerName}?${achievementdetail.ownerName}:陈灿"></p>
+						</div>
+						<div>
+							<h4>技术购买人:</h4>
+							<p th:text="${userData != null}?${userData.nickname}:暂无"></p>
+						</div>
+					</div>
+					<div class="order_right">
+						<div class="order_right_p">
+							<h4>交易金额:</h4>
+							<p th:text="${achievementdetail.transferPrice}?${achievementdetail.transferPrice}:暂无"></p>
+							<span onclick="_MEIQIA('showPanel')">立即议价</span>
+						</div>
+						<div>
+							<h4>电话:</h4>
+							<p th:text="${achievementdetail.ownerMobile}?${achievementdetail.ownerMobile}:073184121803"></p>
+						</div>
+						<div>
+							<h4 >电话:</h4>
+							<p th:text="${userData != null}?${userData.mobile}:暂无"></p>
+						</div>
+					</div>
+				</div>
+				<div class="order_button">
+					<div th:val="${achievementdetail.id}" id='id_'>加入订单</div>
+					<div>去支付</div>
+				</div>
+				<div class="order_text">加入订单,技术所有人很快就会联系你呦~,技淘祝您交易成功!</div>
+			</div>
+			<div id="order_flow">
+				<h3>交易流程</h3>
+				<div>
+					<img th:src="${portalHost+'/img/order_2.png'}" alt="" />
+				</div>
+			</div>
+			<div class="detail_bottom">
+				<div class="line">猜你喜欢</div>
+				<div class="main_introduce">
+					<ul>
+						<li th:each="reachievementlist:${reachievementlist}"><img
+							th:src="${portalHost+'/img/detail_img4.jpg'}" alt="" />
+							<div class="list_text">
+								<p>
+									行业:<span
+										th:text="${reachievementlist.fieldAS}?${reachievementlist.fieldAS}:暂无分类信息"></span>
+								</p>
+								<p>
+									名称:<span
+										th:text="${reachievementlist.name}?${reachievementlist.name}:未知"></span>
+								</p>
+								<p>
+									类型:<span
+										th:text="${reachievementlist.ownerTypeS}?${reachievementlist.ownerTypeS}:个人所有"></span>
+								</p>
+								<p>
+									交易方式:<span
+										th:text="${reachievementlist.transferModeS}?${reachievementlist.transferModeS}:暂无"></span>
+								</p>
+								<p class="likeId" th:text="${reachievementlist.id}"></p>
+								<p class="likeType" th:text="${reachievementlist.ownerType}"></p>
+								<a href="#">了解详情</a>
+							</div></li>
+					</ul>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!--主体内容区域结束-->
+	<div class="pub_fix">
+		<span class="index_blur"></span>
+		<ul class="ret_top">
+			<li><a href=""> <img
+					th:src="${portalHost + '/img/index_fix1.png'}" alt="" />
+					<p>发布需求</p>
+			</a></li>
+			<li><a href=""><img
+					th:src="${portalHost + '/img/index_fix2.png'}" alt="" />
+					<p>发布技术</p> </a></li>
+			<li><a onclick="_MEIQIA('showPanel')"> <img
+					th:src="${portalHost + '/img/index_fix3.png'}" alt="" />
+					<p>联系客服</p>
+			</a></li>
+			<li><a href="" class="pendent_box"> <img
+					th:src="${portalHost + '/img/index_fix4.png'}" alt="" />
+					<p>返回顶部</p>
+			</a></li>
+		</ul>
+		<span class="index_orange"></span>
+	</div>
+	<footer>
+		<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
+	</footer>
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
+		<script type="text/javascript"
+			th:src="${portalHost + '/technologyTrading/achievementOrder.js'}"></script>
+	</div>
+	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
+</body>
+
+</html>

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

@@ -9,9 +9,8 @@
 </head>
 
 <body>
-	<header>
+
 		<div th:replace="common::nav('','demand')"></div>
-	</header>
 	<!-- search -->
 	<div class="container">
 		<div class="clearFix search">

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

@@ -10,9 +10,7 @@
 </head>
 
 <body>
-	<header>
 		<div th:replace="common::nav('','')"></div>
-	</header>
 	<div id="all_achievement">
 		<div class="detail">
 			<div class="detail_top">

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

@@ -11,9 +11,9 @@
 </head>
 
 <body>
-	<header>
+
 		<div th:replace="common::nav('','')"></div>
-	</header>
+
 	<!--banner-->
 	<div class="carouselt">
 		<ul class="ct-img-big clear">

+ 6 - 17
src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

@@ -8,23 +8,12 @@
 </head>
 
 <body>
-	<header>
-		<div th:replace="common::nav('thinkTank','thindTankIndex')"></div>
-	</header>
-	<!--banner-->
-  	<div class="carouselt">
-		<ul class="ct-img-big clear">
-			<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="">
-			<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 th:replace="common::nav('','thindTankIndex')"></div>
+		 <div class="carousel">
+        <img th:src="${portalHost + '/img/thinkTank_banner01.jpg'}" alt="First slide">
+    </div>
+	
 	<!--主体内容区域开始-->
 	<div id="zizone">
 	<div class="row zizone">

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

@@ -8,9 +8,9 @@
 </head>
 
 <body>
-	<header>
+
 		<div th:replace="common::nav('thinkTank','policyList')"></div>
-	</header>
+
 	<!--banner-->
 	<div class="carouselt">
 		<ul class="ct-img-big clear">