From 4ff49ea26d9cf99948f11a5f95ac5ed24d14cf83 Mon Sep 17 00:00:00 2001
From: yangtao <yang1793766139@163.com>
Date: Fri, 12 Apr 2024 14:28:09 +0800
Subject: [PATCH] 1

---
 components/pay/index.vue            |  5 ++---
 pages/users/order_confirm/index.vue | 12 ++++++++++--
 pages/users/user_integral/index.vue | 10 ++++++----
 pages/users/user_pay_pwd/index.vue  |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/components/pay/index.vue b/components/pay/index.vue
index ca4ce0a..29f5e30 100644
--- a/components/pay/index.vue
+++ b/components/pay/index.vue
@@ -66,10 +66,9 @@
 				return arr.sort(() => Math.random() -0.5);
 			},
 			press (obj) {
-				console.log(obj);
 				let num = obj.num
 				if (obj.num == 10) {
-					console.log('我是10我什么都不干')
+					// console.log('我是10我什么都不干')
 				} else if (obj.num == 12) {
 					this.password = this.password.slice(0,this.password.length-1);
 				} else if (obj.num == 11) {
@@ -92,7 +91,7 @@
 			},
 			// 关闭支付页面
 			closeFuc () {
-				this.$emit("closeFuc",false)
+				this.$emit("closeFuc")
 			},
 			// 找回密码
 			forgetFuc () {
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 9e5d727..fb6012d 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -460,7 +460,7 @@
 			<checkDelivery :deliveryName="deliveryName" :isShowBox="isShowBox" :activeObj="activeObj" :radioList="radioList" @close="boxClose" @confirmBtn="getData">
 			</checkDelivery>
 		</block>
-		<pay :show_key="payShow" :price="totalPrice" :show_subTitle="true" :mix="true" @payFunc="payFunc"></pay>
+		<pay :show_key="payShow" :price="totalPrice" :show_subTitle="true" :mix="true" @payFunc="payFunc" @closeFuc="closePay"></pay>
 		<!--优惠明细弹窗-->
 		<discountDetails :isShowDiscount="isShowDiscount" @close="closeDiscount" :couponData="couponData"></discountDetails>
 		<timeranges :isShow='isShow' :time='timeranges' @confrim="confrim" @cancel="cancels"></timeranges>
@@ -768,6 +768,9 @@
 			that.invoice.invoice = false
 		},
 		methods: {
+			closePay(){
+				this.payShow=false;
+			},
 			payFunc(val){
 				let data1=this.payInfo;
 				if(data1.balance_vert){
@@ -1300,8 +1303,13 @@
 								url: goPages
 							});
 							break;
+						case 'pay_error':
+							return that.$util.Tips({
+								title: res.message
+							});
+							break;
 						case 'success':
-							that.payShow=false;
+							that.closePay();
 							return that.$util.Tips({
 								title: res.message,
 								icon: 'success'
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index d1f333d..eaa7756 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -147,8 +147,8 @@
 			this.getIntegralList();
 		},
 		methods: {
-			closeFunc(val){
-				this.payShow=val;
+			closeFunc(){
+				this.payShow=false;
 			},
 			async payFunc(val){
 				let d={
@@ -158,16 +158,18 @@
 					integral:this.presentExp.integral,
 					password:val
 				}
-				this.payShow=false;
+				this.closeFunc();
 				await integralGive(d).then((res)=>{
 					if(res){
 						uni.showToast({
+							icon:'none',
 							title: res.message
 						});
 					}
 				}).catch((err)=>{
 					uni.showToast({
-						title: res.message
+						icon:'none',
+						title: err,
 					});
 				})
 			},
diff --git a/pages/users/user_pay_pwd/index.vue b/pages/users/user_pay_pwd/index.vue
index 0d94722..eab7f04 100644
--- a/pages/users/user_pay_pwd/index.vue
+++ b/pages/users/user_pay_pwd/index.vue
@@ -141,7 +141,7 @@
 				await registerVerify({
 					phone:that.userInfo.phone,
 					code:that.captcha,
-					type: 'change_pwd',
+					type: 'change_pay_pwd',
                     captchaType: 'blockPuzzle',
 					captchaVerification: data.captchaVerification
 				}).then(res => {