fix

src/pages/column/index.vue

@@ -449,17 +449,35 @@ export default {
         }).catch(err => { })
       }
     },
-    // 获取banner 规则：当前栏目有上传的，用当前的，没有上传的话，读取上级的（上级没有读上上级，以此类推）都没有的话读取默认的
+
-    getBanner (data) {
+    // 传入栏目id，返回栏目
-      for (const e of data) {
+    getColumnById (id) {
-        if (e.columnBanner) this.columnBanner = e.columnBanner
+      function searchColumn (columns, targetId) {
-        if (e.id == this.info.id) {
+        for (const item of columns) {
-          break
+          if (item.id === targetId) return item
-        } else if (e.children.length) {
+
-          this.getBanner(e.children)
+          if (item.children && item.children.length) {
+            const found = searchColumn(item.children, targetId)
+            if (found) return found
+          }
         }
+        return null
       }
+
+      return searchColumn(this.columns, id)
     },
+    // 获取banner 规则：当前栏目有上传的，用当前的，没有上传的话，读取上级的（上级没有读上上级，以此类推）都没有的话读取默认的
+    getBanner (item, defaultBanner) {
+      // 如果当前栏目有 banner，则返回当前栏目的 banner
+      if (item.columnBanner) return item.columnBanner
+
+      // 如果当前栏目没有 banner 且有上级栏目，则递归查找上级栏目的 banner
+      if (item.fatherId) return this.getBanner(this.getColumnById(item.fatherId), defaultBanner)
+
+      // 如果当前栏目是根栏目且没有 banner，则返回默认 banner
+      return defaultBanner
+    },
+
     // 获取所属分类
     getClassification () {
       // 会议分类
@@ -542,8 +560,9 @@ export default {
         this.columns = data;
         // 如果没上传banner
         if (!this.info.columnBanner) {
-          this.getBanner(data);
+          this.$nextTick(() => {
-          this.info.columnBanner = this.columnBanner || require('@/assets/images/column-banner.png');
+            this.info.columnBanner = this.getBanner(this.info, require('@/assets/images/column-banner.png'))
+          })
         }
         this.$nextTick(() => {
           const el = this.$refs.leftColumn;

src/pages/iasf/index.vue

@@ -157,24 +157,22 @@
         </div>
 
         <div class="block people-block">
-          <div class="inner">
+          <h2 class="b-title wow fadeInUp">{{ modules[9].form.title }}</h2>
-            <h2 class="b-title wow fadeInUp">{{ modules[9].form.title }}</h2>
+          <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[9].form.des }}</p>
-            <p class="intro wow fadeInUp" data-wow-delay="0.5s">{{ modules[9].form.des }}</p>
+          <ul v-if="articles4.length" class="people">
-            <ul v-if="articles4.length" class="people">
+            <li v-for="(item, i) in articles4" :key="i" @click="toArtice(item, modules[10].form)"
-              <li v-for="(item, i) in articles4" :key="i" @click="toArtice(item, modules[10].form)"
+              class="wow fadeInDown">
-                class="wow fadeInDown">
+              <img class="pic" :src="item.titleImg" alt="">
-                <img class="pic" :src="item.titleImg" alt="">
+              <div class="texts">
-                <div class="texts">
+                <h6>{{ item.title }}</h6>
-                  <h6>{{ item.title }}</h6>
+                <p class="job">{{ item.post }}</p>
-                  <p class="job">{{ item.post }}</p>
+                <p class="hobby">{{ item.hobby }}</p>
-                  <p class="hobby">{{ item.hobby }}</p>
+                <div class="text" v-html="item.mainBody"></div>
-                  <div class="text" v-html="item.mainBody"></div>
+              </div>
-                </div>
+            </li>
-              </li>
+          </ul>
-            </ul>
+          <div class="all-link" @click="toAll(modules[10].form)">
-            <div class="all-link" @click="toAll(modules[10].form)">
+            <span>{{ $t('column.all') }} <img class="icon" src="@/assets/images/arrow.png" alt=""></span>
-              <span>{{ $t('column.all') }} <img class="icon" src="@/assets/images/arrow.png" alt=""></span>
-            </div>
           </div>
         </div>
 
@@ -540,12 +538,10 @@ $bannerMh: 800px;
     h6 {
       margin-bottom: 30px;
       font-size: 68px;
-      font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
     }
 
     .text {
       font-size: 24px;
-      font-family: AppleSystemUIFont;
     }
   }
 }
@@ -568,14 +564,12 @@ $bannerMh: 800px;
 
   .b-title {
     font-size: 35px;
-    font-family: PingFangSC-Semibold, PingFang SC;
     color: #333;
   }
 
   .intro {
     margin-bottom: 3.6rem;
     font-size: 26px;
-    font-family: FZLTXHK--GBK1-0, FZLTXHK--GBK1;
     color: #5b5b5e;
   }
 }
@@ -637,7 +631,6 @@ $bannerMh: 800px;
     width: 100%;
     height: 100%;
     font-size: 29px;
-    font-family: PingFangSC-Medium, PingFang SC;
     color: #fff;
     background-color: rgba(0, 0, 0, 0.3);
     transition: 0.3s;
@@ -662,14 +655,12 @@ $bannerMh: 800px;
 
   .name {
     font-size: 45px;
-    font-family: PingFangSC-Medium, PingFang SC;
   }
 
   h6 {
     margin: 10px 0 20px;
     line-height: 63px;
     font-size: 40px;
-    font-family: PingFangSC-Medium, PingFang SC;
     @include mul-ellipsis(2);
   }
 
@@ -737,7 +728,6 @@ $bannerMh: 800px;
 
     h6 {
       font-size: 24px;
-      font-family: PingFangSC-Semibold, PingFang SC;
       line-height: 43px;
       @include mul-ellipsis(2);
     }
@@ -824,7 +814,6 @@ $bannerMh: 800px;
 
   h6 {
     font-size: 20px;
-    font-family: PingFangSC-Semibold, PingFang SC;
     color: #333;
     @include ellipsis;
   }
@@ -874,7 +863,6 @@ $bannerMh: 800px;
 
   h6 {
     font-size: 24px;
-    font-family: PingFangSC-Medium, PingFang SC;
     cursor: pointer;
   }
 
@@ -891,7 +879,6 @@ $bannerMh: 800px;
 
   .des {
     font-size: 20px;
-    font-family: PingFangSC-Medium, PingFang SC;
     -webkit-line-clamp: 2;
     line-height: 30px;
     cursor: pointer;
@@ -1003,9 +990,10 @@ $bannerMh: 800px;
 
 .people {
   display: flex;
+  justify-content: center;
 
   li {
-    width: 33.33%;
+    width: 400px;
     padding: 20px 70px 40px;
     text-align: center;
     border-right: 1px solid #ddd;
@@ -1037,14 +1025,12 @@ $bannerMh: 800px;
 
   h6 {
     font-size: 1.1rem;
-    font-family: PingFangSC-Medium, PingFang SC;
     color: #333;
   }
 
   .job {
     margin: 18px 0 12px;
     font-size: 1rem;
-    font-family: PingFangSC-Medium, PingFang SC;
     color: #333;
   }
 
@@ -1080,7 +1066,6 @@ $bannerMh: 800px;
 
   h6 {
     font-size: 30px;
-    font-family: PingFangSC-Medium, PingFang SC;
   }
 
   .sub-title {
@@ -1125,7 +1110,6 @@ $bannerMh: 800px;
 
   h6 {
     font-size: 36px;
-    font-family: PingFangSC-Semibold, PingFang SC;
     color: #fff;
   }
 
@@ -1169,7 +1153,6 @@ $bannerMh: 800px;
   .text {
     margin-top: 15px;
     font-size: 1rem;
-    font-family: PingFangSC-Medium, PingFang SC;
     color: #48525e;
   }
 }