From d5b7abbdf6f60ea58c61c7c4007ef431e28d3a95 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 27 Jun 2024 21:16:36 +0800
Subject: [PATCH] add

---
 pageQuota/vipUser/index.vue | 6 +++---
 pages/my/my.vue             | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index f5baab2..b7bf7b9 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -90,7 +90,7 @@
 
 				<view class="store-info" v-if="Role==1">
 					<view class="" style="width: 300rpx;margin: 0 auto;border-bottom: 1px solid #F3F3F3;">
-						<up-input inputAlign='center' placeholder="请输入金额" color='#FF6B00'
+						<up-input inputAlign='center' placeholder="请输入金额" @focus="formData.price=''" color='#FF6B00'
 							:placeholderStyle="{fontSize:'28rpx'}" fontSize='20px' border="none"
 							v-model="formData.price" @blur='tofixedPrice'></up-input>
 					</view>
@@ -472,7 +472,6 @@
 
 
 	let timerInvol = null
-
 	// 开起一个scoket监听用户知否支付成功
 	const userInfo = useUserStore().userInfo;
 	const connection = new Push({
@@ -530,7 +529,7 @@
 			success: function(res) {
 				if (String(res.result.length) != 18) return uni.$u.toast('二维码未扫描完整');
 				uni.showLoading({
-					title: '支付中...'
+					title: '等待用户支付'
 				});
 				reVipRechargeApi({
 					id: item.id,
@@ -538,6 +537,7 @@
 				}).then(res => {
 					timerInvol = setTimeout(() => {
 						uni.hideLoading();
+						if (currentTab.value == 2) return;
 						uni.$u.toast('支付超时');
 					}, 30000)
 				})
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 468167e..d7fd51b 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -190,9 +190,6 @@
 		config
 	} from "@/config/app.js"
 
-	console.log()
-
-
 
 	const userStore = useUserStore();
 	const userInfo = ref({});