Selaa lähdekoodia

修改公共头部、底部,增加部分页面跳转

liliang4869 7 vuotta sitten
vanhempi
commit
8a43f765cf

+ 5 - 4
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -277,30 +277,31 @@ public class WebpageController extends BaseController {
 		JtBusinessCategory gaoqi2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "高企服务");
 		List<JtBusinessProject>gaoqiList=jtBusinessService.getBusinessProjectByCategoryId(gaoqi2.getId(),6);
 		modelview.addObject("gaoqiList",gaoqiList); 
+		modelview.addObject("gqc1",gaoqi);
 		//知识产权贯标
 		JtBusinessCategory zscqgb=jtBusinessService.getBusinessCategoryByLayerAndName(1, "知识产权");
 		List<JtBusinessCategory> zscqgbCategories=jtBusinessService.getBusinessCategoryBySuperId(zscqgb.getId(), 4);
 		int[]zscqsizes= {1,2,4,10};
 		businessHelper(modelview, "zscqgb", zscqgbCategories, zscqsizes);
-		
+		modelview.addObject("zscqc1",zscqgb);
 		//企业认证
 		JtBusinessCategory qiyerenzheng=jtBusinessService.getBusinessCategoryByLayerAndName(1, "企业认证");
 		List<JtBusinessCategory>qyrzCategories=jtBusinessService.getBusinessCategoryBySuperId(qiyerenzheng.getId(), 2);
 		int []qyrzsizes= {8,8};
 		businessHelper(modelview, "qyrz", qyrzCategories, qyrzsizes);
-		
+		modelview.addObject("qyrzc1",qiyerenzheng);
 		//管理体系
 		JtBusinessCategory manageSys=jtBusinessService.getBusinessCategoryByLayerAndName(1, "管理体系");
 		JtBusinessCategory manageSys2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "管理体系");
 		List<JtBusinessProject>manageSysPro=jtBusinessService.getBusinessProjectByCategoryId(manageSys2.getId(), 18);
 		modelview.addObject("manageSystemList",manageSysPro);
-		
+		modelview.addObject("managerSysc1",manageSys);
 		//科技项目
 				JtBusinessCategory scienceProject=jtBusinessService.getBusinessCategoryByLayerAndName(1, "科技项目");
 				JtBusinessCategory scienceProject2=jtBusinessService.getBusinessCategoryByLayerAndName(2, "科技项目");
 				List<JtBusinessProject>scienceProjects=jtBusinessService.getBusinessProjectByCategoryId(scienceProject2.getId(), 12);
 				modelview.addObject("scienceProjectList",scienceProjects);
-				
+				modelview.addObject("spc1",scienceProject);
 		//咨询师
 			List<consultantListBo>userIdentityBos=userIdentityService.getConsultantList(8);
 			modelview.addObject("consultants",userIdentityBos);

+ 17 - 1
src/main/java/com/goafanti/common/mapper/JtBusinessProjectMapper.xml

@@ -102,6 +102,22 @@
     id, name, category_id as categoryId, number, price, activity_price as activityPrice, member_price as memberPrice, offset, activity_flag as activityFlag, 
     introduce, province, city, create_time as createTime, min_img_url as minImgUrl, max_img_url as maxImgUrl, value, apply_conditions as applyConditions
   </sql>
+  
+    <sql id="My_Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 11:08:54 CST 2018.
+    -->
+    jtbp.id,  jtbp.name, jtbp.category_id as categoryId,  jtbp.number,  jtbp.price,  jtbp.activity_price as activityPrice,  jtbp.member_price as memberPrice,  jtbp.offset, 
+     jtbp.activity_flag as activityFlag, 
+     jtbp.introduce, 
+      jtbp.province, 
+       jtbp.city,  jtbp.create_time as createTime,
+         jtbp.min_img_url as minImgUrl,
+           jtbp.max_img_url as maxImgUrl, 
+            jtbp.value,  jtbp.apply_conditions as applyConditions
+  </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.JtBusinessProjectExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
@@ -487,7 +503,7 @@
   
   <select id="findJtBusinessProjectByPage" resultType="com.goafanti.common.model.JtBusinessProject">
   select 
-  <include refid="Base_Column_List" />
+  <include refid="My_Base_Column_List" />
   from jt_business_project jtbp
   <if test="topId!=null">
   left join jt_business_category jtbc on jtbc.super_id =#{topId,jdbcType=VARCHAR}

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

@@ -43,6 +43,7 @@
         </div>
     </div>
     <!-- search -->
+    <div class="topNav">
     <div class="container">
         <div class="navHeader">
             <div class="logo">
@@ -110,6 +111,7 @@
             </div>
         </div>
     </div>
+    </div>
 	</th:block>
 
 	<th:block th:fragment="banners">
@@ -141,100 +143,86 @@
 	</th:block>
 
 	<th:block th:fragment="copyright">
-		<div id="bottom">
+	<div id="bottom">
 			<div class="bottom">
 				<div class="bottom_text">
 					<div class="text_top">
-						<a th:href="${basePath + '/portal/aboutUs.html'}">关于公司</a>
-						<a th:href="${basePath + '/portal/contactUs.html'}">联系我们</a>
-						<p>Copyright &copy 2016-2017 科德 版权所有 湘ICP备15019731号 -2
-							技术支持:湖南阿凡提科技有限公司</p>
+						<a href="#">关于公司/</a>
+						<a href="#">联系我们</a>
+						<p> Copyright &copy 2016-2017 科德 版权所有 湘ICP备15019731号
+							-2 技术支持:湖南阿凡提科技有限公司</p>
 					</div>
-					<div class="text_center" id="qrCode">
+					<div class="text_center">
 						<div class="cont_left">
