liliang4869 лет назад: 7
Родитель
Сommit
ca11cb1ad7
30 измененных файлов с 53 добавлено и 59 удалено
  1. 1 1
      src/main/webapp/WEB-INF/views/admin/achievement.html
  2. 1 1
      src/main/webapp/WEB-INF/views/admin/demand.html
  3. 1 1
      src/main/webapp/WEB-INF/views/admin/index.html
  4. 1 1
      src/main/webapp/WEB-INF/views/admin/login.html
  5. 1 1
      src/main/webapp/WEB-INF/views/admin/set.html
  6. 1 1
      src/main/webapp/WEB-INF/views/admin/userManage.html
  7. 1 1
      src/main/webapp/WEB-INF/views/admin/userOrder.html
  8. 24 30
      src/main/webapp/WEB-INF/views/common.html
  9. 1 1
      src/main/webapp/WEB-INF/views/portal/aboutUs.html
  10. 1 1
      src/main/webapp/WEB-INF/views/portal/contactUs.html
  11. 1 1
      src/main/webapp/WEB-INF/views/portal/index.html
  12. 1 1
      src/main/webapp/WEB-INF/views/portal/news/newsDetail.html
  13. 1 1
      src/main/webapp/WEB-INF/views/portal/service/serviceList.html
  14. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.html
  15. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/demandDetail.html
  16. 1 1
      src/main/webapp/WEB-INF/views/portal/technologyTrading/index.html
  17. 1 1
      src/main/webapp/WEB-INF/views/portal/thinkTank/index.html
  18. 1 1
      src/main/webapp/WEB-INF/views/portal/thinkTank/policyList.html
  19. 1 1
      src/main/webapp/WEB-INF/views/user/account/achievement.html
  20. 1 1
      src/main/webapp/WEB-INF/views/user/account/demand.html
  21. 1 1
      src/main/webapp/WEB-INF/views/user/account/index.html
  22. 1 1
      src/main/webapp/WEB-INF/views/user/account/services.html
  23. 1 1
      src/main/webapp/WEB-INF/views/user/account/set.html
  24. 1 1
      src/main/webapp/WEB-INF/views/user/certify.html
  25. 1 1
      src/main/webapp/WEB-INF/views/user/groupCertify.html
  26. 1 1
      src/main/webapp/WEB-INF/views/user/index.html
  27. 1 1
      src/main/webapp/WEB-INF/views/user/login.html
  28. 1 1
      src/main/webapp/WEB-INF/views/user/msignIn.html
  29. 1 1
      src/main/webapp/WEB-INF/views/user/signIn.html
  30. 1 1
      src/main/webapp/WEB-INF/views/user/subscriberDetail.html

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/achievement.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>科技成果页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/admin/achievement.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/demand.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head>
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>科技需求页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/admin/demand.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>管理中心首页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/admin/index.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/login.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>登录页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/admin/login.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/set.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>设置页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/admin/set.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/userManage.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>用户管理页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/admin/userManage.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/admin/userOrder.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>科技思想页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/admin/userOrder.css'}" rel="stylesheet">

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

@@ -6,12 +6,15 @@
 <head th:fragment="header(title, link)">
   <meta charset="UTF-8">
   <link rel="icon" th:href="${portalHost+'/img/ico_logo.ico'}" />
+  <meta name="Keywords" content=""/>
+	<meta name="Description" content=""/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <th:block th:replace="${link}" />
     <title></title>
 </head>
 
-<th:block th:replace="${link}" />
+
 <body>
 	<th:block th:fragment="nav(mainM,subM)">
 	 <div class="header">
@@ -19,27 +22,23 @@
             <div>
                 <a href="#">网站导航</a>
             </div>
