From f1e212767eb831fc1a947dd5ca7f0ddd9c67de7e Mon Sep 17 00:00:00 2001
From: yziiy <15979918+mayday-yziiy@user.noreply.gitee.com>
Date: Mon, 22 Dec 2025 15:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/BlindBox/turntable/Turntable.vue           |  4 +++-
 src/views/BlindBox/turntable/hook.tsx                |  3 +++
 src/views/gift/giftList/form.vue                     | 10 +++++++++-
 src/views/gift/giftList/hook.tsx                     |  3 ++-
 src/views/room/roomList/Turntable/lotteryResults.vue |  5 +++--
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/views/BlindBox/turntable/Turntable.vue b/src/views/BlindBox/turntable/Turntable.vue
index d9d67a3..99b1054 100644
--- a/src/views/BlindBox/turntable/Turntable.vue
+++ b/src/views/BlindBox/turntable/Turntable.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import lotteryView from '@/views/room/roomList/Turntable/lotteryResults.vue'
+const props = defineProps(["giftBagId"]);
 </script>
 <template>
   <div class="viewPage">
-    <lotteryView></lotteryView>
+    <!-- {{ giftBagId }} -->
+    <lotteryView :giftBagId="giftBagId"></lotteryView>
   </div>
 </template>
\ No newline at end of file
diff --git a/src/views/BlindBox/turntable/hook.tsx b/src/views/BlindBox/turntable/hook.tsx
index 91ed216..2ce98eb 100644
--- a/src/views/BlindBox/turntable/hook.tsx
+++ b/src/views/BlindBox/turntable/hook.tsx
@@ -275,6 +275,9 @@ export function useData() {
   const openLotteryRecord = () => {
     addDialog({
       title: `盲盒转盘开奖记录`,
+      props: {
+        giftBagId: activeName.value
+      },
       fullscreen: true,
       hideFooter: true,
       closeOnClickModal: false,
diff --git a/src/views/gift/giftList/form.vue b/src/views/gift/giftList/form.vue
index feb0768..173d751 100644
--- a/src/views/gift/giftList/form.vue
+++ b/src/views/gift/giftList/form.vue
@@ -9,6 +9,7 @@ const formRules = ref({
   type: [{ required: true, message: "请选择分类", trigger: "change" }],
   label: [{ required: true, message: "请输入礼物标签", trigger: "blur" }],
   base_image: [{ required: true, message: "请上传礼物展示图片", trigger: "change" }],
+  // icon: [{ required: true, message: "请上传礼物标签图片", trigger: "change" }],
   play_image: [],
   gift_type: [{ required: true, message: "请选择", trigger: "change" }],
   is_public_screen: [{ required: true, message: "请选择", trigger: "change" }],
@@ -37,7 +38,8 @@ const newFormInline = ref(
       is_public_server: "",
       is_show: "",
       is_can_buy: "",
-      sort: ""
+      sort: "",
+      icon: ""
     }
 );
 function getRef() {
@@ -46,6 +48,9 @@ function getRef() {
 function handleFileSuccess(list) {
   newFormInline.value.base_image = list.join(',')
 }
+function handleIconSuccess(list) {
+  newFormInline.value.icon = list.join(',')
+}
 function handlePlayFileSuccess(list) {
   newFormInline.value.play_image = list.join(',')
 }
@@ -101,6 +106,9 @@ defineExpose({ getRef });
         :acceptType="newFormInline.file_type === 1 ? '.svg,.svga' : '.mp4'" :limit="1"
         :echoUrl="newFormInline.play_image" />
     </el-form-item>
+    <el-form-item label="礼物标签图" prop="icon">
+      <uploadImage @handleSuccess="handleIconSuccess" :limit="1" :echoUrl="newFormInline.icon" />
+    </el-form-item>
     <el-form-item label="是否有特效" prop="gift_type">
       <el-radio-group v-model="newFormInline.gift_type">
         <el-radio :label="2">是</el-radio>
diff --git a/src/views/gift/giftList/hook.tsx b/src/views/gift/giftList/hook.tsx
index 86294dc..1a3d62d 100644
--- a/src/views/gift/giftList/hook.tsx
+++ b/src/views/gift/giftList/hook.tsx
@@ -187,7 +187,8 @@ export function useData() {
           is_public_server: rowData?.is_public_server ?? "",
           is_show: rowData?.is_show ?? "",
           is_can_buy: rowData?.is_can_buy ?? "",
-          sort: rowData?.sort ?? ""
+          sort: rowData?.sort ?? "",
+          icon: rowData?.icon ?? ""
         }
       },
       width: "40%",
diff --git a/src/views/room/roomList/Turntable/lotteryResults.vue b/src/views/room/roomList/Turntable/lotteryResults.vue
index 8ad7e3e..abfd624 100644
--- a/src/views/room/roomList/Turntable/lotteryResults.vue
+++ b/src/views/room/roomList/Turntable/lotteryResults.vue
@@ -21,7 +21,8 @@ const searchLabel = ref([
   { label: "开始时间", prop: "stime", type: "date" },
   { label: "结束时间", prop: "etime", type: "date" }
 ]);
-const props = defineProps(["roomId"]);
+const props = defineProps(["roomId", 'BagId', 'giftBagId']);
+// console.log('传递过来的参数', )
 const typeList = ref([])
 const formatDate = (date) => {
   // 获取年份
@@ -126,7 +127,7 @@ const getType = async () => {
   }) : []
   if (code) {
     searchLabel.value[0].optionList = typeList.value
-    searchForm.value.gift_bag_id = data[0].id
+    searchForm.value.gift_bag_id = Number(props.giftBagId) || data[0].id
     nextTick(() => {
       getData(searchForm.value)
     })