lilei vor 4 Jahren
Ursprung
Commit
69296b9f74
2 geänderte Dateien mit 30 neuen und 23 gelöschten Zeilen
  1. 30 21
      src/views/market/addlotterySetModal.vue
  2. 0 2
      src/views/market/lotterySettings.vue

+ 30 - 21
src/views/market/addlotterySetModal.vue

@@ -100,7 +100,7 @@
                 :disabled="state==1"
                 style="width: 30%;margin-right: 5px;"
                 v-model="form.purchaseTimesGold"
-                :min="0"
+                :min="1"
                 :max="999999"
                 :precision="0"
                 placeholder="请输入乐豆数(0~999999)"
@@ -291,7 +291,7 @@
                 allowClear />
             </a-form-model-item>
           </a-col>
-          <a-col span="3" v-if="item.isPrizeLimit == 1">
+          <a-col span="3" v-if="item.isPrizeLimit == 1&&item.prizeType!='NONE'">
             <a-form-model-item
               :label="''"
               :required="true"
@@ -309,7 +309,7 @@
                 :disabled="participantsNum>0||state==1"
                 :id="'jpList-prizeNum'+index"
                 v-model="item.prizeNum"
-                :min="0"
+                :min="1"
                 :max="999999"
                 :precision="0"
                 placeholder="请输入奖品数量"
@@ -324,6 +324,7 @@
               :prop="'luckyDrawPrizeList.' + index + '.prizeImage'"
             >
               <Upload
+                :ref="'prizeImage'+index"
                 :disabled="participantsNum>0||state==1"
                 :id="'jpList-prizeImage'+index"
                 v-model="item.prizeImage"
@@ -338,7 +339,7 @@
         <a-row :gutter="48" v-if="form.luckyDrawPrizeList.length">
           <a-col :span="12">
             <div class="form-item">
-              <div style="margin-right: 10px;"><span class="red">*</span>中奖限制:</div>
+              <div style="margin-right: 10px;">中奖限制:</div>
               <a-select
                 mode="multiple"
                 :disabled="state==1"
@@ -373,7 +374,7 @@
                   style="width: 100px;"
                   :id="'luckyDrawWinPrizeLimitList-limitTimes'+index"
                   v-model="item.limitTimes"
-                  :min="0"
+                  :min="1"
                   :max="100"
                   :precision="0"
                   placeholder="请输入次数"
@@ -384,7 +385,7 @@
           </a-col>
           <a-col :span="12">
             <div class="form-item">
-              <div style="margin-right: 10px;"><span class="red">*</span>赠送抽奖次数规则:</div>
+              <div style="margin-right: 10px;">赠送抽奖次数规则:</div>
               <a-select
                 mode="multiple"
                 :disabled="state==1"
@@ -419,7 +420,7 @@
                   style="width: 100px;"
                   :id="'luckyDrawTaskList-giveTimes'+index"
                   v-model="item.giveTimes"
-                  :min="0"
+                  :min="1"
                   :max="100"
                   :precision="0"
                   placeholder="请输入次数"
@@ -435,7 +436,7 @@
             保存
           </a-button>
           <a-button style="margin-left: 10px;" @click="cansel">
-            取消
+            {{ state==1?'关闭':'取消' }}
           </a-button>
         </div>
       </a-form-model>
@@ -467,7 +468,7 @@ export default {
     return {
       loading: false,
       isShow: this.showEditModal,
-      titleText: '新增活动',
+      titleText: '活动',
       formLayout: 'vertical',
       labelCol: {},
       wrapperCol: {},
@@ -564,14 +565,14 @@ export default {
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           console.log('valid submit!!')
-          if (this.form.luckyDrawWinPrizeLimitList.length == 0) {
-            this.$message.warning('请选择中奖限制')
-            return false
-          }
-          if (this.form.luckyDrawTaskList.length == 0) {
-            this.$message.warning('请选择赠送抽奖次数规则')
-            return false
-          }
+          // if (this.form.luckyDrawWinPrizeLimitList.length == 0) {
+          //   this.$message.warning('请选择中奖限制')
+          //   return false
+          // }
+          // if (this.form.luckyDrawTaskList.length == 0) {
+          //   this.$message.warning('请选择赠送抽奖次数规则')
+          //   return false
+          // }
           const formData = JSON.parse(JSON.stringify(this.form))
           formData.activeStartTime = moment(this.form.time[0]).format('YYYY-MM-DD') + ' 00:00:00'
           formData.activeEndTime = moment(this.form.time[1]).format('YYYY-MM-DD') + ' 00:00:00'
@@ -603,11 +604,12 @@ export default {
         if (res.status == 200) {
           this.participantsNum = res.data.participantsNum
 		      this.state = res.data.state
-          res.data.luckyDrawPrizeList.map(item => {
-            if (!item.prizeRate) {
+          this.titleText = this.state == 1 ? '查看活动' : '编辑活动'
+          res.data.luckyDrawPrizeList.map((item, index) => {
+            if (!item.hasOwnProperty('prizeRate')) {
               item.prizeRate = ''
             }
-            if (!item.prizeNum) {
+            if (!item.hasOwnProperty('prizeNum')) {
               item.prizeNum = ''
             }
             delete item.id
@@ -620,6 +622,14 @@ export default {
           this.form.zjXz = this.getGzVal(this.form.luckyDrawWinPrizeLimitList, 0)
           this.form.cjGz = this.getGzVal(this.form.luckyDrawTaskList, 1)
           console.log(this.form.luckyDrawPrizeList)
+          // 回显图片
+          const _this = this
+          setTimeout(() => {
+            _this.form.luckyDrawPrizeList.map((item, index) => {
+              console.log(_this.$refs[`prizeImage${index}`])
+              _this.$refs[`prizeImage${index}`][0].setFileList(item.prizeImage)
+            })
+          }, 500)
         }
       })
     },
@@ -669,7 +679,6 @@ export default {
     },
     itemId (newValue, oldValue) {
       if (newValue && this.isShow) {
-        this.titleText = '编辑活动'
         this.getDetail(newValue)
       } else {
         this.titleText = '新增活动'

+ 0 - 2
src/views/market/lotterySettings.vue

@@ -234,8 +234,6 @@ export default {
         if (res.status == 200) {
           _this.$message.success(res.message)
           _this.$refs.table.refresh()
-        } else {
-          record.state = !record.state
         }
       })
     },