diff --git a/src/pages/merchant/coupon-list.vue b/src/pages/merchant/coupon-list.vue
index 817b38b..0d9cf90 100644
--- a/src/pages/merchant/coupon-list.vue
+++ b/src/pages/merchant/coupon-list.vue
@@ -32,12 +32,18 @@
 				<view class="text-28 c-#fff text-right px-2">ID {{ item.id }}</view>
 				<view class="flex justify-between font-bold mt-1 px-8">
 					<text class="text-32 c-#FFD941">限时领取</text>
-					<text class="text-32 c-#FFD941 px-1 rounded-full bg-#eeeeee44">2025-09-21~2025-12-20</text>
+					<text class="text-30 c-#FFD941 px-1 rounded-full bg-#eeeeee44">2025-09-21~2025-12-20</text>
 				</view>
-				<view class="w-4/5 py-2 text-30 c-#fff px-8">店内核销将会自动扣费1元并领取价值89元的速干T恤1件</view>
+				<view class="w-4/5 py-2 text-28 c-#fff px-8">店内核销将会自动扣费1元并领取价值89元的速干T恤1件</view>
 				<view class="absolute bottom-100 left-60 text-28 bg-#eeeeee44 c-#fff px-2 rounded-full">限量领取 先领先得</view>
-				<view v-if="item.receiverTime" class="absolute bottom-40 right-20 text-20 c-#fff">领取时间 {{ item.receiverTime }}</view>
-				<view v-if="item.cancelTime" class="absolute bottom-10 right-20 text-20 c-#fff">核销时间 {{ item.cancelTime }}</view>
+				<view v-if="item.receiverTime" class="absolute bottom-40 right-20 text-22 c-#fff">
+					<text class="mr-2">领取人 {{ item.receiverUsername }}</text>
+					<text>领取时间 {{ item.receiverTime }}</text>
+				</view>
+				<view v-if="item.cancelTime" class="absolute bottom-10 right-20 text-22 c-#fff">
+					<text class="mr-2">核销人 {{ item.cancelUsername }}</text>
+					<text>核销时间 {{ item.cancelTime }}</text>
+				</view>
 			</view>
 		</z-paging>
 	</crud-layout>
diff --git a/src/pages/merchant/merchant-activity.vue b/src/pages/merchant/merchant-activity.vue
index d8a8854..c42af94 100644
--- a/src/pages/merchant/merchant-activity.vue
+++ b/src/pages/merchant/merchant-activity.vue
@@ -7,11 +7,14 @@
 					<text class="text-32 c-#FF4F3F">限时领取</text>
 					<text class="text-30 c-#FF4F3F px-1 rounded-full bg-#eeeeee44">2025-09-21~2025-12-20</text>
 				</view>
-				<view class="w-4/5 px-8 pt-4 text-30 c-#fff">店内核销将会自动扣费1元并领取价值89元的速干T恤1件</view>
+				<view class="w-4/5 px-8 pt-4 text-28 c-#fff">店内核销将会自动扣费1元并领取价值89元的速干T恤1件</view>
 				<view class="absolute bottom-60 left-60 text-28 bg-#eeeeee44 c-#fff px-2 rounded-full">限量领取 先领先得</view>
 			</view>
-			<view v-if="isGet" class="text-center card p-3 sub-text-30">已 领 取</view>
-			<view v-else class="text-center card p-3 sub-text-30" @click="doGetCoupon">立 即 领 取</view>
+			<view v-if="couponInfo?.actStatus == '2'" class="text-center card p-3 sub-text-30">已 核 销</view>
+			<template v-else>
+				<view v-if="!isGet" class="text-center card p-3 sub-text-30" @click="doGetCoupon">立 即 领 取</view>
+				<view v-if="isGet" class="text-center card p-3 sub-text-30">已 领 取</view>
+			</template>
 			<view v-if="isGet" class="text-center">
 				<tm-button class="px-2 my-4" @click="CouponVerification">我的核销码</tm-button>
 			</view>
@@ -34,7 +37,7 @@ import uqrcode from "@@/utils/uqrcode"
 import * as CryptoJS from "crypto-js"
 
 const isGet = ref(false) // 是否已领取
-const couponInfo = ref<any>(null)
+const couponInfo = ref<any>({})
 const showQrCodeDialog = ref(false)
 
 onLoad(() => {
@@ -64,7 +67,7 @@ const doGetCoupon = async () => {
 	try {
 		uni.showLoading({ title: "正在领取..." })
 		const { code, msg }: any = await actCancel.appGet({})
-		if (code != 0) return uni.showToast({ title: msg || "领取失败", icon: "none" })
+		if (code != 0) return uni.showToast({ title: msg || "领取失败", icon: "none", mask: true })
 		uni.showToast({ title: "领取成功", icon: "success" })
 		await getCouponInfo()
 	} catch (error: any) {