Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

src/service/httpDecorator.js

@@ -40,15 +40,13 @@ const http = new HttpRequest(
         return [null, error];
       },
       request(cfg) {
-        const { method, hideVccChannel } = cfg;
+        const { method } = cfg;
         cfg.headers['X-Auth-Token'] = localStorage.get('vccToken') || '';
         if (cfg.customHeader) {
           Object.assign(cfg.headers, cfg.customHeader);
         }
-        if (!hideVccChannel) {
-          cfg.headers['vccChannel'] = getVccChannel();
-          cfg.headers['sonVccChannel'] = getVccChannel('sonVccChannel');
-        }
+        cfg.headers['vccChannel'] = getVccChannel();
+        cfg.headers['sonVccChannel'] = getVccChannel('sonVccChannel');
         if (method === 'post' && cfg.emulateJSON) {
           cfg.headers['Content-Type'] = 'application/x-www-form-urlencoded';
           cfg.data = getURLSearchParams(cfg.data);

src/service/init.service.js

@@ -2,7 +2,7 @@
  * Created by jialiu on 17/1/11.
  */
 import store from '../store';
-import { isWechat, isApp } from './validation.service';
+import { isWechat, isApp, isAndroid, isIOS } from './validation.service';
 import Cookies from './cookieStorage.service';
 import localStorage from './localStorage.service';
 // import { Toast } from '@qg/cherry-ui';
@@ -20,16 +20,13 @@ export default {
       // 所有自定义路由字段在此处理
       const { meta } = to;
       isWechat && localStorage.set('vccChannel', '159913');
+      isIOS && localStorage.set('vccChannel', '214');
+      isAndroid && localStorage.set('vccChannel', '217');
       meta?.has?.header && store.commit('CHANGE_HEADER', meta.has.header); // 改变header
-      const localParams = ['token', 'redirectUrl', 'h', 'vccToken', 'vccChannel', 'sonVccChannel'];
+      const localParams = ['redirectUrl', 'h', 'vccToken', 'vccChannel', 'sonVccChannel'];
       // TODO: 类似逻辑可以整合
       localParams.forEach(item => {
         const value = to.query[item];
-        console.log(item, value);
-        if (item === 'token' && value === '') {
-          localStorage.remove('token');
-          Cookies.remove('token');
-        }
         if (item === 'vccToken' && value === '') {
           localStorage.remove('vccToken');
           Cookies.remove('vccToken');