-							<img th:src="${portalHost+'/img/dizhi.jpg'}" alt="" />
-							<p>湖南省长沙市营盘东路19号金山大厦八楼</p>
+							<img th:src="${portalHost+'/img/dizhi.jpg'}" alt=""/>
+							<p>湖南省长沙市营盘东路19号金山大厦</p>
 						</div>
 						<div class="cont_center">
-							<img th:src="${portalHost+'/img/dianhua.jpg'}" alt="" />
-							<p>合作电话:400-8800-962</p>
-						</div>
-						<div class="cont_guanli">
-							<a th:href="${basePath + '/admin/login'}">
-								<img th:src="${portalHost+'/img/guanli.png'}" alt="" />
-								<p>管理员入口</p>
-							</a>
+							<img th:src="${portalHost+'/img/dianhua.jpg'}" alt=""/>
+							<p>合作电话:0731-89907207</p>
+							<p>400-8800-962八楼</p>
 						</div>
 						<div class="cont_rightapp">
-							<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="" />
+							<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt=""/>
 							<p>iPhone版</p>
 						</div>
 						<div class="cont_right android">
-							<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt="" />
+							<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt=""/>
 							<p>Android版</p>
 						</div>
 						<div class="cont_right">
-							<img th:src="${portalHost+'/img/erweima.jpg'}" alt="" />
+							<img th:src="${portalHost+'/img/erweima.jpg'}" alt=""/>
 							<p>微信公众号</p>
-						</div>
+						</div>					
 					</div>
 					<div class="text_bottom">
 						<p>友情链接</p>
-						<a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a> <a
-							href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a> <a
-							href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a> <a
-							href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a> <a
-							href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a> <a
-							href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a> <a
-							href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
-						<a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a> <a
-							href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a> <a
-							href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a> <a
-							href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a> <a
-							href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a> <a
-							href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a> <a
-							href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a> <a
-							href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
-						<a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a> <a
-							href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a> <a
-							href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a> <a
-							href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a> <a
-							href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a> <a
-							href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
+						<a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a>
+						<a href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a>
+						<a href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a>
+						<a href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a>
+						<a href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a>
+						<a href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a>
+						<a href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
+						<a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a>
+						<a href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a>
+						<a href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a>
+						<a href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a>
+						<a href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a>
+						<a href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a>
+						<a href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a>
+						<a href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
+						<a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a>
+						<a href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a>
+						<a href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a>
+						<a href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a>
+						<a href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a>
+						<a href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
 					</div>
 				</div>
-			</div>
+			</div>	
 		</div>
-		<div onclick="_MEIQIA('showPanel')" id="lxkf" style="display:none"></div>
-		<div th:if="${!isAdmin}" class="pub_fix">
+		<div class="pub_fix">
 			<span class="index_blur"></span>
 			<ul class="ret_top">
-				<li th:classappend="${!isLogin}? 'head_login'"><a
-					th:if="${!isLogin || userData.lvl == 1}"
-					th:href="${isLogin?(basePath + '/portal/member') : 'javascript:;'}">
+				<li>
+					<a href="">
 						<img th:src="${portalHost+'/img/index_fix0.png'}" alt="" />
 						<p>申请会员</p>
-				</a> <a th:if="${isLogin && userData.lvl == 0}"
-					th:href="${basePath + '/user/certify'}"> <img
-						th:src="${portalHost+'/img/index_fix0.png'}" alt="" />
-						<p>实名认证</p>
-				</a></li>
-				<li><a onclick="_MEIQIA('showPanel')"> <img
-						th:src="${portalHost+'/img/index_fix3.png'}" alt="" />
+					</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>
+					</a>
+				</li>
 			</ul>
 			<span class="index_orange"></span>
 		</div>
-		<div class="message">
-			<span></span>
-		</div>
 	</th:block>
 	<th:block th:fragment="login">
+			<!--登陆页面-->
 		<div class="login">
 			<div class="login_mian">
 				<div class="login_left">
@@ -250,32 +238,31 @@
 					</div>
 				</div>
 				<div class="login_right">
-					<h5>
-						用户登录<a href="/user/signIn.html">免费注册有好礼呦!!</a>
-					</h5>
-					<form id="form_login">
+					<h5>用户登陆<a href="">免费注册有好礼呦!!</a></h5>
+					<form  id="form_login">
 						<div class="login_uesr">
-							<label for="uesname"><img
-								th:src="${portalHost+'/img/login_use.png'}" /></label> <input
-								type="text" name="username" id="Lo_user" placeholder="请输入用户名" />
-							<img th:src="${portalHost+'/img/login_del.png'}" class="log_del" />
+							<label for="uesname"><img th:src="${portalHost+'/img/login_use.png'}"/></label>
+							<input type="text" name="uesname" id="Lo_user" placeholder="用户名/邮箱/手机" />
+							<img th:src="${portalHost+'/img/login_del.png'}" class="log_del"/>
 						</div>
 						<div class="login_pass">
-							<label for="pass"><img
-								th:src="${portalHost+'/img/login_password.png'}" /></label> <input
-								type="password" name="password" id="Lo_pass" placeholder="请输入密码" />
+							<label for="pass"><img th:src="${portalHost+'/img/login_password.png'}"/></label>
+							<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 						</div>
 						<div class="login_check">
-							 <a href="">忘记密码?</a>
+							<label for="checks" class="lab_check">
+								<input type="checkbox" name="type" id="checks" />我是专家
+							</label>
+							<label for="checkst" class="lab_checkno">
+								<input type="checkbox" name="type" id="checkst" />我是企业
+							</label>
+							<a href="">忘记密码?</a>
 						</div>
-						<input type="submit" value="登 陆" class="login_submit" />
+						<input type="submit" value="登 陆" class="login_submit"/>
 					</form>
