Merge branch 'feature/img_onload' into 'master'

Feature/img onload

See merge request !9

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

@@ -18,11 +18,11 @@ if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV === 'production')
     .install();
 }
 
-if (EASY_ENV_IS_BROWSER && process.env.SENTRY_ENV === 'test' || process.env.NODE_ENV !== 'production') {
+// if (EASY_ENV_IS_BROWSER && process.env.SENTRY_ENV === 'test' || process.env.NODE_ENV !== 'production') {
   // ! 上线后务必取掉
-  const vConsole = require('vconsole');
-  new vConsole();
-}
+  // const vConsole = require('vconsole');
+  // new vConsole();
+// }
 
 if (EASY_ENV_IS_BROWSER) {
   const saDirective = new SaDirective();

app/web/service/cookieStorage.service.ts

 // tslint:disable
+import { errorQueryValues } from './utils.service';
 const cookies = require('js-cookie');
 const option = {
   domain: EASY_ENV_IS_BROWSER && window.location.host.indexOf('.q-gp.com') >= 0 ? '.q-gp.com' : '',
@@ -6,7 +7,8 @@ const option = {
 };
 const Cookies = {
   get(key) {
-    const result = cookies.get(key) || '';
+    let result = cookies.get(key) || '';
+    if (errorQueryValues.indexOf(result) > -1) result = '';
     try {
       return JSON.parse(result);
     } catch (e) {
@@ -26,4 +28,4 @@ const Cookies = {
   },
 };
 
-module.exports = Cookies;
+export default Cookies;

app/web/service/init.service.ts

 // import store from '../store';
-import { isWechat, isApp } from './utils.service';
+import { isWechat, isApp, errorQueryValues } from './utils.service';
 import Cookies from './cookieStorage.service';
 import localStorage from './localStorage.service';
 // formXcxPage:标识是从小程序跳转过来的;
@@ -15,14 +15,14 @@ export default {
 
       // meta?.has?.header && store.commit('CHANGE_HEADER', meta.has.header); // 改变header
       localStorageParams.forEach(item => {
-        if (to.query[item]) {
+        if (to.query[item] && errorQueryValues.indexOf(to.query[item]) === -1) {
           localStorage.set(item, to.query[item]);
         } else {
           localStorage.set(item, '');
         }
       });
       cookiesParams.forEach(item => {
-        if (to.query[item]) {
+        if (to.query[item] && errorQueryValues.indexOf(to.query[item]) === -1) {
           Cookies.set(item, to.query[item]);
         } else {
           Cookies.remove(item);

app/web/service/localStorage.service.ts

+// tslint:disable
+import { errorQueryValues } from './utils.service';
+
 export default {
   get(key) {
-    const result = EASY_ENV_IS_BROWSER && window.localStorage.getItem(key);
+    let result = EASY_ENV_IS_BROWSER && window.localStorage.getItem(key);
+    if (errorQueryValues.indexOf(result) > -1) result = '';
     try {
       return JSON.parse(result as string);
     } catch (e) {

app/web/service/utils.service.ts

@@ -136,6 +136,9 @@ export const isIOS = /iphone|ipad|ipod/.test(ua);
 // 判读Android环境
 export const isAndroid = /android/.test(ua);
 
+// 异常字段
+export const errorQueryValues = ['{token}', '{vccToken}', '{registerForm}', '{vccChannel}', '{h}', '{uuid}', '{}'];
+
 export const debounce = (event, time) => {
   let timer = null;
   return function (...args) {

package-lock.json

@@ -1599,9 +1599,9 @@
       "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
     },
     "@qg/cherry-ui": {
-      "version": "2.20.11",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.20.11.tgz",
-      "integrity": "sha512-wnyGGAVXi/MIGKNfY14lJlfT33FLe0NkxPOrx/8PtVOrG+GfWvU0UrHlN6H7yjvXSIHIgRB/Rwavhhdw+UZclw==",
+      "version": "2.20.12",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.20.12.tgz",
+      "integrity": "sha512-H1N65l6MN1drPpHRR0QvkdVcvjKR3wKLRRXZX3P4/ktQIg/rL3I5eVHKVmAshBYct5f7MMbxxdblPlLWabPuSg==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",
@@ -1609,9 +1609,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.0.78",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.78.tgz",
-      "integrity": "sha512-bfhD2w2bdXSoBkFNOzz6oKGc2hn9JjtyElW6szjWlprsD3pkvIdMcxht85DpeNJjvSRhvjBzgB98YPHPSuJgbw==",
+      "version": "0.0.79",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.79.tgz",
+      "integrity": "sha512-lA1lw4uLMOSwJ1lAHenf8aSF4QoDDpPlKkBGVI+7IidSWcc2GbaApuc4Cmxp2tMv+p31A/jVXtuAIVn7xbnzoA==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.20.11",
@@ -23335,9 +23335,9 @@
       }
     },
     "url-toolkit": {
-      "version": "2.2.1",
-      "resolved": "http://npmprivate.quantgroups.com/url-toolkit/-/url-toolkit-2.2.1.tgz",
-      "integrity": "sha512-8+DzgrtDZYZGhHaAop5WGVghMdCfOLGbhcArsJD0qDll71FXa7EeKxi2hilPIscn2nwMz4PRjML32Sz4JTN0Xw=="
+      "version": "2.2.2",
+      "resolved": "http://npmprivate.quantgroups.com/url-toolkit/-/url-toolkit-2.2.2.tgz",
+      "integrity": "sha512-l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug=="
     },
     "urllib": {
       "version": "2.37.1",

package.json

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