From f8481ffbe460c7e793ed55d9ecf739f8d449bcf4 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 28 Mar 2025 09:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E8=B0=83=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=8E=B7=E5=BE=97=E5=95=86=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pay/scanPay.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue
index 0055bfb..2ff1389 100644
--- a/src/pages/pay/scanPay.vue
+++ b/src/pages/pay/scanPay.vue
@@ -1,7 +1,7 @@
 <template>
 	<crud-layout bg="/static/page/blue-bg.png">
 		<view class="h-screen flex flex-col position-relative">
-			<view class="mx-auto text-34 py-2">{{ scanData.name }}</view>
+			<view class="mx-auto text-34 py-2 h-80rpx">{{ scanData.name }}</view>
 
 			<tm-sheet class="flex flex-row">
 				<span class="text-2xl text-[#333] mr-1 line-height-normal">¥</span>
@@ -77,6 +77,7 @@ import { usePayStore } from "@/sheep/stores/pay"
 import payApi from "@@/api/pay"
 import { storePrice } from "@/sheep/utils/formatMoney"
 import { router } from "@/sheep"
+import { merchantApi } from "@/sheep/api"
 
 const amount = ref("")
 const keyboardLayout = ref([
@@ -87,14 +88,19 @@ const keyboardLayout = ref([
 const scanData = ref<{ id?: string; name?: string }>({})
 const disabled = ref(false)
 
-onShow(() => {
-	scanData.value = usePayStore().payData
-	if (scanData.value.id && scanData.value.name) {
+onShow(async () => {
+	uni.showLoading({ title: "加载中...", mask: true })
+	scanData.value.id = usePayStore().payData.id
+	if (scanData.value.id) {
+		const { data } = await merchantApi.detail({ id: scanData.value.id })
+		scanData.value.name = data.name
+		usePayStore().setPayData(scanData.value)
 		disabled.value = false
 	} else {
 		uni.showToast({ title: "扫码信息不存在", icon: "none" })
 		disabled.value = true
 	}
+	uni.hideLoading()
 })
 
 const displayAmount = computed(() => {