扫码支付修改

src/pages/tabbar/message.vue

@@ -17,7 +17,7 @@
 			<view class="h-30rpx" />
 			<tm-sheet v-if="false" v-for="(item, index) in pageHook.list" :key="index" :margin="[0, 20]">
 				<view class="text-36 overflow-hidden text-nowrap text-ellipsis">
-					文本 TmText文本 TmText文本 TmText文本 TmText文本 TmText文本 TmText文本 TmText文本 TmText文本 TmText文本 TmText文本 TmText文本
+					文本TmText文本TmText文本TmText文本TmText文本TmText文本TmText文本TmText文本TmText文本TmText文本TmText文本TmText文本
 				</view>
 				<view class="flex items-center">
 					<image src="@/static/page/时间.svg" mode="aspectFill" class="w-28rpx h-28rpx mr-1" />

src/pages/tabbar/my.vue

@@ -270,7 +270,6 @@ const login = {
 const scanCode = {
 	// 扫一扫
 	scan: async () => {
-		usePayStore().setPayData({})
 		try {
 			const decodedString = await scanCode.getScanResult()
 			if (decodedString) {
@@ -291,9 +290,8 @@ const scanCode = {
 		if (isDevEnv()) {
 			// 开发环境模拟扫码
 			// const testQrCode = "eyJpZCI6IjE4OTYxNTcyMDc2NDQwNTM1MDYiLCJuYW1lIjoi5rWL6K+V5ZWG5oi3In0=" // 线上-测试超市-收款码
-			// const testQrCode = "eyJpZCI6IjE5MDU4MTY3NTEwNDM0NTI5MzAiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=" // 测试环境-邓本地-新县府超市-收款码
-			// const testQrCode = "eyJpZCI6IjE5MDc2ODQwNTY4NDA4NDMyNjYiLCJuYW1lIjoi5pm66IO95p+c6Ieq6JCl5ZWG5oi3MSJ9" // 测试环境-邓本地-智能柜自营商户1-收款码
-			const testQrCode = "eyJoYXJkRG9vcklkIjoiMTkxMzE1NzA4MDQxODI5NTgwOSIsImNhYmluZXRObyI6IjEifQ==" // 测试智能柜货柜二维码
+			const testQrCode = "eyJpZCI6IjE5MDU4MTY3NTEwNDM0NTI5MzAiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=" // 测试环境-邓本地-新县府超市-收款码
+			// const testQrCode = "eyJoYXJkRG9vcklkIjoiMTkxMzE1NzA4MDQxODI5NTgwOSIsImNhYmluZXRObyI6IjEifQ==" // 测试智能柜货柜二维码
 			uni.showModal({ content: "开发环境不是浙政钉和诗画环境，扫码仅供测试，收款商家为测试商户超市" })
 			return scanCode.decodeBase64(testQrCode)
 		} else if (state.appInfo == "zzd") {
@@ -314,8 +312,7 @@ const scanCode = {
 		try {
 			const decodedJson = JSON.parse(decodedString)
 			if (decodedJson?.id && decodedJson?.name) {
-				usePayStore().setPayData(decodedJson)
-				router.jump("/pages/pay/scanPay")
+				router.jump("/pages/pay/scanPay", { id: decodedJson.id, name: decodedJson.name })
 			} else if (decodedJson?.hardDoorId && decodedJson?.cabinetNo) {
 				router.jump("/pages/cabinet/buy", { hardDoorId: decodedJson.hardDoorId, cabinetNo: decodedJson.cabinetNo })
 			} else {