Skip to content

Q
quantum-blocks-h5
Commit 1dcea26a authored by 郭志伟's avatar 郭志伟
Browse files
Options

Merge branch 'master' into feature/cutPrice 

# Conflicts:
#	package-lock.json
#	package.json
parents f7e38968 a226632c
Show whitespace changes
Inline Side-by-side
Showing with 30 additions and 23 deletions
app/web/component/layout/activity/index.ts
View file @ 1dcea26a
...@@ -22,7 +22,7 @@ if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV === 'production') ...@@ -22,7 +22,7 @@ if (process.env.SENTRY_ENV !== 'test' && process.env.NODE_ENV === 'production')
.install(); .install();
} }
if (EASY_ENV_IS_BROWSER) { if (EASY_ENV_IS_BROWSER && process.env.SENTRY_ENV === 'test') {
// ! 上线后务必取掉; // ! 上线后务必取掉;
// const vConsole = require('vconsole'); // const vConsole = require('vconsole');
// new vConsole(); // new vConsole();
...@@ -53,6 +53,9 @@ if (EASY_ENV_IS_BROWSER) { ...@@ -53,6 +53,9 @@ if (EASY_ENV_IS_BROWSER) {
if (json.event === 'getTokenSuccess') { if (json.event === 'getTokenSuccess') {
EventBus.$emit('NATIVE_EVENT_GET_TOKEN', json); EventBus.$emit('NATIVE_EVENT_GET_TOKEN', json);
} }
if (json.event === 'getTongdunIdSuccess') {
EventBus.$emit('NATIVE_EVENT_GET_TDONGDUN_ID', json);
}
}; };
} }
@Component({ @Component({
......
app/web/config/http.config.ts
View file @ 1dcea26a
...@@ -22,9 +22,9 @@ function getVccChannel(channelKey = 'vccChannel') { ...@@ -22,9 +22,9 @@ function getVccChannel(channelKey = 'vccChannel') {
: isWxMp : isWxMp
? '159913' ? '159913'
: isAndroid : isAndroid
? '159905' ? '217'
: isIOS : isIOS
? '159904' ? '214'
: ''; : '';
} }
export default { export default {
......
app/web/service/init.service.ts
View file @ 1dcea26a
// import store from '../store'; import { errorQueryValues } from './utils.service';
import { isWechat, isApp, errorQueryValues } from './utils.service'; import { loginSa } from './sa.service';
import Cookies from './cookieStorage.service'; import Cookies from './cookieStorage.service';
import localStorage from './localStorage.service'; import localStorage from './localStorage.service';
// formXcxPage:标识是从小程序跳转过来的; // formXcxPage:标识是从小程序跳转过来的;
const localStorageParams = ['creditToken', 'vccToken', 'vccChannel', 'sonVccChannel', 'formXcxPage', 'tenantId']; const localStorageParams = ['creditToken', 'vccToken', 'vccChannel', 'sonVccChannel', 'formXcxPage', 'tenantId', 'distinctID'];
const cookiesParams = ['h']; const cookiesParams = ['h'];
export default { export default {
...@@ -17,7 +17,11 @@ export default { ...@@ -17,7 +17,11 @@ export default {
if (router.mode === 'history' && !to.hash) { if (router.mode === 'history' && !to.hash) {
localStorageParams.forEach(item => { localStorageParams.forEach(item => {
if (to.query[item] && errorQueryValues.indexOf(to.query[item]) === -1) { if (to.query[item] && errorQueryValues.indexOf(to.query[item]) === -1) {
if (item === 'distinctID') {
loginSa(to.query[item]);
} else {
localStorage.set(item, to.query[item]); localStorage.set(item, to.query[item]);
}
} else { } else {
localStorage.set(item, ''); localStorage.set(item, '');
} }
......
config/apollo.json
View file @ 1dcea26a
{ {
"api": { "api": {
"apiHost": "https://quantum-blocks-test1.liangkebang.net", "apiHost": "https://quantum-blocks-vcc2.liangkebang.net",
"h5Host": "https://quantum-h5-test1.liangkebang.net", "h5Host": "https://quantum-h5-vcc2.liangkebang.net",
"opapiHost": "https://opapi-test1.liangkebang.net", "opapiHost": "https://opapi-vcc2.liangkebang.net",
"passportHost": "https://passportapi-test1.liangkebang.net", "passportHost": "https://passportapi-vcc2.liangkebang.net",
"kdspHost": "https://talos-test1.liangkebang.net", "kdspHost": "https://talos-vcc2.liangkebang.net",
"loginUrl": "", "loginUrl": "",
"h5ShopHost": "https://tenet-test1.liangkebang.net/#", "h5ShopHost": "https://tenet-vcc2.liangkebang.net/#",
"yxmTenantId": 560761, "yxmTenantId": 560761,
"appIdMap": { "appIdMap": {
"560761": "wxe16bf9293671506c", "560761": "wxe16bf9293671506c",
...@@ -15,16 +15,16 @@ ...@@ -15,16 +15,16 @@
}, },
"mysql": { "mysql": {
"low_code": { "low_code": {
"host": "172.17.5.45", "host": "172.17.5.24",
"port": "32696", "port": "30487",
"username": "qa", "username": "qa",
"password": "qatest", "password": "qatest",
"database": "low_code" "database": "low_code"
} }
}, },
"redis": { "redis": {
"host": "172.17.5.48", "host": "172.17.5.13",
"port": "32625", "port": "31565",
"password": "", "password": "",
"db": 0 "db": 0
}, },
......
config/apollo.ssr.json
View file @ 1dcea26a
{ {
"apiHost": "https://quantum-blocks-test1.liangkebang.net", "apiHost": "https://quantum-blocks-vcc2.liangkebang.net",
"h5Host": "https://quantum-h5-test1.liangkebang.net", "h5Host": "https://quantum-h5-vcc2.liangkebang.net",
"opapiHost": "https://opapi-test1.liangkebang.net", "opapiHost": "https://opapi-vcc2.liangkebang.net",
"passportHost": "https://passportapi-test1.liangkebang.net", "passportHost": "https://passportapi-vcc2.liangkebang.net",
"kdspHost": "https://talos-test1.liangkebang.net", "kdspHost": "https://talos-vcc2.liangkebang.net",
"loginUrl": "", "loginUrl": "",
"h5ShopHost": "https://tenet-test1.liangkebang.net/#", "h5ShopHost": "https://tenet-vcc2.liangkebang.net/#",
"yxmTenantId": 560761, "yxmTenantId": 560761,
"appIdMap": { "appIdMap": {
"560761": "wxe16bf9293671506c", "560761": "wxe16bf9293671506c",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment