diff --git a/common/config.js b/common/config.js index 5eb9aa2..2874e7a 100644 --- a/common/config.js +++ b/common/config.js @@ -1,16 +1,16 @@ // APP -// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg/"; // -// const ROOTPATH = "https://dj-api.hnsiyao.cn/czg/"; //后台服务域名 -// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 +const ROOTPATH1 = "https://dj-api.hnsiyao.cn/czg/"; // +const ROOTPATH = "https://dj-api.hnsiyao.cn/czg/"; //后台服务域名 +const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 // const ROOTPATH1 = "https://video.hnsiyao.cn/czg/"; // // const ROOTPATH = "https://video.hnsiyao.cn/czg/"; //后台服务域名 // const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 // h5 -const ROOTPATH1 = "https://web.hnsiyao.cn/czg/"; // -const ROOTPATH = "https://web.hnsiyao.cn/czg/"; //后台服务域名 -const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 +// const ROOTPATH1 = "https://web.hnsiyao.cn/czg/"; // +// const ROOTPATH = "https://web.hnsiyao.cn/czg/"; //后台服务域名 +// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 // const ROOTPATH1 = "https://web-api.hnsiyao.cn/czg/"; // // const ROOTPATH = "https://web-api.hnsiyao.cn/czg/"; //后台服务域名 diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue index 46acd67..8ca774d 100644 --- a/me/detail/detail.nvue +++ b/me/detail/detail.nvue @@ -810,10 +810,19 @@ console.log('nvue payType=' + paytype); httpsRequest.getT("/app/wuyou/payOrder/" + this.ordersId + '?payType=' + paytype, {}).then(ret => { // plus.runtime.openURL(ret.data.h5Url) - - uni.navigateTo({ - url: '/pages/pays/pays?ordersId=' + this.ordersId + '&url=' + ret.data.h5Url - }); + if(ret.code == 0 ) { + uni.hideLoading() + uni.navigateTo({ + url: '/pages/pays/pays?ordersId=' + this.ordersId + '&url=' + ret.data.h5Url + }); + } else { + uni.hideLoading() + uni.showToast({ + icon: res.msg, + title: '支付失败!' + }); + } + // uni.navigateTo({ // url: '/pages/index/webView?ordersId='+this.ordersId+'url=' + ret.data.h5Url diff --git a/pages/me/index.vue b/pages/me/index.vue index 64af1a9..c09f529 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -194,6 +194,16 @@ 我的团队 + + + + + + APP下载 + + @@ -302,6 +312,7 @@ isWxIosPay: true, //微信下是否显示支付功能 userInfo:$cache_user.userInfo|| {}, isShowMoneyPay: true, + isAndroid: false, } }, onLoad() { @@ -315,10 +326,10 @@ }, onShow() { - const systemInfo = uni.getSystemInfoSync(); - const isIOS = /iOS/.test(systemInfo.platform); - if (isIOS) { - this.isBack = true + if ( uni.getSystemInfoSync().platform == 'android' ) { + // #ifdef H5 + this.isAndroid= true + // #endif } this.isWxIosPay = uni.getStorageSync('isWxIosPay') this.kmPaySel = this.$queue.getData('kmPaySel'); diff --git a/static/images/me/dd795d6bae0782ada7fafc8ee4b748e.png b/static/images/me/dd795d6bae0782ada7fafc8ee4b748e.png new file mode 100644 index 0000000..ca506e0 Binary files /dev/null and b/static/images/me/dd795d6bae0782ada7fafc8ee4b748e.png differ diff --git a/static/images/me/xiazai.png b/static/images/me/xiazai.png new file mode 100644 index 0000000..deccf1a Binary files /dev/null and b/static/images/me/xiazai.png differ