From 3576ec1206fc22c75de304a2dba99b1b898f490a Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 20 Mar 2025 18:56:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=AB=E7=A0=81=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pay/scanPay.vue |   8 ++++----
 src/pages/tabbar/my.vue   |  11 ++---------
 src/static/icon/scan.png  | Bin 0 -> 1081 bytes
 3 files changed, 6 insertions(+), 13 deletions(-)
 create mode 100644 src/static/icon/scan.png

diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue
index c5c56c8..ba4ea70 100644
--- a/src/pages/pay/scanPay.vue
+++ b/src/pages/pay/scanPay.vue
@@ -7,7 +7,7 @@
 				<span class="text-2xl text-[#333] mr-1 line-height-normal">¥</span>
 				<span class="text-3xl font-medium text-[#333]">{{ displayAmount }}</span>
 			</tm-sheet>
-
+			<view>{{ scanData }}</view>
 			<tm-button class="mt-40" :block="true" @click="disabled ? '' : handlePay()" :disabled="disabled">支付</tm-button>
 
 			<view class="bg-[#f5f5f5] px-1 py-2 rounded-4 absolute bottom-0 w-full">
@@ -72,9 +72,9 @@
 </template>
 
 <script setup lang="ts">
-import { usePayStore } from "@/sheep/stores/pay"
-import { onShow } from "@dcloudio/uni-app"
 import { ref, computed } from "vue"
+import { onShow } from "@dcloudio/uni-app"
+import { usePayStore } from "@/sheep/stores/pay"
 
 const amount = ref("")
 const keyboardLayout = ref([
@@ -88,7 +88,7 @@ const disabled = ref(false)
 onShow(() => {
 	scanData.value = usePayStore().payData
 	if (scanData.value) {
-		uni.showToast({ title: `扫码成功：${scanData.value}`, icon: "none" })
+		disabled.value = false
 	} else {
 		uni.showToast({ title: "扫码信息不存在", icon: "none" })
 		disabled.value = true
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 9ddf7e2..4dc9c71 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -61,7 +61,7 @@ const state = reactive<{ wallet: any; userInfo: any; menuList: MenuItem[] }>({
 	wallet: [],
 	userInfo: {},
 	menuList: [
-		{ text: "扫一扫", icon: "/static/icon/service_3.png", router: "" },
+		{ text: "扫一扫", icon: "/static/icon/scan.png", router: "" },
 		{ text: "钱包管理", icon: "/static/icon/service_3.png", router: "/pages/wallet/list" },
 		// { text: "包厢预定", icon: "/static/icon/service_4.png", router: "/pages/boxes/apply-list" },
 		// { text: "外来人员就餐", icon: "/static/icon/service_1.png", router: "/pages/apply/foreign-list" },
@@ -177,16 +177,10 @@ const doLogout = async () => {
 
 // 扫一扫
 const doScanCode = async () => {
-	console.log("ssss")
 	try {
 		const res: any = await (window as any).dd.scan({ type: "all" })
 		console.log(res)
-
-		uni.showToast({
-			title: res,
-			icon: "none",
-		})
-		usePayStore().setPayData(JSON.stringify(res))
+		usePayStore().setPayData(res.text)
 		router.jump("/pages/pay/scanPay")
 	} catch (error: any) {
 		uni.showToast({
@@ -194,7 +188,6 @@ const doScanCode = async () => {
 			icon: "none",
 		})
 	}
-	console.log("eee")
 }
 
 const onTabMenu = async (v: MenuItem, i: number) => {
diff --git a/src/static/icon/scan.png b/src/static/icon/scan.png
new file mode 100644
index 0000000000000000000000000000000000000000..cebbb69386befaf95f2a1048c2011680f7822d45
GIT binary patch
literal 1081
zcmV-91jhS`P)<h;3K|Lk000e1NJLTq001=r001xu1^@s6u`4pe00001b5ch_0Itp)
z=>Px&^GQTORA@u(T1$u=RTMpEa76quB(bYd!7L*9*$BD{K@vft2ok{&L4*hr6J-`I
zG*zu&yRcsoMMMxCL3H892nM2v4vGO0bs^bk79x_3+Es~&3&9|Gw3?}*KUMElmDL}^
z)T-&a_uPB#eeZU^dmmBb@!Psn!h-~^6R-`yRsa{*fErc#9l);u&I0&~!m(b&6IF3p
zR$<GEE?>L^D<Jj**ilyRzseE#9>5zt!y{#}N|9=XIz(ax!u4f=Cm{F5zpLR$Y<S#-
z?Ih)eItE~$3uub(Uy2PMx7o9j@<ROvU}=gDmo@cCY<PQ-a3Lu#)JXt0m9;VhxhOUa
z^X%r5^4dBIVR;6QRx&B!*(73TRB4Qq*H&5(Uao{bLtz2C62r8JY&=7xuI^~dU+3_3
zLCIcQ5Zb>){HBP5A85abH>+|Kuro3I(t^8N#AgNX--!+HFC^6p)FJUqo^nyD2W9<G
zHwgHyBB`Ha!>e36R^Ny_k}f~aForVah58i0Z7x#ld+v%Hxmy5S>T+=GJ#iMow|RQ8
z;hyw+8z}(Y*zl=wQU|o?ZN(n|7Hy>bK(?h&nU6~$HtYx9nknG(#PHTJQZ8q+<>!)f
zIa&368B!@`CYOHRSblz>Wf4b<jLthL0yp*yPmPj#RKzR)TT;S(y@>A)k#cNA%zLH=
ztMkV4bCCk^dfeqBtw0Zuc)RM}s4M@saP66hKX`4eLO9@BNtH5{3X6D)!o9W1c3oD$
zX%Q!={yDDjsh6qxPEAE~lhjng+<=kIOpOGwa%ZQ3B%~1O>Dzi>t(7SOPb7vfG~{Gu
z7%$L!Ans|jq^IRP>GGk<-ZY@#2im@Vp4#3hsRn$TC`7I0H&Kro0N*6lKoF+_v6-pC
zFsIQdYRpV99a;D4=EncfN;s56e61DeAc<EeNMZ;&JJEWf(iYk7MoT({J?X4yUV9X|
zd&&=FJ<iWNDdrvLU5%HyCsojRvG()kom6g%3>{tIo$EI<FU;GFb53e4Hr$)}J=}I~
z>jMaPl^~VdZwHW;-OFlJ#xuz2!HYPRbop3{XKf4#Psb6T%Ozz~%ra$jxOG@NxqzXu
zN(q8-Z0Nh>9K(yfNyN2WQnpdf`jmWE&oGVZ*t68p(nWt_U(Hd@*o<k=fMc3sALXP#
z=iSgPi;f@aBLN#5&$TpW^<KjBNyH~d?b`;~rvY3uD~FwSiTC3!@6Ii1Hf1l=PXMlT
z8kn|#g;45>`*KL27eQDrV@#8ifP;zQs?Da8RR1^Pe7nYzMP%T@)x!V^yE+rd+K&WQ
z8^3Th>S+JZ?*f)7?3m!yxRV5q_Y6O*8mNB&jlDikLBt@^00000NkvXXu0mjfomT+{

literal 0
HcmV?d00001