Merge branch 'scm_optimize' into test

# Conflicts:
#	src/api/webSite.js

src/api/webSite.js

@@ -21,13 +21,13 @@ export function getdomain(params) {
   })
 }
 // 获取官网设置接口
-export function webSite(params) {
+export function webSite(data) {
   return request({
-    // url: '//sysapi.jxhh.com/api/v1/oem/common/counsel',
-    url: '//192.168.26.179:6601/api/v1/oem/common/counsel',
+    url: '//sysapi.jxhh.com/api/v1/channelSite/info',
+    // url: '//192.168.26.179:6601/api/v1/oem/common/counsel',
     // url: '//newsys.jxhh.com/api/v1/oem/common/counsel',
-    method: 'get',
-    params
+    method: 'post',
+    data
   })
 }
 

src/views/entry/process.vue

@@ -64,13 +64,16 @@
       /** 获取通用设置 */
       getWebSite() {
         let params = {
-          channel_ids: this.channel_id
+          domain: window.location.host,
+          type: 2,
+          site_type: 4
         }
         webSite(params).then(res => {
           if (res.code == 1) {
-            if (res.data.universal_lst && res.data.universal_lst != 'null') {
-              this.settitle = res.data.universal_lst
-            }
+            // if (res.data.universal_lst && res.data.universal_lst != 'null') {
+            //   this.settitle = res.data.universal_lst
+            // }
+            this.settitle.topLogo = res.data.channel_site[0].logo
           }
         })
       },