Merge branch 'feature/act-code' into dev

src/components/preview-page.vue

@@ -133,7 +133,6 @@ export default {
       width: 176px;
       height: 176px;
       margin: 11px 0 16px 0;
-      background: #f6f6f6;
       background-image: url('../assets/QRcode.png');
       background-size: 176px auto;
     }

src/views/enterprise/salutatoryIndex.vue

@@ -27,6 +27,11 @@ export default {
       this.activeName = Number(sessionStorage.getItem('activeName'));
     }
   },
+  activated() {
+    if (sessionStorage.getItem('activeName')) {
+      this.activeName = Number(sessionStorage.getItem('activeName'));
+    }
+  },
   destroyed() {
     sessionStorage.setItem('activeName', 1);
   },

src/views/enterprise/salutatorySet.vue

@@ -288,6 +288,7 @@ export default {
       this.isNew = false;
     }
     this.form.type = type;
+    sessionStorage.setItem('activeName', type);
     this.getExistDefaultWelcome();
     this.getAppleList();
   },
@@ -686,7 +687,7 @@ export default {
                 if (!this.$route.query.id) {
                   this.$route.meta.refresh = true;
                 }
-                sessionStorage.setItem('activeName', para.type);
+
                 this.$router.push('salutatory');
               }
             })

src/views/salesleads/actCodeManage/attractFlowLink/landingPage/cardView.vue

@@ -176,6 +176,7 @@ export default {
         align-items: center;
         width: 100%;
         z-index: 100;
+        height: 36px;
         margin-bottom: 19px;
         .logo {
           width: 48px;
@@ -203,7 +204,6 @@ export default {
         z-index: 100;
         width: 236px;
         height: 236px;
-        background: #f6f6f6;
         background-image: url('../../../../../assets/QRcode.png');
         background-size: 236px auto;
       }