sunlupeng před 6 měsíci
rodič
revize
0bfd5210ab
2 změnil soubory, kde provedl 12 přidání a 5 odebrání
  1. 4 4
      config/dev.env.js
  2. 8 1
      src/views/activityManage/activityList.vue

+ 4 - 4
config/dev.env.js

@@ -4,10 +4,10 @@ module.exports = {
   // 本地数据库:登录用户名 admin123,密码 admin123
   // 本地数据库:登录用户名 admin123,密码 admin123
   // BASE_API: '"http://192.168.100.87:9083/admin"',
   // BASE_API: '"http://192.168.100.87:9083/admin"',
   // OS_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"',
   
   
   
   
   
   

+ 8 - 1
src/views/activityManage/activityList.vue

@@ -116,7 +116,7 @@
                         <el-radio :label="'1'">是</el-radio>
                         <el-radio :label="'1'">是</el-radio>
                     </el-radio-group>
                     </el-radio-group>
                 </el-form-item>
                 </el-form-item>
-                <el-form-item v-if="dataForm.type!='3' && dataForm.relationCoupon=='1'"  label="兑换券" prop="couponIds">
+                <el-form-item v-if="(dataForm.type!='3' && dataForm.type!='5') && dataForm.relationCoupon=='1'"  label="兑换券" prop="couponIds">
                     <el-select :disabled="dialogStatus == 'update'?true:false" v-model="dataForm.couponIds" clearable multiple collapse-tags placeholder="请选择兑换券" class="filter-item" style="width: 350px">
                     <el-select :disabled="dialogStatus == 'update'?true:false" 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 :key="item.id" v-for="item in couponsList" :label="item.couponName" :value="item.id">
                         </el-option>
                         </el-option>
@@ -500,7 +500,14 @@ export default {
             });
             });
         },
         },
         handleUpdate(row) {
         handleUpdate(row) {
+            if(row.type == '3'){
+                this.getPrizePoolList();
+            }
+            if(row.type == '5'){
+                this.getDrawPoolList();
+            }
             this.dataForm = Object.assign({}, row);
             this.dataForm = Object.assign({}, row);
+            this.dataForm.prizePoolId = 1;
             if(this.dataForm.couponIds==null){
             if(this.dataForm.couponIds==null){
                 this.dataForm.couponIds = [];
                 this.dataForm.couponIds = [];
             }
             }