Merge branch 'feat/addby' into 'master'

fix(tongdun): 添加同盾回调

See merge request !64

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

@@ -22,7 +22,7 @@ if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV === 'production')
     .install();
 }
 
-if (EASY_ENV_IS_BROWSER) {
+if (EASY_ENV_IS_BROWSER && process.env.SENTRY_ENV === 'test') {
   // ! 上线后务必取掉;
   // const vConsole = require('vconsole');
   // new vConsole();
@@ -53,6 +53,9 @@ if (EASY_ENV_IS_BROWSER) {
     if (json.event === 'getTokenSuccess') {
       EventBus.$emit('NATIVE_EVENT_GET_TOKEN', json);
     }
+    if (json.event === 'getTongdunIdSuccess') {
+      EventBus.$emit('NATIVE_EVENT_GET_TDONGDUN_ID', json);
+    }
   };
 }
 @Component({

app/web/config/http.config.ts

@@ -22,9 +22,9 @@ function getVccChannel(channelKey = 'vccChannel') {
     : isWxMp
     ? '159913'
     : isAndroid
-    ? '159905'
+    ? '217'
     : isIOS
-    ? '159904'
+    ? '214'
     : '';
 }
 export default {

app/web/service/init.service.ts

-// import store from '../store';
-import { isWechat, isApp, errorQueryValues } from './utils.service';
+import { errorQueryValues } from './utils.service';
+import { loginSa } from './sa.service';
 import Cookies from './cookieStorage.service';
 import localStorage from './localStorage.service';
 // formXcxPage:标识是从小程序跳转过来的;
-const localStorageParams = ['creditToken', 'vccToken', 'vccChannel', 'sonVccChannel', 'formXcxPage', 'tenantId'];
+const localStorageParams = ['creditToken', 'vccToken', 'vccChannel', 'sonVccChannel', 'formXcxPage', 'tenantId', 'distinctID'];
 const cookiesParams = ['h'];
 
 export default {
@@ -17,7 +17,11 @@ export default {
       if (router.mode === 'history' && !to.hash) {
         localStorageParams.forEach(item => {
           if (to.query[item] && errorQueryValues.indexOf(to.query[item]) === -1) {
-            localStorage.set(item, to.query[item]);
+            if (item === 'distinctID') {
+              loginSa(to.query[item]);
+            } else {
+              localStorage.set(item, to.query[item]);
+            }
           } else {
             localStorage.set(item, '');
           }

config/apollo.json

@@ -15,8 +15,8 @@
   },
   "mysql": {
     "low_code": {
-      "host": "172.17.5.5",
-      "port": "32580",
+      "host": "172.17.5.24",
+      "port": "30487",
       "username": "qa",
       "password": "qatest",
       "database": "low_code"

package-lock.json

@@ -2367,9 +2367,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.25",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.25.tgz",
-      "integrity": "sha512-ORxX897CKVLiBYolxgi3Qe/imQHS3Sx4+8fGas6R1TrEAxX419yx1g1Gemxc9tnMsAGpyTvImWnYecV2QftUow==",
+      "version": "0.3.26",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.26.tgz",
+      "integrity": "sha512-piybfgOOJScnHZSUqGkrfwYG9SsJUtknw4eDKwdWKHnvDrPHFKL23CDlFnhExzmSYgZSY0QFWUPanGM5pamiNw==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",
@@ -23150,9 +23150,9 @@
       }
     },
     "sa-sdk-javascript": {
-      "version": "1.20.1",
-      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.20.1.tgz",
-      "integrity": "sha512-ahPyFXy0twqJmX8CCOC/QQsGQWnsPGkBayztyS5h9HkHMTZH8PxicSFVh84nnJRjS/9pzl02/5JTTshOllhcjw=="
+      "version": "1.20.2",
+      "resolved": "http://npmprivate.quantgroups.com/sa-sdk-javascript/-/sa-sdk-javascript-1.20.2.tgz",
+      "integrity": "sha512-+cZm7oCI6xPZwJhRuYuz64Ak/Pi+h3YLLFU+3aLCl1pZoQorabIBCPsUvG8IBF91iCKkX4UByUQLZUeUDR2HKA=="
     },
     "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.25",
+    "@qg/citrus-ui": "0.3.26",
     "@qg/js-bridge": "^1.1.12",
     "babel-plugin-transform-vue-jsx": "^4.0.1",
     "cos-nodejs-sdk-v5": "^2.9.12",