Merge branch 'scm_optimize' into test

src/views/entry/process.vue

@@ -50,14 +50,15 @@
         let op = 'open'
         let ssa = window.location.host
         const data = {
-          type: 1,
+          type: 2,
           site_type: 4,
           // domain: ssa,
         }
         indexInfo(data).then(res => {
           if (res.code == 1) {
             this.channel_id = res.data.channel.id
-            this.getWebSite()
+            this.settitle.topLogo = res.data.channel_site[0].logo
+            // this.getWebSite()
           }
         })
       },

src/views/system/order/index.vue

@@ -408,7 +408,7 @@
       getChannelId() {
         let ssa = window.location.host
         const data = {
-          type: 1,
+          type: 2,
           site_type: 4,
           // domain: ssa,
         }