Merge branch 'master' of http://121.37.12.51:13000/jialong.yu/FE_IASF_client

src/pages/overviewDevHistory/index.vue

@@ -15,19 +15,19 @@
 
     <div class="block history">
       <div class="inner">
-        <h2 class="wow fadeInLeft">发展历程</h2>
-        <p class="en">DEVELOPMENT HISTORY</p>
+        <h2 class="wow fadeInLeft">{{ modules[1].form.title }}</h2>
+        <p class="en">{{ modules[1].form.des }}</p>
 
-        <div v-if="modules[1].list.length" class="event">
+        <div v-if="modules[2].list.length" class="event">
           <ul class="time">
-            <template v-for="(item, i) in modules[1].list">
+            <template v-for="(item, i) in modules[2].list">
               <li v-if="item.isEnable" :key="i" :class="{active: curYear == i}" @click="yearClick(i)">{{ item.title }}</li>
             </template>
           </ul>
           <div class="right">
-            <h6 class="year">{{ modules[1].list[curYear].title }}</h6>
+            <h6 class="year">{{ modules[2].list[curYear].title }}</h6>
             <ul class="list">
-              <template v-for="(e, j) in modules[1].list[curYear].list">
+              <template v-for="(e, j) in modules[2].list[curYear].list">
                 <li v-if="e.isEnable" :key="j" :class="{'cursor-pointer': isLink(e.link.linkName)}" @click="openLink(e)">
                   <div class="texts">
                     <p class="date">{{ e.title }}</p>

src/pages/overviewIntro/index.vue

@@ -27,8 +27,8 @@
       <div class="intro-bg">
         <div class="mask"></div>
         <div class="texts">
-          <h6>henzhen Superconducting Soft X-Ray Fre Electron Laser</h6>
-          <div class="des">探索认知微观世界和物质结构的”高速摄像机”</div>
+          <h6>{{ modules[2].form.title }}</h6>
+          <div class="des" v-html="modules[2].form.des"></div>
         </div>
       </div>
     </div>

src/pages/publication/monograph.vue

@@ -5,7 +5,7 @@
         <span class="label">{{$t('column.Publicationtime')}}：</span>
         <el-date-picker
           style="width: 300px"
-          v-model="form.publicationTime"
+          v-model="form.publicationYear"
           type="year"
           :placeholder="$t('column.pleaseSelectThePublicationTime')"
           format="yyyy"
@@ -42,7 +42,7 @@ export default {
       searchTimer: null,
       form: {
         monographQueryKeyWord: '',
-        publicationTime: ''
+        publicationYear: ''
       },
       classifications: [],
       list: [],

src/pages/userSharing/index.vue

@@ -11,13 +11,13 @@
     <div class="block share">
       <div class="inner">
         <div class="left">
-          <h6 class="wow fadeInUp">用户共享</h6>
+          <h6 class="wow fadeInUp">{{ modules[1].form.title }}</h6>
           <p class="en wow fadeInUp" data-wow-delay="0.5s">USERS SHARE</p>
           <div class="des wow fadeInUp" data-wow-delay="0.8s">{{ modules[1].form.des }}</div>
         </div>
         <img class="pic wow bounceInRight" data-wow-delay="0.8s" src="@/assets/images/userSharing/1.png" alt="">
         <div class="card wow bounceInLeft" data-wow-delay="0.8s">
-          <p class="title">高效运行、分类开放</p>
+          <p class="title">{{ modules[1].form.subTitle }}</p>
           <p class="en-text">EFFICIENT OPERATION, CLASSIFICATION OPEN</p>
         </div>
       </div>