From 76774a4ec5b50b408f2e8a5a229f28632598292a Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Wed, 13 Nov 2024 17:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/coupon_manage/add_coupon.vue | 31 +++++++++++++-------------
 src/views/coupon_manage/couponEnum.js  |  4 ++--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue
index f3f7c55..4c27a53 100644
--- a/src/views/coupon_manage/add_coupon.vue
+++ b/src/views/coupon_manage/add_coupon.vue
@@ -22,7 +22,6 @@
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
-         
         <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">
@@ -30,7 +29,12 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.validityType == 'fixed'" label="有效时间" prop="validEndTime" style="width: 100%;">
+        <el-form-item v-if="form.validityType == 'fixed'" 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 v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime" style="width: 100%;">
           <el-date-picker
             v-model="validityTime"
             type="daterange"
@@ -42,11 +46,6 @@
             @change="validityChange"
           />
         </el-form-item>
-        <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" style="width: 100%;">
           <el-input v-model="form.daysToTakeEffect" placeholder="" style="width: 200px;">
             <template slot="prepend">隔</template>
@@ -88,7 +87,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
         <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
       </span>
     </div>
@@ -107,7 +106,12 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.validityType == 'fixed'" label="有效时间" prop="validEndTime" style="width: 100%;">
+        <el-form-item v-if="form.validityType == 'fixed'" 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 v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime" style="width: 100%;">
           <el-date-picker
             v-model="validityTime"
             type="daterange"
@@ -119,11 +123,6 @@
             @change="validityChange"
           />
         </el-form-item>
-        <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" style="width: 100%;">
           <el-input v-model="form.daysToTakeEffect" placeholder="" style="width: 200px;">
             <template slot="prepend">隔</template>
@@ -182,7 +181,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
+        <!-- <el-button @click="dialogVisible = false">取 消</el-button> -->
         <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
       </span>
     </div>
@@ -222,7 +221,7 @@ export default {
         title: '',
         fullAmount: null,
         discountAmount: null,
-        validityType: 'custom',
+        validityType: 'fixed',
         validStartTime: '',
         validEndTime: '',
         userDays: [],
diff --git a/src/views/coupon_manage/couponEnum.js b/src/views/coupon_manage/couponEnum.js
index 973ef4c..f4cbaf5 100644
--- a/src/views/coupon_manage/couponEnum.js
+++ b/src/views/coupon_manage/couponEnum.js
@@ -30,11 +30,11 @@ export default {
   ],
   validityType: [
     {
-      value: 'custom',
+      value: 'fixed',
       label: '领券后有效期内可用'
     },
     {
-      value: 'fixed',
+      value: 'custom',
       label: '固定有效期范围内可用'
     }
   ],