-					<img th:src="${portalHost+'/img/login_hua.png'}" alt=""
-						class="login_hua" /> <img
-						th:src="${portalHost+'/img/login_shadow.png'}" alt="阴影效果"
-						class="login_shadow" /> <img
-						th:src="${portalHost+'/img/login_close.png'}" alt=""
-						class="login_close" />
+					<img th:src="${portalHost+'/img/login_hua.png'}" alt="" class="login_hua"/>
+					<img th:src="${portalHost+'/img/login_shadow.png'}" alt="阴影效果" class="login_shadow"/>
+					<img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close"/>
 				</div>
 			</div>
 		</div>
@@ -285,44 +272,43 @@
 					<div class="forget_top">
 						<a href="">忘记密码?</a>
 						<div class="login_check">
-							<label for="forget_checks" class="lab_check"> <input
-								type="checkbox" name="type" id="forget_checks" />专家登录
-							</label> <label for="forget_checkst" class="lab_checkno"> <input
-								type="checkbox" name="type" id="forget_checkst" />企业登录
+							<label for="forget_checks" class="lab_check">
+								<input type="checkbox" name="type" id="forget_checks" />专家登录
+							</label>
+							<label for="forget_checkst" class="lab_checkno">
+								<input type="checkbox" name="type" id="forget_checkst" />企业登录
 							</label>
 						</div>
 					</div>
 					<div class="forget_center">
 						<div class="phone">
-							<label for="forget_phone"> 手机号码:<input type="text"
-								name="type" id="forget_phone" placeholder="请输入您的手机号码..." />
+							<label for="forget_phone">
+								手机号码:<input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码..."/>
 							</label>
 						</div>
-						<div class="yanzheng">
-							<label for="forget_yanzheng"> 图形验证码:<input type="text"
-								name="type" id="forget_yanzheng" />
+						<div  class="yanzheng">
+							<label for="forget_yanzheng">
+								图形验证码:<input type="text" name="type" id="forget_yanzheng" />
 							</label>
 							<div class="yanzhengma_cont_">
-								<img th:src="${basePath+'/open/getVCode'}" />
+								<img th:src="${basePath+'/open/getVCode'}"/>
 							</div>
 						</div>
 						<div class="cellcode_">
 							<div>
-								验证码:<input type="text" name="cellCode" placeholder="手机验证码"
-									id="photo_n" />
+								验证码:<input type="text" name="cellCode" placeholder="手机验证码" id="photo_n"/>
 							</div>
-							<input type="button" id="photo_m" value="获取验证码" disabled />
+							<input type="button" id="photo_m" value="获取验证码" disabled/>
 						</div>
 						<div class="fastener">
-							<input type="submit" class="forget_sub" value="确认" />
-							<div class="fastener_right">取消</div>
+							<input type="submit" class="forget_sub" value="确认"/>
+							<div class="fastener_right">
+								取消
+							</div>
 						</div>
 					</div>
 				</form>
-				<img th:src="${portalHost+'/img/login_close.png'}" alt=""
-					class="login_close" /> <img
-					th:src="${portalHost+'/img/login_shadow.png'}" alt="阴影效果"
-					class="login_shadow" />
+				<img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close"/>
 			</div>
 		</div>
 		<div id="new_password">
@@ -333,32 +319,28 @@
 						<span>密码长度为6-20个字符,区分大小写</span>
 					</div>
 					<div class="password_center">
-						<div>
-							<label for="new_pass"> 新密码:<input type="password"
-								name="type" id="new_pass" placeholder="请输入您的新密码..." />
+						<div >
+							<label for="new_pass">
+								新密码:<input type="text" name="type" id="new_pass" placeholder="请输入您的新密码..."/>
 							</label>
 						</div>
-						<div>
-							<label for="new_pass_again"> 确认密码:<input type="password"
-								name="type" id="new_pass_again" placeholder="请确认您的密码..." />
+						<div >
+							<label for="new_pass_again">
+								确认密码:<input type="text" name="type" id="new_pass_again" placeholder="请确认您的密码..."/>
 							</label>
 						</div>
 						<div class="fastener">
-							<input type="submit" class="new_password_sub" value="确认" />
-							<div class="fastener_right">取消</div>
+							<input type="submit" class="new_password_sub" value="确认"/>
+							<div class="fastener_right">
+								取消
+							</div>
 						</div>
 					</div>
 				</form>
-				<img th:src="${portalHost+'/img/login_close.png'}" alt=""
-					class="login_close" /> <img
-					th:src="${portalHost+'/img/login_shadow.png'}" alt="阴影效果"
-					class="login_shadow" />
+				<img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close"/>
 			</div>
 		</div>
-
-		<div class="smg">
-			<input type="text" name="msg" value="" id="msg" readonly="readonly" />
-		</div>
+		<div class="smg"><input type="text" name="msg" value="111" id="msg"/></div>
 	</th:block>
 
 	<th:block th:fragment="footer(scripts)">

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

@@ -57,19 +57,19 @@
 					<div id="seachCont">
 						<div class="seachCont seachCont1" clicka="0">
 							<div>
-								<a href="#">购买技术</a>
+								<a th:href="@{/portal/technologyTrading/achievement}">购买技术</a>
 							</div>
 							<div>
-								<a href="#">承按需求</a>
+								<a th:href="@{/portal/technologyTrading/demand}">承按需求</a>
 							</div>
 							<div>
 								<a href="#">技术评估</a>
 							</div>
 							<div>
-								<a href="#">发布需求</a>
+								<a href="@{/portal/technologyTrading/demand}">发布需求</a>
 							</div>
 							<div>
-								<a href="#">发布成果</a>
+								<a href="@{/portal/technologyTrading/achievement}">发布成果</a>
 							</div>
 						</div>
 					</div>
@@ -206,19 +206,24 @@
 				
 				<div th:each="project,projectStatus:${projects}" th:if="${projectStatus.index<3}">
 				<div >
