Merge branch 'master' of http://192.168.40.220/dmc/jz_applet

pages/index/index.vue

@@ -405,32 +405,9 @@
 		// 	.catch((err) => {
 		// 		console.log(err);
 		// 	});
-		// uni.navigateTo({
-		// 	url: "/subpackage/orders/payment/payment?token=445dff5be89c4dcaa89386d1c390930a&openId=0e716af635634d749a981524cc6146a5&orderId=20231016175113823159477&qdOrderNo=20231016175113823159477"
-		// })
-		// uni.navigateTo({
-		// 	url: "/subpackage/orders/sign/sign-up-ali?token=dcb93cca0dde44cdb444b6afab95b66e&openId=c3e66c33299e4faea553ba32a028418c&orderId=20231017142743224495637&qdOrderNo=20231017142747520101000029802083"
-		// })
-		my.navigateToMiniProgram({
-			appId: '2021004124602167', // 16 位
-			path: `/subpackage/orders/payment/payment?qdOrderNo=1&type=3&orderId=1&isPay=1`,
-			query: {
-				a: 'foo',
-				b: 'bar',
-			},
-			envVersion: "develop",
-			extraData: {
-				x: {
-					y: 'z',
-				},
-			},
-			success: function (res) {
-				console.log(res);
-			},
-			fail: function (err) {
-				console.log(err);
-			}
-		});
+		uni.navigateTo({
+			url: "/subpackage/orders/payment/payment?token=445dff5be89c4dcaa89386d1c390930a&openId=0e716af635634d749a981524cc6146a5&orderId=20231016175113823159477&qdOrderNo=20231016175113823159477"
+		})
 	};
 
 	//轮播跳转
@@ -485,17 +462,6 @@
 	const showMask = (val : any) => {
 		state.type = val; //1 客车 2货车
 		isShowMask.value = true;
-		// uni.navigateToMiniProgram({
-		// 	appId: '2021004107608006', // 16 位
-		// 	path: `/pages/recharge/recharge`,
-		// 	envVersion: "develop",
-		// 	success: function (res) {
-		// 		console.log(res);
-		// 	},
-		// 	fail: function (err) {
-		// 		console.log(err);
-		// 	}
-		// });
 	};
 
 	const closeMask = () => {

subpackage/orders/order_payment.vue

@@ -61,7 +61,7 @@
 		CardBillPlaceOrder,
 		CardBillPayStatus,
 		wechatPayConfigId,
-		aliPayConfigId,
+		aliPayConfigIdTwo,
 		obtainUserId,
 		getOpenidApi,
 		orderDetail
@@ -106,7 +106,7 @@
 					const optionsUser = {
 						type: 2,
 						data: {
-							payConfigId: aliPayConfigId,
+							payConfigId: aliPayConfigIdTwo,
 							code: res.authCode
 						},
 						method: "POST",