2023-11-21

manifest.json

@@ -2,8 +2,8 @@
     "name" : "御康堂",
     "appid" : "__UNI__A07DF11",
     "description" : "御康堂",
-    "versionName" : "5.1.9",
-    "versionCode" : 519,
+    "versionName" : "5.2.0",
+    "versionCode" : 520,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/goods/cashier/index.vue

@@ -311,20 +311,13 @@
 						'&spread=' +
 						this
 						.$store.state.app.uid;
-						if (paytype == 'huijupay' && that.orderId) {
-							uni.hideLoading();
-							uni.reLaunch({
-								url: goPages
-							})
-							return ;
-						}
 					if (paytype == 'huijupay' && that.orderId) {
-						setTimeout(()=>{
+						setTimeout(() => {
 							uni.hideLoading();
 							uni.reLaunch({
-								url:goPages
+								url: goPages
 							})
-						},3000)
+						}, 3000)
 						return
 					}
 					switch (status) {
@@ -616,14 +609,14 @@
 				}).catch(err => {
 					uni.hideLoading();
 					if (paytype == 'huijupay') {
-						if(err=='无签约记录'){
+						if (err == '无签约记录') {
 							uni.showModal({
 								title: '错误',
 								content: '您未签约是否立即签约',
 								success: res => {
-									if(res.confirm){
+									if (res.confirm) {
 										uni.reLaunch({
-											url:'/pages/users/user_bind/index'
+											url: '/pages/users/user_bind/index'
 										})
 									}
 								},
@@ -820,4 +813,4 @@
 		}
 
 	}
-</style>
+</style>

pages/users/user_payment/index.vue

@@ -134,6 +134,13 @@
 						payStatus: true
 					},
 					// #endif
+					{
+						name: this.$t(`汇聚支付`),
+						icon: 'icon-yuezhifu1',
+						value: 'huijupay',
+						title: this.$t(`汇聚支付`),
+						payStatus: true
+					},
 				],
 				totalPrice: 0
 			};
@@ -260,7 +267,17 @@
 				}).then(res => {
 					let status = res.data.status,
 						orderId = res.data.result.orderId,
-						jsConfig = res.data.result.jsConfig
+						jsConfig = res.data.result.jsConfig;
+					if (type == 'huijupay') {
+						console.log(res);
+						setTimeout(() => {
+							uni.hideLoading();
+							uni.navigateTo({
+								url: '/pages/users/user_money/index',
+							});
+						}, 3000)
+						return
+					}
 					switch (status) {
 						case 'ORDER_EXIST':
 						case 'EXTEND_ORDER':
@@ -741,4 +758,4 @@
 		font-size: 24rpx;
 		color: #333;
 	}
-</style>
+</style>