+				<a></a>
 					<h2 th:text="${project.name}"></h2>
 					<div class="indexServe_bots">
+					<div class="wrapper">
 						<h3 th:text="${'什么是'+project.name+'?'}"></h3>
 						<p th:text="${project.introduce}"></p>
+						</div>
 						<img th:src="${project.maxImgUrl}==null?${portalHost+'/img/indexNew8.jpg'}:${avatarUploadHost+project.maxImgUrl}" alt="" />
 					</div>
 					<div class="indexServe_bot">
 						<div>认定好处</div>
 						<p th:text="${project.value}"></p>
 					</div>
+					<a th:href="@{/portal/service/serviceDetail(id=${project.id})}">
 					<div class="indexServe_img">
-						了解更多
+					<p>了解更多<span>></span></p>
 					</div>
+					</a>
 					</div>
 				</div>
 				<div class="indexServe_long"  th:each="project,projectStatus:${projects}" th:if="${projectStatus.index>=3} and ${projectStatus.index<5}" >
@@ -230,10 +235,16 @@
 					<div class="indexServe_bot">
 						<div>认定好处</div>
 							<p th:text="${project.value}"></p>
-					</div>
+							<a th:href="@{/portal/service/serviceDetail(id=${project.id})}">
 					<div class="indexServe_img">
+						<p>
 						了解更多
+						
+						<span >></span></p>
 					</div>
+					</a>
+					</div>
+						
 				</div>
 				
 			</div>
@@ -280,8 +291,8 @@
 				<div>需求</div>
 			</div>
 			<div class="indexGroom_tables chengguo" >
-				<a href="">
-					<div th:each="a:${achievements}">
+			<a  th:each="a:${achievements}" th:href="@{/portal/technologyTrading/achievementDetail(id=${a.id})}" >
+					<div>
 						<img th:src="${a.firstPicture}==null?${portalHost+'/img/indexNewTab.jpg'}:${avatarUploadHost+a.firstPicture}" alt="" />
 						<div>
 							<h3 th:text="${a.name}"></h3>
@@ -292,13 +303,13 @@
 							</div>
 						</div>
 					</div>
-				</a>
+			</a>
 				
 			</div>
 			<div class="indexGroom_tables xuqiu">
 				
-				<a href="">
-					<div th:each="d:${demands}">
+				<a th:each="d:${demands}" th:href="@{/portal/technologyTrading/demandDetail(id=${d.id},type=${d.dataCategory})}">
+					<div >
 						<img th:src="${d.pictureUrl}==null?${portalHost+'/img/indexNewTab.jpg'}:${avatarUploadHost+d.pictureUrl}" alt="" />
 						<div>
 							<h3 th:text="${d.name}">风力发电领域内高效率变化内高效率变化</h3>
@@ -312,10 +323,10 @@
 				</a>
 			</div>
 			<div class="indexGroom_more chengguo">
-				<a href="#">< 查看更多 ></a>
+				<a th:href="@{/portal/technologyTrading/achievement}">查看更多 ></a>
 			</div>
 			<div class="indexGroom_more xuqiu">
-				<a href="#">< 查看更多 ></a>
+				<a th:href="@{/portal/technologyTrading/demand}">查看更多 ></a>
 			</div>
 			<img th:src="${portalHost+'/img/indexNew13.jpg'}" alt="" class="indexServe_bottom"/>
 		</div>
@@ -346,224 +357,19 @@
 					
 				</div>
 				<div class="indexGroom_more">
-					<a href="">< 查看更多 ></a>
+					<a href=""> 查看更多 ></a>
 				</div>
 			</div>
 		</div>
 		<div id="indexWord"></div>
