From d6bd064f528a353121d2c119fb5ef27dda9efad9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 28 九月 2025 15:15:12 +0800
Subject: [PATCH] 店铺绑优惠卷领取记录,优惠劵添加问题
---
manager/src/views/promotions/coupon/coupon-publish.vue | 4 ++--
manager/src/views/promotions/coupon/coupon_store_receive.vue | 16 ++++++++++++++--
manager/src/views/statistics/order.vue | 4 ++--
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/manager/src/views/promotions/coupon/coupon-publish.vue b/manager/src/views/promotions/coupon/coupon-publish.vue
index f2b442b..cc6566a 100644
--- a/manager/src/views/promotions/coupon/coupon-publish.vue
+++ b/manager/src/views/promotions/coupon/coupon-publish.vue
@@ -41,11 +41,11 @@
</Input>
<span class="describe">搴楅摵鎵挎媴姣斾緥锛岃緭鍏�0-100涔嬮棿鏁板��</span>
</FormItem>
- <FormItem label="鍙戞斁鏁伴噺" prop="publishNum" v-if="form.getType === 'FREE'">
+ <FormItem label="鍙戞斁鏁伴噺" prop="publishNum" >
<Input :disabled="disabled" v-model="form.publishNum" placeholder="鍙戞斁鏁伴噺" style="width: 260px" />
<div class="tips">濡傛灉鍙戞斁鏁伴噺涓�0鏃�,鍒欎唬琛ㄤ笉闄愬埗鍙戞斁鏁伴噺</div>
</FormItem>
- <FormItem label="棰嗗彇鏁伴噺闄愬埗" prop="couponLimitNum" v-if="form.getType === 'FREE'">
+ <FormItem label="棰嗗彇鏁伴噺闄愬埗" prop="couponLimitNum">
<Input :disabled="disabled" v-model="form.couponLimitNum" placeholder="棰嗗彇闄愬埗" clearable
style="width: 260px" />
<div class="tips">濡傛灉棰嗗彇鏁伴噺涓�0鏃�,鍒欎唬琛ㄤ笉闄愬埗棰嗗彇鏁伴噺</div>
diff --git a/manager/src/views/promotions/coupon/coupon_store_receive.vue b/manager/src/views/promotions/coupon/coupon_store_receive.vue
index 05d1ca6..9f48990 100644
--- a/manager/src/views/promotions/coupon/coupon_store_receive.vue
+++ b/manager/src/views/promotions/coupon/coupon_store_receive.vue
@@ -50,10 +50,10 @@
<Option value="CLOSED">宸蹭綔搴�</Option>
</Select>
</Form-item>
- <Form-item label="娲诲姩鏃堕棿">
+ <Form-item label="棰嗗彇鏃堕棿">
<DatePicker
v-model="selectDate"
- type="daterange"
+ type="datetimerange"
clearable
placeholder="閫夋嫨璧峰鏃堕棿"
style="width: 200px"
@@ -215,6 +215,18 @@
}
},
},
+ {
+ title: "棰嗗彇鏃堕棿",
+ width: 150,
+ render: (h, params) => {
+ return h("div", {
+ domProps: {
+ innerHTML:
+ params.row.claimTime,
+ },
+ });
+ },
+ },
],
data: [], // 琛ㄥ崟鏁版嵁
total: 0, // 琛ㄥ崟鏁版嵁鎬绘暟
diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
index 9433b56..6e35d0f 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -1026,8 +1026,8 @@
formatter:tooltipFormatter
},
grid: {
- left: '5%', // 瑙嗛绫诲瀷宸︾Щ锛岀粰瀹屾挱鐜囨爣绛剧暀绌洪棿
- right: '10%',
+ left: '4%', // 瑙嗛绫诲瀷宸︾Щ锛岀粰瀹屾挱鐜囨爣绛剧暀绌洪棿
+ right: '12%',
bottom: '0',
top: '5%',
containLabel: true
--
Gitblit v1.8.0