Merge remote-tracking branch 'origin/master'

src/views/Home/index.vue

@@ -7,7 +7,7 @@
           <div class="banner-item" :style="{ background: el.colorBackground }">
             <div class="container">
               <div class="row">
-                <div class="col-lg-7 carousel-caption-left">
+                <div class="col-lg-6 carousel-caption-left">
                   <div class="carousel-title">{{ el.title }}</div>
                   <p class="carousel-note">
                     {{ el.brief }}
@@ -1862,6 +1862,9 @@ export default {
           flex-direction: column;
           justify-content: center;
           border-top: 1px solid #f0f5fa;
+          @media screen and (max-width: 992px) {
+            height: 120px;
+          }
         }
         .dzfw-tp {
           height: 40px;
@@ -1915,6 +1918,9 @@ export default {
     padding: 30px 0;
     // height: 433px;
     background-position: center;
+    @media screen and (max-width: 765px) {
+      padding: 15px 0;
+    }
     .spqqsfz-cate {
       display: flex;
       align-items: center;
@@ -1923,6 +1929,9 @@ export default {
       color: #ffffff;
       font-size: 18px;
       margin-bottom: 30px;
+      @media screen and (max-width: 765px) {
+        margin-bottom: 15px;
+      }
       // font-family: PingFangSC-Medium, PingFang SC;
       .spqqsfz-cate-right {
         cursor: pointer;
@@ -1940,12 +1949,18 @@ export default {
       }
       > * {
         height: 300px;
+        @media screen and (max-width: 992px) {
+          height: 240px;
+        }
       }
       .spqqsfz-cont-left {
         .spqqsfz-cont-left-tp {
           text-align: center;
           img {
             max-height: 100%;
+            @media screen and (max-width: 992px) {
+              max-height: 240px;
+            }
           }
         }
       }
@@ -2024,6 +2039,11 @@ export default {
     .djwh-tp {
       img {
         width: 100%;
+        @media screen and (max-width: 765px) {
+          width: calc(100% - 40px);
+          display: block;
+          margin: 0 20px 0 20px;
+        }
       }
     }
     .smallPCImages {

src/views/comps/SubNav.vue

@@ -3,6 +3,7 @@
     :default-active="activeMenu"
     class="el-menu-vertical gs-subnav"
     :collapse="false"
+    :default-openeds="openeds"
     @select="handleSelect"
   >
     <template v-for="submenu in subNav">
@@ -61,13 +62,15 @@ export default {
   data() {
     return {
       activeMenu: "",
+      openeds: []
     };
   },
   computed: {
     ...mapState("system", ["subNav"]),
   },
   created() {
-    // console.log(this.subNav);
+    console.log(this.subNav);
+    this.openeds = this.subNav.map(nav => nav.name)
   },
   watch: {
     subNav: {