-		<div id="bottom">
-			<div class="bottom">
-				<div class="bottom_text">
-					<div class="text_top">
-						<a href="#">关于公司/</a>
-						<a href="#">联系我们</a>
-						<p> Copyright &copy 2016-2017 科德 版权所有 湘ICP备15019731号
-							-2 技术支持:湖南阿凡提科技有限公司</p>
-					</div>
-					<div class="text_center">
-						<div class="cont_left">
-							<img th:src="${portalHost+'/img/dizhi.jpg'}" alt=""/>
-							<p>湖南省长沙市营盘东路19号金山大厦</p>
-						</div>
-						<div class="cont_center">
-							<img th:src="${portalHost+'/img/dianhua.jpg'}" alt=""/>
-							<p>合作电话:0731-89907207</p>
-							<p>400-8800-962八楼</p>
-						</div>
-						<div class="cont_rightapp">
-							<img th:src="${portalHost+'/img/erweima_iphone.png'}" alt=""/>
-							<p>iPhone版</p>
-						</div>
-						<div class="cont_right android">
-							<img th:src="${portalHost+'/img/erweima_android.jpg'}" alt=""/>
-							<p>Android版</p>
-						</div>
-						<div class="cont_right">
-							<img th:src="${portalHost+'/img/erweima.jpg'}" alt=""/>
-							<p>微信公众号</p>
-						</div>					
-					</div>
-					<div class="text_bottom">
-						<p>友情链接</p>
-						<a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a>
-						<a href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a>
-						<a href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a>
-						<a href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a>
-						<a href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a>
-						<a href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a>
-						<a href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
-						<a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a>
-						<a href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a>
-						<a href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a>
-						<a href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a>
-						<a href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a>
-						<a href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a>
-						<a href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a>
-						<a href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
-						<a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a>
-						<a href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a>
-						<a href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a>
-						<a href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a>
-						<a href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a>
-						<a href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
-					</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_fix0.png'}" alt="" />
-						<p>申请会员</p>
-					</a>
-				</li>
-				<!--<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>
-		<!--登陆页面-->
-		<div class="login">
-			<div class="login_mian">
-				<div class="login_left">
-					<div class="login_ewm">
-						<img th:src="${portalHost+'/img/Android.jpg'}" alt="二维码" />
-						<p>Android版</p>
-						<p>客户端</p>
-					</div>
-					<div class="login_ewm">
-						<img th:src="${portalHost+'/img/iPhone.jpg'}" alt="二维码" />
-						<p>iPhone版</p>
-						<p>客户端</p>
-					</div>
-				</div>
-				<div class="login_right">
-					<h5>用户登陆<a href="">免费注册有好礼呦!!</a></h5>
-					<form  id="form_login">
-						<div class="login_uesr">
-							<label for="uesname"><img th:src="${portalHost+'/img/login_use.png'}"/></label>
-							<input type="text" name="uesname" id="Lo_user" placeholder="用户名/邮箱/手机" />
-							<img th:src="${portalHost+'/img/login_del.png'}" class="log_del"/>
-						</div>
-						<div class="login_pass">
-							<label for="pass"><img th:src="${portalHost+'/img/login_password.png'}"/></label>
-							<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
-						</div>
-						<div class="login_check">
-							<label for="checks" class="lab_check">
-								<input type="checkbox" name="type" id="checks" />我是专家
-							</label>
-							<label for="checkst" class="lab_checkno">
-								<input type="checkbox" name="type" id="checkst" />我是企业
-							</label>
-							<a href="">忘记密码?</a>
-						</div>
-						<input type="submit" value="登 陆" class="login_submit"/>
-					</form>
-					<img th:src="${portalHost+'/img/login_hua.png'}" alt="" class="login_hua"/>
-					<img th:src="${portalHost+'/img/login_shadow.png'}" alt="阴影效果" class="login_shadow"/>
-					<img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close"/>
-				</div>
-			</div>
-		</div>
-		<div id="forget">
-			<div class="forget">
-				<form id="forget_form">
-					<div class="forget_top">
-						<a href="">忘记密码?</a>
-						<div class="login_check">
-							<label for="forget_checks" class="lab_check">
-								<input type="checkbox" name="type" id="forget_checks" />专家登录
-							</label>
-							<label for="forget_checkst" class="lab_checkno">
-								<input type="checkbox" name="type" id="forget_checkst" />企业登录
-							</label>
-						</div>
-					</div>
-					<div class="forget_center">
-						<div class="phone">
-							<label for="forget_phone">
-								手机号码:<input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码..."/>
-							</label>
-						</div>
-						<div  class="yanzheng">
-							<label for="forget_yanzheng">
-								图形验证码:<input type="text" name="type" id="forget_yanzheng" />
-							</label>
-							<div class="yanzhengma_cont_">
-								<img th:src="${basePath+'/open/getVCode'}"/>
-							</div>
-						</div>
-						<div class="cellcode_">
-							<div>
-								验证码:<input type="text" name="cellCode" placeholder="手机验证码" id="photo_n"/>
-							</div>
-							<input type="button" id="photo_m" value="获取验证码" disabled/>
-						</div>
-						<div class="fastener">
-							<input type="submit" class="forget_sub" value="确认"/>
-							<div class="fastener_right">
-								取消
-							</div>
-						</div>
-					</div>
-				</form>
-				<img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close"/>
-			</div>
-		</div>
-		<div id="new_password">
-			<div class="new_password">
-				<form id="new_password_form">
-					<div class="password_top">
-						<h4>设置新密码</h4>
-						<span>密码长度为6-20个字符,区分大小写</span>
-					</div>
-					<div class="password_center">
-						<div >
-							<label for="new_pass">
-								新密码:<input type="text" name="type" id="new_pass" placeholder="请输入您的新密码..."/>
-							</label>
-						</div>
-						<div >
-							<label for="new_pass_again">
-								确认密码:<input type="text" name="type" id="new_pass_again" placeholder="请确认您的密码..."/>
-							</label>
-						</div>
-						<div class="fastener">
-							<input type="submit" class="new_password_sub" value="确认"/>
-							<div class="fastener_right">
-								取消
-							</div>
-						</div>
-					</div>
-				</form>
-				<img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close"/>
-			</div>
-		</div>
-		<div class="smg"><input type="text" name="msg" value="111" id="msg"/></div>
-	<script type="text/javascript" th:src="${portalHost+'/vendors.js'}"></script><script type="text/javascript" th:src="${portalHost+'/index.js'}"></script></body>
+		
+		<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+'/index.js'}"></script>
+	</div>
+	</body>
 </html>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceDetails.html


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceIndex.html


+ 4 - 97
src/main/webapp/WEB-INF/views/portal/service/serviceList.html

@@ -10,103 +10,10 @@
 <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet"><link th:href="${portalHost+'/newMenu/serviceList.css'}" rel="stylesheet"></head>
 
 <body>
