diff --git a/App.vue b/App.vue
index de77746..8941b45 100644
--- a/App.vue
+++ b/App.vue
@@ -4,11 +4,11 @@
// url: 'http://192.168.3.4:9301/crest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- // url: 'https://pay.dctpay.com/crest',
- // imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
+ url: 'https://pay.dctpay.com/crest',
+ imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
//测试
- url: 'https://gratia-pay.dctpay.com/crest',
- imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
+ // url: 'https://gratia-pay.dctpay.com/crest',
+ // imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
userInfo: "",
openId: '',
h5code: '',
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 8565a0a..9c93c9d 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -17,28 +17,28 @@
},
onLoad(options) {
let that = this;
- uni.reLaunch({
- url: '../tabBar/home/home'
- })
+ // uni.reLaunch({
+ // url: '../tabBar/home/home'
+ // })
// #ifdef H5
- // let arr1 = window.location.href;
- // let arr2 = arr1.split('=');
- // if (arr2[2]) {
- // var arr3 = arr2[2].split('&');
- // if (arr3[0] != undefined && arr3[0]) {
- // app.globalData.h5code = arr3[0];
- // uni.setStorage({
- // key: "h5code",
- // data: arr3[0]
- // })
- // }
- // } else {
+ let arr1 = window.location.href;
+ let arr2 = arr1.split('=');
+ if (arr2[2]) {
+ var arr3 = arr2[2].split('&');
+ if (arr3[0] != undefined && arr3[0]) {
+ app.globalData.h5code = arr3[0];
+ uni.setStorage({
+ key: "h5code",
+ data: arr3[0]
+ })
+ }
+ } else {
// 获取openid
- // that.jumpcdx();
- // }
- // if (app.globalData.h5code) {
- // that.getAccessToken();
- // }
+ that.jumpcdx();
+ }
+ if (app.globalData.h5code) {
+ that.getAccessToken();
+ }
// #endif
},
methods: {
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index a72f995..eba0065 100644
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
惠支付
\ No newline at end of file
+ document.write('')