fix

src/i18n/index.js

@@ -43,9 +43,7 @@ export const messages = {
       selectDate: '选择日期',
       pleaseEnterPatentOfficer: '请输入专利名称/发明人姓名/申请号',
       patentName: '专利名称',
-      patentClassification: '专利类别',
       ApplicationNumber: '申请号',
-      ApplicationDate: '申请日期',
       AuthorizationDate: '授权日期',
       inventor: '发明人',
       Pleaseselect: '请选择',
@@ -70,6 +68,7 @@ export const messages = {
       ActivityIntroduction: '活动简介',
       back: '返回',
 			comming: '暂无更多信息，敬请期待。',
+			nothing: '没有找到您搜索的内容，您可尝试搜索其他关键词。',
     }
   },
   'en': {
@@ -110,14 +109,12 @@ export const messages = {
       pleaseSelectThePublicationTime: 'Please select the publication time',
       PleaseEnterThePaperName: 'Please enter the paper title/journal name/author name',
       journalName: 'JournalName',
-      patentClassification: 'PatentClassification',
       applicationDate: 'ApplicationDate',
       selectDate: 'SelectDate',
       pleaseEnterPatentOfficer: 'Please enter the patent name/inventor name/application number',
       patentName: 'Patent title',
       patentClassification: 'Patent classification',
       ApplicationNumber:'Application number',
-      ApplicationDate: 'Application date',
       AuthorizationDate: 'Authorization Date',
       inventor: 'Inventor',
       Pleaseselect: 'Please select',
@@ -142,6 +139,7 @@ export const messages = {
       ActivityIntroduction: 'Activity Introduction',
       back: 'Back',
 			comming: 'coming soone',
+			nothing: `We couldn't find the content you were searching for. You can try searching for other keywords.`,
     }
   }
 };

src/layouts/footer/index.vue

@@ -47,6 +47,7 @@
         <div class="info">
           <div class="leftBox">
             <img class="m-b-20"
+                 style="width: 300px"
                  src="@/assets/images/iasf.png"
                  alt="">
             <p class="meta">Copyright ©2002- 2021</p>

src/layouts/header/index.vue

@@ -226,7 +226,7 @@ export default {
       this.modelType = !this.modelType
       if (this.title) {
         this.showSearch = false
-        this.$router.push(`/column/result`)
+        this.$router.push(`/column/result?siteId=${this.site}`)
       }
     },
     // 更改右侧盒子样式

src/layouts/navbar/index.vue

@@ -45,7 +45,8 @@ export default {
       parentId: 0,
       otherMenus: [],
       // 当导航栏条目大于10条,则在pc端显示更多的按钮
-      showMoreBtns: false
+      showMoreBtns: false,
+      lastSite: 1,
     };
   },
   components: {
@@ -61,10 +62,11 @@ export default {
     '$route' () {
       const { siteId } = this.$route.query
       // siteId有变化，则重新获取栏目，并更改store
-      if (siteId && siteId != this.site) {
+      if (siteId && (siteId != this.site || this.lastSite != this.site)) {
         this.getColumn()
         this.setSite(siteId)
       }
+      this.lastSite = siteId
       this.handleColor()
     },
     isHome () {

src/main.js

@@ -39,7 +39,6 @@ Vue.use(ElementUI, {
 });
 
 router.beforeEach((to, from, next) => {
-  console.log("🚀 ~ file: permission.js:5 ~ router.beforeEach ~ to:", Util.getLang())
 	VueI18n.locale = Util.getLang()
   next()
 })

src/mixins/estate/index.js

@@ -19,7 +19,6 @@ export default {
             data :
             data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
           this.modules = json
-          console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
         }
       }).catch(err => {})
     },

src/pages/article/activity.vue

@@ -1,5 +1,10 @@
 <template>
   <div class="wrap">
+    <div v-if="form.bannerImg"
+         class="banner"
+         :style="{backgroundImage: form.bannerImg ? ('url(' + form.bannerImg + ')') : ''}">
+      {{ form.columnName }}
+    </div>
     <div class="content">
       <Breadcrumb ref="breadcrumb"
                   :data.sync="routes" />

src/pages/article/index.vue

@@ -1,7 +1,8 @@
 <template>
   <div v-show="loaded"
        class="wrap">
-    <div v-if="form.articleTemplate !== 23"
+    <!-- 人物详情不展示banner -->
+    <div v-if="form.articleTemplate !== 23 && !isPeople"
          class="banner"
          :style="{backgroundImage: form.bannerImg ? ('url(' + form.bannerImg + ')') : ''}">
       {{ form.columnName }}
@@ -222,7 +223,7 @@ export default {
         padding-bottom: 1.5rem;
         margin: 1rem 0;
         font-size: 1.2rem;
-        line-height: 1.33;
+        line-height: 1.6;
         color: #606060;
         border-bottom: 1px solid #d8d8d8;
     }

src/pages/column/index.vue

@@ -183,7 +183,7 @@
                           <img class="pic"
                                :src="item.titleImg"
                                alt=""
-                               onerror="javascript:this.src='./images/1.png';" />
+                               onerror="javascript:this.src='./images/1.png?id=1';" />
                           <div class="texts">
                             <p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
                                class="type">
@@ -305,7 +305,7 @@
                           <img class="pic"
                                :src="item.titleImg"
                                alt=""
-                               onerror="javascript:this.src='./images/1.png';" />
+                               onerror="javascript:this.src='./images/1.png?id=1';" />
                         </template>
                       </li>
                     </ul>
@@ -340,7 +340,7 @@
                                class="pic"
                                :src="item.titleImg"
                                alt=""
-                               onerror="javascript:this.src='./images/1.png';" />
+                               onerror="javascript:this.src='./images/1.png?id=1';" />
 
                           <template v-else-if="item.fileList">
                             <!-- <el-image class="media-pic"
@@ -412,7 +412,7 @@
                         </template>
                       </li>
                     </ul>
-                    <div v-if="articles.length > pageSize"
+                    <div v-if="total > articles.length"
                          class="pagination">
                       <el-pagination background
                                      @current-change="currentChange"
@@ -835,7 +835,6 @@ export default {
           if (this.total) {
             this.$post(`${this.api.findArticle}?id=${articles[0].id}`).then(async ({ data }) => {
               this.article = data
-              console.log("🚀 ~ file: index.vue:778 ~ .then ~ this.article:", this.article)
             }).catch(err => { })
           }
         })

