From d999381f4a947d33dc17dfec7b8c78fd6d00bbc4 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Sun, 21 Sep 2025 13:41:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=A2=86=E5=8F=96=E4=BA=BA=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/merchant/coupon-list.vue       | 48 ++++++------------------
 src/pages/merchant/merchant-activity.vue |  8 ++--
 2 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/src/pages/merchant/coupon-list.vue b/src/pages/merchant/coupon-list.vue
index 73f2402..2467bd2 100644
--- a/src/pages/merchant/coupon-list.vue
+++ b/src/pages/merchant/coupon-list.vue
@@ -1,35 +1,13 @@
 <template>
 	<crud-layout mainIsScroll bg="/static/page/blue-bg.png">
-		<z-paging
-			ref="pageRef"
-			height="100%"
-			:fixed="false"
-			v-model="pageHook.list"
-			:default-page-size="10"
-			safe-area-inset-bottom
-			:loading-more-enabled="true"
-			:show-scrollbar="false"
-			@query="query"
-			:auto-clean-list-when-reload="false"
-			:auto-scroll-to-top-when-reload="false"
-			@scroll="pageHook.scroll"
-		>
+		<z-paging ref="pageRef" height="100%" :fixed="false" v-model="pageHook.list" :default-page-size="10"
+			safe-area-inset-bottom :loading-more-enabled="true" :show-scrollbar="false" @query="query"
+			:auto-clean-list-when-reload="false" :auto-scroll-to-top-when-reload="false" @scroll="pageHook.scroll">
 			<template #top>
-				<tm-input
-					class="mt-2"
-					v-model="params.keyword"
-					type="text"
-					height="72"
-					minHeight="72"
-					fontSize="28"
-					:showClear="true"
-					:focus="false"
-					placeholder="请输入领取人姓名"
-					style="border: 4rpx solid #0779fd; border-radius: 14rpx"
-					:focus-highlight="false"
-					color="#ECF4F9"
-					@clear="inputClear"
-				>
+				<tm-input class="mt-2" v-model="params.receiverUserName" type="text" height="72" minHeight="72"
+					fontSize="28" :showClear="true" :focus="false" placeholder="请输入领取人姓名"
+					style="border: 4rpx solid #0779fd; border-radius: 14rpx" :focus-highlight="false" color="#ECF4F9"
+					@clear="inputClear">
 					<template v-slot:rightIcon>
 						<tm-button class="mr-1 px-3 py-26rpx text-30rpx!" size="xs" @click="search">搜 索</tm-button>
 					</template>
@@ -39,12 +17,9 @@
 				</view>
 			</template>
 
-			<view
-				class="card w-full h-400rpx relative activity-card overflow-hidden mb-2 py-2"
-				:style="{ backgroundColor: getActStatus(item.actStatus)?.color }"
-				v-for="(item, index) in pageHook.list"
-				:key="index"
-			>
+			<view class="card w-full h-400rpx relative activity-card overflow-hidden mb-2 py-2"
+				:style="{ backgroundColor: getActStatus(item.actStatus)?.color }" v-for="(item, index) in pageHook.list"
+				:key="index">
 				<view class="ribbon" :style="{ backgroundColor: getActStatus(item.actStatus)?.color }">
 					{{ getActStatus(item.actStatus)?.name }}
 				</view>
@@ -82,7 +57,7 @@ const tabs = [
 ]
 const params = reactive({
 	actStatus: tabs[0].id,
-	keyword: "",
+	receiverUserName: "",
 })
 
 const pageRef = ref<any>(null)
@@ -117,6 +92,7 @@ const inputClear = () => {
 	background-size: contain;
 	background-position: 150%;
 }
+
 .ribbon {
 	width: 160rpx;
 	height: 40rpx;
diff --git a/src/pages/merchant/merchant-activity.vue b/src/pages/merchant/merchant-activity.vue
index 38d1963..6b7d0d9 100644
--- a/src/pages/merchant/merchant-activity.vue
+++ b/src/pages/merchant/merchant-activity.vue
@@ -24,7 +24,8 @@
 		</template>
 	</crud-layout>
 
-	<tm-drawer z-index="100" v-model:show="showQrCodeDialog" title="兑换券核销二维码" :show-close="true" position="bottom" size="60%">
+	<tm-drawer z-index="100" v-model:show="showQrCodeDialog" title="兑换券核销二维码" :show-close="true" position="bottom"
+		size="60%">
 		<view class="flex-col-center">
 			<view class="h-80rpx" />
 			<canvas canvas-id="qrcodeId" class="size-200px" />
@@ -90,8 +91,8 @@ const CouponVerification = async () => {
 		text: CryptoJS.enc.Base64.stringify(words),
 		size: 200,
 		margin: 0,
-		success: (res) => {},
-		complete: () => {},
+		success: (res) => { },
+		complete: () => { },
 	})
 }
 </script>
@@ -104,6 +105,7 @@ const CouponVerification = async () => {
 	background-position: 150%;
 	background-color: #1879ff77;
 }
+
 .ribbon {
 	width: 160rpx;
 	height: 40rpx;