-    <div class="header">
-        <div class="container">
-            <div>
-                <a href="#">网站导航</a>
-            </div>
-            <div>
-                <ul>
-                    <li>
-                        <a href="javascript:void(0)" class="head_login">登录</a>
-                    </li>
-                    <li>
-                        <a href="#">注册</a>
-                    </li>
-                    <li>
-                        <a href="#">我的订单</a>
-                    </li>
-                    <li>
-                        <a href="#">我的关注</a>
-                    </li>
-                    <li>
-                        <a href="#">我的消息</a>
-                    </li>
-                </ul>
-            </div>
-            <div class="colorRed">
-                全国统一服务热线:400-8800-962
-            </div>
-        </div>
-    </div>
-    <!-- search -->
-    <div class="container">
-        <div class="navHeader">
-            <div class="logo">
-                <a href="#">
-                    <img th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘">
-                </a>
-            </div>
-            <div class="logo_right"></div>
-            <div class="nav">
-                <ul>
-                    <li>
-                        <a href="#">科技服务</a>
-                        <img th:src="${portalHost+'/img/hot.png'}">
-                        <ol class="subnavigation">
-                            <li>
-                                <a href="#">高企认定</a>
-                            </li>
-                            <li>
-                                <a href="#">知识产权</a>
-                            </li>
-                        </ol>
-                    </li>
-                    <li>
-                        <a href="#">技术交易</a>
-                        <ol class="subnavigation">
-                            <li>
-                                <a href="#">专利产品</a>
-                            </li>
-                            <li>
-                                <a href="#">技术成果</a>
-                            </li>
-                            <li>
-                                <a href="#">技术需求</a>
-                            </li>
-                            <li>
-                                <a href="#">技术评估</a>
-                            </li>
-                        </ol>
-                    </li>
-                    <li>
-                        <a href="#">智库咨询</a>
-                        <ol class="subnavigation">
-                            <li>
-                                <a href="#">智政</a>
-                            </li>
-                            <li>
-                                <a href="/portal/thinkTank/index.html#zizone">智者</a>
-                            </li>
-                        </ol>
-                    </li>
-
-                    <li>
-                        <a href="/portal/aboutUs.html">关于公司</a>
-                        <ol class="subnavigation" style="display: none;">
-                            <li>
-                                <a href="#">联系我们</a>
-                            </li>
-                        </ol>
-                    </li>
-                </ul>
-            </div>
-            <div class="nav_right">
-                <img th:src="${portalHost+'/img/newMenu/navImg.jpg'}" alt="">
-                <span>国家技术转移示范机构</span>
-            </div>
-        </div>
-    </div>
+   	<header>
+		<div th:replace="common::nav('','')"></div>
+	</header>
+  
     <div class="container">
         <div class="industry">
             <p>业务分类</p>

+ 10 - 317
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -6,112 +6,17 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>科技成果</title>
-    <!-- <link rel="stylesheet" href="../../th:src/css/bootstrap.css">
-    <link rel="stylesheet" href="../../th:src/css/newMenu/public.css">
-    <link rel="stylesheet" href="../../th:src/css/newMenu/header.css">
-    <link rel="stylesheet" href="../../th:src/css/newMenu/achievement.css"> -->
-    
 <link th:href="${portalHost+ '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost+ '/newMenu/achievement.css'}" rel="stylesheet">
 </head>
 
 <body>
-    <div class="header">
-        <div class="container">
-            <div>
-                <a href="#">网站导航</a>
-            </div>
-            <div>
-                <ul>
-                    <li>
-                        <a href="javascript:void(0)" class="head_login">登录</a>
-                    </li>
-                    <li>
-                        <a href="#">注册</a>
-                    </li>
-                    <li>
-                        <a href="#">我的订单</a>
-                    </li>
-                    <li>
-                        <a href="#">我的关注</a>
-                    </li>
-                    <li>
-                        <a href="#">我的消息</a>
-                    </li>
-                </ul>
-            </div>
-            <div class="colorRed">
-                全国统一服务热线:400-8800-962
-            </div>
-        </div>
-    </div>
+   <header>
+   <div th:replace="common::nav('','')"></div>
+   </header>
     <!-- search -->
     <div class="container">
-        <div class="navHeader">
-            <div class="logo">
-                <a href="#">
-                    <img th:src="${portalHost+'/img/Logo111.png'}" alt="" title="技淘">
-                </a>
-            </div>
-            <div class="logo_right"></div>
-            <div class="nav">
-                <ul>
-                    <li>
-                        <a href="#">科技服务</a>
-                        <img th:src="${portalHost+'/img/hot.png'}">
-                        <ol class="subnavigation">
-                            <li>
-                                <a href="#">高企认定</a>
-                            </li>
-                            <li>
-                                <a href="#">知识产权</a>
-                            </li>
-                        </ol>
-                    </li>
-                    <li>
-                        <a href="#">技术交易</a>
-                        <ol class="subnavigation">
-                            <li>
-                                <a href="#">专利产品</a>
-                            </li>
-                            <li>
-                                <a href="#">技术成果</a>
-                            </li>
-                            <li>
-                                <a href="#">技术需求</a>
-                            </li>
-                            <li>
-                                <a href="#">技术评估</a>
-                            </li>
-                        </ol>
-                    </li>
-                    <li>
-                        <a href="#">智库咨询</a>
-                        <ol class="subnavigation">
-                            <li>
-                                <a href="#">智政</a>
-                            </li>
-                            <li>
-                                <a href="/portal/thinkTank/index.html#zizone'}">智者</a>
-                            </li>
-                        </ol>
-                    </li>
-
-                    <li>
-                        <a href="/portal/aboutUs.html">关于公司</a>
-                        <ol class="subnavigation" style="display: none;">
-                            <li>
-                                <a href="#">联系我们</a>
-                            </li>
-                        </ol>
-                    </li>
-                </ul>
-            </div>
-            <div class="nav_right">
-                <img th:src="${portalHost+'/img/newMenu/navImg.jpg'}" alt="">
-                <span>国家技术转移示范机构</span>
-            </div>
-        </div>
+        
         <div class="clearFix search">
             <div class="navMeau">
                 <div>
@@ -442,224 +347,12 @@
         </div>
     </div>
     <footer>