src/pages/column/result.vue

@@ -9,7 +9,7 @@
                  v-model="title">
           <i class="el-icon-search icon"></i>
         </div>
-        <p class="result">包含 “{{ title }}” 的搜索结果</p>
+        <p class="result">{{ $i18n.locale === 'en' ? `Search results containing "${ title }"` : `包含 “${ title }” 的搜索结果` }} </p>
       </div>
 
       <ul v-if="articles.length"
@@ -26,7 +26,7 @@
            class="none">
         <img src="@/assets/images/none.png"
              alt="">
-        <p class="text">没有找到您搜索的内容，您可尝试搜索其他关键词。</p>
+        <p class="text">{{ $t('column.nothing') }}</p>
       </div>
     </div>
   </div>
@@ -50,7 +50,15 @@ export default {
   components: {
     Breadcrumb
   },
+  computed: {
+    ...mapState('content', [
+      'keyword'
+    ]),
+  },
   watch: {
+    keyword () {
+      this.title = this.keyword
+    },
     title () {
       clearTimeout(this.searchTimer)
       this.searchTimer = setTimeout(() => {
@@ -67,7 +75,6 @@ export default {
     ]),
     // 查询文章列表
     getArticle () {
-      this.setKeyword('')
       this.$post(this.api.newlyPublishedArticles, {
         siteId: this.site,
         pageNum: 1,

src/pages/contactUs/index.vue

@@ -36,21 +36,22 @@
                              align="center"
                              min-width="100"></el-table-column>
             <el-table-column prop="phone"
-                             label="电话"
                              align="center"
-                             min-width="150"></el-table-column>
+                             min-width="150">
+              <template slot="header"
+                        slot-scope="scope">
+                <img src="@/assets/images/tel1.png"
+                     alt=""> 电话
+              </template>
+            </el-table-column>
             <el-table-column prop="email"
-                             label="邮箱"
                              align="center"
                              min-width="150">
-
+              <template slot="header"
-              <template slot-scope="scope">
+                        slot-scope="scope">
-                <div class="flex j-center a-center">
+                <img style="width: 20px"
-                  <img class="m-r-5"
+                     src="@/assets/images/email-white.png"
-                       src="@/assets/images/mall1.png"
+                     alt=""> 邮箱
-                       alt="">
-                  {{ scope.row.email }}
-                </div>
               </template>
             </el-table-column>
           </el-table>

src/pages/estate/location/index.vue

@@ -30,7 +30,8 @@
         </div>
         <div class="texts">
           <h6>{{ modules[1].form.title }}</h6>
-          <div class="des">{{ modules[1].form.des }}</div>
+          <div class="des"
+               v-html="modules[1].form.des"></div>
         </div>
       </div>
       <div class="item wow bounceInRight"
@@ -44,7 +45,8 @@
         </div>
         <div class="texts">
           <h6>{{ modules[2].form.title }}</h6>
-          <div class="des">{{ modules[2].form.des }}</div>
+          <div class="des"
+               v-html="modules[2].form.des"></div>
         </div>
       </div>
       <div class="item wow bounceInLeft"
@@ -58,7 +60,8 @@
         </div>
         <div class="texts">
           <h6>{{ modules[3].form.title }}</h6>
-          <div class="des">{{ modules[3].form.des }}</div>
+          <div class="des"
+               v-html="modules[3].form.des"></div>
         </div>
       </div>
     </div>

src/pages/governance/index.vue

@@ -9,7 +9,8 @@
       </div>
     </div>
 
-    <div class="block history gray">
+    <div class="block history gray"
+         style="padding-bottom: 70px">
       <div class="inner">
         <div class="texts wow fadeInDown"
              data-wow-delay="0.5s">
@@ -38,7 +39,8 @@
       </ul>
     </div>
 
-    <div class="block committee gray">
+    <div class="block committee gray"
+         style="padding-top: 80px">
       <div v-if="modules[2].list[curYear].list[0]"
            class="inner">
         <div class="left">
@@ -143,7 +145,7 @@ export default {
     }
 }
 .cards {
-    padding: 60px 0;
+    padding-top: 50px;
     ul {
         display: flex;
         justify-content: center;

src/pages/home/index.vue

@@ -13,6 +13,10 @@
                :src="item.pic"
                alt=""
                @click="openLink(item)">
+          <!-- <div class="texts">
+            <h6>{{ item.title }}</h6>
+            <p class="text">{{ item.des }}</p>
+          </div> -->
         </el-carousel-item>
       </template>
     </el-carousel>
@@ -251,6 +255,28 @@ export default {
     /deep/.el-carousel__container {
         height: 100vh;
     }
+    .texts {
+        position: absolute;
+        bottom: 20%;
+        left: 120px;
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        h6,
+        .text {
+            padding: 20px 15px;
+            color: #fff;
+        }
+        h6 {
+            margin-bottom: 30px;
+            font-size: 68px;
+            font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
+        }
+        .text {
+            font-size: 24px;
+            font-family: AppleSystemUIFont;
+        }
+    }
 }
 .block {
     padding-top: 3.15rem;

src/pages/iasf/index.vue

@@ -216,8 +216,8 @@
                    alt="">
               <div class="texts">
                 <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>
@@ -367,7 +367,7 @@ export default {
               this.articles4 = Util.removeTag(data.slice(0, articleNum || 3))
             }).catch(err => { })
           }
-          this.carouselInterval()
+          // this.carouselInterval()
         }
       }).catch(err => { })
     },
@@ -519,6 +519,9 @@ $bannerMh: 800px;
         height: $bannerHeight;
         min-height: $bannerMh;
     }
+    /deep/.el-carousel__arrow i {
+        font-size: 30px;
+    }
     .texts {
         position: absolute;
         bottom: 20%;
@@ -917,21 +920,26 @@ $bannerMh: 800px;
 
     li {
         width: 33.33%;
-        padding: 20px 73px 40px;
+        padding: 20px 70px 40px;
         text-align: center;
         border-right: 1px solid #ddd;
         cursor: pointer;
         &:first-child {
-            padding-left: 0;
+            // width: calc(33.33% - 70px);
+            // padding-left: 0;
+        }
+        &:nth-child(2) {
+            // width: calc(33.33% + 70px);
         }
         &:last-child {
-            padding-right: 0;
+            // width: calc(33.33% - 70px);
+            // padding-right: 0;
             border-right: 0;
         }
     }
     .pic {
-        width: 293px;
+        width: 259px;
-        height: 293px;
+        height: 259px;
         margin-bottom: 28px;
         border-radius: 50%;
     }
@@ -943,7 +951,6 @@ $bannerMh: 800px;
     .job {
         margin: 18px 0 12px;
         font-size: 1rem;
-        font-weight: 600;
         font-family: PingFangSC-Medium, PingFang SC;
         color: #333;
     }

src/pages/industrial/index.vue

@@ -32,10 +32,10 @@
 
     <div class="block land">
       <div class="inner">
-        <img class="pic"
+        <img class="pic wow fadeInLeft"
              :src="modules[2].form.pic"
              alt="">
-        <div class="right">
+        <div class="right wow fadeInDown">
           <h6 v-html="modules[2].form.title"></h6>
           <div class="text"
                v-html="modules[2].form.des"></div>

src/pages/news/index.vue

@@ -76,7 +76,7 @@
         </ul>
         <div class="more wow fadeInDown"
              data-wow-delay="0.5s"
-             @click="toMore">More news ></div>
+             @click="toMore">more ></div>
       </div>
     </div>
 
@@ -544,7 +544,7 @@ export default {
         color: #666;
     }
     .des {
-        height: 3.75rem;
+        height: 3.7rem;
         margin: 10px 0;
         font-size: 1.25rem;
         font-family: SFProDisplay;

src/pages/publication/index.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="wrap">
-    <div class="banner">
+    <div class="single-banner">
-      <img width="100%"
+      <img class="banner-img"
-           height="280"
            :src="info.columnBanner"
            alt="" />
       <div class="texts">
-        <p class="text">{{ info.columnName }}</p>
+        <h6 class="banner-title">{{ info.columnName }}</h6>
       </div>
     </div>
 
@@ -112,25 +111,26 @@ export default {
 .wrap {
     background-color: #f9f9f9;
 }
-.banner {
+.single-banner {
     position: relative;
-    height: 280px;
     color: #fff;
+    .banner-img {
+        width: 100%;
+        height: 24rem;
+    }
     .texts {
         position: absolute;
-        top: 123px;
+        top: 160px;
-        left: 243px;
+        left: 267px;
     }
-
+    .banner-title {
-    .text {
+        margin-bottom: 19px;
         font-size: 2.2rem;
-        font-weight: 600;
+        font-family: PingFangSC-Medium, PingFang SC;
-        @include ellipsis;
     }
-
+    .banner-des {
-    .sub {
+        font-size: 1.2rem;
-        margin-top: 10px;
+        font-family: PingFangSC-Medium, PingFang SC;
-        font-size: 2rem;
     }
 }
 .tabs {

src/pages/publication/patent.vue

@@ -54,7 +54,7 @@
                        align="center"
                        min-width="150"></el-table-column>
       <el-table-column prop="applicationDate"
-                       :label="$t('column.ApplicationDate')"
+                       :label="$t('column.applicationDate')"
                        align="center"
                        min-width="150"></el-table-column>
       <el-table-column prop="dateOfAuthorization"

src/pages/userSharing/index.vue

@@ -22,12 +22,12 @@
         </div>
         <img class="pic wow bounceInRight"
              data-wow-delay="0.8s"
-             src="@/assets/images/userSharing/1.png"
+             :src="modules[1].form.pic"
              alt="">
         <div class="card wow bounceInLeft"
              data-wow-delay="0.8s">
           <p class="title">{{ modules[1].form.subTitle }}</p>
-          <p class="en-text">EFFICIENT OPERATION, CLASSIFICATION OPEN</p>
+          <p class="en-text">{{ modules[1].form.enTitle }}</p>
         </div>
       </div>
     </div>

src/styles/common.scss

@@ -121,8 +121,13 @@
         min-width: 0;
     }
     span {
+        display: inline-block;
+        max-width: 130px;
         font-size: 0.8rem;
         color: #333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
     .active > .el-submenu__title span,
     .active > span {

src/styles/page/page.scss

@@ -126,92 +126,3 @@
         }
     }
 }
-
-@media (max-width: 1200px) {
-    .wrap {
-        .single-banner {
-            .banner-img {
-                height: 35rem;
-            }
-            .texts {
-                top: 20rem;
-                left: 9rem;
-            }
-        }
-    }
-    .inner {
-        width: 95%;
-    }
-    .tabs {
-        overflow: hidden;
-        overflow-x: auto;
-        white-space: normal;
-        justify-content: normal;
-        display: -webkit-box;
-        li {
-            white-space: normal;
-        }
-    }
-}
-@media (max-width: 980px) {
-    .wrap {
-        .single-banner {
-            .banner-img {
-                height: 25rem;
-            }
-            .texts {
-                top: 15rem;
-                left: 5rem;
-            }
-        }
-    }
-    .block {
-        padding: 50px 0;
-    }
-}
-@media (max-width: 768px) {
-    .wrap {
-        .single-banner {
-            .banner-img {
-                height: 22rem;
-            }
-            .texts {
-                top: 12rem;
-                left: 5rem;
-            }
-        }
-    }
-
-    .tabs {
-        li {
-            padding: 1rem 10px;
-            margin: 0;
-        }
-    }
-}
-@media (max-width: 640px) {
-    .wrap {
-        .single-banner {
-            .banner-img {
-                height: 18rem;
-            }
-            .texts {
-                top: 10rem;
-                left: 5rem;
-            }
-        }
-    }
-}
-@media (max-width: 480px) {
-    .wrap {
-        .single-banner {
-            .banner-img {
-                height: 15rem;
-            }
-            .texts {
-                top: 6rem;
-                left: 5rem;
-            }
-        }
-    }
-}