diff --git a/apps/web-antd/.env b/apps/web-antd/.env index 9adceb6..bfa9b80 100644 --- a/apps/web-antd/.env +++ b/apps/web-antd/.env @@ -1,6 +1,6 @@ # 应用标题 VITE_APP_TITLE=喵喵喵之家 -VITE_APP_LOGO='../public/favicon.ico' # Adjust the path as necessary +VITE_APP_LOGO='https://merge-pet-web.oss-cn-heyuan.aliyuncs.com/favicon.ico' # Adjust the path as necessary # 应用命名空间,用于缓存、store等功能的前缀,确保隔离 VITE_APP_NAMESPACE=vben-web-antd diff --git a/apps/web-antd/public/public/favicon.ico b/apps/web-antd/public/public/favicon.ico new file mode 100644 index 0000000..4038522 Binary files /dev/null and b/apps/web-antd/public/public/favicon.ico differ diff --git a/apps/web-antd/src/api/core/log.ts b/apps/web-antd/src/api/core/log.ts index 1692663..79feb6a 100644 --- a/apps/web-antd/src/api/core/log.ts +++ b/apps/web-antd/src/api/core/log.ts @@ -42,6 +42,7 @@ export interface UserLogInfo { Bonus?: number; Code?: string; RegisterTime: number; + Ban?: number; Order: UserLogOrder[]; Heatmap?: heatType[]; } diff --git a/apps/web-antd/src/api/core/user.ts b/apps/web-antd/src/api/core/user.ts index 05aa94d..00c1e86 100644 --- a/apps/web-antd/src/api/core/user.ts +++ b/apps/web-antd/src/api/core/user.ts @@ -32,6 +32,9 @@ export async function userGmApi(data : object) { return requestClient.post('/user/gm', data); } +export async function userBanApi(data : object) { + return requestClient.post('/user/ban', data); +} diff --git a/apps/web-antd/src/preferences.ts b/apps/web-antd/src/preferences.ts index 2399942..ac9a95d 100644 --- a/apps/web-antd/src/preferences.ts +++ b/apps/web-antd/src/preferences.ts @@ -9,7 +9,7 @@ export const overridesPreferences = defineOverridesPreferences({ // overrides app: { name: "喵喵喵之家2", - defaultAvatar:'../public/favicon.ico', // Adjust the path as necessary + defaultAvatar:'https://merge-pet-web.oss-cn-heyuan.aliyuncs.com/favicon.ico', // Adjust the path as necessary }, copyright: { companyName: '厦门蹊径科技公司', diff --git a/apps/web-antd/src/views/operation/mail/mail-detail.vue b/apps/web-antd/src/views/operation/mail/mail-detail.vue index a13c8bb..4174198 100644 --- a/apps/web-antd/src/views/operation/mail/mail-detail.vue +++ b/apps/web-antd/src/views/operation/mail/mail-detail.vue @@ -159,7 +159,8 @@ const [Modal, modalApi] = useVbenModal({ items: modalData.items, start_time: 0, register_time: modalData.register_time, - mail_type: modalData.mail_type === 1 ? '全服邮件' : '个人邮件', + mail_type: modalData.mail_type === 1 ? '普通邮件' : '节日邮件', + send_type: modalData.send_type === 1 ? '全服邮件' : '个人邮件', ToUids: modalData.to_uids, }); FormApi.updateSchema([ diff --git a/apps/web-antd/src/views/operation/mail/mail-table.vue b/apps/web-antd/src/views/operation/mail/mail-table.vue index 7fcb877..0ad9468 100644 --- a/apps/web-antd/src/views/operation/mail/mail-table.vue +++ b/apps/web-antd/src/views/operation/mail/mail-table.vue @@ -1,6 +1,6 @@