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 }); + + + + + + 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" }); - } - }); + // }); }); } });