feat:商户活动

src/sheep/hooks/use-scan-code.ts

@@ -14,9 +14,7 @@ export function useScanCode(actModalShow) {
 			// const testQrCode = "eyJoYXJkRG9vcklkIjoiMTkxMzE1NzA4MDQxODI5NTgwOSIsImNhYmluZXRObyI6IjEifQ==" // 邓本地-测试单门智能柜柜门二维码
 			// const testQrCode = "http://192.168.101.45:8889/h5/#/pages/pay/scanPay?id=1905816751043452930&name=测试新县府超市" // 邓本地-测试环境-新县府超市收款二维码
 			// const testQrCode = "http://192.168.101.45:8889/h5/#/pages/pay/scanPay?hardDoorId=1913157080418295809&cabinetNo=1" // 测试智能柜柜门二维码
-			// const testQrCode = "eyJhY3RJZCI6IjE5NjkyNTAwOTg1MTM4MDUzMTQiLCJ0b3RhbFByaWNlIjoxfQ==" // 测试商户活动核销
-			// const testQrCode = "eyJhY3RJZCI6IjE5NjkzMjQwNjMwNTk4Nzc4OTAiLCJ0b3RhbFByaWNlIjoxfQ==" // 测试商户活动核销
-			const testQrCode = "eyJhY3RJZCI6IjE5NjkzMjU3NDQxNDUzMDk2OTciLCJ0b3RhbFByaWNlIjoxfQ==" // 测试商户活动核销
+			const testQrCode = "eyJjYW5jZWxJZCI6IjE5ODQyNDA4MzM5NDMyMDc5MzcifQ==" // 测试商户活动核销
 			uni.showModal({ content: "开发环境不是浙政钉和诗画环境，扫码仅供测试" })
 			return Promise.resolve(testQrCode)
 		}
@@ -70,8 +68,8 @@ export function useScanCode(actModalShow) {
 		try {
 			const decodedJson = JSON.parse(decodedString)
 			// 商户活动优惠券扫码核销
-			if (decodedJson.actId) {
-				actModalShow({ actId: decodedJson.actId, totalPrice: decodedJson.totalPrice })
+			if (decodedJson.cancelId) {
+				actModalShow({ cancelId: decodedJson.cancelId })
 				return
 			}
 			// 商户扫码支付