From 95d1eda7a3fbef757866a3a6385a6c54f3a7d3be Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 13 Jan 2025 16:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E4=B8=AD=E5=BF=83=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.js                           |  4 +-
 .../finance/components/pop-add-redPack.vue    | 51 ++++++-------------
 src/views/finance/financeList.vue             |  9 +++-
 3 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/src/config/index.js b/src/config/index.js
index 73cd2bd..68aed2a 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -4,8 +4,8 @@ export const productUrl='dj-admin';
 // const baseUrl = "http://192.168.1.7:8100/czg/"
 //  const baseUrl = "https://api.tianjinzhitongdaohe.com/czg/"
 
-//  const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试
-const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上
+ const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试
+// const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上
 
 export default{
     baseUrl
diff --git a/src/views/finance/components/pop-add-redPack.vue b/src/views/finance/components/pop-add-redPack.vue
index 23de57f..917a151 100644
--- a/src/views/finance/components/pop-add-redPack.vue
+++ b/src/views/finance/components/pop-add-redPack.vue
@@ -1,46 +1,24 @@
 <template>
-  <el-dialog
-    :title="form.id ? '修改红包' : '新增红包'"
-    width="500px"
-    :visible.sync="dialogVisible"
-    @close="diaClose"
-    :close-on-click-modal="true"
-  >
+  <el-dialog :title="form.id ? '修改红包' : '新增红包'" width="500px" :visible.sync="dialogVisible" @close="diaClose"
+    :close-on-click-modal="true">
     <el-form :model="form" label-width="100px">
       <el-form-item label="描述" required>
         <el-input v-model="form.name"></el-input>
       </el-form-item>
       <el-form-item label="从第几次开始变化">
-        <el-input-number
-          :min="0"
-          stepstep-strictly
-          v-model="form.num"
-        ></el-input-number>
+        <el-input-number :min="0" stepstep-strictly v-model="form.num"></el-input-number>
       </el-form-item>
       <el-form-item label="最大金额" required>
-        <el-input-number
-          :min="0"
-          :max="100"
-          v-model="form.maxAmount"
-        ></el-input-number>
+        <el-input-number :min="0" :max="100" v-model="form.maxAmount"></el-input-number>
         <span>元</span>
       </el-form-item>
 
       <el-form-item label="中奖概率" required>
-        <el-input-number
-          :min="0"
-          :max="1"
-          :step="0.1"
-          v-model="form.random"
-        ></el-input-number>
+        <el-input-number :min="0" :max="1" :step="0.1" v-model="form.random"></el-input-number>
         <span></span>
       </el-form-item>
       <el-form-item label="是否启用" required>
-        <el-switch
-          v-model="form.status"
-          :inactive-value="0"
-          :active-value="1"
-        ></el-switch>
+        <el-switch v-model="form.status" :inactive-value="0" :active-value="1"></el-switch>
       </el-form-item>
     </el-form>
 
@@ -56,9 +34,9 @@ import { $redPackApi } from "@/api/red-pack.js";
 import { isNull } from "@/utils/validate.js";
 export default {
   props: {
-    source:{
-      type:[String,Number],
-      default:1
+    source: {
+      type: [String, Number],
+      default: 1
     }
   },
   data() {
@@ -82,7 +60,7 @@ export default {
       console.log(item);
       this.dialogVisible = true;
       this.item = item;
-      if (item!==undefined) {
+      if (item !== undefined) {
         this.form = {
           ...item,
           num: item.num === "" || item.num === null ? undefined : item.num,
@@ -114,12 +92,12 @@ export default {
       }
       console.log(id);
       const res = id
-        ? await $redPackApi.update({ ...this.form, num: this.form.num || "" ,discType:this.source})
-        : await $redPackApi.add({...this.form,discType:this.source});
+        ? await $redPackApi.update({ ...this.form, num: this.form.num || "", discType: this.source, type: this.source.type })
+        : await $redPackApi.add({ ...this.form, discType: this.source, type: this.source.type });
       console.log(res);
       const { data, msg } = res;
       if (data && data.code == 0) {
-        this.$message.success(id?"修改成功":"添加成功");
+        this.$message.success(id ? "修改成功" : "添加成功");
         this.$emit("refresh");
         this.diaClose();
       } else {
@@ -133,9 +111,11 @@ export default {
 .el-form-item__label {
   text-align: left;
 }
+
 ::v-deep .el-form-item__label {
   text-align: left;
 }
+
 .upload-file-box {
   border-radius: 6px;
   width: 148px;
@@ -145,6 +125,7 @@ export default {
   align-items: center;
   overflow: hidden;
   border: 1px solid #c0c4cc;
+
   img {
     width: 100%;
     height: 100%;
diff --git a/src/views/finance/financeList.vue b/src/views/finance/financeList.vue
index 7558abd..c7c3619 100644
--- a/src/views/finance/financeList.vue
+++ b/src/views/finance/financeList.vue
@@ -529,6 +529,10 @@
       <el-tab-pane label="现金红包抽奖金额配置" name="senven">
         <div class="">
           <div style="margin-bottom: 20px">
+            <el-select @change="redPackInit" v-model="zhuanPanType" placeholder="请选择">
+              <el-option v-for="item in zhuanPanTypes" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
             <el-button type="primary" @click="openPop('refAddRedPack')">添加</el-button>
           </div>
           <el-table :border="true" :data="redPackData">
@@ -556,7 +560,7 @@
       </el-tab-pane>
     </el-tabs>
     <pop-add-zhuanpan ref="refAddZhuanpan" @refresh="zhuanPanRefresh" :source="zhuanPanType"></pop-add-zhuanpan>
-    <pop-add-red-pack ref="refAddRedPack" @refresh="redpackRefresh"></pop-add-red-pack>
+    <pop-add-red-pack ref="refAddRedPack" @refresh="redpackRefresh" :source="zhuanPanType"></pop-add-red-pack>
   </div>
 </template>
 
@@ -1102,7 +1106,8 @@ export default {
       const { data } = await $redPackApi.getList({
         page: this.page,
         limit: this.limit,
-        source: this.zhuanPanType
+        source: this.zhuanPanType,
+        type: this.zhuanPanType
       });
       this.redPackData = data.data.records;
     },