修改

config/dev.env.js

@@ -4,10 +4,10 @@ module.exports = {
   // 本地数据库：登录用户名 admin123，密码 admin123
   // BASE_API: '"http://192.168.100.87:9083/admin"',
   // OS_API: '"http://192.168.100.87:9083/admin"',
-  // BASE_API: '"http://47.103.79.143:9085/admin"',
-  // OS_API: '"http://47.103.79.143:9085/admin"',
-  OS_API: '"https://xiaoyou.dgtis.com/admin"',
-  BASE_API: '"https://xiaoyou.dgtis.com/admin"',
+  BASE_API: '"http://47.103.79.143:9085/admin"',
+  OS_API: '"http://47.103.79.143:9085/admin"',
+  // OS_API: '"https://xiaoyou.dgtis.com/admin"',
+  // BASE_API: '"https://xiaoyou.dgtis.com/admin"',
   
   
   

src/views/activityManage/activityList.vue

@@ -125,7 +125,7 @@
                 <el-form-item v-if="dataForm.type=='3' || dataForm.type=='5'" label="抽奖次数">
                     <el-input-number :disabled="dialogStatus == 'update'?true:false" style="width: 350px" :min="0" :step="1" v-model="dataForm.prizeNum"></el-input-number>
                 </el-form-item>
-                <el-form-item v-if="dataForm.type=='5'" label="兑换积分" prop="expenseIntegral">
+                <el-form-item v-if="dataForm.type=='3' || dataForm.type=='5'" label="兑换积分">
                     <el-input-number :disabled="dialogStatus == 'update'?true:false" style="width: 350px" :min="0" :step="1" v-model="dataForm.expenseIntegral"></el-input-number>
                 </el-form-item>
                 <el-form-item v-if="dataForm.type=='5'" label="开奖日期" prop="winningTimeCron">
@@ -248,7 +248,7 @@ export default {
                 relationCoupon:'0',
                 couponIds:[],
                 prizeNum:undefined,
-                expenseIntegral:0,
+                expenseIntegral:undefined,
                 participants: [],
                 content: '',
                 images: [],
@@ -328,7 +328,7 @@ export default {
             this.dataForm.relationCoupon = '0';
             this.dataForm.couponIds = [];
             this.dataForm.prizeNum = undefined;
-            this.dataForm.expenseIntegral = 0;
+            this.dataForm.expenseIntegral = undefined,
             this.dataForm.participants = [];
             this.dataForm.content = undefined;
             this.dataForm.images = [];
@@ -463,7 +463,7 @@ export default {
                 relationCoupon:'0',
                 couponIds:[],
                 prizeNum:'',
-                expenseIntegral:0,
+                expenseIntegral:undefined,
                 participants: [],
                 content: '',
                 images: [],

src/views/raffleManage/raffleList.vue

@@ -8,6 +8,11 @@
           <el-option :key="item.type" v-for="item in typeList" :label="item.name" :value="item.type">
           </el-option>
       </el-select>
+      <el-select v-model="listQuery.prizePoolType" clearable placeholder="奖池类型" class="filter-item" style="width: 200px">
+                        <el-option :key="item.dictValue" v-for="item in prizePoolTypeList" :label="item.dictLabel"
+                            :value="item.dictValue">
+                        </el-option>
+                    </el-select>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">查找</el-button>
       <el-button class="filter-item" type="primary" @click="handleCreate" icon="el-icon-edit">添加</el-button>
       <!-- <el-button class="filter-item" type="warning" icon="el-icon-delete" @click="delAll">批量删除</el-button> -->
@@ -78,6 +83,14 @@
           <el-form-item  label="奖池名称" prop="title">
             <el-input style="width: 300px" v-model="dataForm.title"></el-input>
           </el-form-item>
+          <el-form-item label="奖池类型" prop="prizePoolType">
+                    <el-select v-model="dataForm.prizePoolType" filterable placeholder="请选择" style="width: 300px"
+                        value-key="value">
+                        <el-option :key="item.dictValue" v-for="item in prizePoolTypeList" :label="item.dictLabel"
+                            :value="item.dictValue">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
           <el-form-item  label="状态">
               <el-radio-group v-model="dataForm.status">
                   <el-radio :label="'0'">关闭</el-radio>
@@ -116,6 +129,7 @@
 
 <script>
   import { list, createItem, updateItem, deleteitem } from "@/api/raffleManage";
+  import { dataTypeList } from "@/api/public";
   import waves from "@/directive/waves"; // 水波纹指令
   import Tinymce from '@/components/Tinymce'
 
@@ -124,6 +138,7 @@ export default {
   directives: { waves },
   data() {
     return {
+      prizePoolTypeList: [],
       typeList: [
       {
         type: "1",
@@ -146,9 +161,11 @@ export default {
         limit: 10,
         title: '',
         status: '',
+        prizePoolType:'',
       },
       dataForm: {
         title: undefined,
+        prizePoolType: undefined,
         status: '1',
         content: undefined,
       },
@@ -161,19 +178,24 @@ export default {
       imageUrl: undefined,
       rules: {
         title: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],
+        prizePoolType: [{ required: true, message: "请选择奖池类型", trigger: "blur" }],
       },
     }
   },
   created() {
-      this.getList();
+    this.getprizePoolTypeList();
+    this.getList();
   },
   methods: {
-      handleDictData(row){
-
-      },
+    getprizePoolTypeList(){
+            dataTypeList({dictType:'prize_pool_type'}).then(response => {
+                this.prizePoolTypeList = response.data.data;
+            }).catch(() => {});
+        },
     resetForm() {
       this.dataForm = {
           title: undefined,
+          prizePoolType: undefined,
           status: '1',
           content: undefined,
       };
@@ -235,6 +257,7 @@ export default {
 
     handleUpdate(row) {
       this.dataForm = Object.assign({}, row);
+      this.dataForm.prizePoolType = row.prizePoolType.toString();
       this.dialogStatus = 'update'
       this.dialogFormVisible = true
       this.$nextTick(() => {