From ee9405c5a6c1866b74a65f76a5fca8b4ef730bd4 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 12 Nov 2024 16:09:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=BB=A1?=
 =?UTF-8?q?=E5=87=8F=E8=BE=93=E5=85=A5=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/coupon_manage/add_coupon.vue | 43 +++++++++++++++++---------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue
index a527dd1..d253a6d 100644
--- a/src/views/coupon_manage/add_coupon.vue
+++ b/src/views/coupon_manage/add_coupon.vue
@@ -6,29 +6,30 @@
     </div>
     <!-- 优惠券 -->
     <div v-if="form.type == 1" class="content">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
-        <el-form-item label="优惠券券名" prop="title">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="120px" label-position="left">
+        <el-form-item label="优惠券券名" prop="title" style="width: 100%;">
           <el-input v-model="form.title" placeholder="" style="width: 289px;" />
         </el-form-item>
-        <el-form-item label="使用门槛">
+        <el-form-item label="使用门槛" prop="fullAmount">
           <el-input v-model="form.fullAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;margin-right: 66px;">
             <template slot="prepend">满</template>
             <template slot="append">元</template>
           </el-input>
+        </el-form-item>
+        <el-form-item label="" prop="discountAmount">
           <el-input v-model="form.discountAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;">
             <template slot="prepend">减</template>
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
-
-        <el-form-item label="有效期类型">
+        <el-form-item label="有效期类型" style="width: 100%;">
           <el-radio-group v-model="form.validityType">
             <el-radio v-for="item in couponEnum.validityType" :key="item.value" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime">
+        <el-form-item v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime" style="width: 100%;">
           <el-date-picker
             v-model="validityTime"
             type="daterange"
@@ -40,12 +41,12 @@
             @change="validityChange"
           />
         </el-form-item>
-        <el-form-item label="有效期（天）" prop="validDays">
+        <el-form-item label="有效期（天）" prop="validDays" style="width: 100%;">
           <el-input v-model="form.validDays" placeholder="" style="width: 200px;">
             <template slot="append">天</template>
           </el-input>
         </el-form-item>
-        <!-- <el-form-item label="使用门槛" prop="daysToTakeEffect">
+        <!-- <el-form-item label="使用门槛" prop="daysToTakeEffect" style="width: 100%;">
           <el-input v-model="form.daysToTakeEffect" placeholder="" style="width: 200px;">
             <template slot="prepend">隔</template>
             <template slot="append">天生效</template>
@@ -54,19 +55,19 @@
             <i class="el-icon-question" />
           </el-tooltip>
         </el-form-item> -->
-        <el-form-item label="可用周期" prop="userDays">
+        <el-form-item label="可用周期" prop="userDays" style="width: 100%;">
           <el-checkbox-group v-model="form.userDays">
             <el-checkbox v-for="(city,index) in couponEnum.cycle" :key="index" :label="city.label" @change="userDayChagne">{{ city.label }}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="指定时间段">
+        <el-form-item label="指定时间段" style="width: 100%;">
           <el-radio-group v-model="form.useTimeType">
             <el-radio v-for="item in couponEnum.useTimeType" :key="item.value" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.useTimeType == 'custom'" label="指定时间段" prop="useEndTime">
+        <el-form-item v-if="form.useTimeType == 'custom'" label="指定时间段" prop="useEndTime" style="width: 100%;">
           <el-time-picker
             v-model="useTime"
             is-range
@@ -78,7 +79,7 @@
             @change="useTimeChange"
           />
         </el-form-item>
-        <el-form-item label="发放数量" prop="number">
+        <el-form-item label="发放数量" prop="number" style="width: 100%;">
           <el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 200px;" />
           <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
             <i class="el-icon-question" />
@@ -96,15 +97,13 @@
         <el-form-item label="商品券券名" prop="title">
           <el-input v-model="form.title" placeholder="" style="width: 289px;" />
         </el-form-item>
-        <el-form-item style="margin: 0!important;" />
-        <el-form-item style="margin: 0!important;" />
         <el-form-item label="发放数量" prop="number">
           <el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 289px;" />
           <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
             <i class="el-icon-question" />
           </el-tooltip>
         </el-form-item>
-        <el-form-item label="使用门槛">
+        <el-form-item label="使用门槛" prop="fullAmount">
           全额满<el-input v-model="form.fullAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
         </el-form-item>
         <el-form-item label="赠送商品" prop="products">
@@ -186,6 +185,20 @@ export default {
             trigger: 'blur'
           }
         ],
+        fullAmount: [
+          {
+            required: true,
+            message: '填写满减金额',
+            trigger: 'blur'
+          }
+        ],
+        discountAmount: [
+          {
+            required: true,
+            message: '填写满减金额',
+            trigger: 'blur'
+          }
+        ],
         number: [
           {
             required: true,

From 251353d48e1a75ad87edbf83fa674887dc846c57 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 12 Nov 2024 16:15:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=BB=A1?=
 =?UTF-8?q?=E5=87=8F=E8=BE=93=E5=85=A5=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/coupon_manage/coupon_list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/coupon_manage/coupon_list.vue b/src/views/coupon_manage/coupon_list.vue
index d334361..b198c79 100644
--- a/src/views/coupon_manage/coupon_list.vue
+++ b/src/views/coupon_manage/coupon_list.vue
@@ -31,7 +31,7 @@
         <el-table-column label="总发放数量" prop="number" />
         <el-table-column label="已领取" align="center">
           <template v-slot="scope">
-            <div style="display: flex;align-items: center;">
+            <div style="display: flex;align-items: center;justify-content: center;">
               <div style="width: 30px;">{{ scope.row.number-scope.row.leftNumber }}</div>
               <div style="margin: 0 10px;">|</div>
               <div style="color: #3F9EFF;cursor: pointer;flex-shrink: 0;" @click="couponDetailsOpen(scope.row)">详情</div>