From 5d532b6884f4ef1411c503159eab1102993194e1 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Thu, 18 May 2023 10:40:56 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=BC=B9=E7=AA=97=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=202.=E6=89=93=E5=8C=85=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue     | 47 ++++++++++++++++++++++-----------------
 pages/welcome/welcome.vue |  8 ++-----
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0139ad9..df49203 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -465,10 +465,11 @@
 							2)) {
 						storetype = this.storediscountType;
 						storeprice = this.storediscountPrice;
-					} else {
-						storetype = this.storediscountType;
-						storeprice = this.storediscountPrice;
-					}
+					} 
+					// else {
+					// 	storetype = this.storediscountType;
+					// 	storeprice = this.storediscountPrice;
+					// }
 				}
 				let phone = '';
 				if (app.globalData.userInfo) {
@@ -676,7 +677,10 @@
 				// }
 			},
 			// 创建订单
-			createJSAPIOrder(item) {
+			createJSAPIOrder(item) {
+				uni.showLoading({
+					title:'请求中'
+				})
 				// "微信：WECHAT  支付宝：ALIPAY   银联：UQRCODEPAY",
 				let phone = '';
 				if (app.globalData.userInfo) {
@@ -691,7 +695,8 @@
 					"userDiscountId": this.memDiscountId,
 					"userPhone": phone
 				}
-				createJSAPIOrder(datas).then(res => {
+				createJSAPIOrder(datas).then(res => {
+					uni.hideLoading();
 					if (res.return_code == '000000') {
 						this.jsapiPay(res.return_data.outTradeNo);
 					} else {
@@ -794,11 +799,11 @@
 				}
 				//第一位输入小数点时
 				if (this.plateNumberList1[0] == '.') {
-					uni.showToast({
-						title: '请输入正确的金额',
-						duration: 2000,
-						icon: 'none'
-					})
+					// uni.showToast({
+					// 	title: '请输入正确的金额',
+					// 	duration: 2000,
+					// 	icon: 'none'
+					// })
 					this.plateNumberList1.pop();
 					return;
 				}
@@ -811,21 +816,21 @@
 				// }
 				//如果已经有小数点 并且输入的是小数点
 				if (strdata1.length == 3 && !strdata2) {
-					uni.showToast({
-						title: '请输入正确的金额',
-						duration: 2000,
-						icon: 'none'
-					})
+					// uni.showToast({
+					// 	title: '请输入正确的金额',
+					// 	duration: 2000,
+					// 	icon: 'none'
+					// })
 					this.plateNumberList1.pop();
 					return;
 				}
 				//校验小数点后两
 				if (this.plateNumberList.indexOf('.') != -1 && !strdata2) {
-					uni.showToast({
-						title: '请输入正确的金额',
-						duration: 2000,
-						icon: 'none'
-					})
+					// uni.showToast({
+					// 	title: '请输入正确的金额',
+					// 	duration: 2000,
+					// 	icon: 'none'
+					// })
 					this.plateNumberList1.pop();
 					return;
 				}
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 331af2c..9d1c968 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -31,11 +31,7 @@
 				} else {
 					let that = this;
 					var arr4;
-					if (app.globalData.platformType == 'WECHAT') {
-						arr4 = arr2[2].split('&');
-					} else {
-						arr4 = arr2[1].split('&');
-					}
+					arr4 = arr2[2].split('&');
 					app.globalData.code = arr4[0];
 					uni.getStorage({
 						key: 'snNumber',
@@ -115,7 +111,7 @@
 				}
 				if (app.globalData.platformType == 'ALIPAY') {
 					location.href =
-						'https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=2021003176605875&scope=auth_base&redirect_uri=https%3A%2F%2Fpay.dctpay.com%2FscanPay';
+						'https://openauth.alipay.com/oauth2/publicAppAuthorize.htm?app_id=2021003176605875&scope=auth_base&redirect_uri=https://pay.dctpay.com/redirect?redirect_uri=https%3A%2F%2Fpay.dctpay.com%2FscanPay%3Fsn%3D1000017476';
 				}
 			},
 		}