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

src/main/resources/static/home/css/home.css

@@ -407,7 +407,6 @@ em{
 	}
 }
 .name{
-
 	margin-left: 20px;
 	font-size: 24px;
 	overflow: hidden;
@@ -1646,4 +1645,51 @@ em{
 .popupInfo {
 	font-size: 16px;
 	text-align: left;
+}
+.dropMenu{
+	display: inline-block;
+	position: relative;
+	height: 100%;
+	vertical-align: middle;
+	margin-right: 15px;
+}
+.loginName {
+	font-size: 14px;
+	overflow: hidden;
+	margin-left: 0;
+	cursor: pointer;
+}
+.dropMenu .menu{
+	display: none;
+	background: #fff;
+	position: absolute;
+	top: 60px;
+	right: 0;
+	z-index: 5;
+	line-height: 40px;
+	white-space: nowrap;
+	border: 1px solid #ebeef5;
+	border-radius: 4px;
+	box-shadow: 0 2px 12px 0 rgba(0,0,0,.1)
+}
+.dropMenu:hover .menu{
+	display: block;
+}
+.dropMenu .menu a{
+	display: block;
+	color: #606266;
+	padding: 3px 15px;
+}
+.dropMenu .menu a:hover {
+	color: #66b1ff;
+	background-color: #ecf5ff;
+}
+.toAdmin {
+	margin-right: 15px;
+	cursor: pointer;
+}
+.loginIcon {
+	margin-right: 15px;
+	max-height:80px;
+	max-width: 80px;
 }

src/main/resources/templates/home/common/common.html

@@ -57,8 +57,13 @@
         loginUserId = localStorage.getItem('user_id')
         $(function () {
             if (loginUserName) {
-                document.getElementById('login_user_name').innerText = loginUserName;
+                // document.getElementsByClassName('.loginIcon')[0].src = loginUserName;
+                document.getElementsByClassName('loginName')[0].innerText = loginUserName;
                 document.getElementById('login-link').style.display = 'none'
+            } else {
+                document.getElementsByClassName('toAdmin')[0].style.display = 'none'
+                document.getElementsByClassName('loginIcon')[0].style.display = 'none'
+                document.getElementsByClassName('dropMenu')[0].style.display = 'none'
             }
         });
         $(function () {
@@ -67,6 +72,11 @@
             }
         });
 
+        function logOut() {
+            localStorage.clear()
+            window.location.href = 'http://' + window.location.host +  '/admin/logout'
+        }
+
         function showDT() {
             var days = new Array("日", "一", "二", "三", "四", "五", "六");
             var currentDT = new Date();

src/main/resources/templates/home/common/header.html

@@ -30,8 +30,18 @@
 					<!--<a th:href="@{/home/login}" class="iconlogin"><i class="iconfont">&#xe634;</i></a>-->
 					<!--<span style="margin-right:10px;">登录人</span>-->
 					<!--<i class="iconfont">&#xe634;</i>-->
-					<span id="login_user_name"></span>
-					<a  id="login-link" th:href="@{/home/login}">登录</a>
+					<!--<span id="login_user_name" style="margin-right:10px;"></span>-->
+					<a th:href="@{/admin/home}" class="toAdmin">后台</a>
+					<img class="loginIcon" th:src="@{/assets/images/userImg.png}" alt="头像">
+					<div class="dropMenu">
+						<div class="loginName"></div>
+						<div class="menu">
+							<a th:href="@{/index/#/myActivity}">我的活动</a>
+							<a th:href="@{/index/#/favouriteActivity}">活动收藏</a>
+							<a onclick="logOut()">退出</a>
+						</div>
+					</div>
+					<a  id="login-link" style="margin-right:10px;" th:href="@{/home/login}">登录</a>
 					<a th:href="@{/home}"><img th:src="@{/assets/images/homePng.png}" alt=""></a>
 				</div>
 			</div>

src/main/resources/templates/home/html/contentDetail.html

@@ -45,9 +45,9 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb clearfix"
-                    style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix"
+                    style="margin-top: 40px;border-bottom: 0px solid #fff;margin-bottom: 0;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/policy/policyDetail.html

@@ -44,9 +44,9 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb clearfix"
-                    style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix"
+                    style="border-bottom: 0px solid #fff;margin-bottom: 0;margin-top:40px;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/policy/policyList.html

@@ -19,31 +19,32 @@
 </div>
 
 <div class="policy-bg">
-    <div class="policy-content">
+    <div class="policy-content" style="padding-top:0;">
         <div>
             <div class="row">
                 <!--面包屑-->
-                <div class="col-sm-6 col-md-6 col-lg-8 hidden-xs" style="padding-left: 0;">
-                    <ol class="breadcrumb" style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+                <div class="hidden-xs" style="padding-left: 0;position:relative;">
+                    <ol class="breadcrumbFixed clearfix" style="border-bottom: 0px solid #fff;margin-bottom: 20px;">
                         <li>
                             <a th:href="@{/home}">首页</a>
                         </li>
                         <li class="active"><a><cite>政策雷达</cite></a></li>
                     </ol>
-                </div>
-                <!--搜索框-->
-                <div class="col-sm-6 col-md-6 col-lg-4 col-xs-12">
-                    <div style="display: inline-block;float: right;padding-top: 10px;width: 100%;">
+                    <div class="col-sm-6 col-md-6 col-lg-4 col-xs-12" style="position: absolute;right: 0px;top: 5px;">
+                        <div style="display: inline-block;float: right;padding-top: 10px;width: 100%;">
 					<span style="display: inline-block;width:100%">
 					    <input type="text" name="keyword" lay-verify="required" placeholder="请输入关键字搜索"
                                autocomplete="off" class="layui-input" style="width: 100%;display: inline-block">
 				    </span>
-                        <button onclick="" id="keywordSearch"
-                                style="display: inline-block;float: right;background:none;border:none;">
-                            <i class=" iconfont icon-sousuo"></i>
-                        </button>
+                            <button onclick="" id="keywordSearch"
+                                    style="display: inline-block;float: right;background:none;border:none;">
+                                <i class=" iconfont icon-sousuo"></i>
+                            </button>
+                        </div>
                     </div>
                 </div>
+                <!--搜索框-->
+
             </div>
         </div>
         <!--搜索条件-->

src/main/resources/templates/home/html/policy/policyProjectDetail.html

@@ -20,8 +20,8 @@
     <div class="policy-content">
         <!--面包屑-->
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-8 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb" style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix" style="border-bottom: 0px solid #fff;margin-bottom: 0;margin-top:40px;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/policy/policyQuestDetail.html

@@ -45,9 +45,9 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
                 <ol class="breadcrumb clearfix"
-                    style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+                    style="margin-top: 40px;border-bottom: 0px solid #fff;margin-bottom: 0;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/policy/policyQuestionDetail.html

@@ -45,9 +45,9 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
                 <ol class="breadcrumb clearfix"
-                    style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+                    style="margin-top: 40px;border-bottom: 0px solid #fff;margin-bottom: 0;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/policy/policySpecialDetail.html

@@ -45,9 +45,9 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb clearfix"
-                    style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix"
+                    style="margin-top: 40px;border-bottom: 0px solid #fff;margin-bottom: 0;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/policy/policySpecialList.html

@@ -17,28 +17,28 @@
     <div th:replace="~{home/common/header :: nav}"></div>
 </div>
 <div class="policy-bg">
-    <div class="policy-content">
+    <div class="policy-content" style="padding-top:0;">
         <!--面包屑-->
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-8 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb" style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;position:relative;">
+                <ol class="breadcrumbFixed clearfix" style="border-bottom: 0px solid #fff;margin-bottom: 20px;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>
                     <li class="active"><a><cite>[[${navigation_name}]]</cite></a></li>
                     <li>专项解读</li>
                 </ol>
-            </div>
-            <!--搜索框-->
-            <div class="col-sm-6 col-md-6 col-lg-4 col-xs-12">
-                <div style="display: inline-block;float: right;padding-top: 10px;width: 100%;">
+                <div class="col-sm-6 col-md-6 col-lg-4 col-xs-12" style="position: absolute;right: 0px;top: 5px;">
+                    <div style="display: inline-block;float: right;padding-top: 10px;width: 100%;">
 					<span style="display: inline-block;width:100%">
-					    <input type="text" id="keyWord" name="keyword" placeholder="请输入政策搜索关键词" class="layui-input"
-                               style="width: 100%;display: inline-block">
+					    <input type="text" name="keyword" lay-verify="required" placeholder="请输入关键字搜索"
+                               autocomplete="off" class="layui-input" style="width: 100%;display: inline-block">
 				    </span>
-                    <button id="keywordSearch" style="display: inline-block;float: right;background:none;border:none;">
-                        <i class=" iconfont icon-sousuo"></i>
-                    </button>
+                        <button onclick="" id="keywordSearch"
+                                style="display: inline-block;float: right;background:none;border:none;">
+                            <i class=" iconfont icon-sousuo"></i>
+                        </button>
+                    </div>
                 </div>
             </div>
         </div>

src/main/resources/templates/home/html/projectDetail.html

@@ -35,8 +35,8 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb" style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix" style="border-bottom: 0px solid #fff;margin-bottom: 0;margin-top:40px;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/projectFillingDetail.html

@@ -35,8 +35,8 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb" style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix" style="margin-top: 40px;border-bottom: 0px solid #fff;margin-bottom: 0;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/projectIntelligentDetail.html

@@ -35,8 +35,8 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb" style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix" style="margin-top: 40px;border-bottom: 0px solid #fff;margin-bottom: 0;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/projectProvincesDetail.html

@@ -35,8 +35,8 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb" style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix" style="margin-top: 40px;border-bottom: 0px solid #fff;margin-bottom: 0;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>

src/main/resources/templates/home/html/serverDetail.html

@@ -45,9 +45,9 @@
 <div class="main">
     <div class="container projects">
         <div class="row">
-            <div class="col-sm-6 col-md-6 col-lg-9 hidden-xs" style="padding-left: 0;">
-                <ol class="breadcrumb clearfix"
-                    style="padding-top: 15px;border-bottom: 0px solid #fff;margin-bottom: 0;">
+            <div class="hidden-xs" style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix"
+                    style="margin-top: 40px;border-bottom: 0px solid #fff;margin-bottom: 0;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>