From d1615f86fe8f150e3b58ac52e1c84abc2295ac60 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 14 Jun 2024 17:17:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/couponDetail.vue | 20 ++++++++++---------- src/components/giveCouponModal.vue | 4 ++-- src/components/inquiryDetailMoneyModal.vue | 2 +- src/components/medinceOrderModal.vue | 2 +- src/views/coupon/coupon-list/index.vue | 16 ++++++++-------- src/views/coupon/userCoupon-list/index.vue | 8 ++++---- src/views/order/medince-list/index.vue | 2 +- src/views/order/order-list/index.vue | 4 ++-- src/views/order/service-list/index.vue | 6 +++--- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue index 1fcba62..8a9e770 100644 --- a/src/components/couponDetail.vue +++ b/src/components/couponDetail.vue @@ -3,7 +3,7 @@
-
优惠卷信息
+
优惠劵信息
- + @@ -187,11 +187,11 @@ - + @@ -396,10 +396,10 @@ - + @@ -889,14 +889,14 @@ const handleUpdateCoupon = async () => { }); }; const rules = { - coupon_name: [{ required: true, message: '请输入优惠卷名称' }], + coupon_name: [{ required: true, message: '请输入优惠劵名称' }], coupon_client: [{ required: true, message: '请选择使用平台' }], application_scope: [{ required: true, message: '请选择使用范围' }], coupon_type: [{ required: true, message: '请选择发放类型' }], distribution_object: [{ required: true, message: '请选择发放对象' }], valid_type: [{ required: true, message: '请选择有效类型' }], coupon_count:[{ required: true, message: '请输入发放数量' }], - coupon_price:[{ required: true, message: '请输入优惠卷金额' }] + coupon_price:[{ required: true, message: '请输入优惠劵金额' }] }; defineExpose({ changeStatus, diff --git a/src/components/giveCouponModal.vue b/src/components/giveCouponModal.vue index cef7128..f457a07 100644 --- a/src/components/giveCouponModal.vue +++ b/src/components/giveCouponModal.vue @@ -2,7 +2,7 @@ @@ -33,7 +33,7 @@ - + diff --git a/src/components/inquiryDetailMoneyModal.vue b/src/components/inquiryDetailMoneyModal.vue index 5d1865b..0d20238 100644 --- a/src/components/inquiryDetailMoneyModal.vue +++ b/src/components/inquiryDetailMoneyModal.vue @@ -46,7 +46,7 @@ - + {{modalForm.coupon_amount_total}}元 diff --git a/src/components/medinceOrderModal.vue b/src/components/medinceOrderModal.vue index ac9e636..9d9fad4 100644 --- a/src/components/medinceOrderModal.vue +++ b/src/components/medinceOrderModal.vue @@ -57,7 +57,7 @@ - + {{modalForm.order_product_coupon?'-'+modalForm.order_product_coupon.coupon_use_price:0}}元 diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue index 041d5d3..61e4e7d 100644 --- a/src/views/coupon/coupon-list/index.vue +++ b/src/views/coupon/coupon-list/index.vue @@ -2,11 +2,11 @@
- - + + - - + + @@ -71,7 +71,7 @@
- 创建优惠卷 + 创建优惠劵 @@ -116,7 +116,7 @@ 发放优惠卷 + @click="handleGive(record)">发放优惠劵 @@ -214,7 +214,7 @@ const isVisible=ref(false); dataIndex: 'code', slotName:'code' },{ - title: '优惠卷名称', + title: '优惠劵名称', dataIndex: 'coupon_name', },{ title: '适用平台', @@ -247,7 +247,7 @@ const isVisible=ref(false); dataIndex:'coupon_used_count' }, { - title: '优惠卷金额', + title: '优惠劵金额', dataIndex:'coupon_price', slotName:'coupon_price' }, diff --git a/src/views/coupon/userCoupon-list/index.vue b/src/views/coupon/userCoupon-list/index.vue index f81f5bd..a4fcd77 100644 --- a/src/views/coupon/userCoupon-list/index.vue +++ b/src/views/coupon/userCoupon-list/index.vue @@ -5,8 +5,8 @@ - - + + @@ -108,13 +108,13 @@ width:180 }, { - title: '优惠卷名称', + title: '优惠劵名称', dataIndex: 'coupon', slotName:'coupon', width:200 }, { - title: '优惠卷状态', + title: '优惠劵状态', dataIndex: 'user_coupon_status', slotName:'user_coupon_status', width:100 diff --git a/src/views/order/medince-list/index.vue b/src/views/order/medince-list/index.vue index 1068944..2bf808b 100644 --- a/src/views/order/medince-list/index.vue +++ b/src/views/order/medince-list/index.vue @@ -372,7 +372,7 @@ - + {{modalForm.order_product_coupon?'-'+modalForm.order_product_coupon.coupon_use_price:0}}元 diff --git a/src/views/order/order-list/index.vue b/src/views/order/order-list/index.vue index 83dd3f1..533b62b 100644 --- a/src/views/order/order-list/index.vue +++ b/src/views/order/order-list/index.vue @@ -193,8 +193,8 @@ - - {{modalForm.order_inquiry_coupon.coupon_name}}({{modalForm.order_inquiry_coupon.coupon_use_price}}元) + + {{modalForm.order_inquiry_coupon.coupon_use_price?'-'+modalForm.order_inquiry_coupon.coupon_use_price:0}}元 diff --git a/src/views/order/service-list/index.vue b/src/views/order/service-list/index.vue index acbafed..1aed812 100644 --- a/src/views/order/service-list/index.vue +++ b/src/views/order/service-list/index.vue @@ -328,7 +328,7 @@ - + {{ modalForm.order_inquiry_coupon.coupon_name }}({{ modalForm.order_inquiry_coupon.coupon_use_price @@ -570,7 +570,7 @@ - + @@ -850,7 +850,7 @@ - + {{modalInquiryForm.order_inquiry_coupon.coupon_name}}({{modalForm.order_inquiry_coupon.coupon_use_price}}元)