Merge branch 'feature/十月迭代' into master

src/views/apps/card/newCard.vue

@@ -18,7 +18,7 @@
           </div>
           <div v-else class="card-add-btn text-center cursor-pointer" @click="showCard"><span class="el-icon-plus font-12 color-909399"></span><span class="font-14 color-909399 p-l-8">添加卡券</span></div>
         </el-form-item>
-        <el-form-item prop="coupCardId">
+        <!-- <el-form-item>
           <span slot="label">
             <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>
           </span>
@@ -26,7 +26,7 @@
             <el-radio :label="0">固定1次</el-radio>
             <el-radio :label="1">不限次数</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <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>
@@ -152,10 +152,8 @@ export default {
         selectList: [],
         eachSendTimes: 3,
         sendType: '0',
-        receiveTime: 0,
+        // receiveTime: 0,
         totalSendTimes: 0
-        // receiveType: '0',
-        // totalReceiveTimes: 0
       },
       rules: {
         coupCardId: [{ required: true, message: '请选择卡券', trigger: 'change' }],
@@ -254,7 +252,7 @@ export default {
         coupCardId: that.formData.coupCardId,
         sendRange: that.formData.sendRange,
         selectList: selectList,
-        receiveTime: this.formData.receiveTime,
+        // receiveTime: this.formData.receiveTime,
         // eachSendTimes: that.formData.eachSendTimes || '0',
         // sendType: that.formData.sendType,
         totalSendTimes: that.formData.totalSendTimes,
@@ -363,8 +361,8 @@ export default {
               selectList: resData.result.detail.sendRange != 0 ? (resData.result.detail.sendRange == 2 ? resData.result.list.map(item => item.id) : resData.result.list) : [],
               eachSendTimes: resData.result.detail.eachSendTimes,
               sendType: String(resData.result.detail.sendType),
-              totalSendTimes: resData.result.detail.totalSendTimes,
-              receiveTime: resData.result.detail.receiveTime
+              totalSendTimes: resData.result.detail.totalSendTimes
+              // receiveTime: resData.result.detail.receiveTime
               // receiveType: String(resData.result.detail.receiveType),
               // totalReceiveTimes: resData.result.detail.totalReceiveTimes
             };