From 19e048873dca67015b6e6bb32d5c30a526ad1356 Mon Sep 17 00:00:00 2001
From: chenruiye <862859104@qq.com>
Date: Mon, 31 Mar 2025 18:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B9=B8=E8=BF=90=E7=A4=BC?=
 =?UTF-8?q?=E7=89=A9=E5=88=86=E5=8C=BA=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/luckGift/luckGift.js                  | 11 ++++-
 .../GiftPanelManagement.vue                   | 12 ++++--
 src/views/bravoGift/bravoGiftSet.vue          | 43 +++++++++++--------
 src/views/luckGift/luckGiftSet.vue            | 42 ++++++++++--------
 4 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/src/api/luckGift/luckGift.js b/src/api/luckGift/luckGift.js
index 5634bac..3c7958e 100644
--- a/src/api/luckGift/luckGift.js
+++ b/src/api/luckGift/luckGift.js
@@ -67,4 +67,13 @@ export const updateUserMulti = query => {
         method: 'post',
         params: query
     });
-};
\ No newline at end of file
+};
+
+// 分区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
diff --git a/src/views/GiftPanelManagement/GiftPanelManagement.vue b/src/views/GiftPanelManagement/GiftPanelManagement.vue
index 8f48f62..4f14432 100644
--- a/src/views/GiftPanelManagement/GiftPanelManagement.vue
+++ b/src/views/GiftPanelManagement/GiftPanelManagement.vue
@@ -105,6 +105,7 @@
 </template>
 <script>
 import { list, update } from "@/api/GiftPanelManagement/GiftPanelManagement";
+import { listAll} from "@/api/partition/partitionInfo";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
@@ -118,10 +119,10 @@ export default {
       inquire: {
         partitionId: 4,
         inquireonInfos: [
-          { desc: "英语区", id: 1 },
-          { desc: "阿拉伯区", id: 2 },
-          { desc: "华语区", id: 4 },
-          { desc: "土耳其区", id: 8 },
+          // { desc: "英语区", id: 1 },
+          // { desc: "阿拉伯区", id: 2 },
+          // { desc: "华语区", id: 4 },
+          // { desc: "土耳其区", id: 8 },
         ],
       },
       // 表格
@@ -153,6 +154,9 @@ export default {
     this.eidDialogTitle = `编辑礼物面板信息-华语区`;
     this.eidText = `华语区`;
     this.getData();
+    listAll().then((res) => {
+      this.inquire.inquireonInfos = res.data;
+    });
   },
   methods: {
     // 查询接口
diff --git a/src/views/bravoGift/bravoGiftSet.vue b/src/views/bravoGift/bravoGiftSet.vue
index e18f861..036d711 100644
--- a/src/views/bravoGift/bravoGiftSet.vue
+++ b/src/views/bravoGift/bravoGiftSet.vue
@@ -70,9 +70,9 @@
           >
             <el-option
               v-for="item in inquire.options"
-              :key="item.type"
-              :label="item.name"
-              :value="item.type"
+              :key="item.id"
+              :label="item.desc"
+              :value="item.id"
             >
             </el-option>
           </el-select>
@@ -342,6 +342,8 @@
   </template>
   <script>
   import { getConfig, updateSet, updateUserMulti } from "@/api/bravoGift/bravoGift";
+import { listAll} from "@/api/partition/partitionInfo";
+
   // @ts-ignore
   import { dateFormat } from "@/utils/system-helper";
   // @ts-ignore
@@ -358,22 +360,22 @@
         inquire: {
           value: 2,
           options: [
-            {
-              name: "阿拉伯区",
-              type: 2,
-            },
-            {
-              name: "英语区",
-              type: 1,
-            },
-            {
-              name: "华语区",
-              type: 4,
-            },
-            {
-              name: "土耳其区",
-              type: 8,
-            },
+            // {
+            //   name: "阿拉伯区",
+            //   type: 2,
+            // },
+            // {
+            //   name: "英语区",
+            //   type: 1,
+            // },
+            // {
+            //   name: "华语区",
+            //   type: 4,
+            // },
+            // {
+            //   name: "土耳其区",
+            //   type: 8,
+            // },
           ],
           comparisonValue: "",
           goldInventory: "",
@@ -397,6 +399,9 @@
     },
     created() {
       this.getData();
+      listAll().then((res) => {
+        this.inquire.options = res.data;
+      });
     },
     methods: {
       // 查询接口
diff --git a/src/views/luckGift/luckGiftSet.vue b/src/views/luckGift/luckGiftSet.vue
index 54ab115..dad2fa4 100644
--- a/src/views/luckGift/luckGiftSet.vue
+++ b/src/views/luckGift/luckGiftSet.vue
@@ -70,9 +70,9 @@
         >
           <el-option
             v-for="item in inquire.options"
-            :key="item.type"
-            :label="item.name"
-            :value="item.type"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
           >
           </el-option>
         </el-select>
@@ -342,6 +342,7 @@
 </template>
 <script>
 import { getConfig, updateSet, updateUserMulti } from "@/api/luckGift/luckGift";
+import { listAll} from "@/api/partition/partitionInfo";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
@@ -358,22 +359,22 @@ export default {
       inquire: {
         value: 2,
         options: [
-          {
-            name: "阿拉伯区",
-            type: 2,
-          },
-          {
-            name: "英语区",
-            type: 1,
-          },
-          {
-            name: "华语区",
-            type: 4,
-          },
-          {
-            name: "土耳其区",
-            type: 8,
-          },
+          // {
+          //   name: "阿拉伯区",
+          //   type: 2,
+          // },
+          // {
+          //   name: "英语区",
+          //   type: 1,
+          // },
+          // {
+          //   name: "华语区",
+          //   type: 4,
+          // },
+          // {
+          //   name: "土耳其区",
+          //   type: 8,
+          // },
         ],
         comparisonValue: "",
         goldInventory: "",
@@ -397,6 +398,9 @@ export default {
   },
   created() {
     this.getData();
+    listAll().then((res) => {
+      this.inquire.options = res.data;
+    });
   },
   methods: {
     // 查询接口