Explorar o código

improve: h5支付

From-wh %!s(int64=2) %!d(string=hai) anos
pai
achega
665fa35f72

+ 6 - 3
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':

+ 1 - 5
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(`缺少参数无法查看订单支付状态`)
 			}, {

+ 6 - 4
template/uni-app/pages/user/index.vue

@@ -59,9 +59,9 @@
 								</view>
 								<!-- #endif -->
 								<!-- #ifdef H5 -->
-								<view class="name" v-if="!userInfo.uid && isWeixin" @click="openAuto"
+								<view class="name" v-if="!userInfo.uid" @click="openAuto"
 									style="height: 100%; display: flex; align-items: center;">
-									{{$t('请点击授权')}}
+									{{$t(isWeixin ? '请点击授权' : '请点击登录')}}
 								</view>
 								<!-- #endif -->
 								<view class="name" v-if="userInfo.uid">
@@ -1008,9 +1008,11 @@
 							align-items: center;
 							color: #fff;
 							font-size: 31rpx;
-							.nickname{
-								max-width: 8em;
+
+							.nickname {
+								max-width: 8em;
 							}
+
 							.vip {
 								margin-left: 10rpx;