From 2c8e8ff9bd8b1e43f78fcdb35e4297d3f89605a2 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 3 Apr 2025 16:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pay/scanPay.vue       |  9 +++++----
 src/pages/pay/transferMoney.vue | 12 +++++++-----
 src/pages/wallet/list.vue       | 11 ++++++++---
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue
index dffa552..56edd5d 100644
--- a/src/pages/pay/scanPay.vue
+++ b/src/pages/pay/scanPay.vue
@@ -83,11 +83,12 @@ const pay = async () => {
 			customPrice: storePrice(Number(amount.value)),
 		})
 		if (res.code != 0) {
-			throw new Error()
+			uni.showToast({ title: res.msg || "支付失败", icon: "error" })
+		} else {
+			uni.hideLoading()
+			usePayStore().setPayData({ ...scanData.value, customPrice: Number(amount.value).toFixed(2) })
+			router.jump("/pages/pay/payComplete", {}, 2)
 		}
-		uni.hideLoading()
-		usePayStore().setPayData({ ...scanData.value, customPrice: Number(amount.value).toFixed(2) })
-		router.jump("/pages/pay/payComplete", {}, 2)
 	} catch (error: any) {
 		uni.showToast({ title: "错误", icon: "error" })
 		uni.hideLoading()
diff --git a/src/pages/pay/transferMoney.vue b/src/pages/pay/transferMoney.vue
index 4c76a70..80bbb7d 100644
--- a/src/pages/pay/transferMoney.vue
+++ b/src/pages/pay/transferMoney.vue
@@ -153,13 +153,13 @@ const confirmTransfer = async () => {
 	if (!amount.value || amount.value === "0" || amount.value === "0." || parseFloat(amount.value) === 0) {
 		return uni.showToast({ title: "金额不能为零", icon: "none" })
 	}
-	if (numAmount > transferMoney.sourceWalletType.balance) {
+	if (numAmount.value > transferMoney.sourceWalletType.balance) {
 		return uni.showToast({ title: "转账金额不能超过钱包余额", icon: "none" })
 	}
 
-	console.log("state.sourceWalletTypeId", state.sourceWalletTypeId)
-	console.log("state.targetWalletTypeId", state.targetWalletTypeId)
-	console.log("金额", numAmount.value)
+	// console.log("state.sourceWalletTypeId", state.sourceWalletTypeId)
+	// console.log("state.targetWalletTypeId", state.targetWalletTypeId)
+	// console.log("金额", numAmount.value)
 
 	uni.showModal({
 		title: "确定转入吗？",
@@ -181,7 +181,9 @@ const confirmTransferAgain = async () => {
 		})
 		if (res.code == 0) {
 			uni.showToast({ title: "转账成功", icon: "success" })
-			router.jump("/pages/wallet/list", {}, 2)
+			transferMoney.setSourceWalletType({})
+			// router.jump("/pages/wallet/list", {}, 2)
+			router.back()
 		} else {
 			uni.showToast({ title: res.msg, icon: "none" })
 		}
diff --git a/src/pages/wallet/list.vue b/src/pages/wallet/list.vue
index 1810a1f..e68e60d 100644
--- a/src/pages/wallet/list.vue
+++ b/src/pages/wallet/list.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
 import { ref, reactive } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
-import { isEmpty } from "radash"
 import uqrcode from "@@/utils/uqrcode"
 
 import { hooks, router } from "@@/index"
-import { merchantApi, walletApi } from "@@/api"
+import { walletApi } from "@@/api"
 
 import { filePath } from "@@/utils/file"
 import { useTransferMoney } from "@/sheep/stores/transferMoney"
@@ -31,7 +30,13 @@ const freezeForm = reactive<any>({
 })
 
 onLoad(() => {})
-onShow(() => {})
+onShow(async () => {
+	const isLogin = await hooks.useCheckLogin()
+	if (!isLogin) return
+	if (pageRef.value) {
+		pageRef.value.reload(false)
+	}
+})
 
 const pageRef = ref<any>(null)
 const pageHook = hooks.usePage(pageRef, walletApi.all, null, "data.records")