From 84b176865234513c9e8f61573aaa9d06f95b2442 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Sat, 20 Sep 2025 17:38:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=B8=E9=94=80=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/merchant/merchant-activity.vue |  3 +--
 src/pages/tabbar/my.vue                  | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

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 @@
 		</view>
 	</crud-layout>
 
-	<tm-modal :show="state.actModalShow" :showCancel="false" title="兑换券核销" zIndex="999" @confirm="" @cancel="" @close="">
-		<view class="text-center"></view>
+	<tm-modal :show="state.actModalShow" :showCancel="false" title="核销活动兑换券" zIndex="999" @confirm="" @cancel="" @close="">
+		<view class="text-center second-text-28">是否确认核销该活动兑换券？</view>
+		<view class="text-center second-text-28">确认核销将会对用户的消费钱包扣除 1元 钱</view>
 		<template #footer>
 			<view class="w-full flex justify-center gap-6">
 				<tm-button skin="thin" @tap="actModalCancel">取消</tm-button>
-				<tm-button color="primary" @tap="actModalConfirm">确定</tm-button>
+				<tm-button color="primary" @tap="actModalConfirm">确认</tm-button>
 			</view>
 		</template>
 	</tm-modal>
@@ -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(() => {