xiebaomin 1 年間 前
コミット
5404242bb4

+ 8 - 6
src/main/resources/static/css/article/article.css

@@ -179,8 +179,9 @@ dl,dd,dt{zoom:1}
 	/*信息平台banner*/
 	.info-banner {width: fit-content;box-sizing: border-box;display: flex;justify-content: space-between;}
 	.info-banner .banner {width: 514px;margin-right: 10px;height: 384px;margin-bottom: 16px;}
-	.info-banner .sider-banner {width: 360px;display: flex;flex-direction: column;justify-content: space-between;height: 384px;}
-	.info-banner .sider-banner div {height: 49%;}
+	.info-banner .sider-banner {width: 360px;display: flex;flex-direction: column;}
+	.info-banner .sider-banner div {height: 186px;}
+	.info-banner .sider-banner div:nth-child(2) {margin-top: 10px;}
 	.info-Notice {width: 284px;background: #fff;float: right;height: 384px;margin-bottom: 16px;}
 	.info-Notice .notice-title {display: flex;justify-content: space-between;box-sizing: border-box;height: 48px;padding: 14px 16px;}
 	.info-Notice .notice-title div:nth-child(1) {font-size: 16px;font-weight: bold;color: #333333;}
@@ -400,10 +401,11 @@ dl,dd,dt{zoom:1}
 	.van-collapse .van-document {height: 14vw;padding: 0 5vw 0 0;font-size: 3.6vw;line-height: 14vw;border-bottom: 1px solid #D8D8D8;display: block;color: #323233;}
 
 	.info-Notice {display: none;}
-	.info-banner {margin: 3.2vw auto;width: 94.4vw;display: flex;justify-content: space-between;align-items: center;height: 40vw;}
-	.info-banner .banner {width: 55vw;height: 100%;box-sizing: border-box;}
-	.info-banner .sider-banner {width: 37.8vw; height: 100%;box-sizing: border-box;display: flex;flex-direction: column;justify-content: space-between;}
-	.info-banner .sider-banner div {width: 100%;height: 49%;}
+	.info-banner {margin: 3.2vw auto;width: 94.4vw;display: flex;justify-content: space-between;align-items: center;}
+	.info-banner .banner {width: 55vw;height: 40vw;box-sizing: border-box;}
+	.info-banner .sider-banner {width: 37.8vw;box-sizing: border-box;display: flex;flex-direction: column;}
+	.info-banner .sider-banner div {width: 100%;height: 19vw;}
+	.info-banner .sider-banner div:nth-child(2) {margin-top: 2vw;}
 	.info-h5-notice {height: 10vw;box-sizing: border-box;margin: 1.6vw auto 3.2vw auto;width: 93.6vw;background: #fff;display: flex;justify-content: space-between;padding: 2.7vw 3.2vw;}
 	.info-h5-notice .h5-notice {font-weight: bold;font-size: 3.6vw;color: #333333;}
 	.info-h5-notice .h5-notice-title ul > li {list-style: disc;white-space: nowrap;text-overflow: ellipsis;width: 60vw;overflow: hidden;font-size: 3.2vw;}

+ 3 - 3
src/main/resources/templates/article/components/article-header.html

@@ -18,9 +18,9 @@
                 <a class="searchBtn icon" href="javascript:void(0);">搜索</a>
             </div>
             <div class="keywords">
-                <div th:each="label,count : ${labels}" th:if="${count.index} le 9">
+                <div th:each="label,count : ${labels}" th:if="${count.index} le 7">
                     <a th:labelId="${label.id}" th:href="'/info/label-' + ${label.id} + '-1.html'" th:text="${label.name}" th:class="${labelId==label.id}?'label-active':''"></a>
-                    <span th:if="${count.index} le 8"> / </span>
+                    <span th:if="${count.index} le 6"> / </span>
                 </div>
             </div>
         </div>
@@ -45,7 +45,7 @@
             <a class="searchBtn icon" href="javascript:void(0);" @click="handlerH5Search">搜索</a>
         </div>
         <div class="keywords">
-            <div th:each="label,count : ${labels}" @click.stop="show = !show" th:if="${count.index} le 9">
+            <div th:each="label,count : ${labels}" @click.stop="show = !show" th:if="${count.index} le 7">
                 <a th:href="'/info/label-' + ${label.id} + '-1.html'" th:text="${label.name}"></a>
             </div>
         </div>

+ 1 - 1
src/main/resources/templates/article/list.html

@@ -71,7 +71,7 @@
                 </div>
             </div>
             <!--    精选文章推荐-->
-            <div class="featured-Articles" id="featured-Articles" th:if="${isSearch}">
+            <div class="featured-Articles" id="featured-Articles" th:if="${isSearch} and ${#arrays.length(infoSelected)} > 0">
                 <div class="featured-title">
                     <div>精选推荐</div>
                     <div>