From 8abf91600e06398ffabf17735a7b5a0779652156 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 7 Mar 2024 10:48:53 +0800
Subject: [PATCH] bug

---
 .../src/views/EventMarketing/activeConsumption/index.vue    | 6 +++---
 .../src/views/EventMarketing/activeFullminus/index.vue      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index e5cbaba60..5b85295cb 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -84,7 +84,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="活动时间" align="center" prop="adaptUserType" >
+      <el-table-column label="活动时间" width="150" align="center" prop="adaptUserType" >
         <template slot-scope="scope">
           <div>{{scope.row.activeStartTime || 0}}</div>
           <div>{{scope.row.activeEndTime || 0}}</div>
@@ -109,7 +109,7 @@
 <!--          <span >{{scope.row.activeStartTime || 0}}-{{scope.row.activeEndTime || 0}}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="活动更新时间" align="center" prop="updateTime" >
+      <el-table-column label="活动更新时间" width="150" align="center" prop="updateTime" >
         <template slot-scope="scope">
           <span >{{scope.row.updateTime || '暂无更新'}}</span>
         </template>
@@ -120,7 +120,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 
           <el-button
diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
index bdfeaef63..f9a3fe310 100644
--- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
@@ -186,7 +186,7 @@
               <span>满</span> <el-input-number v-model="activeDiscountChildList[0].amount"  :min="0" :max="99999" label="0"></el-input-number> <span>元</span>
             </div>
             <div  style="width: 25%;display: flex; align-items: center;">
-              <span>减</span>   <el-input-number v-model="activeDiscountChildList[0].deductionAmount"  :min="0" :max="9.9" placeholder="1 ~ 9.9" label=""></el-input-number> <span>元</span>
+              <span>减</span>   <el-input-number v-model="activeDiscountChildList[0].deductionAmount"  :min="0" :max="activeDiscountChildList[0].amount" label=""></el-input-number> <span>元</span>
             </div>
             <!--            <div @click="deleteactiveDiscountChildList(index)">-->
             <!--              <el-button type="danger" icon="el-icon-delete" circle style="margin-left: 8px"  ></el-button>-->