From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并

---
 admin/src/components/business/OperaCouponWindow.vue |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/admin/src/components/business/OperaCouponWindow.vue b/admin/src/components/business/OperaCouponWindow.vue
index a6649b7..90814dd 100644
--- a/admin/src/components/business/OperaCouponWindow.vue
+++ b/admin/src/components/business/OperaCouponWindow.vue
@@ -1,12 +1,11 @@
 <template>
   <GlobalWindow
       :title="title"
-      width="80%"
       :visible.sync="visible"
       :confirm-working="isWorking"
       @confirm="confirm"
   >
-    <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" inline>
+    <el-form :model="form" ref="form" :rules="rules" label-width="120px" label-suffix="锛�" >
       <p class="tip-header" >鍩烘湰灞炴��</p>
       <el-form-item label="浼樻儬鍒稿悕绉�" prop="name">
         <el-input v-model="form.name" placeholder="璇疯緭鍏ヤ紭鎯犲埜鍚嶇О" :maxlength="12" v-trim/>
@@ -95,7 +94,7 @@
       <p class="tip-header" >鍙戞斁瑙勫垯</p>
       <el-form-item label="鍙戞斁鎬婚噺" prop="num">
         <div class="num-style">
-          <el-input-number  v-model="form.num" :controls="false" :min="0" :max="99999" placeholder="璇疯緭鍏ュ彂鏀炬�婚噺(0~99999)" v-trim></el-input-number>
+          <el-input   v-model="form.num" type="number" :controls="false" :min="0" :max="99999" placeholder="璇疯緭鍏ュ彂鏀炬�婚噺(0~99999)" v-trim></el-input >
         </div>
         <p class="tip-warn" style="margin-bottom: 1px;"><i class="el-icon-warning"></i>鎻愰啋锛氬彂鏀炬�婚噺涓�0琛ㄧず涓嶉檺鍒�</p>
       </el-form-item>
@@ -152,7 +151,9 @@
       }
     }
     const numRule = (rule, value, callBack) => {
-      if (value < 0) {
+      if (value ==='') {
+        callBack(new Error())
+      } else if (value < 0) {
         callBack(new Error())
       } else {
         callBack()
@@ -175,6 +176,7 @@
         applyCateIdList: [],
         type: 0,
         limitPrice: '',
+        maxPrice:'',
         price: '',
         startDate: '',
         endDate: '',
@@ -183,7 +185,7 @@
         getMethod: '',
         integral: '',
         status: '',
-        num: '',
+        num: 0,
         info: ''
       },
       shops: [],
@@ -274,6 +276,8 @@
       this.getDate = []
       this.form.startDate = ''
       this.form.endDate = ''
+      this.form.validDays=''
+      this.form.maxPrice =''
       this.applyDataList = []
       this.form.applyIdList = []
       this.form.applyCateIdList = []
@@ -282,7 +286,7 @@
       this.form.price = null
       this.form.startDate = null
       this.form.endDate = null
-      this.form.num = 1
+      this.form.num = 0
       // 鏂板缓
       if (target == null) {
         this.$nextTick(() => {

--
Gitblit v1.9.3