fix

src/components/breadcrumb/index.vue

@@ -2,7 +2,7 @@
   <!-- 面包屑 -->
   <div class="breadcrumb">
     <span class="back"
-          @click="$router.back()">返回&emsp;></span>
+          @click="$router.back()">{{ $t('column.back') }}&emsp;></span>
     <span v-if="data[1]">{{ data[1].name }}</span>
   </div>
 </template>

src/i18n/index.js

@@ -67,7 +67,8 @@ export const messages = {
       geographicLocation: '地理位置',
       organization: '机构设置',
       introduce: '介绍',
-      ActivityIntroduction: '活动简介'
+      ActivityIntroduction: '活动简介',
+      back: '返回',
     }
   },
   'en': {
@@ -137,7 +138,8 @@ export const messages = {
       geographicLocation: 'geographic location',
       organization: 'Organization',
       introduce: 'Introduce',
-      ActivityIntroduction: 'Activity Introduction'
+      ActivityIntroduction: 'Activity Introduction',
+      back: 'Back',
     }
   }
 };

src/layouts/footer/index.vue

@@ -123,7 +123,7 @@ export default {
   data () {
     return {
       isIasf: false,
-      showDefaultPath: ['/home', '/iasf'], // 展示默认页脚的页面
+      showDefaultPath: ['/home', '/iasf', '/estate/index'], // 展示默认页脚的页面
       showContactPath: ['/news', '/sfel', '/talent', '/about', '/careers', '/edu', '/news'], // 展示联系我们页脚的页面
       columns: [],
       modules: []

src/layouts/header/index.vue

@@ -35,7 +35,7 @@
           <img class="search"
                :src="require('@/assets/images/oa' + (isHome ? '-white' : '') + '.png')"
                alt=""
-               @click.stop="toMail">
+               @click.stop="toOa">
         </template>
         <template v-if="Util.isEn(site)">
           <img :src="require('@/assets/images/cn' + (isHome ? '-white' : '') + '.png')"
@@ -205,7 +205,7 @@ export default {
     },
     // oa点击
     toOa () {
-      window.open('http://oa.iasf.ac.cn/sys/portal/page.jsp')
+      window.open('http://oa.iasf.ac.cn/login.jsp')
     },
     // 切换语言
     toggleLang () {

src/pages/column/index.vue

@@ -208,6 +208,7 @@
                     <el-pagination background
                                    @current-change="currentChange"
                                    :current-page="page"
+                                   :page-size="pageSize"
                                    layout="total, prev, pager, next"
                                    :total="total"></el-pagination>
                   </div>
@@ -284,6 +285,7 @@
                     <el-pagination background
                                    @current-change="currentChange"
                                    :current-page="page"
+                                   :page-size="pageSize"
                                    layout="total, prev, pager, next"
                                    :total="total"></el-pagination>
                   </div>
@@ -364,6 +366,7 @@
                     <el-pagination background
                                    @current-change="currentChange"
                                    :current-page="page"
+                                   :page-size="pageSize"
                                    layout="total, prev, pager, next"
                                    :total="total"></el-pagination>
                   </div>
@@ -498,11 +501,12 @@ export default {
           .then(({ data }) => {
             this.columnClick(data);
             if (data.typeId !== 3) this.loaded = true; // 非长页，才展示页面
-            this.info = data;
-            this.showNav = this.showNavIds.includes(data.listStyleId);
-            this.handlePublication();
-            this.getLeftColumn();
-            this.getClassification();
+            this.info = data
+            this.pageSize = data.pageSize || 10
+            this.showNav = this.showNavIds.includes(data.listStyleId)
+            this.handlePublication()
+            this.getLeftColumn()
+            this.getClassification()
           })
           .catch((res) => { });
     },
@@ -724,7 +728,7 @@ export default {
         siteId: this.site,
         columnIds,
         pageNum: this.page,
-        pageSize: this.info.pageSize || 10,
+        pageSize: this.pageSize,
         labelName,
         ...this.form
       })

src/pages/column/result.vue

@@ -3,21 +3,29 @@
     <div class="articles">
       <div class="top">
         <div class="search">
-          <input ref="search" type="text" :placeholder="$t('column.titlePlaceholder')" v-model="title">
+          <input ref="search"
+                 type="text"
+                 :placeholder="$t('column.titlePlaceholder')"
+                 v-model="title">
           <i class="el-icon-search icon"></i>
         </div>
         <p class="result">包含 “{{ title }}” 的搜索结果</p>
       </div>
 
-      <ul v-if="articles.length" class="list">
-        <li v-for="(item, i) in articles" :key="i">
+      <ul v-if="articles.length"
+          class="list">
+        <li v-for="(item, i) in articles"
+            :key="i">
           <h6 @click="toArtice(item)">{{ item.title }}</h6>
-          <div class="des" v-html="item.mainBody"></div>
-          <Breadcrumb :data.sync="item.routes"/>
+          <div class="des"
+               v-html="item.mainBody"></div>
+          <Breadcrumb :data.sync="item.routes" />
         </li>
       </ul>
-      <div v-else class="none">
-        <img src="@/assets/images/none.png" alt="">
+      <div v-else
+           class="none">
+        <img src="@/assets/images/none.png"
+             alt="">
         <p class="text">没有找到您搜索的内容，您可尝试搜索其他关键词。</p>
       </div>
     </div>
@@ -32,7 +40,7 @@ import mixins from '@/mixins/article'
 import Breadcrumb from '@/components/breadcrumb'
 export default {
   mixins: [mixins],
-  data() {
+  data () {
     return {
       title: this.$store.state.content.keyword,
       searchTimer: null,
@@ -43,14 +51,14 @@ export default {
     Breadcrumb
   },
   watch: {
-    title() {
+    title () {
       clearTimeout(this.searchTimer)
       this.searchTimer = setTimeout(() => {
         this.getArticle()
       }, 500)
     }
   },
-  mounted() {
+  mounted () {
     this.getArticle()
   },
   methods: {
@@ -58,7 +66,7 @@ export default {
       'setKeyword'
     ]),
     // 查询文章列表
-    getArticle() {
+    getArticle () {
       this.setKeyword('')
       this.$post(this.api.newlyPublishedArticles, {
         siteId: this.site,
@@ -82,7 +90,7 @@ export default {
           ]
         })
         this.articles = list
-      }).catch(res => {})
+      }).catch(res => { })
     },
   }
 };
@@ -90,95 +98,104 @@ export default {
 
 <style lang="scss" scoped>
 .wrap {
-  background: url(../../assets/images/result-bg1.png) no-repeat,
-              url(../../assets/images/result-bg2.png) bottom right/auto no-repeat;
-  background-color: #fff;
+    background: url(../../assets/images/result-bg1.png) no-repeat, url(../../assets/images/result-bg2.png) bottom right/auto no-repeat;
+    background-color: #fff;
 }
 .articles {
-  width: 100%;
-  padding-top: 47px;
-  margin: 0 auto;
+    width: 70%;
+    padding-top: 47px;
+    margin: 0 auto;
 }
 .top {
-  display: flex;
-  align-items: center;
-  .result {
-    font-size: 18px;
-    color: #969696;
-  }
+    display: flex;
+    align-items: center;
+    .result {
+        font-size: 18px;
+        color: #969696;
+    }
 }
 .search {
-  position: relative;
-  display: inline-flex;
-  height: 62px;
-  margin-right: 30px;
-  border-radius: 6px;
-  overflow: hidden;
-  input {
-    width: 510px;
-    padding: 0 20px;
-    font-size: 18px;
-    color: #333;
-    border: 0;
-    outline: none;
-    background: #F7F7F7;
-  }
-  .icon {
-    position: absolute;
-    top: 17px;
-    right: 15px;
-    font-size: 26px;
-    color: #ccc;
-    border-radius: 0px 6px 6px 0px;
-  }
+    position: relative;
+    display: inline-flex;
+    height: 62px;
+    margin-right: 30px;
+    border-radius: 6px;
+    overflow: hidden;
+    input {
+        width: 510px;
+        padding: 0 20px;
+        font-size: 18px;
+        color: #333;
+        border: 0;
+        outline: none;
+        background: #f7f7f7;
+    }
+    .icon {
+        position: absolute;
+        top: 17px;
+        right: 15px;
+        font-size: 26px;
+        color: #ccc;
+        border-radius: 0px 6px 6px 0px;
+    }
 }
 .list {
-  li {
-    margin-top: 30px;
-    border-bottom: 1px dashed #e3e3e3;
-  }
-  h6 {
-    margin-bottom: 10px;
-    font-size: 22px;
-    color: #1583FF;
-    line-height: 30px;
-    cursor: pointer;
-  }
-  .des {
-    font-size: 18px;
-    line-height: 36px;
-    color: #333;
-    @include mul-ellipsis(2);
-  }
-  .breadcrumb {
-    margin: 15px 0 30px;
-  }
+    li {
+        margin-top: 30px;
+        border-bottom: 1px dashed #e3e3e3;
+    }
+    h6 {
+        margin-bottom: 10px;
+        font-size: 22px;
+        color: #1583ff;
+        line-height: 30px;
+        cursor: pointer;
+    }
+    .des {
+        font-size: 18px;
+        line-height: 36px;
+        color: #333;
+        @include mul-ellipsis(2);
+    }
+    .breadcrumb {
+        margin: 15px 0 30px;
+    }
 }
 .none {
-  margin-top: 118px;
-  text-align: center;
-  .text {
-    margin-top: 59px;
-    font-size: 18px;
-    color: #333;
-  }
+    margin-top: 118px;
+    text-align: center;
+    .text {
+        margin-top: 59px;
+        font-size: 18px;
+        color: #333;
+    }
 }
-@media (min-width: 280px) and (max-width: 750px) {
-  .articles{
-    width: 100%;
-    .top{
-      flex-direction: column;
-      .search{
-        width: 95%;
-        margin: 0 auto;
-      }
+@media (max-width: 1100px) {
+    .top {
+        flex-direction: column;
+        align-items: flex-start;
     }
-    .none{
-      margin-top: 50px;
-      .text{
-        font-size: .5rem;
-      }
+    .search {
+        margin-bottom: 10px;
+    }
+}
+
+@media (max-width: 750px) {
+    .articles {
+        width: 90%;
+        .top {
+            flex-direction: column;
+            .search {
+                width: 95%;
+                margin: 0 auto;
+            }
+        }
+        .none {
+            margin-top: 50px;
+            .text {
+                font-size: 0.5rem;
+            }
+        }
     }
-  }
 }
 </style>

src/pages/deviceIntroBeam/index.vue

@@ -43,7 +43,8 @@
     </div>
 
     <div class="unit">
-      <h6>{{ modules[4].form.title }}</h6>
+      <div class="title"
+           v-html="modules[4].form.title"></div>
       <img class="pic"
            :src="modules[4].form.pic"
            alt="">
@@ -218,7 +219,7 @@ export default {
     width: 986px;
     padding-bottom: 60px;
     margin: 0 auto;
-    h6 {
+    .title {
         padding-left: 0.93rem;
         margin-bottom: 0.93rem;
         font-size: 0.88rem;

src/pages/deviceIntroLayout/index.vue

@@ -22,11 +22,9 @@
         <p class="en">{{ modules[1].form.subTitle }}</p>
         <div class="card"
              v-html="modules[1].form.des"></div>
-        <div class="flex textBox">
-          <div class="left">
-            <div class="des"
-                 v-html="modules[2].form.des"></div>
-          </div>
+        <div class="texts">
+          <div class="des"
+               v-html="modules[2].form.des"></div>
           <img class="pic"
                :src="modules[2].form.pic"
                alt="">
@@ -44,7 +42,8 @@
     </div>
 
     <div class="unit">
-      <h6>{{ modules[4].form.title }}</h6>
+      <div class="title"
+           v-html="modules[4].form.title"></div>
       <img class="pic"
            :src="modules[4].form.pic"
            alt="">
@@ -125,28 +124,19 @@ export default {
     .inner {
         width: 100%;
         max-width: 1323px;
-        .textBox {
-            position: absolute;
-            width: 85%;
-            right: 0;
-            top: 26rem;
-            .left {
-                flex-grow: 1;
-            }
-        }
-        h6 {
-            font-weight: bold;
-        }
     }
-    .left {
-        width: 34.187rem;
-        margin-right: 4.125rem;
+    .texts {
+        position: absolute;
+        width: 85%;
+        right: 0;
+        top: 26rem;
+        display: flex;
     }
     h6 {
         position: relative;
         font-size: 1.76rem;
         font-family: PingFangSC-Medium, PingFang SC;
-        font-weight: 500;
+        font-weight: bold;
         color: #333333;
     }
     .en {
@@ -171,11 +161,12 @@ export default {
         background: url(http://10.10.11.7/images/device/5.png) 0 0 /100% 100% no-repeat;
     }
     .des {
-        margin-top: 25px;
-        font-size: 0.98rem;
+        flex-grow: 1;
+        margin: 25px 4rem 0 0;
+        font-size: 1rem;
         -webkit-line-clamp: inherit;
         color: #333;
-        line-height: 37px;
+        line-height: 2;
         overflow: visible;
     }
     .pic {
@@ -209,7 +200,7 @@ export default {
     width: 986px;
     padding-bottom: 60px;
     margin: 0 auto;
-    h6 {
+    .title {
         padding-left: 0.93rem;
         margin-bottom: 0.93rem;
         font-size: 0.88rem;
@@ -228,17 +219,15 @@ export default {
         .inner {
             max-width: none;
             width: 95%;
-            .textBox {
+            .texts {
                 position: static;
                 display: flex;
                 flex-direction: column;
                 align-items: flex-end;
                 margin-left: 15%;
-                .left {
+                .des {
                     width: 100%;
-                    .des {
-                        -webkit-line-clamp: 100;
-                    }
+                    -webkit-line-clamp: 100;
                 }
             }
         }
@@ -277,11 +266,11 @@ export default {
 @media (max-width: 640px) {
     .share {
         .inner {
-            .textBox {
+            .texts {
                 margin: 0 auto;
             }
         }
-        .left {
+        .des {
             margin-right: 0;
         }
     }

src/pages/deviceIntroLinear/index.vue

@@ -40,12 +40,14 @@
     <div class="block intro">
       <div class="inner">
         <div class="left">
-          <h5>{{ modules[3].form.title }}</h5>
+          <div class="title1"
+               v-html="modules[3].form.title"></div>
           <img :src="modules[3].form.pic"
                alt="" />
         </div>
         <div class="right">
-          <h6>{{ modules[4].form.title }}</h6>
+          <div class="title2"
+               v-html="modules[4].form.title"></div>
           <img :src="modules[4].form.pic"
                alt="" />
         </div>
@@ -218,7 +220,7 @@ export default {
         width: 68%;
         margin-left: 2%;
     }
-    h5 {
+    .title1 {
         margin-bottom: 0.93rem;
         font-size: 0.88rem;
         font-family: PingFangSC-Medium, PingFang SC;
@@ -226,7 +228,7 @@ export default {
         color: #2a2a2a;
     }
 
-    h6 {
+    .title2 {
         padding-left: 0.93rem;
         margin-bottom: 0.93rem;
         font-size: 0.88rem;

src/pages/estate/orgSetup/index.vue

@@ -22,8 +22,8 @@
       <div class="org">
         <div class="left">
           <h6>{{ modules[1].form.title }}</h6>
-          <p class="text"
-             v-html="modules[1].form.des"></p>
+          <div class="text"
+               v-html="modules[1].form.des"></div>
         </div>
         <img class="pic"
              src="http://10.10.11.7/images/overviewSetup/1.png"

src/pages/estate/survey/index.vue

@@ -26,8 +26,8 @@
                src="http://10.10.11.7/images/overviewIntro/2.png"
                alt="">
         </h6>
-        <p class="text"
-           v-html="modules[1].form.des"></p>
+        <div class="text"
+             v-html="modules[1].form.des"></div>
       </div>
       <div class="lg-bg">
         <img width="100%"
@@ -89,6 +89,7 @@ export default {
         font-size: 1rem;
         color: #020202;
         line-height: 2rem;
+        // @include mul-ellipsis(10);
     }
 }
 .lg-bg {

src/pages/iasf/index.vue

@@ -430,6 +430,9 @@ export default {
         position: absolute;
         bottom: 20%;
         left: 120px;
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
         h6,
         .text {
             padding: 20px 15px;

src/pages/overviewIntro/index.vue

@@ -92,6 +92,7 @@ export default {
     padding-top: 3.85rem;
     .intro {
         display: flex;
+        align-items: center;
         margin-bottom: 5.5rem;
         .pic {
             width: 40%;
@@ -112,7 +113,7 @@ export default {
         }
         .text {
             margin-top: 2rem;
-            font-size: 0.99rem;
+            font-size: 1rem;
             color: #020202;
             line-height: 2;
         }

src/pages/team/index.vue

@@ -12,20 +12,22 @@
     <div class="content">
       <div class="left">
         <ul class="list">
-          <li v-for="(item, i) in modules[1].list"
-              :key="i"
-              :class="{'cursor-pointer': isLink(item.link.linkName)}"
-              @click="openLink(item)">
-            <img :src="item.pic"
-                 alt=""
-                 class="pic">
-            <div class="texts">
-              <h6>{{ item.title }}</h6>
-              <p class="job">{{ item.subTitle }}</p>
-              <div class="text"
-                   v-html="item.des"></div>
-            </div>
-          </li>
+          <template v-for="(item, i) in modules[1].list">
+            <li v-if="item.isEnable"
+                :key="i"
+                :class="{'cursor-pointer': isLink(item.link.linkName)}"
+                @click="openLink(item)">
+              <img :src="item.pic"
+                   alt=""
+                   class="pic">
+              <div class="texts">
+                <h6>{{ item.title }}</h6>
+                <p class="job">{{ item.subTitle }}</p>
+                <div class="text"
+                     v-html="item.des"></div>
+              </div>
+            </li>
+          </template>
         </ul>
       </div>
 

src/styles/common.scss

@@ -5,6 +5,10 @@
     font-family: PingFang;
     src: url('font/PingFang-Regular.otf');
 }
+@font-face {
+    font-family: PingFang SC;
+    src: url('font/PingFang-Regular.otf');
+}
 @font-face {
     font-family: PingFangSC-Medium;
     src: url('font/PingFangSC-Medium.otf');