update: dist

src/views/ecm/form.vue

@@ -103,8 +103,7 @@
         <h3 class="dm-title__label">
           消费触发配置
         </h3>
-        <p class="fz14 gray mb20 ml10">同时满足以下条件即可触发</p>
-        <div class="ecm-title">消费触发配置</div>
+        <p class="fz14 gray ml10">同时满足以下条件即可触发</p>
         <div class="ecm-content">
           <el-radio :label="1" :disabled="!isAdd" v-model="form.consum_type" @change="handleConsumTypeChange"
             >按照单笔订单实付金额触发
@@ -192,10 +191,14 @@
                 <el-button v-show="xxSysp.filterAbbrInfo.length && isAdd" @click="handleXxSyspReset" class="fl mt5" size="mini">清空</el-button>
               </div>
               <div v-show="consumeChecked.good">
-                <span style="margin-left: 38px;">赠品是否支持触发</span>
-                <el-radio-group :disabled="!isAdd" v-model="form.gift_flag">
-                  <el-radio :label="1" style="width: auto;">支持</el-radio>
-                  <el-radio :label="0" style="width: auto;">不支持</el-radio>
+                <span style="margin-left: 38px;">是否剔除“赠品”类型商品</span>
+                <el-tooltip class="item" effect="dark" :open-delay="200">
+                  <template slot="content">当满足消费商品条件的商品为“赠品”类型时，是否进行剔除</template>
+                  <i style="margin-left:4px;cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
+                </el-tooltip>
+                <el-radio-group :disabled="!isAdd" v-model="form.gift_flag" style="margin-left:20px;">
+                  <el-radio :label="1" style="width: auto;">不剔除</el-radio>
+                  <el-radio :label="0" style="width: auto;">剔除</el-radio>
                 </el-radio-group>
               </div>
               <div v-show="consumeChecked.good && form.consum_type == 1" class="fz12" style="color:#f5222d;margin-left: 38px;">勾选消费商品后，消费金额、消费件数仅指适用消费商品的金额和件数。</div>
@@ -223,6 +226,21 @@
             </div>
           </div>
         </el-form-item>
+        <el-form-item>
+          <div class="no_label_form_label">
+            <el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.count">消费件数</el-checkbox>
+            <div>
+              <span class="fz14 gray" v-show="!consumeChecked.count">任意消费件数</span>
+              <div v-show="consumeChecked.count">
+                <el-input-number :disabled="!isAdd" controls-position="right" min="" :max="1000000" style="width:150px;" v-model="form.lowest_cost_count" @change="handleLowestCostCount()"></el-input-number>
+                <span class="ml5 mr5">至</span>
+                <el-input-number :disabled="!isAdd" controls-position="right" min="" :max="1000000" style="width:150px;" v-model="form.max_cost_count" @change="handleLowestCostCount()"></el-input-number>
+                <span class="pl5">件</span>
+                <el-popover placement="right" title="" width="200" trigger="hover" content="最大值最小值可选填其一或两个都填写，包含边界值，不包含赠品"><i class="el-icon-info ml5 gray" slot="reference"></i></el-popover>
+              </div>
+            </div>
+          </div>
+        </el-form-item>
         <el-form-item v-if="form.consum_type == 1">
           <div class="no_label_form_label">
             <el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.cost">消费金额</el-checkbox>
@@ -245,21 +263,6 @@
             <span class="fz14 gray ml58">订单传至GIC系统后，计算该客户当天的累计实付金额高于此门槛才会触发；</span>
           </div>
         </el-form-item>
-        <el-form-item>
-          <div class="no_label_form_label">
-            <el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.count">消费件数</el-checkbox>
-            <div>
-              <span class="fz14 gray" v-show="!consumeChecked.count">任意消费件数</span>
-              <div v-show="consumeChecked.count">
-                <el-input-number :disabled="!isAdd" controls-position="right" min="" :max="1000000" style="width:150px;" v-model="form.lowest_cost_count" @change="handleLowestCostCount()"></el-input-number>
-                <span class="ml5 mr5">至</span>
-                <el-input-number :disabled="!isAdd" controls-position="right" min="" :max="1000000" style="width:150px;" v-model="form.max_cost_count" @change="handleLowestCostCount()"></el-input-number>
-                <span class="pl5">件</span>
-                <el-popover placement="right" title="" width="200" trigger="hover" content="最大值最小值可选填其一或两个都填写，包含边界值，不包含赠品"><i class="el-icon-info ml5 gray" slot="reference"></i></el-popover>
-              </div>
-            </div>
-          </div>
-        </el-form-item>
       </section>
       <!-- 会员卡升/降级触发设置 -->
       <section class="dm-form__wrap" v-if="form.effectType == 0 && (form.effectAction === 'degrade' || form.effectAction === 'upgrade')">
@@ -399,7 +402,7 @@
             <div>
               <span class="dm-status--primary pl10" style="vertical-align:top"></span>
               <div style="display:inline-block">
-                消费触发模式下，营销事件选择“卡券/积分”时，订单产生退款时，仅下单日期90天内进行的退款订单处理退卡券和积分业务，超出90天之后产生的退款订单不会处理退卡券和积分业务； 若订单整单退款：已赠送卡券/积分全部退回
+                消费触发模式下，营销事件选择“卡券/积分”时，订单产生退款时，仅下单日期90天内进行的退款订单处理退卡券和积分业务，超出90天之后产生的退款订单不会处理退卡券和积分业务；
                 <br />
                 若订单整单退款：已赠送卡券/积分全部退回
                 <br />