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

src/views/apps/card/newCard.vue

@@ -22,9 +22,9 @@
           <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>
-          <el-radio-group v-model="radio">
-            <el-radio :label="1">固定1次</el-radio>
-            <el-radio :label="0">不限次数</el-radio>
+          <el-radio-group v-model="formData.receiveTime">
+            <el-radio :label="0">固定1次</el-radio>
+            <el-radio :label="1">不限次数</el-radio>
           </el-radio-group>
         </el-form-item>
         <div class="el-form-item el-form-item--large">
@@ -152,6 +152,7 @@ export default {
         selectList: [],
         eachSendTimes: 3,
         sendType: '0',
+        receiveTime: 0,
         totalSendTimes: 0
         // receiveType: '0',
         // totalReceiveTimes: 0
@@ -165,8 +166,7 @@ export default {
       },
       cardSelectShow: false,
       addTag: true, // 默认是添加
-      loadingBtn: false,
-      radio: 1
+      loadingBtn: false
     };
   },
   methods: {
@@ -254,6 +254,7 @@ export default {
         coupCardId: that.formData.coupCardId,
         sendRange: that.formData.sendRange,
         selectList: selectList,
+        receiveTime: this.formData.receiveTime,
         // eachSendTimes: that.formData.eachSendTimes || '0',
         // sendType: that.formData.sendType,
         totalSendTimes: that.formData.totalSendTimes,
@@ -362,7 +363,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
+              totalSendTimes: resData.result.detail.totalSendTimes,
+              receiveTime: resData.result.detail.receiveTime
               // receiveType: String(resData.result.detail.receiveType),
               // totalReceiveTimes: resData.result.detail.totalReceiveTimes
             };