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 @@
-
+
-
+
搜 索
@@ -39,12 +17,9 @@
-
+
{{ getActStatus(item.actStatus)?.name }}
@@ -82,7 +57,7 @@ const tabs = [
]
const params = reactive({
actStatus: tabs[0].id,
- keyword: "",
+ receiverUserName: "",
})
const pageRef = ref(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 @@
-
+
@@ -90,8 +91,8 @@ const CouponVerification = async () => {
text: CryptoJS.enc.Base64.stringify(words),
size: 200,
margin: 0,
- success: (res) => {},
- complete: () => {},
+ success: (res) => { },
+ complete: () => { },
})
}
@@ -104,6 +105,7 @@ const CouponVerification = async () => {
background-position: 150%;
background-color: #1879ff77;
}
+
.ribbon {
width: 160rpx;
height: 40rpx;