diff --git a/src/utils/http/config.ts b/src/utils/http/config.ts index 8d27060..776c2bb 100644 --- a/src/utils/http/config.ts +++ b/src/utils/http/config.ts @@ -1,4 +1,4 @@ -export const URL = "http://tmd.xscmmidi.site"; +export const URL = "http://md.xscmmidi.site"; // http://md.xscmmidi.site 正式 // http://tmd.xscmmidi.site 测试 // 声网appId 在这里换 diff --git a/src/views/BlindBox/turntable/form.vue b/src/views/BlindBox/turntable/form.vue index a133e16..8ce3bf0 100644 --- a/src/views/BlindBox/turntable/form.vue +++ b/src/views/BlindBox/turntable/form.vue @@ -5,7 +5,9 @@ const ruleFormRef = ref(); const typeList = ref([]) const formRules = ref({ gift_id: [{ required: true, message: "请选择礼物", trigger: "change" }], - quantity: [{ required: true, message: "请输入每期数量", trigger: "blur" }] + quantity: [{ required: true, message: "请输入每期数量", trigger: "blur" }], + weight: [{ required: true, message: "请输入起止数量", trigger: "blur" }], + is_world_show: [{ required: true, message: "请选择状态", trigger: "change" }], }); const props = defineProps(["formInline"]); const newFormInline = ref( @@ -13,7 +15,8 @@ const newFormInline = ref( ? props.formInline : { gift_id: "", - quantity: "" + quantity: 1, + weight: 1 } ); function getRef() { @@ -30,7 +33,7 @@ defineExpose({ getRef }); diff --git a/src/views/BlindBox/turntable/hook.tsx b/src/views/BlindBox/turntable/hook.tsx index 701cc40..1a858b8 100644 --- a/src/views/BlindBox/turntable/hook.tsx +++ b/src/views/BlindBox/turntable/hook.tsx @@ -77,8 +77,8 @@ export function useData() { prop: "quantity" }, { - label: "未开数量", - prop: "remaining_number" + label: "多少次后可参与开奖", + prop: "weight" }, { label: "公屏", @@ -177,7 +177,9 @@ export function useData() { props: { formInline: { gift_id: rowData?.gift_id ?? "", - quantity: rowData?.quantity ?? "", + quantity: rowData?.quantity ?? 1, + weight: rowData?.weight ?? 1, + is_world_show: rowData?.is_world_show ?? "" } }, width: "40%", diff --git a/src/views/room/roomList/Turntable/statistics.vue b/src/views/room/roomList/Turntable/statistics.vue index 6c6e292..d1ce2ba 100644 --- a/src/views/room/roomList/Turntable/statistics.vue +++ b/src/views/room/roomList/Turntable/statistics.vue @@ -85,10 +85,6 @@ const dynamicflowColumns = ref([ label: "未开数量", prop: "remaining_number" }, - // { - // label: "排序", - // prop: "content" - // }, { label: "公屏播报", prop: "is_public_screen" @@ -134,6 +130,7 @@ const getData = async (formData) => { tableList.value = data.lists.map(ele => { return { ...ele, ...data.total_data, + remaining_number: ele.remaining_number, is_public_screen: data.is_public_screen === 1 ? '是' : '否', is_public_server: data.is_public_server === 1 ? '是' : '否', is_world_show: data.is_world_show === 1 ? '是' : '否',