lilei 4 лет назад
Родитель
Сommit
f1028d2f30
2 измененных файлов с 8 добавлено и 11 удалено
  1. 4 10
      src/views/market/addlotterySetModal.vue
  2. 4 1
      src/views/market/winingRecord.vue

+ 4 - 10
src/views/market/addlotterySetModal.vue

@@ -665,7 +665,7 @@ export default {
       this.participantsNum = 0
       this.taskParticipantsNum = 0
       this.state = 0
-      this.form.isPeopleLimit = false
+      this.form.isPeopleLimit = true
       this.form.luckyDrawPrizeList = []
       this.form.luckyDrawTaskList = []
       this.form.luckyDrawWinPrizeLimitList = []
@@ -677,15 +677,6 @@ export default {
       this.rules = this.getRules(true)
     }
   },
-  created () {
-    this.$nextTick(() => {
-      setTimeout(() => {
-        this.zjXz = this.$refs.zjXzType.getOptionDatas()
-        this.cjGz = this.$refs.zsGzType.getOptionDatas()
-        this.rules = this.getRules(true)
-      }, 500)
-    })
-  },
   watch: {
     showEditModal (newValue, oldValue) {
       this.isShow = newValue
@@ -696,6 +687,9 @@ export default {
       } else {
         this.$nextTick(() => {
           this.$refs.ruleForm.resetFields()
+          this.zjXz = this.$refs.zjXzType.getOptionDatas()
+          this.cjGz = this.$refs.zsGzType.getOptionDatas()
+          this.rules = this.getRules(true)
         })
       }
     },

+ 4 - 1
src/views/market/winingRecord.vue

@@ -67,6 +67,9 @@
           @click="handleView(record)" />
         <span v-else>--</span>
       </template>
+      <template slot="prizeDesc" slot-scope="text, record">
+        {{ record.prizeType == 'GOODS' ? text : (text+'乐豆') }}
+      </template>
     </s-table>
     <!-- 发货 -->
     <GoodsLogistics :openModal="openModal" :itemId="itemId" @submit="handleSubmit" @close="openModal=false" />
@@ -110,7 +113,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '中奖时间', dataIndex: 'winTime', width: 200, align: 'center' },
         { title: '活动名称', dataIndex: 'activeName', width: 200, align: 'center' },
-        { title: '奖品', dataIndex: 'prizeDesc', width: 200, align: 'center' },
+        { title: '奖品', dataIndex: 'prizeDesc', scopedSlots: { customRender: 'prizeDesc' }, width: 200, align: 'center' },
         { title: '中奖用户', dataIndex: 'customerMobile', width: 200, align: 'center' },
         { title: '状态', dataIndex: 'stateDictValue', width: 200, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }