From 2e2a71c06428d53ccd814ec400e696847bb20400 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Tue, 19 Nov 2024 08:41:30 +0800
Subject: [PATCH] 11.29

---
 .../src/views/EventMarketing/activeConsumption/index.vue  | 8 ++++----
 .../src/views/EventMarketing/liJianMarketing/index.vue    | 1 +
 .../src/views/EventMarketing/openCardGift/index.vue       | 6 ++++++
 .../src/views/EventMarketing/openCardGift/popUp.vue       | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index ea91ec9ca..aafd0643f 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -129,7 +129,7 @@
             <el-form-item label="活动奖品" prop="activeGift">
               <el-checkbox-group v-model="ruleForm.activeGift" @change="changes">
                 <div style="display: flex;align-items: center;font-size: 14px;margin: 15px 0">
-                  <el-checkbox label="选项一" key="0" name="type"><!--积分--></el-checkbox>
+                  <el-checkbox label="" key="0" name="type"><!--积分--></el-checkbox>
                   <div style="margin-left: 10px">按</div>
                   <el-select v-model="pointOrderType" style="margin: 0 10px" placeholder="请选择">
                     <el-option label="订单金额" value="0"></el-option>
@@ -157,7 +157,7 @@
                 </div>
 
                 <div style="display: flex;align-items: center;font-size: 14px;margin: 15px 0">
-                  <el-checkbox label="选项二" key="3" name="type"><!--成长值--></el-checkbox>
+                  <el-checkbox label="" key="3" name="type"><!--成长值--></el-checkbox>
                   <div style="margin-left: 10px">按</div>
                   <el-select v-model="growthValueOrderType" style="margin: 0 10px" placeholder="请选择">
                     <el-option label="订单金额" value="0"></el-option>
@@ -186,7 +186,7 @@
                 </div>
 
                 <div style="display: flex;font-size: 14px;align-items: center;margin: 15px 0">
-                  <el-checkbox label="选项三" key="1" name="type"><!--优惠券--></el-checkbox>
+                  <el-checkbox label="" key="1" name="type"><!--优惠券--></el-checkbox>
                   <div style="margin-left: 10px">按</div>
                   <el-select v-model="couponOrderType" style="margin: 0 10px" placeholder="请选择">
                     <el-option label="订单金额" value="0"></el-option>
@@ -213,7 +213,7 @@
                       :label="item1.name"
                       :value="item1.id"></el-option>
                   </el-select>
-                  <el-input-number      style="width: 45%; margin-left: 10px;"
+                  <el-input-number      style="width: 25%; margin-left: 10px;"
                                         v-model.number="item.giftCardTotal"
                                         :min="1"
                                         :max="item.max"
diff --git a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue
index f82ad92cb..cc55528ca 100644
--- a/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/liJianMarketing/index.vue
@@ -717,6 +717,7 @@ export default {
 .d-s {
   display: flex;
   align-items: center;
+  padding-top:10px;
 }
 
 .icon-type {
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue
index ea66c3093..cea36a46c 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/index.vue
@@ -6,6 +6,7 @@
       --
       {{ title }}
     </div>
+    <div style="width: 100%;height: 40px"></div>
     <!---->
     <activeNewlyweds v-if="id == 1" :activeId="activeId"></activeNewlyweds>
     <activeConsumption v-if="id == 3" :activeId="activeId"></activeConsumption>
@@ -157,6 +158,11 @@ export default {
   background: #fff;
   font-size: 12px;
   color: #666666;
+  position: fixed;
+  top: 60px;
+  left: 200px;
+  border-top: 1px solid #eceff1;
+  z-index: 999;
 }
 
 .cot-box {
diff --git a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue
index 8a7e043dc..af2d7ba93 100644
--- a/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue
+++ b/fuintAdmin/src/views/EventMarketing/openCardGift/popUp.vue
@@ -97,7 +97,7 @@
             </div>
             <div style="width: 80%">
 
-              <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center">
+              <div v-for="(item,index) in couponList" :key="index" style="font-size: 14px;margin: 15px 0;display: flex;align-items: center;margin-top: 0px">
                 <div style="width: 5%">赠送</div>
                 <el-select v-model="item.vouchersId" style="margin-left: 10px;width: 45%" placeholder="请选择" @change="updateMax(item)">
                   <el-option