Merge branch 'feat/v1.6-0621' into 'master'

Feat/v1.6 0621

See merge request !93

app/web/config/dev.config.ts

@@ -3,11 +3,11 @@ const protocol = EASY_ENV_IS_BROWSER ? window.location.protocol : 'https:';
 
 const hostMap = {
   apiHost: `${protocol}//localhost:7002`,
-  talosHost: `${protocol}//talos-sc.liangkebang.net`,
-  kdspHost: `${protocol}//kdsp-api-sc.liangkebang.net`,
+  talosHost: `${protocol}//talos-yxm.liangkebang.net`,
+  kdspHost: `${protocol}//kdsp-api-yxm.liangkebang.net`,
   shenceUrl: `${protocol}//bn.xyqb.com/sa?project=default`,
-  mallHost: `${protocol}//mall-sc.liangkebang.net`,
-  xyqbH5Host: `${protocol}//mapi-sc.liangkebang.net`,
+  mallHost: `${protocol}//mall-yxm.liangkebang.net`,
+  xyqbH5Host: `${protocol}//mapi-yxm.liangkebang.net`,
   test: true,
   yxmTenantId: 560761,
   appIdMap: {

app/web/page/activity/component/FreedomContainer/index.ts

@@ -2,28 +2,57 @@ import { Component, Prop, Vue, Mixins } from 'vue-property-decorator';
 import { Action, Mutation, State, Getter } from 'vuex-class';
 import TransformStyleMixin from '@/page/mixins/transformStyle.mixin';
 import SaMixin from '@/page/mixins/sa.mixin';
+import localStorage from '@/service/localStorage.service';
 // import { resizeDiv } from '@/service/utils.service';
-import { locationHrefPatchDelay, getTokenFromApp } from '@qg/citrus-ui/src/helper/service/utils';
+import { locationHrefPatchDelay, getTokenFromApp, parseSearch, locationHrefPatchNoHandleParams } from '@qg/citrus-ui/src/helper/service/utils';
 import saTrackMixins from '@qg/citrus-ui/src/helper/mixins/saTrack.mixins';
 
 @Component({ name: 'FreedomContainer' })
 export default class FreedomContainer extends Mixins(TransformStyleMixin, SaMixin, saTrackMixins) {
   @Getter('pageData') pageData;
   @State(state => state.activity.curChildIndex) curChildIndex;
+  // showVideo = false;
   @Mutation('UPDATE_PAGE_INFO') updatePageInfo;
   @Prop({type: Object, default: () => ({ child: [] })}) childItem;
   @Prop({type: Object, default: () => ({})}) saInfo;
   @Prop(String) link;
   @Prop(String) backgroundImage;
 
-  clickEvent() {
-    console.log(this.childItem);
+  clickEvent(e) {
     let needLogin = false;
     try {
-      needLogin = this.childItem.props.needLogin;
+      needLogin = this.childItem.props ? false : this.childItem.props.needLogin;
     } catch (err) {
       console.log(err);
     }
+    if (this.childItem.props && this.childItem.props.isFinance) {
+      let paramsStr = '', url = this.link;
+      const localStorageParams = [
+        'token',
+        'tchannel',
+        'tenantId',
+        'appChannel',
+        'appName'
+      ];
+      const params = parseSearch(this.link);
+      localStorageParams.forEach(item => {
+        let key = item;
+        if (item == 'token') {
+          key = 'vccToken';
+        }
+        if (item == 'tchannel') {
+          key = 'vccChannel';
+        }
+        const itemVal = localStorage.get(key);
+        params[item] = itemVal || '';
+      });
+      Object.keys(params).forEach(item => {
+        paramsStr += `&${item}=${params[item]}`;
+      });
+      const targetUrl = `${url.split('?')[0]}?${paramsStr.slice(1)}`;
+      locationHrefPatchNoHandleParams(targetUrl);
+      return;
+    }
     if (needLogin) {
       getTokenFromApp().then(hasLogin => {
         if (hasLogin) {
@@ -37,6 +66,7 @@ export default class FreedomContainer extends Mixins(TransformStyleMixin, SaMixi
   }
 
   mounted() {
+    // this.showVideo = true;
     // 根据背景图设置元素高度
     // const index = this.pageData?.elements?.findIndex(v => v.point?.responsive);
     // const { props: { backgroundImage }, point } = this.pageData?.elements[index] || { props: {}};

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

 <template>
-  <div class="freedom" v-track.banClick="{link}" @click="clickEvent">
+  <div class="freedom" v-track.banClick="{link}" @click.stop="clickEvent">
     <div class="freedom-body">
+      <!-- <video width="100%" ref="videoBackground" height="auto" style="z-index: -10; osition: absolute; top: 0; left: 0" v-if="showVideo && childItem.props.freedomVideo" :src="childItem.props.freedomVideo" playsinline autoplay loop muted /> -->
       <component :class="['freedom-body-item', { 'Fb-item_selected': curChildIndex === index }]" v-for="(item, index) in childItem.child" :style="transformStyle(item.commonStyle, 'container')" :is="item.name" :key="index" :sa-info="getSaInfo(item)" v-bind="item.props"></component>
     </div>
   </div>
 </template>
 <script lang="ts" src="./index.ts"></script>
 <style lang="less" scoped>
+  video::-webkit-media-controls{ 
+    display:none !important;
+  }
   .freedom {
     height: 100%;
     width: 100%;

package-lock.json

@@ -2367,9 +2367,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.52",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.52.tgz",
-      "integrity": "sha512-lxEcVFegRhLc+6N76DzgG0Ekoh0yBH0O6GAL+RmJvX5yu+TB9ufjvlKThqRUq3kH5DlUMardRc3zjxTDQGD5uw==",
+      "version": "0.3.54",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.54.tgz",
+      "integrity": "sha512-N4cFIBYIOVL3OCC67i/wZhlyFm2ZcJvSSLRdFT0KmiLSmd5rlJzDQxg26Sohc5v5yUtXH7g/qLHmYI1m1Uf2vw==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",
@@ -23304,9 +23304,9 @@
       }
     },
     "sa-sdk-javascript": {
-      "version": "1.23.2",
-      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.23.2.tgz",
-      "integrity": "sha512-PAEolLpSWgk1+7qDRDo/ylS2rkRVlrq36tjlL2on/i6bw4wmCwdDehEoes9XatrmNqnbNoc+cv/ksgS+Hljnaw=="
+      "version": "1.23.3",
+      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.23.3.tgz",
+      "integrity": "sha512-YQXMwAPPCFzaQRaLqEFg2fyYN5St66JwZN8aGjtEPzGVLbE7pCX8UBuwMOF84vHmvFLUXO+GnXt8PrNDEiT6Jw=="
     },
     "safe-buffer": {
       "version": "5.2.1",

package.json

@@ -26,7 +26,7 @@
     "@better-scroll/core": "^2.0.5",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.52",
+    "@qg/citrus-ui": "0.3.54",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",