diff --git a/template/uni-app/pages/goods/cashier/index.vue b/template/uni-app/pages/goods/cashier/index.vue index ca1e16d35..d4739c654 100644 --- a/template/uni-app/pages/goods/cashier/index.vue +++ b/template/uni-app/pages/goods/cashier/index.vue @@ -505,12 +505,15 @@ case "WECHAT_H5_PAY": uni.hideLoading(); - uni.reLaunch({ + that.$util.Tips({ + title: that.$t(`等待支付中`) + }, { + tab: 4, url: goPages + '&status=0' - }) + }); setTimeout(() => { location.href = res.data.result.jsConfig.h5_url; - }, 1000); + }, 1500); break; case 'ALIPAY_PAY': diff --git a/template/uni-app/pages/goods/order_pay_status/index.vue b/template/uni-app/pages/goods/order_pay_status/index.vue index 02c233480..6f21c20cd 100644 --- a/template/uni-app/pages/goods/order_pay_status/index.vue +++ b/template/uni-app/pages/goods/order_pay_status/index.vue @@ -146,12 +146,8 @@ deep: true } }, - onLoad: function(options) { + onLoad(options) { this.options = options - console.log(options, 'options') - uni.setNavigationBarTitle({ - title: '' - }); if (!options.order_id) return this.$util.Tips({ title: this.$t(`缺少参数无法查看订单支付状态`) }, { diff --git a/template/uni-app/pages/user/index.vue b/template/uni-app/pages/user/index.vue index 0eaa34a76..2062576f1 100644 --- a/template/uni-app/pages/user/index.vue +++ b/template/uni-app/pages/user/index.vue @@ -59,9 +59,9 @@ - - {{$t('请点击授权')}} + {{$t(isWeixin ? '请点击授权' : '请点击登录')}} @@ -1008,9 +1008,11 @@ align-items: center; color: #fff; font-size: 31rpx; - .nickname{ - max-width: 8em; + + .nickname { + max-width: 8em; } + .vip { margin-left: 10rpx;