From e64eb34c93f42540cec7838f0200d7eb1ddb8886 Mon Sep 17 00:00:00 2001
From: yziiy <15979918+mayday-yziiy@user.noreply.gitee.com>
Date: Sat, 17 Jan 2026 16:14:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=9B=B2=E7=9B=92=E8=BD=AC=E7=9B=98?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BB=A5=E5=8F=8A=E5=8E=BB=E6=8E=89=E9=81=93?=
 =?UTF-8?q?=E5=85=B7=E8=B5=A0=E9=80=81=E7=9A=84=E4=BA=8C=E7=BA=A7=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/BlindBox/turntable/hook.tsx        | 10 ++++----
 src/views/BlindBox/turntable/settingRule.vue |  7 ++++++
 src/views/Decorate/decorateList/hook.tsx     | 24 ++++++++++----------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/views/BlindBox/turntable/hook.tsx b/src/views/BlindBox/turntable/hook.tsx
index 020a213..11714b2 100644
--- a/src/views/BlindBox/turntable/hook.tsx
+++ b/src/views/BlindBox/turntable/hook.tsx
@@ -151,11 +151,11 @@ export function useData() {
     const { code, data } = await queryBoxTypeList({ activities_id: 5 });
     typeList.value = code
       ? data.map(ele => {
-          return {
-            label: ele.name,
-            value: ele.id
-          };
-        })
+        return {
+          label: ele.name,
+          value: ele.id
+        };
+      })
       : [];
     if (code) handleClick(data[0].id);
   };
diff --git a/src/views/BlindBox/turntable/settingRule.vue b/src/views/BlindBox/turntable/settingRule.vue
index 954ddb7..f6bb85a 100644
--- a/src/views/BlindBox/turntable/settingRule.vue
+++ b/src/views/BlindBox/turntable/settingRule.vue
@@ -7,6 +7,7 @@ const typeList = ref([])
 const formRules = ref({
   gift_id: [{ required: true, message: "请选择礼物", trigger: "change" }],
   introd: [{ required: true, message: "请输入玩法介绍", trigger: "blur" }],
+  status: [{ required: true, message: "请选择转盘状态", trigger: "change" }],
   description: [{ required: true, message: "请输入说明", trigger: "blur" }]
 });
 const props = defineProps(["formInline"]);
@@ -53,5 +54,11 @@ defineExpose({ getRef });
       <RichText style="border: 1px solid #ccc;" :echoValue="newFormInline.introd" @changeValue="chanageEditorValue">
       </RichText>
     </el-form-item>
+    <el-form-item label="转盘状态" prop="status">
+      <el-radio-group v-model="newFormInline.status">
+        <el-radio label="开启" :value="1" />
+        <el-radio label="关闭" :value="0" />
+      </el-radio-group>
+    </el-form-item>
   </el-form>
 </template>
diff --git a/src/views/Decorate/decorateList/hook.tsx b/src/views/Decorate/decorateList/hook.tsx
index 95d5e60..6e10f0a 100644
--- a/src/views/Decorate/decorateList/hook.tsx
+++ b/src/views/Decorate/decorateList/hook.tsx
@@ -229,19 +229,19 @@ export function useData() {
 
         FormRef.validate(async valid => {
           if (!valid) return;
+          curData.decorate_id = rowData.id;
+          const { code, msg } = await giveDecorate(curData);
+          if (code) {
+            message("赠送成功", { type: "success" });
+            onSearch(searchForm.value);
+            done();
+          } else {
+            message(msg, { type: "error" });
+          }
+          // // 赠送操作 - 需要二级密码验证
+          // verifyPassword(async () => {
 
-          // 赠送操作 - 需要二级密码验证
-          verifyPassword(async () => {
-            curData.decorate_id = rowData.id;
-            const { code, msg } = await giveDecorate(curData);
-            if (code) {
-              message("赠送成功", { type: "success" });
-              onSearch(searchForm.value);
-              done();
-            } else {
-              message(msg, { type: "error" });
-            }
-          });
+          // });
         });
       }
     });