diff --git a/src/pages/merchant/merchant-activity.vue b/src/pages/merchant/merchant-activity.vue index dca9d47..0f3ef33 100644 --- a/src/pages/merchant/merchant-activity.vue +++ b/src/pages/merchant/merchant-activity.vue @@ -77,8 +77,7 @@ const doGetCoupon = async () => { // 券核销 const CouponVerification = async () => { showQrCodeDialog.value = true - // const words = CryptoJS.enc.Utf8.parse(JSON.stringify({ actId: couponInfo.value.id, totalPrice: 1 })) - const words = CryptoJS.enc.Utf8.parse(JSON.stringify({ actId: "1969324063059877890", totalPrice: 1 })) + const words = CryptoJS.enc.Utf8.parse(JSON.stringify({ actId: couponInfo.value.id, totalPrice: 1 })) uqrcode.make({ canvasId: "qrcodeId", text: CryptoJS.enc.Base64.stringify(words), diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 61fb539..7cf7d25 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -50,12 +50,13 @@ - - + + 是否确认核销该活动兑换券? + 确认核销将会对用户的消费钱包扣除 1元 钱 @@ -371,7 +372,8 @@ const isMallMchUser = async () => { const isMchUser = async () => { const { data } = await userApi.isMerchant() // 商家查看优惠券列表 - if (data) state.menuList.unshift({ text: "优惠券列表", icon: "/static/icon/service_1.png", path: "/pages/merchant/coupon-list" }) + if (data) + state.menuList.unshift({ text: "查看用户领取的优惠券列表", icon: "/static/icon/service_1.png", path: "/pages/merchant/coupon-list" }) } onShow(() => {