improve: h5微信支付

template/uni-app/components/payment/index.vue

@@ -265,7 +265,7 @@
 								let data = res.data;
 								if (data.status == "WECHAT_H5_PAY") {
 									uni.hideLoading();
-									location.replace(data.result.jsConfig.mweb_url);
+									location.replace(data.result.jsConfig.h5_url);
 									return that.$util.Tips({
 										title: that.$t(`支付成功`),
 										icon: 'success'
@@ -563,4 +563,4 @@
 	.icon-haoyoudaizhifu {
 		color: #F34C3E !important;
 	}
-</style>
+</style>

template/uni-app/pages/annex/offline_pay/index.vue

@@ -322,7 +322,7 @@
 						uni.showToast({
 							title: res.msg,
 							success() {
-								location.href = jsConfig.mweb_url;
+								location.href = jsConfig.h5_url;
 							}
 						});
 						break;

template/uni-app/pages/annex/vip_paid/index.vue

@@ -225,8 +225,8 @@
 				toLogin();
 			}
 		},
-		onShow() {
-			this.payClose();
+		onShow() {
+			this.payClose();
 			let options = wx.getEnterOptionsSync();
 			if (options.scene == '1038' && options.referrerInfo.appId == 'wxef277996acc166c3' && this.initIn) {
 				// 代表从收银台小程序返回
@@ -669,7 +669,7 @@
 						uni.showToast({
 							title: data.msg,
 							success() {
-								location.href = jsConfig.mweb_url;
+								location.href = jsConfig.h5_url;
 							}
 						});
 						break;
@@ -1280,4 +1280,4 @@
 			color: #FFFFFF;
 		}
 	}
-</style>
+</style>

template/uni-app/pages/goods/cashier/index.vue

@@ -94,7 +94,7 @@
 				orderId: 0,
 				fromType: '',
 				active: 0,
-				payPrice: 0,
+				payPrice: 0,
 				payPriceShow: 0,
 				payPostage: 0,
 				offlinePostage: false,
@@ -512,7 +512,7 @@
 								url: goPages + '&status=0'
 							});
 							setTimeout(() => {
-								location.href = res.data.result.jsConfig.mweb_url;
+								location.href = res.data.result.jsConfig.h5_url;
 							}, 2000);
 							break;
 
@@ -763,4 +763,4 @@
 		}
 
 	}
-</style>
+</style>

template/uni-app/pages/goods/order_confirm/index.vue

@@ -1206,7 +1206,7 @@
 					// 			url: goPages + '&status=0'
 					// 		});
 					// 		setTimeout(() => {
-					// 			location.href = res.data.result.jsConfig.mweb_url;
+					// 			location.href = res.data.result.jsConfig.h5_url;
 					// 		}, 2000);
 					// 		break;
 
@@ -1670,7 +1670,7 @@
 		height: 135rpx;
 		border-radius: 3rpx;
 		margin-top: 30rpx;
-		padding: 25rpx 28rpx;
+		padding: 25rpx 28rpx;
 		font-size: 28rpx;
 		box-sizing: border-box;
 	}
@@ -1761,7 +1761,7 @@
 		box-sizing: border-box;
 		position: fixed;
 		left: 0;
-		bottom: 0;
+		bottom: 0;
 		padding: 15rpx 30rpx;
 		padding-bottom: calc(15rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
 		padding-bottom: calc(15rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
@@ -1822,4 +1822,4 @@
 	.fontC {
 		color: grey;
 	}
-</style>
+</style>

template/uni-app/pages/goods_cate/goods_cate1.vue

@@ -113,7 +113,6 @@
 			})
 		},
 		mounted() {
-			console.log(this.version)
 			let that = this
 			// #ifdef H5
 			uni.getSystemInfo({
@@ -187,7 +186,6 @@
 			},
 			getAllCategory: function() {
 				let that = this;
-				console.log(this.version, '1', uni.getStorageSync('CAT_VERSION'))
 				if (this.isNew || !uni.getStorageSync('CAT1_DATA')) {
 					getCategoryList().then(res => {
 						uni.setStorageSync('CAT1_DATA', res.data)

template/uni-app/pages/users/user_payment/index.vue

@@ -408,7 +408,7 @@
 								title: that.$t(`订单创建成功`)
 							});
 							setTimeout(() => {
-								location.href = res.data.result.jsConfig.mweb_url;
+								location.href = res.data.result.jsConfig.h5_url;
 							}, 2000);
 							break;
 
@@ -710,4 +710,4 @@
 		font-size: 24rpx;
 		color: #333;
 	}
-</style>
+</style>