前台新样式

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

@@ -26,8 +26,19 @@ a:hover{
 	/*height: 58px;*/
 	background: #fff;
 	color: #333;
-	line-height: 58px;
-	padding: 15px 20px;
+	line-height: 80px;
+	height: 80px;
+	/*background: url("../image/header-bg.jpg") no-repeat center top;*/
+	background-color: #fff;
+	border-bottom: 1px solid #ededee;
+}
+
+.headLine{
+	height: 100%;
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
 }
 span{
 	display: inline-block;
@@ -43,11 +54,7 @@ body{
 	margin:0 auto;
 	min-width: 1250px;
 }
-.w1300{
-	margin:auto;
-	/*overflow:hidden;*/
-	text-align: center;
-}
+
 .fl{
 	float: left;
 }
@@ -67,6 +74,18 @@ body{
 	display: inline-block;
 	vertical-align: middle;
 }
+.activityList > div {
+	padding: 25px 30px;
+	border: 1px solid #e7e8ec;
+	margin-left: 0;
+	margin-right: 0;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+.activityList > div:nth-of-type(2n) {
+	background-color: #e7e8ec;
+}
 .centerContent ul li {
 	margin-top: 20px;
 }
@@ -112,6 +131,8 @@ h2{
 }
 .navbar-default {
 	margin-bottom:0;
+    background-color: #fff;
+	border-bottom: 1px solid #EDEDEE;
 }
 .device .arrow-left {
 	position: absolute;
@@ -205,7 +226,9 @@ h2{
 .breadcrumb{
 	background-color: #fff;
 	border-bottom:1px solid #F6F7FB;
+	padding: 20px 15px;
 	width: 100%;
+    color: #fff;
 }
 .breadcrumb > li {
 	display: inline-block;
@@ -216,6 +239,27 @@ h2{
 	content: "> ";
 	padding-left: 7px;
 }
+.breadcrumbFixed{
+	border-bottom:1px solid #F6F7FB;
+	padding: 25px 30px;
+	font-size: 16px;
+	width: 100%;
+	background-color: #878CA0;
+	color: #fff;
+	border-radius: 0px;
+}
+.breadcrumbFixed > li {
+	display: inline-block;
+	float: left;
+}
+.breadcrumbFixed > li > a{
+	color: #fff;
+}
+.breadcrumbFixed > li + li:before {
+	color: #CCCCCC;
+	content: "> ";
+	padding-left: 7px;
+}
 
 /*按钮样式*/
 
@@ -271,7 +315,7 @@ h2{
 	padding: 1px;
 	width: 100%;
 	height: 100%;
-	background-color: #2976CE !important;
+	background-color: #151517 !important;
 }
 .layui-laypage a:hover{
 	color: #2976CE !important;
@@ -310,14 +354,21 @@ em{
 }
 .logo{
 	width: auto;
+	height: 100%;
 	/*height: 80px;*/
 	/*margin-top: 5px;*/
 	font-size: 22px;
 }
 .logo img{
-	max-width: 100%;
-	max-height: 100%;
-	/*display: block;*/
+	width: auto;
+	height: 100%;
+	background-color: #488DFB;
+	display: inline-block;
+	margin-top: -5px;
+}
+.logo span {
+	font-size: 18px;
+	font-weight: bold;
 }
 .small-logo {
 	display: none;
@@ -351,9 +402,26 @@ em{
 	overflow: hidden;
 }
 .login{
+	height: 100%;
 	font-size: 14px;
-	line-height: 36px;
-	margin-top: 15px;
+}
+.login > a > img {
+	background-color: #488dfb;
+	margin-top: -3px;
+}
+.login > .login-link {
+	margin-right: 10px;
+	font-weight: bold;
+	cursor: pointer;
+}
+.login i {
+	height: 100%;
+	width: 60px;
+	display: inline-block;
+	font-size: 24px;
+	text-align: center;
+	background-color: #488DFB;
+	color: #fff;
 }
 .navbar-collapse {
 	padding-right: 0;
@@ -554,35 +622,41 @@ em{
 	height: auto;
 }
 .navbar {
-	background-color: #19273c;
+	/*background-color: #19273c;*/
 }
 .navbar-default .nave_style ul li a{
-	font-size: 18px;
-	color: #fff;
-	padding: 0 17px;
-	line-height: 60px;
+	font-size: 16px;
+	color: #a3a3a3;
+	padding: 0 20px;
+	line-height: 65px;
 }
 .navbar-default .nave_style ul li a:hover{
-	color: #fff;
-	background-color: #2976ce;
+	color: #333333;
 }
 .navbar-default .nave_style ul li a:focus{
-	color: #fff;
+	color: #333333;
 }
 .navbar-default .nave_style ul li .second-menu {
 	display: none;
 	position: absolute;
-	width: 100%;
 	left: 0;
-	background: #ff5555;
+	background: #fff;
 	z-index: 10;
 }
 .navbar-default .nave_style ul li .second-menu a {
 	font-size: 14px;
 	display: block;
-	padding: 0;
 	text-align: center;
 	line-height: 40px;
+	text-align: left;
+	padding: 5px 20px;
+	white-space: nowrap;
+}
+.navbar-default .nave_style ul li .second-menu a:hover {
+	background: #eee;
+	color: #000;
+	-webkit-transform: translateX(2px);
+	transform: translateX(2px);
 }
 .navbar-default .nave_style ul li:hover .second-menu {
 	display: block;
@@ -594,8 +668,8 @@ em{
 .navbar-default .navbar-nav > .active > a,
 .navbar-default .navbar-nav > .active > a:hover,
 .navbar-default .navbar-nav > .active > a:focus{
-	color:#fff;
-	background-color: #2976ce;
+	color:#333;
+    background-color: #fff;
 }
 .navbar-default .navbar-toggle{
 	border-color: #ddd;
@@ -628,11 +702,10 @@ em{
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	font-size: 16px;
-	margin: 0 0 10px;
 
 }
 .textEllipsis a{
-	color: #2976CE;
+	color: #333333;
 }
 .textEllipsis1{
 	width: 100%;
@@ -786,7 +859,6 @@ em{
 }
 .center_nav .navbar {
 	border-radius: 0;
-	border: none;
 }
 .num-box {
 	height: 110px;
@@ -1015,7 +1087,9 @@ em{
 	padding-bottom: 20px;
 }
 .screen-box {
-	margin: 20px 0;
+	padding: 20px 30px;
+	border-left: solid 1px #dadada;
+	border-right: solid 1px #dadada;
 }
 .sort-box {
 	border: solid 1px #dadada;
@@ -1041,8 +1115,8 @@ em{
 }
 .kind-tip {
 	border: solid 1px #dadada;
-	padding: 10px;
-	margin-bottom: 20px;
+	border-bottom: none;
+	padding: 15px 30px;
 }
 .kind-box {
 	display: inline-block;
@@ -1058,9 +1132,15 @@ em{
 	color: #fff;
 }
 .activity-list ul li{
-	border-bottom: solid 1px #dadada;
-	padding-bottom: 20px;
-	margin-bottom: 20px;
+	padding: 25px 30px;
+	border: 1px solid #e7e8ec;
+	margin-left: 0;
+	margin-right: 0;
+	display: flex;
+	align-items: center;
+}
+.activity-list ul li:nth-child(2n ){
+	background-color: #e7e8ec;
 }
 .notice-img-box {
 	width: 270px;
@@ -1150,11 +1230,6 @@ em{
 }
 
 
-/*2018年4月24日*/
-.head {
-	background: url("../image/header-bg.jpg") no-repeat center top;
-	height: 120px;
-}
 .icon-time,.iconlogin {
 	background: #dd0000;
 }
@@ -1164,12 +1239,12 @@ em{
 .navbar {
 	/*background: #ff0000;*/
 }
-.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {
-	background: #dd0000;
-}
-.navbar-default .nave_style ul li a:hover {
-	background: #dd0000;
-}
+/*.navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus {*/
+	/*background: #dd0000;*/
+/*}*/
+/*.navbar-default .nave_style ul li a:hover {*/
+	/*background: #fff;*/
+/*}*/
 .banner-bg {
 	background: url("../image/banner-bg.jpg") no-repeat center top;
 	height: 317px;
@@ -1177,18 +1252,15 @@ em{
 .main {
 	padding-bottom: 40px;
 }
+.list-main {
+	padding-top: 40px;
+}
 .main-bg {
 	/*background: url("../image/main-bg.jpg") no-repeat center top;*/
 	background: #f9f9f9;
 	min-height: 575px;
 }
-.home-content {
-	position: relative;
-	background: #fff;
-	width: 1250px;
-	min-height: 575px;
-	margin: 0 auto;
-}
+
 .num-info {
 	position: absolute;
 	top: -184px;
@@ -1282,31 +1354,75 @@ em{
 
 .footer {
 	margin-top: 0;
-	background: #eaeaea;
+	background: #878ca0;
 	padding: 30px 0;
 }
+
 .footer .home-content {
-	background: none;
-	min-height: auto;
+	max-height: 575px;
+	width: 100%;
+	margin: 0 auto;
+    padding:0 18%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.footer .footer-left {
+	max-width: 60%;
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+}
+.footer .footer-right {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+.footer-right div {
+	width:90px;
+	text-align: center;
+}
+.footer-right div img {
+	max-height: 100px;
+}
+.footer-right div p {
+	font-size: 10px;
+	color: #fff;
 }
 .footer .link {
 	width: 670px;
-	background: #fff;
 	padding: 20px;
 }
 .link-title {
 	font-size: 16px;
 	color: #333;
+	border-bottom: 2px solid #9fa3b3;
+	color: #fff;
 }
 .footer .home-content ul li {
 	border-right: solid 1px #b3b3b3;
 }
-.footer .home-content .link a {
-	color: #666;
-}
 .link-line {
 	background: #dd0000;
 }
+.link .friendlyLink {
+	padding: 3px 50px 3px 0;
+}
+.link .helpLink {
+	padding: 3px 20px 3px 0;
+}
+.link a {
+	font-size: 13px;
+	color: #c9cbd3;
+	margin-top: 10px;
+	cursor: pointer;
+	display: inline-block;
+	border-bottom: 1px solid transparent;
+}
+.link a:hover{
+	color:#fff;
+	border-bottom: 1px solid #fff;
+}
 .cord-box {
 	border-top: none;
 	width: 510px;
@@ -1338,7 +1454,8 @@ em{
 	position: relative;
 	border-top: none;
 	text-align: center;
-	color: #666;
+	color: #464953;
+    border-top: 2px solid #797E90;
 }
 .fangwen {
 	position: absolute;

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

@@ -53,6 +53,14 @@
     <![endif]-->
 
     <script type="text/javascript">
+        loginUserName = localStorage.getItem('user_name')
+        loginUserId = localStorage.getItem('user_id')
+        $(function () {
+            if (loginUserName) {
+                document.getElementById('login_user_name').innerText = loginUserName;
+                document.getElementById('login-link').style.display = 'none'
+            }
+        });
         $(function () {
             if ($("#showtime").length > 0) {
                 showDT();
@@ -101,15 +109,6 @@
         function toIndustrial() {
             window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/industrialReserve');
         }
-
-        function toIndustrialHome() {
-            window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/home');
-        }
-
-        function toIndustrialMap() {
-            window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/industrialReserve');
-        }
-
         function checkLogin1(e) {
             $.ajax({
                 url: pagePath + "/home/checkLogin/",
@@ -122,10 +121,17 @@
                     if (result.success) {
                         var obj = result.obj;
                         if (obj.isLogin) {
-                            if(e === 'azw') {
-                                window.location.href="http://202.102.20.60:8008/xq/#/login?username="+obj.userName;
-                            }
-                            if(e === 'gycf') {
+                            if(e == 'azw') {
+                                window.open("http://202.102.20.60:8008/xq/#/login?username="+obj.userName)
+                            } else if(e='dljk') {
+                                window.open("http://202.102.20.60:8008/ly/#/login?username="+obj.userName)
+                            } else if(e='lyjj') {
+                                window.open("http://112.4.85.47:8000/lyzf/#/login?username="+obj.userName)
+                            } else if (e == 'jwtz') {
+                                if (obj.userType == 3) {
+                                    window.open('http://112.4.85.50:9300/irsweb/?id=' + loginUserId)
+                                }
+                            } else if(e == 'gycf') {
                                 // window.location.href = pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home';
                                 window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/home');
                                 $.ajax({
@@ -143,23 +149,6 @@
                                     }
                                 });
                             }
-                            if (e === 'gytd'){
-                                window.open(pagePath.substring(0,pagePath.lastIndexOf("/")) + '/industry/home/#/industrialReserve');
-                                $.ajax({
-                                    url: pagePath + "/token/create",
-                                    type: "get",
-                                    dataType: "json",
-                                    data: {
-                                        timeStamp: new Date()
-                                    },
-                                    success: function (result) {
-                                        if (result.success) {
-                                            var token = result.obj;
-                                            localStorage.setItem("INDUSTRIAL_CARRIER", token);
-                                        }
-                                    }
-                                });
-                            }
                         } else {
                             //errorMessage("请登陆！");
                             location.href = pagePath + "/home/login";
@@ -173,9 +162,6 @@
                             if(e == 'gycf') {
                                 localStorage.setItem("industrialCarrier", "1");
                             }
-                            if(e == 'gytd') {
-                                localStorage.setItem("industrialLand", "1");
-                            }
                         }
                     } else {
                         errorMessage(result.message);

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

@@ -43,53 +43,61 @@
 <!--</div>-->
 <div class="footer" th:fragment="footer">
     <div class="home-content">
-        <div class="clearfix">
+        <div class="footer-left">
             <div class="pull-left link">
                 <p class="clearfix">
-                    <span class="link-line"></span>
-                    <span class="link-title">友情链接</span>
+                    <span class="link-title friendlyLink">友情链接</span>
                 </p>
-                <ul>
-                    <li th:each="model:${friendLinks}" th:object="${model}"><a th:href="@{*{link_location}}"
-                                                                               th:text="*{name}"></a></li>
-                </ul>
-            </div>
-            <div class="pull-right cord-box clearfix">
-                <div class="pull-left cord-left">
-                    <p class="ft-18">关注微信公众号</p>
-                    <p class="cord-line-box">
-                        <span class="cord-samll-name">获取最新服务资讯</span>
-                    </p>
+                <div>
+                    <a href="http://www.miit.gov.cn/" target="_blank">中华人民共和国工业和信息化部</a><br/>
+                    <a href="http://www.sme.gov.cn/" target="_blank">中国中小企业信息网</a><br/>
+                    <a href="http://www.jseic.gov.cn/" target="_blank">江苏省经济和信息化委员会</a><br/>
+                    <a href="http://www.szetc.gov.cn/szjxw/" target="_blank">苏州市经济和信息化委员会</a><br/>
+                    <a href="http://www.snd.gov.cn/snd/" target="_blank">苏州高新区管委会</a>
                 </div>
-                <div class="pull-left cord-list clearfix">
-                    <div class="clearfix ewm-box" style="width:150px;">
-                        <img th:src="@{/home/image/cord-w.jpg}" class="cord-img pull-left">
-                        <div style="width: 18px; float: left">苏<br>州<br>高<br>新<br>区</div>
-                        <div style="width: 18px; float: left">中<br>小<br>企<br>业<br>服</div>
-                        <div style="width: 18px; float: left">务<br>中<br>心</div>
-                    </div>
-                    <div class="clearfix ewm-box">
-                        <img th:src="@{/home/image/cord-fgj.jpg}" class="cord-img pull-left">经发委二维码
-                    </div>
+            </div>
+            <div class="pull-left link">
+                <p class="clearfix">
+                    <span class="link-title helpLink">帮助</span>
+                </p>
+                <div>
+                    <a class="help-item" checkData="feedback">诉求反馈</a><br/>
+                    <a class="help-item" checkData="complaints">我要投诉</a><br/>
+                    <a class="help-item" checkData="appcode">APP下载</a><br/>
+                    <a class="help-item" checkData="files">文件资料</a>
                 </div>
             </div>
         </div>
-
-        <div class="copy-box">
+        <div class="footer-right">
             <div>
-                <p>建设单位：苏州高新区经济发展委员会</p>
-                <p>&copy2019版权所有</p>
-                <p>&nbsp</p>
+                <img th:src="@{/home/image/cord-fgj.jpg}" class="cord-img">
+                <p>经发委</p>
+                <p>二维码</p>
             </div>
-            <div class="fangwen">
-                <img th:src="@{/home/image/statistics.png}">
-                <div id="statistics">访问量：0 注册企业数：0 活跃度：0</div>
-                <div>
-                    <script type="text/javascript">var cnzz_protocol = (("https:" == document.location.protocol) ? "https://" : "http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1276885018'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s96.cnzz.com/z_stat.php%3Fid%3D1276885018%26show%3Dpic1' type='text/javascript'%3E%3C/script%3E"));</script>
-                </div>
+            <div style="margin-left: 40px;">
+                <img th:src="@{/home/image/cord-w.jpg}" class="cord-img">
+                <p>苏州高新区中小企业服务中心</p>
             </div>
         </div>
     </div>
+    <div class="copy-box">
+        <div>
+            <p>建设单位：苏州高新区经济发展委员会&copy2019版权所有</p>
+        </div>
+        <!--<div class="fangwen">-->
+        <!--<img th:src="@{/home/image/statistics.png}">-->
+        <!--<div id="statistics">访问量：0 注册企业数：0 活跃度：0</div>-->
+        <!--<div>-->
+        <!--<script type="text/javascript">var cnzz_protocol = (("https:" == document.location.protocol) ? "https://" : "http://");document.write(unescape("%3Cspan id='cnzz_stat_icon_1276885018'%3E%3C/span%3E%3Cscript src='" + cnzz_protocol + "s96.cnzz.com/z_stat.php%3Fid%3D1276885018%26show%3Dpic1' type='text/javascript'%3E%3C/script%3E"));</script>-->
+        <!--</div>-->
+        <!--</div>-->
+    </div>
+    <div class="tips-popup">
+        <div class="tips-content">
+            <span class="tipsclose">关闭</span>
+            <div id="popupCentent">敬请期待……</div>
+        </div>
+    </div>
     <script>
 
         var pagePath = $("meta[name='_ctx']").attr("content");
@@ -160,9 +168,42 @@
                 }
             });
         }
+        $(".help-item").on("click", function () {
+            var dataVal = $(this).attr('checkData');
+            $(".tips-content").removeClass("appCodestyle")
+            $(".tips-popup").show();
+            if(dataVal == 'feedback') {
+                $("#popupCentent").html('<div class="popupInfo"><p>投诉邮箱：qyfwzx@snd.gov.cn</p></div>')
+            }
+            else if(dataVal == 'complaints') {
+                $("#popupCentent").html('<div class="popupInfo"><p>投诉邮箱：qyfwzx@snd.gov.cn</p><p>投诉电话：0512-68755225</p></div>')
+            }
+            else if(dataVal == 'appcode') {
+                $("#popupCentent").html('<div class="app-code clearfix">\n' +
+                    '                        <div class="app-code-box">\n' +
+                    '                            <img src="'+pagePath+'/home/image/appCode.png">\n' +
+                    '                            <p>安卓版</p>\n' +
+                    '                        </div>\n' +
+                    '                        <div class="app-code-box">\n' +
+                    '                            <img src="'+pagePath+'/home/image/ios.png">\n' +
+                    '                            <p>ios版</p>\n' +
+                    '                        </div>\n' +
+                    '                    </div>')
+                $(".tips-content").addClass("appCodestyle")
+            }
+            else if(dataVal == 'files') {
+                $("#popupCentent").html('<div class="popupInfo"><p style="text-align: center; font-size: 20px; color: #ff0000;margin-top: -50px; margin-bottom: 10px;">文件下载</p><p><a href="'+pagePath+'/home/image/园区工业载体使用说明.docx" style="display: block; width: 100%"><span style=" float: left">园区工业载体使用说明.docx</span><span style="float: right; color: #dd0000">↓下载</span></a></p><p><a href="'+pagePath+'/home/image/属地工业载体使用说明.docx" style="display: block; width: 100%"><span style=" float: left">属地工业载体使用说明.docx</span><span style="float: right; color: #dd0000"">↓下载</span></a></p><p><a href="'+pagePath+'/home/image/政府工业载体使用说明.docx" style="display: block; width: 100%"><span style=" float: left">政府工业载体使用说明.docx</span><span style="float: right; color: #dd0000"">↓下载</span></a></p></div>')
+            }
+            else {
+                $("#popupCentent").html('敬请期待……')
+            }
+        });
+        $(".tipsclose").on("click", function () {
+            $(".tips-popup").hide();
+        });
     </script>
     <!--右侧悬浮目录-->
-    <script th:src="@{/home/plugin/rightMenu.js}" type="text/javascript"></script>
+    <!--<script th:src="@{/home/plugin/rightMenu.js}" type="text/javascript"></script>-->
 </div>
 </body>
 

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

@@ -11,27 +11,29 @@
 <body>
 
 	<!-- 头部 -->
-		<div class="head" th:fragment="header" style="padding-top: 20px;">
-			<div class="w1300 container">
-                <div class="row">
-                    <!--<div class="logo fl hidden-xs"><img th:src="@{/home/image/logoSmall.png}" class="small-logo"><img th:src="@{/home/image/logoTop.png}" class="logo-big"></div>-->
-                    <div class="logo fl" style="padding-left: 15px;">
-                        <img  th:src="@{*{fileUrl}+*{logo.fileDown.file_url}}" th:alt="*{logo.fileDown.file_name}" th:title="苏州高新区企业发展服务云平台">
-						<h1 style="text-indent: -99999px">苏州高新区企业发展服务云平台</h1>
-                    </div>
-                    <!--<div class="name fl hidden-xs">-->
-                        <!--<a th:href="${logo.link}" th:if="${logo.link}">[[${logo.name}]]</a>-->
-                        <!--<span th:unless="${logo.link}">[[${logo.name}]]</span>-->
-                    <!--</div>-->
-                    <div class="login fr clearfix">
-                        <!--<button class="btn btn-add" type="submit">注册</button>-->
-                        <div class="pull-left relative">
-                            <span id="showtime" class="datetime"></span>
-                            <span class="icon-time"><i class="iconfont">&#xe62d;</i></span>
-                        </div>
-                        <a th:href="@{/home/login}" class="iconlogin"><i class="iconfont">&#xe634;</i></a>
-                    </div>
-                </div>
+		<div class="head" th:fragment="header">
+			<div class="headLine">
+				<div class="logo">
+					<img  th:src="@{/assets/images/logoPng.png}" th:alt="logo" th:title="苏州高新区企业发展服务云平台">
+					<span>欢迎来到企业发展服务平台！</span>
+				</div>
+				<!--<div class="name fl hidden-xs">-->
+					<!--<a th:href="${logo.link}" th:if="${logo.link}">[[${logo.name}]]</a>-->
+					<!--<span th:unless="${logo.link}">[[${logo.name}]]</span>-->
+				<!--</div>-->
+				<div class="login">
+					<!--<button class="btn btn-add" type="submit">注册</button>-->
+					<!--<div class="pull-left relative">-->
+						<!--<span id="showtime" class="datetime"></span>-->
+						<!--<span class="icon-time"><i class="iconfont">&#xe62d;</i></span>-->
+					<!--</div>-->
+					<!--<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>
+					<a th:href="@{/home}"><img th:src="@{/assets/images/homePng.png}" alt=""></a>
+				</div>
 			</div>
 		</div>
 
@@ -50,31 +52,52 @@
 			</div>
 			<div class="collapse navbar-collapse clearfix" id="example-navbar-collapse">
 				<ul id="nav" class="nav navbar-nav">
-					<li role="presentation" class="active">
-						<a th:href="@{/home}" data-title="首页">首页</a>
+					<!--<li role="presentation" class="active">-->
+						<!--<a th:href="@{/home}" data-title="首页">首页</a>-->
+					<!--</li>-->
+					<!--<li role="presentation" th:each="model,iterStat:${navigations}" th:object="${model}">-->
+						<!--<a th:if="*{id!=2 and id!=80}" th:href="@{'/home/informList/'+*{id}}" th:id="*{id}" th:text="*{name}" ></a>-->
+						<!--<a th:if="*{id==2}" th:href="@{/home/unionCompany}" th:id="*{id}" name="unionCompany" th:text="*{name}" ></a>-->
+						<!--<a th:if="*{id==80}" onclick="checkLogin1('azw')" th:id="*{id}" name="safetySupervision" th:text="*{name}" ></a>-->
+					<!--</li>-->
+					<li role="presentation" >
+						<a th:href="@{/newsList}" data-title="通知公告">通知公告</a>
+					</li>
+					<li role="presentation" >
+						<a th:href="@{/home/informList/66}" data-title="政策雷达" target="_blank">政策雷达</a>
 					</li>
-					<li role="presentation" th:each="model,iterStat:${navigations}" th:object="${model}">
-						<a th:if="*{id!=2 and id!=80}" th:href="@{'/home/informList/'+*{id}}" th:id="*{id}" th:text="*{name}" ></a>
-						<a th:if="*{id==2}" th:href="@{/home/unionCompany}" th:id="*{id}" name="unionCompany" th:text="*{name}" ></a>
-						<a th:if="*{id==80}" onclick="checkLogin1('azw')" th:id="*{id}" name="safetySupervision" th:text="*{name}" ></a>
+					<li role="presentation" >
+						<a th:href="@{/home/informList/69}" data-title="申报服务">申报服务</a>
 					</li>
-					<li role="presentation">
-						<a th:href="@{/home/login}" data-title="存量用地">存量用地</a>
+					<li role="presentation" >
+						<a th:href="@{/activityHome}" data-title="专题活动">专题活动</a>
 					</li>
+					<li role="presentation" >
+						<a th:href="@{/serviceleague/home}" data-title="服务联盟">服务联盟</a>
+					</li>
+					<!--<li role="presentation">-->
+						<!--<a th:href="@{/home/login}" data-title="存量用地">存量用地</a>-->
+					<!--</li>-->
 					<!--<li role="presentation">-->
 						<!--<a onclick="redirectToIndustrialCarrier()" data-title="工业载体">工业载体</a>-->
 					<!--</li>-->
 					<li role="presentation" class="relative">
 						<a data-title="工业载体">工业载体</a>
 						<div class="second-menu">
-							<!--<a onclick="checkLogin1('gycf')" data-title="工业厂房">工业厂房</a>-->
-							<a onclick="toIndustrialHome()" data-title="工业厂房">工业厂房</a>
-							<a onclick="toIndustrialMap()" data-title="工业土地">工业土地</a>
+							<a onclick="checkLogin1('gycf')" data-title="工业厂房">工业厂房</a>
+							<a onclick="toIndustrial()" data-title="工业土地">工业土地</a>
+						</div>
+					</li>
+					<li role="presentation" class="relative">
+						<a data-title="应用中心">应用中心</a>
+						<div class="second-menu">
+							<a href="https://xsg.tq.geostsapp.cn/xgkfq/infoCollect/#/index" data-title="工业资源" target="_blank">工业资源</a>
+							<a onclick="checkLogin1('azw')" data-title="安专委平台">安专委平台</a>
+							<a onclick="checkLogin1('dljk')" data-title="电炉监控系统">电炉监控系统</a>
+							<a onclick="checkLogin1('lyjj')" data-title="楼宇经济管理平台">楼宇经济管理平台</a>
+							<a onclick="checkLogin1('jwtz')" data-title="境外投资项目备案系统">境外投资项目备案系统</a>
 						</div>
 					</li>
-					<!--<li role="presentation">-->
-						<!--<a onclick="checkLogin1()" data-title="安专委">安专委工作平台</a>-->
-					<!--</li>-->
 				</ul>
 				<!--<div class="pull-right search-box clearfix">-->
 					<!--<input placeholder="请输入关键字" type="text" class="search-input pull-left">-->

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

@@ -22,7 +22,6 @@
             background: #f60;
             color: #fff;
             padding: 0 10px;
-            margin-top: 12px;
         }
         .black-gray {
             background: #ccc;
@@ -39,13 +38,14 @@
     <div th:replace="~{home/common/header :: nav}"></div>
 </div>
 
-<div class="main">
+<div class="main list-main">
 
     <!--面包屑-->
     <div class="container projects">
-        <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="col-sm-6 col-md-6 col-lg-8 hidden-xs"-->
+            <div style="padding-left: 0;">
+                <ol class="breadcrumbFixed clearfix" style="border-bottom: 0px solid #fff;margin-bottom: 0;">
                     <li>
                         <a th:href="@{/home}">首页</a>
                     </li>
@@ -53,18 +53,18 @@
                 </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%;">
-					<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="onInit(1)" id="keywordSearch"
-                            style="display: inline-block;float: right;background:none;border:none;">
-                        <i class=" iconfont icon-sousuo"></i>
-                    </button>
-                </div>
-            </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%;">-->
+					<!--<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="onInit(1)" id="keywordSearch"-->
+                            <!--style="display: inline-block;float: right;background:none;border:none;">-->
+                        <!--<i class=" iconfont icon-sousuo"></i>-->
+                    <!--</button>-->
+                <!--</div>-->
+            <!--</div>-->
         </div>
     </div>
     <div id="activity_box" class="container projects" hidden>
@@ -93,9 +93,9 @@
             </ul>
         </div>
     </div>
-    <div id="news_box" class="container projects" style="margin-top: 20px;">
+    <div id="news_box" class="container projects">
         <div class="row">
-            <div class="col-sm-12 col-md-12 col-lg-12" id="centerContent"></div>
+            <div class="col-sm-12 col-md-12 col-lg-12 activityList" id="centerContent"></div>
         </div>
     </div>
     <!--分页-->
@@ -122,7 +122,7 @@
         </p>
         <p style="display: inline-block;margin: 0 0 10px;" class="fr textColor hidden-xs">{{ content.create_time }}</p>
     </div>
-    <p class="textEllipsis1">{{ content.brief }}</p>
+    <!--<p class="textEllipsis1">{{ content.brief }}</p>-->
 
 
     {{/each}}
@@ -201,10 +201,10 @@
                             laypage.render({
                                 elem: 'paging',
                                 count: result.obj.counts,
-                                first: '首页',
-                                last: '尾页',
-                                prev: '<em>上一页</em>',
-                                next: '<em>下一页</em>',
+                                first: '1',
+                                last: Math.ceil(result.obj.counts/10),
+                                prev: '<em>＜</em>',
+                                next: '<em>＞</em>',
                                 curr: result.obj.page_no,     //当前页
                                 jump: function (obj, first) {   //触发分页后的回调
                                     //触发分页后的回调,并传递当前页obj.cuur
@@ -309,9 +309,9 @@
                         str += '<p><i class="iconfont">&#xe62d;</i> ' + newList[i].activity_starttime.substring(0, 4) + '年' + newList[i].activity_starttime.substring(5, 7) + '月' + newList[i].activity_starttime.substring(8, 10) + '日' + newList[i].activity_starttime.substring(10, 16) + '</p>'
                         str += '<p><i class="iconfont">&#xe6e5;</i> ' + newList[i].activity_location + '</p>'
                         str += '<div>'
-                        if (newList[i].can_sign_up === true) {
+                        if (newList[i].activity_deadline == '0') {
                             str += '<a href="' + pagePath + '/home/activityDetail/' + newList[i].id + '" class="btn btn-success radius" onclick="" target="_blank">参与报名</a>'
-                        } else if (newList[i].can_sign_up === false) {
+                        } else if (newList[i].activity_deadline == '1') {
                             str += '<a href="' + pagePath + '/home/activityDetail/' + newList[i].id + '" class="btn btn-success radius" onclick="" target="_blank">活动详情</a>'
                         }
 
@@ -328,9 +328,9 @@
                             elem: 'paging',
                             count: result.obj.counts,
                             first: '首页',
-                            last: '尾页',
-                            prev: '<em>上一页</em>',
-                            next: '<em>下一页</em>',
+                            last: Math.ceil(result.obj.counts/10),
+                            prev: '<em>＜</em>',
+                            next: '<em>＞</em>',
                             curr: result.obj.page_no,     //当前页
                             jump: function (obj, first) {   //触发分页后的回调
                                 //触发分页后的回调,并传递当前页obj.cuur
@@ -461,7 +461,7 @@
                         // }
                         else {
                             applyStatus = "申报中";
-                            html += '<li class="clearfix row">' +
+                            html += '<li class="clearfix">' +
                                 '        <div style="float:left; width:100px">' +
                                 '            <span class="project-apply" id="apply_status">'+ applyStatus +'</span>' +
                                 '        </div>' ;
@@ -476,8 +476,8 @@
                             '                    '+ projects[i].project_source_name +'】 ' +
                             '                    '+ projects[i].project_name +'</a>' +
                             '            </p>' +
-                            '            <p style="display: inline-block;margin: 0 0 10px;" class="fr textColor hidden-xs">'+ projects[i].create_time +'</p>' +
-                            '            <p>申报截止日期：'+ projects[i].apply_enddate +'</p>' +
+                            '            <p style="display: inline-block;" class="fr textColor hidden-xs">'+ projects[i].create_time +'</p>' +
+                            // '            <p>申报截止日期：'+ projects[i].apply_enddate +'</p>' +
                             '        </div>' +
                             '    </li>';
                     }
@@ -488,10 +488,10 @@
                         laypage.render({
                             elem: 'paging',
                             count: result.obj.counts,
-                            first: '首页',
-                            last: '尾页',
-                            prev: '<em>上一页</em>',
-                            next: '<em>下一页</em>',
+                            first: '1',
+                            last: Math.ceil(result.obj.counts/10),
+                            prev: '<em>＜</em>',
+                            next: '<em>＞</em>',
                             curr: result.obj.page_no,     //当前页
                             jump: function (obj, first) {   //触发分页后的回调
                                 //触发分页后的回调,并传递当前页obj.cuur