From 7ad31f9b66085b65b9d14384093a6a45c28c38cb Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 6 Jun 2024 10:30:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inquiry/service.js             | 20 ++++++++++----------
 src/components/couponDetail.vue        | 26 ++++++++++++++++++--------
 src/views/coupon/coupon-list/index.vue |  4 ++--
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/api/inquiry/service.js b/src/api/inquiry/service.js
index ac92e17..69f74bb 100644
--- a/src/api/inquiry/service.js
+++ b/src/api/inquiry/service.js
@@ -1,17 +1,17 @@
 import request from '../../utils/request'
 
-export function getInquiryconfigList(params){
+export function getHealthList(data){//健康包管理-获取健康包列表-分页
   return request({
-    url:'/admin/inquiry/doctor',
-    method: 'get',
-    params
-  })
-}
-
-export function addInquiryconfig(data){//添加配置
-  return request({
-    url:'/admin/inquiry/doctor',
+    url:'/admin/inquiry/health/page',
     method: 'post',
     data
   })
+}
+
+export function healthDetail(id,params){//健康包管理-获取健康包详情
+  return request({
+    url:'/admin/inquiry/health/'+id,
+    method: 'post',
+    params
+  })
 }
\ No newline at end of file
diff --git a/src/components/couponDetail.vue b/src/components/couponDetail.vue
index 6506fc4..bdbdef2 100644
--- a/src/components/couponDetail.vue
+++ b/src/components/couponDetail.vue
@@ -135,6 +135,7 @@
             <a-input-number
               v-model="modalForm.coupon_count"
               :style="{ width: '320px' }"
+              :step="0" :precision="0"
               placeholder="请输入发放数量"
               class="input-demo"
               :min="1"
@@ -150,7 +151,7 @@
               :style="{ width: '320px' }"
               placeholder="请输入优惠卷金额"
               class="input-demo"
-              :min="0"
+              :min="1"
             />
           </a-form-item>
         </a-col>
@@ -179,6 +180,7 @@
               v-model="modalForm.valid_days"
               :style="{ width: '320px' }"
               placeholder="请输入有效天数"
+              :step="0" :precision="0"
               class="input-demo"
               :min="1"
             />
@@ -198,7 +200,7 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
+      <a-row :gutter="24" v-if="showMinNumber">
         <a-col a-col :span="24">
           <a-form-item field="min_usable_number" label="单商品最小可使用数量：" :rules="[{required: true,message:'请输入单商品最小可使用数量'}]">
             <a-input-number
@@ -207,6 +209,7 @@
               placeholder="请输入单商品最小可使用数量"
               class="input-demo"
               :min="1"
+              :step="0" :precision="0"
             />
           </a-form-item>
         </a-col>
@@ -219,6 +222,7 @@
               :style="{ width: '320px' }"
               placeholder="请输入发放关联天数"
               class="input-demo"
+              :step="0" :precision="0"
               :min="1"
             />
           </a-form-item>
@@ -270,13 +274,19 @@
           </a-form-item>
         </a-col>
       </a-row>
-      <a-row :gutter="24">
-        <a-col a-col :span="24">
-          <a-form-item field="inquiry_type" label="状态：">
-            <a-switch
+      <a-row :gutter="24" v-if="modalForm.coupon_id">
+        <a-col a-col :span="12">
+          <a-form-item field="inquiry_type" label="状态：" :style="{width:'320px'}">
+            <a-select
+              placeholder="请选择发放类型"
               v-model="modalForm.coupon_status"
-              :checked-value="1"
-            />
+            >
+              <!-- 1:正常 2:强制失效 3:结束 4:删除-->
+              <a-option :key="1" :value="1" label="正常">正常</a-option>
+              <a-option :key="2" :value="2" label="强制失效">强制失效</a-option>
+              <a-option :key="3" :value="3" label="结束">结束</a-option>
+              <a-option :key="4" :value="4" label="删除">删除</a-option>
+            </a-select>
           </a-form-item>
         </a-col>
       </a-row>
diff --git a/src/views/coupon/coupon-list/index.vue b/src/views/coupon/coupon-list/index.vue
index 1f0d48d..e65f840 100644
--- a/src/views/coupon/coupon-list/index.vue
+++ b/src/views/coupon/coupon-list/index.vue
@@ -311,8 +311,8 @@ const isVisible=ref(false);
     modalForm.valid_days=null;
     modalForm.coupon_status=1;
     modalForm.coupon_client=1;
-    modalForm.is_mutex=0;
-    modalForm.is_display=0;
+    modalForm.is_mutex=1;
+    modalForm.is_display=1;
     modalForm.is_popup=0;
     modalForm.valid_start_time='';
     modalForm.valid_end_time='';