Merge branch 'master' into feature/cutPrice

# Conflicts:
#	package-lock.json
#	package.json

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

 {
   "api": {
-    "apiHost": "https://quantum-blocks-test1.liangkebang.net",
-    "h5Host": "https://quantum-h5-test1.liangkebang.net",
-    "opapiHost": "https://opapi-test1.liangkebang.net",
-    "passportHost": "https://passportapi-test1.liangkebang.net",
-    "kdspHost": "https://talos-test1.liangkebang.net",
+    "apiHost": "https://quantum-blocks-vcc2.liangkebang.net",
+    "h5Host": "https://quantum-h5-vcc2.liangkebang.net",
+    "opapiHost": "https://opapi-vcc2.liangkebang.net",
+    "passportHost": "https://passportapi-vcc2.liangkebang.net",
+    "kdspHost": "https://talos-vcc2.liangkebang.net",
     "loginUrl": "",
-    "h5ShopHost": "https://tenet-test1.liangkebang.net/#",
+    "h5ShopHost": "https://tenet-vcc2.liangkebang.net/#",
     "yxmTenantId": 560761,
     "appIdMap": {
       "560761": "wxe16bf9293671506c",
@@ -15,16 +15,16 @@
   },
   "mysql": {
     "low_code": {
-      "host": "172.17.5.45",
-      "port": "32696",
+      "host": "172.17.5.24",
+      "port": "30487",
       "username": "qa",
       "password": "qatest",
       "database": "low_code"
     }
   },
   "redis": {
-    "host": "172.17.5.48",
-    "port": "32625",
+    "host": "172.17.5.13",
+    "port": "31565",
     "password": "",
     "db": 0
   },

config/apollo.ssr.json

 {
-  "apiHost": "https://quantum-blocks-test1.liangkebang.net",
-    "h5Host": "https://quantum-h5-test1.liangkebang.net",
-    "opapiHost": "https://opapi-test1.liangkebang.net",
-    "passportHost": "https://passportapi-test1.liangkebang.net",
-    "kdspHost": "https://talos-test1.liangkebang.net",
+  "apiHost": "https://quantum-blocks-vcc2.liangkebang.net",
+    "h5Host": "https://quantum-h5-vcc2.liangkebang.net",
+    "opapiHost": "https://opapi-vcc2.liangkebang.net",
+    "passportHost": "https://passportapi-vcc2.liangkebang.net",
+    "kdspHost": "https://talos-vcc2.liangkebang.net",
     "loginUrl": "",
-    "h5ShopHost": "https://tenet-test1.liangkebang.net/#",
+    "h5ShopHost": "https://tenet-vcc2.liangkebang.net/#",
     "yxmTenantId": 560761,
     "appIdMap": {
       "560761": "wxe16bf9293671506c",