-        <div id="bottom">
-            <div class="bottom">
-                <div class="bottom_text">
-                    <div class="text_top">
-                        <a href="/portal/aboutUs.html">关于公司</a>
-                        <a href="/portal/contactUs.html">联系我们</a>
-                        <p>Copyright © 2016-2017 科德 版权所有 湘ICP备15019731号 -2 技术支持:湖南阿凡提科技有限公司
-                        </p>
-                    </div>
-                    <div class="text_center" id="qrCode">
-                        <div class="cont_left">
-                            <img th:src="${portalHost+'/img/dizhi.jpg'}" alt="">
-                            <p>湖南省长沙市营盘东路19号金山大厦八楼</p>
-                        </div>
-                        <div class="cont_center">
-                            <img th:src="${portalHost+'/img/dianhua.jpg'}" alt="">
-                            <p>合作电话:400-8800-962</p>
-                        </div>
-                        <div class="cont_guanli">
-                            <a href="/admin/login">
-                                <img th:src="${portalHost+'/img/guanli.png'}" alt="">
-                                <p>管理员入口</p>
-                            </a>
-                        </div>
-                        <div class="cont_rightapp">
-                            <img th:src="${portalHost+'/img/erweima_iphone.png'}" alt="">
-                            <p>iPhone版</p>
-                        </div>
-                        <div class="cont_right android">
-                            <img th:src="${portalHost+'/img/erweima_android.jpg'}" alt="">
-                            <p>Android版</p>
-                        </div>
-                        <div class="cont_right">
-                            <img th:src="${portalHost+'/img/erweima.jpg'}" alt="">
-                            <p>微信公众号</p>
-                        </div>
-                    </div>
-                    <div class="text_bottom">
-                        <p>友情链接</p>
-                        <a href="http://www.hnst.gov.cn/" target="_blank">湖南省科技厅/</a>
-                        <a href="http://www.cssti.cn/" target="_blank">长沙市科技局/</a>
-                        <a href="http://www.cast.org.cn/" target="_blank">中国科学技术协会/</a>
-                        <a href="http://www.chinatorch.gov.cn/" target="_blank">科技部火炬中心/</a>
-                        <a href="http://www.nosta.gov.cn/web/index.aspx" target="_blank">国家科技成果奖励办/</a>
-                        <a href="http://www.nast.org.cn/" target="_blank">国家科技成果网/</a>
-                        <a href="http://www.hnast.org.cn/portal/comm/index.action" target="_blank">湖南省科学技术协会/</a>
-                        <a href="http://www.hncgw.gov.cn/" target="_blank">湖南省科技成果转化公共服务平台/</a>
-                        <a href="http://www.hnjxw.gov.cn/" target="_blank">湖南省经济信息化委员会/</a>
-                        <a href="http://kyy.hnu.cn/" target="_blank">湖南大学科学技术研究院/</a>
-                        <a href="http://www.gxst.gov.cn/gxkjt/" target="_blank">广西省科技厅/</a>
-                        <a href="http://www.nmkjt.gov.cn/" target="_blank">内蒙古自治区科技厅/</a>
-                        <a href="http://www.cshtz.gov.cn/" target="_blank">长沙市高新区管委会/</a>
-                        <a href="http://www.jxas.ac.cn/" target="_blank">江西省科学院/</a>
-                        <a href="http://www.cnic.cn/front/index.html#/cnicSite/home" target="_blank">中科院计算机网络信息中心/</a>
-                        <a href="http://kxyjb.csu.edu.cn/" target="_blank">中南大学科学研究部/</a>
-                        <a href="http://www.cast.org.cn/" target="_blank">中国科协创新创业服务中心/</a>
-                        <a href="http://www.hbstd.gov.cn/" target="_blank">湖北省科技厅/</a>
-                        <a href="http://www.gdstc.gov.cn/" target="_blank">广东省科技厅/</a>
-                        <a href="http://www.hnkjt.gov.cn/" target="_blank">河南省科技厅/</a>
-                        <a href="http://www.cbtm.gov.cn/" target="_blank">技术合同登记官网</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div onclick="_MEIQIA('showPanel')" id="lxkf" style="display:none"></div>
-        <div class="pub_fix">
-            <span class="index_blur"></span>
-            <ul class="ret_top">
-                <li class="head_login">
-                    <a href="javascript:;">
-                        <img th:src="${portalHost+'/img/index_fix0.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>
-        <div class="message">
-            <span></span>
-        </div>
-        <div class="login">
-            <div class="login_mian">
-                <div class="login_left">
-                    <div class="login_ewm">
-                        <img th:src="${portalHost+'/img/Android.jpg'}" alt="二维码" />
-                        <p>Android版</p>
-                        <p>客户端</p>
-                    </div>
-                    <div class="login_ewm">
-                        <img th:src="${portalHost+'/img/iPhone.jpg'}" alt="二维码" />
-                        <p>iPhone版</p>
-                        <p>客户端</p>
-                    </div>
-                </div>
-                <div class="login_right">
-                    <h5>用户登陆
-                        <a href="">免费注册有好礼呦!!</a>
-                    </h5>
-                    <form id="form_login">
-                        <div class="login_uesr">
-                            <label for="uesname">
-                                <img th:src="${portalHost+'/img/login_use.png'}" />
-                            </label>
-                            <input type="text" name="uesname" id="Lo_user" placeholder="用户名" />
-                            <img th:src="${portalHost+'/img/login_del.png'}" class="log_del" />
-                        </div>
-                        <div class="login_pass">
-                            <label for="pass">
-                                <img th:src="${portalHost+'/img/login_password.png'}" />
-                            </label>
-                            <input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
-                        </div>
-                        <div class="login_check">
-                            <a href="">忘记密码?</a>
-                        </div>
-                        <input type="submit" value="登 陆" class="login_submit" />
-                    </form>
-                    <img th:src="${portalHost+'/img/login_hua.png'}" alt="" class="login_hua" />
-                    <img th:src="${portalHost+'/img/login_shadow.png'}" alt="阴影效果" class="login_shadow" />
-                    <img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close" />
-                </div>
-            </div>
-        </div>
-        <div id="forget">
-            <div class="forget">
-                <form id="forget_form">
-                    <div class="forget_top">
-                        <a href="">忘记密码?</a>
-                        <div class="login_check">
-                            <label for="forget_checks" class="lab_check">
-                                <input type="checkbox" name="type" id="forget_checks" />专家登录
-                            </label>
-                            <label for="forget_checkst" class="lab_checkno">
-                                <input type="checkbox" name="type" id="forget_checkst" />企业登录
-                            </label>
-                        </div>
-                    </div>
-                    <div class="forget_center">
-                        <div class="phone">
-                            <label for="forget_phone">
-                                手机号码:
-                                <input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码..." />
-                            </label>
-                        </div>
-                        <div class="yanzheng">
-                            <label for="forget_yanzheng">
-                                图形验证码:
-                                <input type="text" name="type" id="forget_yanzheng" />
-                            </label>
-                            <div class="yanzhengma_cont_">
-                                <img th:src="${basePath+'/open/getVCode'}" />
-                            </div>
-                        </div>
-                        <div class="cellcode_">
-                            <div>
-                                验证码:
-                                <input type="text" name="cellCode" placeholder="手机验证码" id="photo_n" />
-                            </div>
-                            <input type="button" id="photo_m" value="获取验证码" disabled/>
-                        </div>
-                        <div class="fastener">
-                            <input type="submit" class="forget_sub" value="确认" />
-                            <div class="fastener_right">
-                                取消
-                            </div>
-                        </div>
-                    </div>
-                </form>
-                <img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close" />
-            </div>
-        </div>
-        <div id="new_password">
-            <div class="new_password">
-                <form id="new_password_form">
-                    <div class="password_top">
-                        <h4>设置新密码</h4>
-                        <span>密码长度为6-20个字符,区分大小写</span>
-                    </div>
-                    <div class="password_center">
-                        <div>
-                            <label for="new_pass">
-                                新密码:
-                                <input type="text" name="type" id="new_pass" placeholder="请输入您的新密码..." />
-                            </label>
-                        </div>
-                        <div>
-                            <label for="new_pass_again">
-                                确认密码:
-                                <input type="text" name="type" id="new_pass_again" placeholder="请确认您的密码..." />
-                            </label>
-                        </div>
-                        <div class="fastener">
-                            <input type="submit" class="new_password_sub" value="确认" />
-                            <div class="fastener_right">
-                                取消
-                            </div>
-                        </div>
-                    </div>
-                </form>
-                <img th:src="${portalHost+'/img/login_close.png'}" alt="" class="login_close" />
-            </div>
-        </div>
-        <div class="smg">
-            <input type="text" name="msg" value="111" id="msg" />
-        </div>
+     	<div th:replace="common::copyright"></div>
+		<div th:replace="common::login"></div>
     </footer>
