fix

src/components/menuTree/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="menu-child">
     <template v-for="item in this.menuList">
-      <el-submenu :popper-class="isHome ? 'home-menu-popup' : ''"
+      <el-submenu :popper-class="site == 2 && $store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
                   :class="{active: $route.query.id == item.id}"
                   :key="item.id"
                   :index="String(item.id)"
@@ -42,6 +42,9 @@ export default {
     isHome () {
       return Util.isIndex()
     },
+    site () {
+      return this.$route.query.siteId || this.$store.state.content.site
+    },
   },
   data () {
     return {}

src/layouts/footer/index.vue

@@ -157,6 +157,8 @@ export default {
         typeId: '',
         isSort: 1
       }).then(({ data }) => {
+
+        console.log("🚀 ~ file: index.vue:177 ~ this.$post ~ json:", window.innerWidth)
         this.columns = data.slice(0, 5)
       }).catch(err => { })
     },
@@ -171,7 +173,6 @@ export default {
             data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
 
           this.modules = json
-          console.log("🚀 ~ file: index.vue:177 ~ this.$post ~ json:", json)
         }
       }).catch(err => { })
     },
@@ -375,12 +376,12 @@ export default {
         }
     }
 }
-@media (max-width: 1200px) {
+@media (max-width: 1500px) {
-    body {
+    .footer {
-        width: 100% !important;
+        padding: 64px 10% 25px;
     }
 }
-@media (max-width: 750px) {
+@media (max-width: 1350px) {
     .inner {
         width: 100% !important;
         .title {

src/layouts/header/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="['header', { channel: isHome, estate: isEstate }]">
+  <div :class="['header', { channel: isHome, estate: isEstate, iasf: isIasf }]">
     <a class="logo"
        @click="toIndex">
       <template v-if="!$store.getters.getModelType">
@@ -19,6 +19,7 @@
               ref="nav"
               :isHome.sync="isHome"
               :isEstate.sync="isEstate"
+              :isIasf.sync="isIasf"
               @showMoreBtns="updateBtnsType"></navbar>
       <div class="tools">
         <img class="search"
@@ -121,6 +122,7 @@ export default {
       Util,
       isHome: true,
       isEstate: false,
+      isIasf: false,
       showSearch: false,
       height: 907,
       title: '',
@@ -138,13 +140,14 @@ export default {
     },
     site () {
       return this.$route.query.siteId || this.$store.state.content.site
-    }
+    },
   },
   watch: {
     '$route.path': {
       handler () {
         this.isHome = Util.isIndex()
         this.isEstate = this.$route.path === '/estate/index'
+        this.isIasf = this.$route.path === '/iasf'
       },
       deep: true,
       immediate: true

src/layouts/navbar/index.vue

@@ -11,7 +11,7 @@
              @select="jump"
              :default-active="String(active)">
       <menuTree :menuList="menus" />
-      <el-submenu :popper-class="isHome ? 'home-menu-popup' : ''"
+      <el-submenu :popper-class="site == 2 && $store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
                   v-show="showMoreBtns"
                   index="522222">
         <template slot="title">
@@ -29,7 +29,7 @@ import menuTree from '@/components/menuTree'
 import mixins from '@/mixins/article'
 import { mapState, mapMutations, mapGetters } from 'vuex'
 export default {
-  props: ['isHome', 'isEstate', 'updateModelType'],
+  props: ['isHome', 'isEstate', 'isIasf', 'updateModelType'],
   mixins: [mixins],
   data () {
     return {
@@ -55,7 +55,7 @@ export default {
     ...mapGetters(["getNavSum"]),
     mapboxMap1 () {
       return this.navSum;
-    }
+    },
   },
   watch: {
     '$route' () {

src/pages/column/index.vue

@@ -717,7 +717,7 @@ export default {
         siteId: this.site,
         columnIds,
         pageNum: this.page,
-        pageSize: this.info.pageSize,
+        pageSize: this.info.pageSize || 10,
         labelName,
         ...this.form
       })

src/pages/iasf/index.vue

@@ -80,6 +80,7 @@
                    height="100%"
                    :src="articles[0].titleImg"
                    alt="">
+              <div class="pic-cover"></div>
             </div>
             <div class="right">
               <h6>{{ articles[0].title }}</h6>
@@ -100,6 +101,7 @@
                   <img class="pic"
                        :src="item.titleImg"
                        alt="">
+                  <div class="pic-cover"></div>
                 </div>
                 <div class="texts">
                   <h6>{{ item.title }}</h6>
@@ -175,7 +177,8 @@
                 <div class="des"
                      @click="toArtice(curArticle3, modules[8].form)">{{ curArticle3.title }}</div>
               </div>
-              <p class="date">{{ curArticle3.releaseTime }}</p>
+              <p v-if="curArticle3.activityStartTime"
+                 class="date">{{ curArticle3.activityStartTime.split(' ')[0] }}</p>
             </div>
             <div class="action">
               <i class="el-icon-arrow-left dir"
@@ -429,11 +432,11 @@ export default {
         }
         h6 {
             margin-bottom: 30px;
-            font-size: 3rem;
+            font-size: 68px;
             font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
         }
         .text {
-            font-size: 1.1rem;
+            font-size: 24px;
             font-family: AppleSystemUIFont;
         }
     }
@@ -459,10 +462,11 @@ export default {
 .card {
     display: flex;
     justify-content: space-between;
+    margin-top: 80px;
     li {
         position: relative;
-        width: 47%;
+        width: calc((100% - 64px) / 2);
-        height: 366px;
+        height: 488px;
         transition: 0.3s;
         overflow: hidden;
         &:hover {
@@ -487,7 +491,7 @@ export default {
         align-items: center;
         width: 100%;
         height: 100%;
-        font-size: 2.4rem;
+        font-size: 45px;
         font-family: PingFangSC-Medium, PingFang SC;
         color: #fff;
         background-color: rgba(0, 0, 0, 0.3);
@@ -503,25 +507,26 @@ export default {
         align-items: center;
         width: 100%;
         height: 100%;
-        padding: 0 1rem;
+        padding: 0 128px;
+        text-align: center;
         color: #fff;
         background-color: rgba(0, 0, 0, 0.3);
         transition: 0.3s;
     }
     .name {
-        font-size: 2rem;
+        font-size: 45px;
         font-family: PingFangSC-Medium, PingFang SC;
     }
     h6 {
-        margin: 1rem 0;
+        margin: 10px 0 20px;
-        line-height: 2rem;
+        line-height: 63px;
-        font-size: 1.6rem;
+        font-size: 45px;
         font-family: PingFangSC-Medium, PingFang SC;
         @include mul-ellipsis(2);
     }
     .des {
-        font-size: 1.2rem;
+        font-size: 28px;
-        line-height: 30px;
+        line-height: 44px;
     }
 }
 .news-wrap {
@@ -534,11 +539,29 @@ export default {
     display: flex;
     margin-top: 20px;
     cursor: pointer;
+    box-shadow: 0px 4px 16px 0px rgba(0, 0, 0, 0.06);
+    &:hover {
+        .right {
+            background-color: #091733;
+        }
+        .pic-cover {
+            display: block;
+        }
+    }
     .pic-wrap {
+        position: relative;
         width: 50%;
-        height: 24.5rem;
         overflow: hidden;
     }
+    .pic-cover {
+        display: none;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(111, 182, 255, 0.2);
+    }
     .pic {
         transition: 0.5s;
     }
@@ -548,6 +571,7 @@ export default {
         padding: 42px 71px 90px 58px;
         background: #026be1;
         color: #fff;
+        transition: 0.3s;
         h6 {
             font-size: 24px;
             font-family: PingFangSC-Semibold, PingFang SC;
@@ -576,8 +600,22 @@ export default {
         &:nth-child(3n) {
             margin-right: 0;
         }
+        &:hover {
+            .pic-cover {
+                display: block;
+            }
+            .texts {
+                background-color: #091733;
+            }
+            .meta,
+            h6,
+            .des {
+                color: #fff;
+            }
+        }
     }
     .pic-wrap {
+        position: relative;
         width: 100%;
         height: 220px;
         overflow: hidden;
@@ -587,10 +625,20 @@ export default {
         height: 100%;
         transition: 0.5s;
     }
+    .pic-cover {
+        display: none;
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-color: rgba(111, 182, 255, 0.2);
+    }
     .texts {
         padding: 24px 28px;
         background-color: #fff;
-        box-shadow: 2px 2px 2px rgba(241, 241, 241, 0.8);
+        box-shadow: 0px 4px 16px 0px rgba(0, 0, 0, 0.06);
+        transition: 0.3s;
     }
     .meta {
         font-size: 16px;
@@ -619,6 +667,7 @@ export default {
         height: 284px;
         margin-right: 20px;
         overflow: hidden;
+        box-shadow: 0px 4px 16px 0px rgba(0, 0, 0, 0.06);
         &:nth-child(3n) {
             margin-right: 0;
         }
@@ -701,11 +750,15 @@ export default {
     display: flex;
     li {
         width: 33.33%;
-        padding: 30px;
+        padding: 20px 73px 40px;
         text-align: center;
         border-right: 1px solid #ddd;
         cursor: pointer;
+        &:first-child {
+            padding-left: 0;
+        }
         &:last-child {
+            padding-right: 0;
             border-right: 0;
         }
     }
@@ -782,7 +835,7 @@ export default {
     .inner {
         position: relative;
         height: 465px;
-        padding: 73px 50px 58px;
+        padding: 73px 0 58px;
     }
     .left {
         width: 44%;
@@ -820,10 +873,9 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        // width: 160px;
+        padding: 0 22px;
-        padding: 0 1.2rem;
         margin-bottom: 1px;
-        font-size: 1rem;
+        font-size: 20px;
         color: #0084ff;
         line-height: 56px;
         background-color: rgba(19, 18, 19, 0.94);
@@ -833,7 +885,7 @@ export default {
             content: '';
             width: 28px;
             height: 28px;
-            margin-right: 5px;
+            margin-right: 7px;
             background: url(http://10.10.11.7/images/iasf/icon1.png) no-repeat;
         }
         &:nth-child(2):before {
@@ -873,6 +925,11 @@ export default {
     .inner {
         width: 95%;
     }
+    .card {
+        li {
+            height: auto;
+        }
+    }
     .about {
         .pic {
             width: 700px;
@@ -881,6 +938,11 @@ export default {
     }
 }
 @media (max-width: 1370px) {
+    .card {
+        .texts {
+            padding: 0 1rem;
+        }
+    }
     .about {
         .inner {
             height: auto;

src/styles/common.scss

@@ -130,6 +130,88 @@
         background-color: #fff !important;
     }
 }
+.iasf-menu-popup {
+    & > .el-menu {
+        &:before {
+            content: '';
+            position: absolute;
+            top: -16px;
+            left: 50px;
+            width: 0;
+            height: 0;
+            border: 8px solid transparent;
+            border-left-width: 6px;
+            border-right-width: 6px;
+            border-bottom-color: rgba(74, 79, 81, 0.71);
+        }
+        .el-menu:before {
+            display: none;
+        }
+    }
+    .el-menu {
+        padding: 0;
+        text-align: left;
+        background-color: rgba(74, 79, 81, 0.71) !important;
+        box-shadow: 0px 4px 8px 0px rgba(2, 39, 74, 0.27);
+        border-radius: 4px;
+        .el-menu-item {
+            padding: 0 16px;
+            &:first-child {
+                border-top-left-radius: 4px;
+                border-top-right-radius: 4px;
+            }
+            &:last-child {
+                border-bottom-left-radius: 4px;
+                border-bottom-right-radius: 4px;
+            }
+            &:hover,
+            &.is-active {
+                background-color: #fff !important;
+                span {
+                    color: #057ff0;
+                }
+            }
+        }
+
+        .el-submenu__title,
+        .el-menu-item,
+        .menu-child {
+            width: 160px !important;
+            min-width: 0;
+        }
+        .menu-child {
+            border-radius: 4px;
+            overflow: hidden;
+        }
+        .el-submenu {
+            // background-color: rgba(74, 79, 81, 0.71) !important;
+            // box-shadow: 0px 4px 8px 0px rgba(2, 39, 74, 0.27);
+            &:first-child {
+                border-top-left-radius: 4px;
+                border-top-right-radius: 4px;
+            }
+            &:last-child {
+                border-bottom-left-radius: 4px;
+                border-bottom-right-radius: 4px;
+            }
+            .el-submenu__title {
+                padding: 0 0 0 16px;
+                background-color: transparent !important;
+                &:hover,
+                &.is-active {
+                    background-color: #fff !important;
+                    span {
+                        color: #057ff0;
+                    }
+                }
+            }
+        }
+    }
+    span {
+        font-size: 14px;
+        color: #fff;
+    }
+}
 
 .party {
     .l-title:after {