diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts index c933717..ca824c7 100644 --- a/src/utils/http/index.ts +++ b/src/utils/http/index.ts @@ -159,8 +159,6 @@ class PureHttp { ...param, ...axiosConfig } as PureHttpRequestConfig; - console.log(config) - console.log(getToken()) // 单独处理自定义请求/响应回调 return new Promise((resolve, reject) => { PureHttp.axiosInstance @@ -198,5 +196,4 @@ class PureHttp { return this.request("get", url, params, config); } } - export const http = new PureHttp(); diff --git a/src/views/paradise/paradiseList/hook.tsx b/src/views/paradise/paradiseList/hook.tsx index 59b1dab..de542bd 100644 --- a/src/views/paradise/paradiseList/hook.tsx +++ b/src/views/paradise/paradiseList/hook.tsx @@ -80,14 +80,21 @@ export function useData() { label: "公屏", prop: "is_public_screen", cellRenderer: ({ row }) => ( - {row.is_public_screen === 1 ? '是' : '否'} + {row.is_public_screen === 1 ? '显示' : '隐藏'} ) }, { label: "全服显示", prop: "is_public_server", cellRenderer: ({ row }) => ( - {row.is_world_show === 1 ? '是' : '否'} + {row.is_public_server === 1 ? '显示' : '隐藏'} + ) + }, + { + label: "榜单显示", + prop: "is_world_show", + cellRenderer: ({ row }) => ( + {row.is_world_show === 1 ? '显示' : '隐藏'} ) }, { diff --git a/src/views/paradise/paradiseList/settingRule.vue b/src/views/paradise/paradiseList/settingRule.vue index b9ffaf5..43e3e80 100644 --- a/src/views/paradise/paradiseList/settingRule.vue +++ b/src/views/paradise/paradiseList/settingRule.vue @@ -80,18 +80,24 @@ defineExpose({ getRef }); 锁定礼物 - + + 赠送房主礼物 - + + diff --git a/src/views/room/roomList/Turntable/lotteryResults.vue b/src/views/room/roomList/Turntable/lotteryResults.vue index 456a83f..dbf7346 100644 --- a/src/views/room/roomList/Turntable/lotteryResults.vue +++ b/src/views/room/roomList/Turntable/lotteryResults.vue @@ -58,10 +58,10 @@ const dynamicflowColumns = ref([ label: "盲盒转盘类型", prop: "gift_bag_type" }, - { - label: "期数", - prop: "periods" - }, + // { + // label: "期数", + // prop: "periods" + // }, { label: "开奖人ID", prop: "user_name" @@ -119,9 +119,9 @@ const getData = async (formData) => { tableList.value = data.lists.map(ele => { return { ...ele, ...data.total_data, - is_public_screen: data.is_public_screen === 1 ? '是' : '否', - is_public_server: data.is_public_server === 1 ? '是' : '否', - is_world_show: data.is_world_show === 1 ? '是' : '否', + is_public_screen: data.is_public_screen === 1 ? '显示' : '隐藏', + is_public_server: data.is_public_server === 1 ? '显示' : '隐藏', + is_world_show: data.is_world_show === 1 ? '显示' : '隐藏', } }); statisticsData.value = data.total_data diff --git a/src/views/room/roomList/Turntable/statistics.vue b/src/views/room/roomList/Turntable/statistics.vue index d1ce2ba..b32cd14 100644 --- a/src/views/room/roomList/Turntable/statistics.vue +++ b/src/views/room/roomList/Turntable/statistics.vue @@ -49,10 +49,10 @@ const statisticsList = ref([ }, ]) const dynamicflowColumns = ref([ - { - label: "当前期数", - prop: "" - }, + // { + // label: "当前期数", + // prop: "" + // }, { label: "ID", prop: "id" @@ -65,10 +65,10 @@ const dynamicflowColumns = ref([ label: "礼物名称", prop: "gift_name" }, - { - label: "封面图", - prop: "base_image" - }, + // { + // label: "封面图", + // prop: "base_image" + // }, { label: "价格", prop: "gift_price" @@ -131,9 +131,9 @@ const getData = async (formData) => { 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 ? '是' : '否', + is_public_screen: data.is_public_screen === 1 ? '显示' : '隐藏', + is_public_server: data.is_public_server === 1 ? '显示' : '隐藏', + is_world_show: data.is_world_show === 1 ? '显示' : '隐藏', } }); statisticsData.value = data.total_data diff --git a/src/views/room/roomList/XunLeHui/statistics.vue b/src/views/room/roomList/XunLeHui/statistics.vue index 9623282..621feaf 100644 --- a/src/views/room/roomList/XunLeHui/statistics.vue +++ b/src/views/room/roomList/XunLeHui/statistics.vue @@ -89,9 +89,9 @@ const getData = async (formData) => { tableList.value = data.lists.map(ele => { return { ...ele, ...data.total_data, - is_public_screen: data.is_public_screen === 1 ? '是' : '否', - is_public_server: data.is_public_server === 1 ? '是' : '否', - is_world_show: data.is_world_show === 1 ? '是' : '否', + is_public_screen: data.is_public_screen === 1 ? '显示' : '隐藏', + is_public_server: data.is_public_server === 1 ? '显示' : '隐藏', + is_world_show: data.is_world_show === 1 ? '显示' : '隐藏', } }); statisticsData.value = data.total_data diff --git a/vite.config.ts b/vite.config.ts index d07854f..0d7d26d 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -36,7 +36,7 @@ export default ({ mode }: ConfigEnv): UserConfigExport => { if (req.method === 'OPTIONS') { proxyReq.method = 'OPTIONS'; // 设置CORS头 - res.setHeader('Access-Control-Allow-Origin', URL); + res.setHeader('Access-Control-Allow-Origin', 'https://admin.xscmmidi.site'); res.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS'); res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization'); res.end();