From 9329978f6d34eecc460bb5ad64ba0d05a07d246d Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Mon, 2 Sep 2024 17:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E3=80=91=E5=95=86=E5=9F=8E:=20=E6=BB=A1=E5=87=8F?=
 =?UTF-8?q?=E9=80=81=E6=B4=BB=E5=8A=A8=E6=8F=90=E7=A4=BA=E5=BC=B1=E5=8C=96?=
 =?UTF-8?q?=E4=B8=80=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/promotion/rewardActivity/components/RewardRule.vue | 6 +++---
 .../rewardActivity/components/RewardRuleCouponSelect.vue    | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/mall/promotion/rewardActivity/components/RewardRule.vue b/src/views/mall/promotion/rewardActivity/components/RewardRule.vue
index d365dace..c87d26d5 100644
--- a/src/views/mall/promotion/rewardActivity/components/RewardRule.vue
+++ b/src/views/mall/promotion/rewardActivity/components/RewardRule.vue
@@ -58,9 +58,6 @@
                 积分
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-tag type="warning"> 当赠送积分为 0 时，表示不赠送积分</el-tag>
-            </el-col>
             <el-col :span="24">
               <span>送优惠券：</span>
               <RewardRuleCouponSelect ref="rewardRuleCouponSelectRef" v-model="rule!" />
@@ -72,6 +69,9 @@
     <el-col :span="24" class="mt-10px">
       <el-button type="primary" @click="addRule">添加优惠规则</el-button>
     </el-col>
+    <el-col :span="24">
+      <el-tag type="warning"> 赠送积分为 0 时不赠送。未选优惠券时不赠送。</el-tag>
+    </el-col>
   </el-row>
 </template>
 
diff --git a/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue b/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue
index e629b32c..6e435bc7 100644
--- a/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue
+++ b/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue
@@ -1,8 +1,6 @@
 <template>
   <el-button class="ml-10px" type="text" @click="selectCoupon">添加优惠卷</el-button>
-  <el-col :span="24">
-    <el-tag type="warning"> 当没有选择优惠券时，表示不赠送优惠券</el-tag>
-  </el-col>
+
   <div
     v-for="(item, index) in list"
     :key="item.id"