-<script type="text/javascript" th:src="${portalHost+'/vendors.js'}"></script><script type="text/javascript" th:src="${portalHost+'/newMenu/achievement.js'}"></script></body>
+   	<div th:replace="common::footer(~{::script})">
+<script type="text/javascript" th:src="${portalHost+'/vendors.js'}"></script><script type="text/javascript" th:src="${portalHost+'/newMenu/achievement.js'}"></script>
+</div>
+</body>
 
 </html>

+ 4 - 59
src/main/webapp/WEB-INF/views/portal/technologyTrading/demand.html

@@ -11,64 +11,11 @@
 </head>
 
 <body>
-	<div class="header">
-		<div class="container">
-			<div>
-				<a href="#">网站导航</a>
-			</div>
-			<div>
-				<ul>
-					<li><a href="javascript:void(0)" class="head_login">登录</a></li>
-					<li><a href="#">注册</a></li>
-					<li><a href="#">我的订单</a></li>
-					<li><a href="#">我的关注</a></li>
-					<li><a href="#">我的消息</a></li>
-				</ul>
-			</div>
-			<div class="colorRed">全国统一服务热线:400-8800-962</div>
-		</div>
-	</div>
+	<header>
+		<div th:replace="common::nav('','')"></div>
+	</header>
 	<!-- search -->
 	<div class="container">
-		<div class="navHeader">
-			<div class="logo">
-				<a href="#"> <img th:src="${portalHost+'/img/Logo111.png'}"
-					alt="" title="技淘">
-				</a>
-			</div>
-			<div class="logo_right"></div>
-			<div class="nav">
-				<ul>
-					<li><a href="#">科技服务</a> <img
-						th:src="${portalHost+'/img/hot.png'}">
-						<ol class="subnavigation">
-							<li><a href="#">高企认定</a></li>
-							<li><a href="#">知识产权</a></li>
-						</ol></li>
-					<li><a href="#">技术交易</a>
-						<ol class="subnavigation">
-							<li><a href="#">专利产品</a></li>
-							<li><a href="#">技术成果</a></li>
-							<li><a href="#">技术需求</a></li>
-							<li><a href="#">技术评估</a></li>
-						</ol></li>
-					<li><a href="#">智库咨询</a>
-						<ol class="subnavigation">
-							<li><a href="#">智政</a></li>
-							<li><a href="/portal/thinkTank/index.html#zizone">智者</a></li>
-						</ol></li>
-
-					<li><a href="/portal/aboutUs.html">关于公司</a>
-						<ol class="subnavigation" style="display: none;">
-							<li><a href="#">联系我们</a></li>
-						</ol></li>
-				</ul>
-			</div>
-			<div class="nav_right">
-				<img th:src="${portalHost+'/img/newMenu/navImg.jpg'}" alt="">
-				<span>国家技术转移示范机构</span>
-			</div>
-		</div>
 		<div class="clearFix search">
 			<div class="navMeau">
 				<div>
@@ -523,8 +470,6 @@
 	</footer>
 	<div th:replace="common::footer(~{::script})">
 		<script type="text/javascript" th:src="${portalHost + '/vendors.js'}"></script>
-
-<script type="text/javascript"
-	th:src="${portalHost+'/newMenu/demand.js'}"></script>
+<script type="text/javascript" th:src="${portalHost+'/newMenu/demand.js'}"></script></div>
 
 </html>