updated

src/main/resources/static/css/article/article.css

@@ -98,6 +98,7 @@ dl,dd,dt{zoom:1}
 	.search-top .search .keyword{width:100%;height:100%;border: none;color:#B2B2B2;font-size:14px; padding: 0 80px 0 16px;}
 	.search-top .search .search-info .label-keyword {height: 100%;width: 604px;padding: 0 10px; border: none;color:#B2B2B2;}
 	.search-top .search .keywords {display: flex;flex-wrap: wrap;}
+	.search-top .search .keywords .label-active {color: #FF5B00;}
 	.search-top .search .keywords span {margin-right: 4px;}
 
 	.header .nav{display:table;width:100%;background:#FF5B00;}
@@ -176,11 +177,11 @@ dl,dd,dt{zoom:1}
 
 	.content .row:nth-last-child(1){border-bottom:0}
 	/*信息平台banner*/
-	.info-banner {margin: 16px auto;width: 1185px;height:384px;box-sizing: border-box;display: flex;justify-content: space-between;}
-	.info-banner .banner {width: 524px;}
-	.info-banner .sider-banner {width: 360px;display: flex;flex-direction: column;justify-content: space-between;}
+	.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-Notice {width: 284px;background: #fff;}
+	.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;}
 	.info-Notice .notice-content {height: calc(100% - 48px);padding: 0 20px;box-sizing: border-box;overflow: hidden;}
@@ -396,6 +397,7 @@ dl,dd,dt{zoom:1}
 	.navPopup .van-cell__right-icon {height: 14vw;line-height: 14vw;}
 	.van-collapse-item__content {padding: 0 !important;}
 	.van-collapse-item__content .van-collapse-nav {padding: 3vw 0 0 3vw;display: block;font-size: 3.2vw;}
+	.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;}

src/main/resources/static/css/supplier-center/article/article-edit.css

@@ -1,3 +1,15 @@
+/*修复element-ui字体样式问题*/
+.el-icon-arrow-up:before {
+    content: "\276F" !important;
+}
+.el-select__caret {
+    transform: rotate(90deg) !important;
+}
+.el-icon-plus:before {
+    content: "+";
+    font-size: 30px;
+}
+
 .hide-upload .el-upload {
     display: none
 }

src/main/resources/static/css/supplier-center/article/article-list.css

@@ -1,4 +1,14 @@
 @charset "UTF-8";
+/*修复element-ui字体样式问题*/
+.el-icon-arrow-up:before {
+    content: "\276F" !important;
+}
+.el-select__caret {
+    transform: rotate(90deg) !important;
+}
+.el-icon-circle-close:before {
+    content: "\2716" !important;
+}
 @media screen and (min-width: 768px){
 .top-row{width:968px;padding:12px 0 12px 236px;margin:0 auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}
 .top-row .crumbs{width:auto;padding:0;margin:0}

src/main/resources/static/js/supplier-center/article/article-list.js

@@ -75,10 +75,12 @@ var articleList = new Vue({
             return this.articleTypeList.filter(i => i.typeId.toString() === id)[0]?.typeName
         },
         // 获取文章列表
-        getArticleList: function getArticleList($event) {
+        getArticleList: function getArticleList($event, isTypeSelect) {
             var that = this;
-            this.articleTypeChildren = this.articleTypeList.filter(i => i.typeId === $event)[0]?.articleTypes || [];
-            this.listQuery.childId = '';
+            if (isTypeSelect) { // 判断文章分类
+                this.articleTypeChildren = this.articleTypeList.filter(i => i.typeId === $event)[0]?.articleTypes || [];
+                this.listQuery.childId = '';
+            }
             this.listQuery.shopId = this.shopId;
             const listQuery = JSON.parse(JSON.stringify(this.listQuery))
             listQuery.typeId = listQuery.childId || listQuery.typeId

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

@@ -19,7 +19,7 @@
             </div>
             <div class="keywords">
                 <div th:each="label,count : ${labels}" th:if="${count.index} le 7">
-                    <a th:href="'/info/label-' + ${label.id} + '-1.html'" th:text="${label.name}"></a>
+                    <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 6"> / </span>
                 </div>
             </div>
@@ -58,6 +58,7 @@
                 <a th:href="'/info/center-'+${type.id}+'-1.html'" th:text="${type.name}" class="van-collapse-nav"></a>
                 <a class="van-collapse-nav" th:each="link: *{type.linkList}" th:text="${link.name}" th:href="'/info/center-'+${link.id}+'-1.html'"></a>
             </van-collapse-item>
+            <a class="van-document" @click="(right_drawer = false)" href="/document/beauty-archive.html">美业资料</a>
         </van-collapse>
     </van-popup>
 

src/main/resources/templates/article/list.html

@@ -23,43 +23,43 @@
         </span>
     </div>
 </div>
-<div class="info-banner PcBanner" th:if="${isSearch} and ${articleImages}">
-    <div class="banner" th:each="type: ${articleImages}" th:if="${type.levelType} == 1" >
-        <a th:href="${type.jumpLink}">
-            <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" />
-        </a>
-    </div>
-    <div class="sider-banner">
-        <div th:each="type: ${articleImages}" th:if="${type.levelType} == 2">
-            <a th:href="${type.jumpLink}">
-                <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" />
-            </a>
-        </div>
-    </div>
-    <div class="info-Notice" id="infoNotice">
-        <div class="notice-title">
-            <div>公告</div>
-            <div>
-                <a href="/info/articlerecommendation-3-1.html?isNotice">更多 ></a>
-            </div>
-        </div>
-        <div class="notice-content" v-cloak>
-            <ul class="notice-content-list">
-                <li class="notice-content-li" v-for="(list ,index) in newsList" :key="index" @click="hanldDetails(list.id)">
-                    {{ list.title }}
-                </li>
-            </ul>
-        </div>
-    </div>
-</div>
-<div class="info-banner AppBanner" th:if="${isSearch}">
-    <div class="banner" th:each="type: ${articleImages}" th:if="${type.levelType} == 1" >
+<!--<div class="info-banner PcBanner" th:if="${isSearch} and ${articleImages}">-->
+<!--    <div class="banner" th:each="type: ${articleImages}" th:if="${type.levelType} == 1" >-->
+<!--        <a th:href="${type.jumpLink}">-->
+<!--            <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" />-->
+<!--        </a>-->
+<!--    </div>-->
+<!--    <div class="sider-banner">-->
+<!--        <div th:each="type: ${articleImages}" th:if="${type.levelType} == 2">-->
+<!--            <a th:href="${type.jumpLink}">-->
+<!--                <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" />-->
+<!--            </a>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--    <div class="info-Notice" id="infoNotice">-->
+<!--        <div class="notice-title">-->
+<!--            <div>公告</div>-->
+<!--            <div>-->
+<!--                <a href="/info/articlerecommendation-3-1.html?isNotice">更多 ></a>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="notice-content" v-cloak>-->
+<!--            <ul class="notice-content-list">-->
+<!--                <li class="notice-content-li" v-for="(list ,index) in newsList" :key="index" @click="hanldDetails(list.id)">-->
+<!--                    {{ list.title }}-->
+<!--                </li>-->
+<!--            </ul>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
+<div class="info-banner AppBanner" th:if="${isSearch} and ${articleImages}">
+    <div class="banner" th:each="type: ${articleImages}" th:if="${type.levelType} == 1 and ${type.headAppBanner}" >
         <a th:href="${type.jumpLink}">
             <img th:src="${type.headAppBanner}" style="width: 100%;height: 100%;" />
         </a>
     </div>
     <div class="sider-banner">
-        <div th:each="type: ${articleImages}" th:if="${type.levelType} == 2" >
+        <div th:each="type: ${articleImages}" th:if="${type.levelType} == 2 and ${type.headAppBanner}" >
             <a th:href="${type.jumpLink}">
                 <img th:src="${type.headAppBanner}" style="width: 100%;height: 100%;" />
             </a>
@@ -81,6 +81,20 @@
                 </div>
                 <div class="h5-notice-more"><a href="/info/articlerecommendation-3-1.html?isNotice">更多 ></a></div>
             </div>
+            <div class="info-banner PcBanner" th:if="${isSearch} and ${articleImages}">
+                <div class="banner" th:each="type: ${articleImages}" th:if="${type.levelType} == 1 and ${type.headPcBanner}" >
+                    <a th:href="${type.jumpLink}">
+                        <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" />
+                    </a>
+                </div>
+                <div class="sider-banner">
+                    <div th:each="type: ${articleImages}" th:if="${type.levelType} == 2 and ${type.headPcBanner}">
+                        <a th:href="${type.jumpLink}">
+                            <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" />
+                        </a>
+                    </div>
+                </div>
+            </div>
             <!--    精选文章推荐-->
             <div class="featured-Articles" id="featured-Articles" th:if="${isSearch}">
                 <div class="featured-title">
@@ -214,6 +228,21 @@
 <!--            </div>-->
         </div>
     </div>
+    <div class="info-Notice" id="infoNotice" th:if="${isSearch}" v-cloak>
+        <div class="notice-title">
+            <div>公告</div>
+            <div>
+                <a href="/info/articlerecommendation-3-1.html?isNotice">更多 ></a>
+            </div>
+        </div>
+        <div class="notice-content" v-cloak>
+            <ul class="notice-content-list">
+                <li class="notice-content-li" v-for="(list ,index) in newsList" :key="index" @click="hanldDetails(list.id)">
+                    {{ list.title }}
+                </li>
+            </ul>
+        </div>
+    </div>
     <!--侧边栏Ross广告图-->
     <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">
         <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>

src/main/resources/templates/supplier-center/article/article-list.html

@@ -5,7 +5,6 @@
     <title>采美365网-文章管理-文章列表</title>
     <template th:replace="components/head-link"></template>
     <!--element ui 样式表-->
-    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css" />
     <link rel="stylesheet" th:href="@{/lib/element-ui/element-ui-min.css}" />
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
 <!--    <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">-->
@@ -54,7 +53,7 @@
                         <!--文章分类-->
                         <div class="filter-control">
                             <span class="label">文章分类：</span>
-                            <el-select v-model="listQuery.typeId" @change="getArticleList($event)" clearable>
+                            <el-select v-model="listQuery.typeId" @change="getArticleList($event, true)" clearable>
                                 <el-option label="全部" value=""></el-option>
                                 <template v-for="(typeInfo, index) in articleTypeList">
                                     <el-option :key="index" :label="typeInfo.typeName" :value="typeInfo.typeId"></el-option>