Merge branch 'dev' of http://222.92.16.3:3000/hzh/snd-escloud into dev

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

@@ -359,10 +359,21 @@ em{
 	/*margin-top: 5px;*/
 	font-size: 22px;
 }
-.logo img{
+.logoNew img {
 	width: auto;
 	height: 100%;
+	display: inline-block;
 	background-color: #488DFB;
+	margin-top: -5px;
+}
+.logoNew span {
+	font-size: 18px;
+	font-weight: bold;
+}
+.logo img{
+	width: auto;
+	height: 100%;
+	/*background-color: #488DFB;*/
 	display: inline-block;
 	margin-top: -5px;
 }
@@ -625,7 +636,7 @@ em{
 	/*background-color: #19273c;*/
 }
 .navbar-default .nave_style ul li a{
-	font-size: 16px;
+	font-size: 18px;
 	color: #a3a3a3;
 	padding: 0 20px;
 	line-height: 65px;

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

@@ -13,9 +13,9 @@
 	<!-- 头部 -->
 		<div class="head" th:fragment="header">
 			<div class="headLine">
-				<div class="logo">
+				<div class="logoNew">
 					<img  th:src="@{/assets/images/logoPng.png}" th:alt="logo" th:title="苏州高新区企业发展服务云平台">
-					<span>欢迎来到企业发展服务平台！</span>
+					<span>苏州高新区企业发展服务云平台</span>
 				</div>
 				<!--<div class="name fl hidden-xs">-->
 					<!--<a th:href="${logo.link}" th:if="${logo.link}">[[${logo.name}]]</a>-->
@@ -61,7 +61,7 @@
 						<!--<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>
+						<a th:href="@{/index/#/newsList}" data-title="通知公告">通知公告</a>
 					</li>
 					<li role="presentation" >
 						<a th:href="@{/home/informList/66}" data-title="政策雷达" target="_blank">政策雷达</a>
@@ -70,7 +70,7 @@
 						<a th:href="@{/home/informList/69}" data-title="申报服务">申报服务</a>
 					</li>
 					<li role="presentation" >
-						<a th:href="@{/activityHome}" data-title="专题活动">专题活动</a>
+						<a th:href="@{/index/#/activityHome}" data-title="专题活动">专题活动</a>
 					</li>
 					<li role="presentation" >
 						<a th:href="@{/serviceleague/home}" data-title="服务联盟">服务联盟</a>