Merge branch 'master' of http://git.quantgroup.cn/ui/quantum-block-h5 into feat/history

app/web/api/editor.api.ts

@@ -28,12 +28,15 @@ export default {
       hideLoading: true
     });
   },
-  getFinanceSetting() {
+  getFinanceSetting(appChannel) {
     const customHeader: any = {};
     if (EASY_ENV_IS_BROWSER) {
       const ua = window.navigator.userAgent;
       const appVersion = ua.match(/xyqb\/([\d|.]+)/) ? (ua.match(/xyqb\/([\d|.]+)/) as string[])[1] : '8.2.00';
       customHeader.version = appVersion;
+      if (appChannel) {
+        customHeader.appChannel = appChannel;
+      }
     }
 
     // return http.post(`http://yapi.quantgroups.com/mock/351/api/kdsp/api/kdsp/vcc_switch`, {

app/web/page/activity/component/BackTop/index.vue

@@ -137,7 +137,7 @@ export default {
       } else if (isWechat && !isWxMp) {
         const { shareOpenMethod, link: url } = this;
         const jumpUrl = shareOpenMethod === 1 ? WEAPP_PATH : APP_PATH;
-        window.location.href = `${cfg.mallHost}/common/launch?jumpUrl=${jumpUrl}&terminal=${shareOpenMethod}&extraInfo=${encodeURIComponent(JSON.stringify({ url }))}`;
+        window.location.href = `${cfg.mallHost}/common/launch?jumpUrl=${jumpUrl}&terminal=${shareOpenMethod || 2}&extraInfo=${encodeURIComponent(JSON.stringify({ url }))}`;
       }
     },
     handleBackTopClick(e = {}) {
@@ -165,7 +165,7 @@ export default {
         console.log(e);
       }
       const { coverImage, pageName, pageDescribe } = this.pageInfo;
-      let link = `${window.location.origin}${window.location.pathname}?vccToken={token}&tenantId=${localStorage.get('tenantId') || ''}`;
+      let link = `${window.location.origin}${window.location.pathname}?vccToken={token}&tenantId=${localStorage.get('tenantId') || ''}&appChannel={appChannel}`;
       if (this.getUrlParamsVal('navId') !== false && this.getUrlParamsVal('index') !== false) {
         // 向分享URL中填充导航ID与位置索引
         link += `&navId=${this.getUrlParamsVal("navId")}&index=${this.getUrlParamsVal('index')}` 

app/web/page/activity/view/activity/index.ts

@@ -160,8 +160,8 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
         return;
       }
     }
-
-    const [res, ] = await editorApi.getFinanceSetting();
+    const appChannel = localStorage.get('appChannel') || '';
+    const [res, ] = await editorApi.getFinanceSetting(appChannel);
     const [serverTime, ] = await editorApi.getServerTime();
     // console.log(res, 'finance result');
     // console.log(serverTime, 'time');

app/web/service/init.service.ts

@@ -3,7 +3,7 @@ import { loginSa } from './sa.service';
 import Cookies from './cookieStorage.service';
 import localStorage from './localStorage.service';
 // formXcxPage:标识是从小程序跳转过来的;
-const localStorageParams = ['creditToken', 'vccToken', 'vccChannel', 'sonVccChannel', 'formXcxPage', 'tenantId', 'distinctID'];
+const localStorageParams = ['creditToken', 'vccToken', 'vccChannel', 'sonVccChannel', 'formXcxPage', 'tenantId', 'distinctID', 'appChannel'];
 const cookiesParams = ['h'];
 
 export default {