fix

src/layouts/header/index.vue

@@ -36,12 +36,12 @@
                alt=""
                @click.stop="toMail">
         </template>
-        <template v-if="$i18n.locale == 'en'">
+        <template v-if="Util.isEn(site)">
           <img :src="require('@/assets/images/cn' + (isHome ? '-white' : '') + '.png')"
                alt=""
                @click.stop="toggleLang">
         </template>
-        <template v-else-if="$i18n.locale == 'zh'">
+        <template v-else>
           <img :src="require('@/assets/images/en' + (isHome ? '-white' : '') + '.png')"
                alt=""
                @click.stop="toggleLang">
@@ -80,12 +80,12 @@
                  @click.stop="toggleSearch"></div>
           <div class="languageBox">
             <!-- <img :src="require('@/assets/images/cn' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')" alt="" @click.stop="toggleLang"> -->
-            <template v-if="$i18n.locale == 'en'">
+            <template v-if="Util.isEn(site)">
               <img :src="require('@/assets/images/cn' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')"
                    alt=""
                    @click.stop="toggleLang">
             </template>
-            <template v-else-if="$i18n.locale == 'zh'">
+            <template v-else>
               <img :src="require('@/assets/images/en' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')"
                    alt=""
                    @click.stop="toggleLang">
@@ -118,6 +118,7 @@ import navbar from '../navbar'
 export default {
   data () {
     return {
+      Util,
       isHome: true,
       isEstate: false,
       showSearch: false,

src/libs/util.js

@@ -1,6 +1,7 @@
 import { _local } from "./util.db";
 import { Message } from "element-ui";
 import Router from '@/router'
+import Setting from '@/setting'
 
 // 文件后缀集合
 const exts = {
@@ -140,7 +141,11 @@ const util = {
     // 是否是各个站点的首页，首页的导航样式不一样，所以要单独判断
     isIndex() {
       return indexPath.includes(Router.app.$route.path)
-    }
+    },
+    // 传入站点id，判断是否英文
+    isEn(id) {
+      return Setting.enIds.includes(+id)
+    },
 };
 
 export default util;

src/pages/iasf/index.vue

@@ -1,13 +1,24 @@
 <template>
   <div class="wrap">
-    <div class="iasf-banner">
+    <el-carousel class="carousel"
-      <img :src="modules[0].form.pic"
+                 :interval="6000"
-           alt="">
+                 :arrow="(modules[0] && modules[0].list.filter(e => e.isEnable).length > 1) ? 'hover' : 'never'"
-      <div class="texts">
+                 :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
-        <h6>{{ modules[0].form.title }}</h6>
+      <template v-for="(item, i) in modules[0].list">
-        <p class="text">{{ modules[0].form.des }}</p>
+        <el-carousel-item v-if="item.pic && item.isEnable"
-      </div>
+                          :key="i">
-    </div>
+          <img :class="[{'cursor-pointer': isLink(item.link.linkName)}]"
+               width="100%"
+               :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>
 
     <div class="block"
          style="padding-top: 110px">
@@ -78,8 +89,10 @@
                      :src="item.titleImg"
                      alt="">
                 <div class="texts">
+                  <h6>{{ item.title }}</h6>
+                  <div class="des"
+                       v-html="item.mainBody"></div>
                   <p class="meta">{{ item.releaseTime }} {{ item.classificationName && ' | ' + item.classificationName }}</p>
-                  <div class="des">{{ item.title }}</div>
                 </div>
               </li>
             </template>
@@ -414,15 +427,17 @@ export default {
 <style lang="scss" scoped>
 @import url(../../plugins/wow/animate.css);
 @import '../../styles/page/page.scss';
-.iasf-banner {
+.carousel {
-    height: 727px;
+    height: 100vh;
     img {
-        width: 100%;
         height: 100%;
     }
+    /deep/.el-carousel__container {
+        height: 100vh;
+    }
     .texts {
         position: absolute;
-        bottom: 40%;
+        bottom: 20%;
         left: 120px;
         h6,
         .text {
@@ -451,6 +466,10 @@ export default {
         margin-bottom: 3.6rem;
     }
 }
+.inner {
+    width: 1370px;
+    min-width: 70%;
+}
 .card {
     display: flex;
     justify-content: space-between;
@@ -569,12 +588,14 @@ export default {
         color: #666;
     }
     h6 {
-        margin-top: 5px;
         font-size: 1.1rem;
         font-family: PingFangSC-Semibold, PingFang SC;
         color: #333;
         @include mul-ellipsis(2);
     }
+    .des {
+        margin: 15px 0;
+    }
 }
 .news-carousel {
     display: flex;
@@ -607,12 +628,12 @@ export default {
         cursor: pointer;
     }
     .meta {
-        margin: 8px 0;
+        margin: 14px 0;
         font-size: 0.9rem;
         color: rgba(255, 255, 255, 0.86);
     }
     .des {
-        margin-bottom: 8px;
+        margin-bottom: 14px;
         font-size: 1rem;
         font-family: PingFangSC-Medium, PingFang SC;
         cursor: pointer;
@@ -698,7 +719,7 @@ export default {
 .talent {
     display: flex;
     color: #fff;
-    background: #1a2844;
+    background: #1583ff;
     border-radius: 0px 100px 0px 100px;
     .left {
         width: 50%;
@@ -791,8 +812,9 @@ export default {
     }
 }
 .tools {
+    z-index: 10;
     position: fixed;
-    top: 430px;
+    top: 60vh;
     right: 0;
     li {
         display: flex;
@@ -815,6 +837,11 @@ export default {
         margin-right: 10px;
     }
 }
+@media (max-width: 1450px) {
+    .inner {
+        width: 95%;
+    }
+}
 @media (max-width: 1200px) {
     .card {
         flex-direction: column;
@@ -877,10 +904,5 @@ export default {
     }
 }
 @media (max-width: 1200px) {
-    .iasf-banner {
-        .texts {
-            left: 3%;
-        }
-    }
 }
 </style>

src/styles/common.scss

@@ -29,6 +29,10 @@
     font-family: ProximaNova;
     src: url('font/ProximaNova-Regular.otf');
 }
+@font-face {
+    font-family: AlimamaShuHeiTi-Bold;
+    src: url('font/AlimamaShuHeiTi-Bold.otf');
+}
 
 [v-cloak] {
     display: none;