-            <div>
-                <ul>
-                    <li>
-                        <a href="javascript:void(0)" class="head_login">登录</a>
-                    </li>
-                    <li>
-                        <a th:href="@{/user/signIn}">注册</a>
-                    </li>
-                    <li th:if="${isLogin}">
-                        <a th:href="@{/user/account/index.html#techList}">我的订单</a>
-                    </li>
-                    <li th:if="${isLogin}">
-                        <a th:href="@{/user/account/index.html#collection}">我的关注</a>
-                    </li>
-                    <li th:if="${isLogin}">
-                        <a href="#">我的消息</a>
-                    </li>
-                </ul>
-            </div>
-            <div class="colorRed">
-                全国统一服务热线:400-8800-962
+           <div>
+				<ul>
+						<li>
+							<a th:href="@{/user/signIn}">注册</a>
+						</li>
+						<li>
+							<a href="javascript:;" class="head_login">登录</a>
+						</li>
+					<li th:if="${isLogin}">
+						<a th:href="${basePath + (isAdmin? '/admin/index.html':'/user/account/index.html')}"
+							th:text="${#strings.isEmpty(userName)?'个人中心':userName}">个人中心</a>
+						<a th:href="${basePath + '/user/logout'}">退出</a>
+					</li>
+				</ul>
+			</div>
+			<div class="colorRed">
+               	全国统一服务热线:400-8800-962
             </div>
         </div>
     </div>
@@ -69,13 +68,13 @@
                             
                     
                     <li>
-                        <a href="#">智库咨询</a>
+                        <a th:href="@{/portal/thinkTank/index.html}">智库咨询</a>
                         <ol class="subnavigation">
                             <li>
                                 <a th:href="@{/portal/thinkTank/policyList}">智政</a>
                             </li>
                             <li>
-                                <a href="/portal/thinkTank/index.html#zizone">智者</a>
+                                <a th:href="@{/portal/thinkTank/index.html#zizone}">智者</a>
                             </li>
                         </ol>
                     </li>
@@ -241,12 +240,7 @@
 							<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"/>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/aboutUs.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 >
+<head th:replace="common::header(~{::title},~{::link})">
 <title>技淘--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/aboutUs.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/contactUs.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 >
+<head th:replace="common::header(~{::title},~{::link})">
 <title>技淘--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/contactUs.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/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>
+<head th:replace="common::header(~{::title},~{::link})">
 <meta charset="utf-8" />
 <link rel="icon" th:href="${portalHost+'/img/ico_logo.ico'}">
 <meta name="keywords" content="" />

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/news/newsDetail.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>
+<head th:replace="common::header(~{::title},~{::link})">
 <title>新闻详情--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/thinkTank/policyDetail.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/serviceList.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>
+<head th:replace="common::header(~{::title},~{::link})">
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievementDetail.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 >
+<head th:replace="common::header(~{::title},~{::link})">
 <title>科技成果详情--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost +'/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/achievementDetail.css'}" rel="stylesheet">

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

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 <title >科技需求详情--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading/demandDetail.css'}" rel="stylesheet">

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

@@ -3,7 +3,7 @@
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 <title>技术交易--我的技术和科技服务交易平台</title>
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/technologyTrading.css'}"

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

@@ -1,7 +1,7 @@
 <!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 >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>智库咨询--我的技术和科技服务交易平台</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/thinkTank.css'}" rel="stylesheet">

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

@@ -1,7 +1,7 @@
 <!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 >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>智政--我的技术和科技服务交易平台</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${portalHost + '/thinkTank/policyList.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/account/achievement.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head>
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>科技成果页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/user/account/achievement.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/account/demand.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>科技需求页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/user/account/demand.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/account/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head>
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>用户页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/user/account/index.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/account/services.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>科技服务页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/user/account/services.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/account/set.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>用户设置页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/user/account/set.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/certify.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>个人用户认证页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/user/certify.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/groupCertify.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>团体用户认证页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/user/groupCertify.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>个人中心首页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/user/index.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/login.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head >
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>登录页</title>
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/user/login.css'}" rel="stylesheet">

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

+ 1 - 1
src/main/webapp/WEB-INF/views/user/signIn.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:th="http://www.thymeleaf.org">
-<head>
+<head th:replace="common::header(~{::title},~{::link})">
 	<title>注册页</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 	<link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">

+ 1 - 1
src/main/webapp/WEB-INF/views/user/subscriberDetail.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>
+<head th:replace="common::header(~{::title},~{::link})">
 
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${staticHost+'/dll/dll.css'}" rel="stylesheet">