Merge branch 'fix/route_wrong_params' into 'master'

Fix/route wrong params

See merge request !10

app/web/component/layout/activity/index.ts

@@ -7,10 +7,11 @@ import { release } from '@/.sentryclirc';
 import '@/service/qg.service';
 import SaDirective from '@qg/citrus-ui/src/helper/directives/saTrack.directive.js';
 import config from '@qg/citrus-ui/src/config/index.js';
+import lazyload from '@qg/cherry-ui/src/lazyload/index';
 
 // 初始化sentry
 if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV === 'production') {
-  Raven.config('http://0785298052fd46128e201f30ca649102@sentry.q-gp.com/64', {
+  Raven.config('https://0785298052fd46128e201f30ca649102@sentry.q-gp.com/64', {
     release,
     environment: 'production'
   })
@@ -28,7 +29,7 @@ if (EASY_ENV_IS_BROWSER) {
   const saDirective = new SaDirective();
   Vue.directive('track', saDirective.directive);
 }
-
+Vue.use(lazyload);
 @Component({
   name: 'Layout'
 })

app/web/config/http.config.ts

@@ -13,9 +13,11 @@ function getURLSearchParams(json) {
 }
 
 function getVccChannel() {
+  let storageChannel = localStorage.get('vccChannel');
+  storageChannel = !isNaN(Number(storageChannel)) ? storageChannel : '';
   return isWechat
-    ? localStorage.get('vccChannel') || ''
-    : (isAndroid ? '159905' : isIOS ? '159904' : localStorage.get('vccChannel')) || '';
+    ? storageChannel || ''
+    : (isAndroid ? '159905' : isIOS ? '159904' : storageChannel || '');
 }
 export default {
   service: {

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

 import { Vue, Component, Emit } from 'vue-property-decorator';
 import Layout from 'component/layout/activity/index.vue';
+
 @Component({
   components: {
     Layout

app/web/service/utils.service.ts

@@ -137,7 +137,7 @@ export const isIOS = /iphone|ipad|ipod/.test(ua);
 export const isAndroid = /android/.test(ua);
 
 // 异常字段
-export const errorQueryValues = ['{token}', '{vccToken}', '{registerForm}', '{vccChannel}', '{h}', '{uuid}', '{}'];
+export const errorQueryValues = ['{token}', '{vccToken}', '{registerFrom}', '{vccChannel}', '{h}', '{uuid}', '{}'];
 
 export const debounce = (event, time) => {
   let timer = null;

package-lock.json

@@ -1599,9 +1599,9 @@
       "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
     },
     "@qg/cherry-ui": {
-      "version": "2.20.12",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.20.12.tgz",
-      "integrity": "sha512-H1N65l6MN1drPpHRR0QvkdVcvjKR3wKLRRXZX3P4/ktQIg/rL3I5eVHKVmAshBYct5f7MMbxxdblPlLWabPuSg==",
+      "version": "2.20.15",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.20.15.tgz",
+      "integrity": "sha512-d5HJXIwkPs+UPjrabLnPzw6/ZCmp58Y/Lhwd134A9uaXDtF3OeGlJJ2XM6m59VJVvPMg9kPjwcuagueij1dDzw==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",
@@ -1609,19 +1609,20 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.0.79",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.79.tgz",
-      "integrity": "sha512-lA1lw4uLMOSwJ1lAHenf8aSF4QoDDpPlKkBGVI+7IidSWcc2GbaApuc4Cmxp2tMv+p31A/jVXtuAIVn7xbnzoA==",
+      "version": "0.0.84",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.84.tgz",
+      "integrity": "sha512-haJBxI8SLJpHrOI4LUrVBTAFH7HhMxY/MYn/FlnZGznVn+0ctj/Uur7prDYZvEqrRc/NlnLqzxT5Tdr7IvZ5ag==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
-        "@qg/cherry-ui": "^2.20.11",
+        "@qg/cherry-ui": "^2.20.15",
         "@qg/js-bridge": "^1.1.9",
         "axios": "^0.21.1",
         "intersection-observer": "^0.12.0",
         "js-cookie": "^2.2.1",
         "sa-sdk-javascript": "^1.16.1",
         "swiper": "^4.5.1",
-        "vuex": "^3.6.0"
+        "vuex": "^3.6.0",
+        "weixin-js-sdk": "^1.6.0"
       }
     },
     "@qg/js-bridge": {
@@ -20748,9 +20749,9 @@
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
     "rollup": {
-      "version": "2.45.2",
-      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.45.2.tgz",
-      "integrity": "sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ==",
+      "version": "2.46.0",
+      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.46.0.tgz",
+      "integrity": "sha512-qPGoUBNl+Z8uNu0z7pD3WPTABWRbcOwIrO/5ccDJzmrtzn0LVf6Lj91+L5CcWhXl6iWf23FQ6m8Jkl2CmN1O7Q==",
       "requires": {
         "fsevents": "~2.3.1"
       }
@@ -20819,9 +20820,9 @@
       }
     },
     "sa-sdk-javascript": {
-      "version": "1.16.12",
-      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.16.12.tgz",
-      "integrity": "sha512-cFoZQSMg6M+JEl/bTEx6zkgonFS3aU3D1KmaT1sranZujPkdCT28YE/SehMofcgIAAnHLVTco7ysTSCJ/ojZMA=="
+      "version": "1.16.13",
+      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.16.13.tgz",
+      "integrity": "sha512-Mv0ik+IXlzP642uLKyPqRRwPaLRDzRtjxkqVXkTVGDkdwbOjBfrFPg3EOknDM291ZSmM2/25WXQi0502sUhOYA=="
     },
     "safe-buffer": {
       "version": "5.2.1",
@@ -24390,6 +24391,11 @@
       "resolved": "http://npmprivate.quantgroups.com/webwackify/-/webwackify-0.1.6.tgz",
       "integrity": "sha512-pGcw1T3HpNnM/UTRQqqRkkkzythSLts05mB+7Gr00B+0VbL0m39dFL5g20rSIEUt9Wrpw+/8k+snxRlUFHhcqA=="
     },
+    "weixin-js-sdk": {
+      "version": "1.6.0",
+      "resolved": "http://npmprivate.quantgroups.com/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz",
+      "integrity": "sha512-3IYQH7aalJGFJrwdT3epvTdR1MboMiH7vIZ5BRL2eYOJ12BNah7csoMkmSZzkq1+l92sSq29XdTCVjCJoK2sBQ=="
+    },
     "whatwg-encoding": {
       "version": "1.0.5",
       "resolved": "http://npmprivate.quantgroups.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",

package.json

@@ -20,8 +20,8 @@
   },
   "dependencies": {
     "@better-scroll/core": "^2.0.5",
-    "@qg/cherry-ui": "^2.20.12",
-    "@qg/citrus-ui": "0.0.79",
+    "@qg/cherry-ui": "^2.20.15",
+    "@qg/citrus-ui": "0.0.84",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",
     "egg": "^2.3.0",