From de17c36177cf0bcd54a3a162ba8539924ee04b3e Mon Sep 17 00:00:00 2001 From: weiwei Date: Thu, 3 Apr 2025 17:38:48 +0800 Subject: [PATCH] 1 --- src/pages/pay/scanPay.vue | 2 +- src/pages/tabbar/my.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/pay/scanPay.vue b/src/pages/pay/scanPay.vue index fcb1d0c..87c7834 100644 --- a/src/pages/pay/scanPay.vue +++ b/src/pages/pay/scanPay.vue @@ -56,7 +56,7 @@ const disabled = ref(false) const walletList = ref([]) const curWalletId = ref("") -onLoad(async () => { +onShow(async () => { uni.showLoading({ title: "加载中...", mask: true }) scanData.value.id = usePayStore().payData.id if (scanData.value.id) { diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 9477f37..91d7bbc 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -188,7 +188,8 @@ const doScanCode = async () => { try { let decodedString: string | undefined = "" if (isDevEnv()) { - decodedString = decodeBase64("eyJpZCI6IjE4OTYxNTcyMDc2NDQwNTM1MDYiLCJuYW1lIjoi5rWL6K+V5ZWG5oi3In0=") + // decodedString = decodeBase64("eyJpZCI6IjE4OTYxNTcyMDc2NDQwNTM1MDYiLCJuYW1lIjoi5rWL6K+V5ZWG5oi3In0=") // 线上-测试超市-收款码 + decodedString = decodeBase64("eyJpZCI6IjE5MDU4MTY3NTEwNDM0NTI5MzAiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=") // 测试环境-邓本地-新县府超市-收款码 uni.showToast({ title: "开发环境不是浙政钉环境,扫码仅供测试,收款商家为测试商户超市", icon: "none" }) } else { const res: any = await (window as any).dd.scan({ type: "all" })