sunlupeng 1 year ago
parent
commit
7f77ccbefa
2 changed files with 31 additions and 7 deletions
  1. 9 0
      src/api/public.js
  2. 22 7
      src/views/activityManage/activityList.vue

+ 9 - 0
src/api/public.js

@@ -64,5 +64,14 @@ export function couponsList(query) {
     params:query
   })
 }
+
+// 获取已开启奖池下拉
+export function prizePoolList(query) {
+  return request({
+    url: '/mall-pool-type/actOptionselect',
+    method: 'get',
+    params:query
+  })
+}
   
   

+ 22 - 7
src/views/activityManage/activityList.vue

@@ -67,9 +67,6 @@
                 <el-form-item label="活动名称" prop="title">
                     <el-input v-model="dataForm.title" style="width: 350px"></el-input>
                 </el-form-item>
-                <el-form-item label="活动连接">
-                    <el-input v-model="dataForm.activityUrl" style="width: 350px"></el-input>
-                </el-form-item>
                 <el-form-item style="width: 800px" label="活动图片" prop="imgUrl">
                     <el-tooltip content="建议图片宽高比260*200" placement="top-start">
                         <el-upload :action="fileImgUrl" list-type="picture-card" :file-list="dataForm.images" :limit="1"
@@ -107,20 +104,26 @@
                     </template>
                 </el-input>
                 </el-form-item>
-                <el-form-item label="关联兑换卷" prop="relationCoupon">
+                <el-form-item v-if="dataForm.type=='3'"  label="关联奖池" prop="prizePoolId">
+                    <el-select v-model="dataForm.prizePoolId" clearable placeholder="请选择奖池" class="filter-item" style="width: 350px">
+                        <el-option :key="item.id" v-for="item in prizePoolList" :label="item.title" :value="item.id">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item v-else label="关联兑换卷" prop="relationCoupon">
                     <el-radio-group v-model="dataForm.relationCoupon">
                         <el-radio :label="'0'">否</el-radio>
                         <el-radio :label="'1'">是</el-radio>
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item v-if="dataForm.relationCoupon=='1'"  label="兑换券" prop="couponIds">
-                    <el-select v-model="dataForm.couponIds" clearable multiple collapse-tags placeholder="请选择兑换券" class="filter-item" style="width: 300px">
+                    <el-select v-model="dataForm.couponIds" clearable multiple collapse-tags placeholder="请选择兑换券" class="filter-item" style="width: 350px">
                         <el-option :key="item.id" v-for="item in couponsList" :label="item.couponName" :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item v-if="dataForm.type=='3'" label="抽奖次数" prop="prizeNum">
-                    <el-input-number :min="1" :precision="0" :step="1" v-model="dataForm.prizeNum"></el-input-number>
+                    <el-input v-model="dataForm.prizeNum" style="width: 350px"></el-input>
                 </el-form-item>
                 <el-form-item label="活动连接">
                     <el-input v-model="dataForm.activityUrl" style="width: 350px"></el-input>
@@ -170,7 +173,7 @@
 <script>
 import { createItem, updateItem, activityList, activityState } from "@/api/activityManage";
 import Crontab from '@/components/Crontab'
-import { allUserList,dataTypeList,couponsList } from "@/api/public";
+import { allUserList,dataTypeList,couponsList,prizePoolList } from "@/api/public";
 import waves from "@/directive/waves"; // 水波纹指令
 import Tinymce from '@/components/Tinymce'
 
@@ -179,6 +182,7 @@ export default {
     directives: { waves },
     data() {
         return {
+            prizePoolList:[],
             couponsList:[],
              // 是否显示Cron表达式弹出层
             openCronStart: false,
@@ -211,6 +215,7 @@ export default {
                 activityUrl: '',
                 startCron: '',
                 endCron: '',
+                prizePoolId:'',
                 relationCoupon:'0',
                 couponIds:[],
                 prizeNum:'',
@@ -243,6 +248,9 @@ export default {
                 endCron: [
                     { required: true, message: "cron执行表达式不能为空", trigger: "blur" }
                 ],
+                prizePoolId: [
+                    { required: true, message: "请选择奖池", trigger: "blur" }
+                ],
                 relationCoupon: [
                     { required: true, message: "请选择是否关联兑换卷", trigger: "blur" }
                 ],
@@ -258,12 +266,18 @@ export default {
         }
     },
     created() {
+        this.getPrizePoolList();
         this.getCouponsList();
         this.getTypeList();
         this.getAllUserList(); 
         this.getList();
     },
     methods: {
+        getPrizePoolList() {
+            prizePoolList({}).then(response => {
+                this.prizePoolList = response.data.data;
+            }).catch(() => { });
+        },
         getCouponsList() {
             couponsList({}).then(response => {
                 this.couponsList = response.data.data;
@@ -365,6 +379,7 @@ export default {
                 activityUrl: '',
                 startCron: '',
                 endCron: '',
+                prizePoolId:'',
                 relationCoupon:'0',
                 couponIds:[],
                 prizeNum:'',