From ec9bd399dafa643082fa1037ed95b4d36f01be3d Mon Sep 17 00:00:00 2001
From: yziiy <15979918+mayday-yziiy@user.noreply.gitee.com>
Date: Tue, 14 Oct 2025 11:46:36 +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      |  8 ++++++++
 src/views/BlindBox/turntable/hook.tsx           | 14 +++++++++++++-
 src/views/BlindBox/turntable/index.vue          |  3 +++
 src/views/paradise/paradiseList/hook.tsx        |  4 ++++
 src/views/room/roomList/Turntable/Turntable.vue |  6 +++---
 5 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 src/views/BlindBox/turntable/Turntable.vue

diff --git a/src/views/BlindBox/turntable/Turntable.vue b/src/views/BlindBox/turntable/Turntable.vue
new file mode 100644
index 0000000..d9d67a3
--- /dev/null
+++ b/src/views/BlindBox/turntable/Turntable.vue
@@ -0,0 +1,8 @@
+<script setup lang="ts">
+import lotteryView from '@/views/room/roomList/Turntable/lotteryResults.vue'
+</script>
+<template>
+  <div class="viewPage">
+    <lotteryView></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 adcd86b..628a94f 100644
--- a/src/views/BlindBox/turntable/hook.tsx
+++ b/src/views/BlindBox/turntable/hook.tsx
@@ -9,6 +9,7 @@ import {
   getBlindBoxRule,
   settingBlindBoxRule
 } from "@/api/modules/blindBox";
+import TurntableView from './Turntable.vue';
 import editForm from "./form.vue";
 import settingRuleView from './settingRule.vue'
 import { addDialog } from "@/components/ReDialog";
@@ -266,6 +267,16 @@ export function useData() {
       }
     });
   }
+  // 开奖记录
+  const openLotteryRecord = () => {
+    addDialog({
+      title: `盲盒转盘开奖记录`,
+      fullscreen: true,
+      hideFooter: true,
+      closeOnClickModal: false,
+      contentRenderer: () => h(TurntableView, { ref: formRef, formInline: null })
+    });
+  }
   return {
     searchForm,
     searchLabel,
@@ -286,6 +297,7 @@ export function useData() {
     openDialog,
     resetSetting,
     handleDelete,
-    setting
+    setting,
+    openLotteryRecord
   };
 }
\ No newline at end of file
diff --git a/src/views/BlindBox/turntable/index.vue b/src/views/BlindBox/turntable/index.vue
index f617a98..1b6e941 100644
--- a/src/views/BlindBox/turntable/index.vue
+++ b/src/views/BlindBox/turntable/index.vue
@@ -26,6 +26,7 @@ const {
   openDialog,
   resetSetting,
   handleDelete,
+  openLotteryRecord,
   setting
 } = useData();
 onMounted(() => {
@@ -56,8 +57,10 @@ defineOptions({
       <PureTableBar title="盲盒转盘列表" :class="[isShow && !deviceDetection() ? '!w-[60vw]' : 'w-full']"
         :columns="tableLabel" @refresh="onSearch">
         <template #buttons>
+          <el-button type="text" @click="openLotteryRecord">开奖记录</el-button>
           <el-popconfirm :title="`是否重置当前盲盒转盘的规则数量`" @confirm="resetSetting(row)">
             <template #reference>
+
               <el-button type="primary">
                 重置数量
               </el-button>
diff --git a/src/views/paradise/paradiseList/hook.tsx b/src/views/paradise/paradiseList/hook.tsx
index c50804c..6405263 100644
--- a/src/views/paradise/paradiseList/hook.tsx
+++ b/src/views/paradise/paradiseList/hook.tsx
@@ -73,6 +73,10 @@ export function useData() {
       label: "每期数量",
       prop: "quantity"
     },
+    {
+      label: "未开数量",
+      prop: "remaining_number"
+    },
     {
       label: "多少次后可参与开奖",
       prop: "weight"
diff --git a/src/views/room/roomList/Turntable/Turntable.vue b/src/views/room/roomList/Turntable/Turntable.vue
index 8fe53a8..929c24e 100644
--- a/src/views/room/roomList/Turntable/Turntable.vue
+++ b/src/views/room/roomList/Turntable/Turntable.vue
@@ -13,14 +13,14 @@ const changeIndex = (data) => {
 </script>
 <template>
   <div class="viewPage">
-    <el-row>
+    <!-- <el-row>
       <el-button @click="changeIndex(ele)" :type="activeIndex === ele.index ? 'primary' : ''" v-for="ele in activeList"
         :key="ele.index">{{
           ele.name }}</el-button>
-    </el-row>
+    </el-row> -->
     <div>
       <statisticsView v-if="activeIndex === 0" :roomId="props.roomDetail.room_id" />
-      <lotteryView v-else :roomId="props.roomDetail.room_id"></lotteryView>
+      <!-- <lotteryView v-else :roomId="props.roomDetail.room_id"></lotteryView> -->
     </div>
   </div>
 </template>
\ No newline at end of file