Merge branch 'feature/卡券赠送相关调整' into dev

src/components/app/card/select-card.vue

@@ -5,7 +5,8 @@
 <template>
   <el-dialog title="卡券选择" :visible.sync="dialogVisible" width="994px" :before-close="handleClose">
     <div class="search-div">
-      <el-input placeholder="请输入卡券名称" maxlength="50" v-model="searchInput" class="w-264" style="width: 264px;" clearable @keyup.native="value => toInput(value, searchInput)" @clear="clearInput"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input><span class="search-tip p-l-20 font-14 color-909399">仅支持选择“领取限制&gt;=100”的卡券，系统已自动过滤不符合条件的卡券，符合条件的卡券共{{ total }}张</span>
+      <el-input placeholder="请输入卡券名称" maxlength="50" v-model="searchInput" class="w-264" style="width: 264px;" clearable @keyup.native="value => toInput(value, searchInput)" @clear="clearInput"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
+      <!-- <span class="search-tip p-l-20 font-14 color-909399">仅支持选择“领取限制&gt;=100”的卡券，系统已自动过滤不符合条件的卡券，符合条件的卡券共{{ total }}张</span> -->
     </div>
     <div class="chat-log-content boder-box m-t-20">
       <el-table :data="tableData" style="width: 100%">

src/views/apps/card/newCard.vue

@@ -39,7 +39,8 @@
             <div v-if="(formData.sendRange == '1' || formData.sendRange == '2' || formData.sendRange == '3') && !formData.selectList.length" class="el-form-item__error">请选择发送范围</div>
           </div>
         </div>
-        <div class="el-form-item el-form-item--large">
+        <!-- 卡券赠送调整：取消发放张数和发放总数的配置 -->
+        <!-- <div class="el-form-item el-form-item--large">
           <label for="name" class="el-form-item__label" style="width: 120px; cursor: pointer;">
             <el-tooltip class="item" effect="dark" content="卡券限制每个会员最大发放次数" placement="top-start"> <span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;">券发放张数</span></el-tooltip>
           </label>
@@ -56,7 +57,7 @@
               请选择券发放总数
             </div>
           </div>
-        </div>
+        </div> -->
         <!--<el-form-item label="转赠功能" prop="">
           <el-switch v-model="formData." active-text="" inactive-text=""> </el-switch>
         </el-form-item>-->
@@ -243,8 +244,8 @@ export default {
         coupCardId: that.formData.coupCardId,
         sendRange: that.formData.sendRange,
         selectList: selectList,
-        eachSendTimes: that.formData.eachSendTimes || '0',
-        sendType: that.formData.sendType,
+        // eachSendTimes: that.formData.eachSendTimes || '0',
+        // sendType: that.formData.sendType,
         totalSendTimes: that.formData.totalSendTimes,
         // receiveType: that.formData.receiveType,
         // totalReceiveTimes: that.formData.totalReceiveTimes,