diff --git a/src/components/async-error/index.vue b/src/components/async-error/index.vue index a23dd6d..980234d 100644 --- a/src/components/async-error/index.vue +++ b/src/components/async-error/index.vue @@ -1,79 +1,89 @@ + - - - diff --git a/src/components/async-loading/index.vue b/src/components/async-loading/index.vue index 5bb623b..803f092 100644 --- a/src/components/async-loading/index.vue +++ b/src/components/async-loading/index.vue @@ -22,6 +22,9 @@ import { computed } from 'vue'; align-items: center; justify-content: center; height: 100vh; + background-image: url('@/static/image/clockIn/z3280@3x.png'); + background-size: cover; + background-position: bottom center; } .heading { diff --git a/src/main.js b/src/main.js index e4cf021..fae97a9 100644 --- a/src/main.js +++ b/src/main.js @@ -90,6 +90,11 @@ export function createApp() { useUserStore().loadSetting() } + //处理OA、墨册强制刷新时,聊天同步强制刷新 + window.doLocationRefresh = () => { + location.reload(true) + } + window.message = ['success', 'error', 'warning'].reduce((acc, type) => { acc[type] = (message) => { if (typeof message === 'string') { diff --git a/src/pages/chatSettings/index.vue b/src/pages/chatSettings/index.vue index ebecaf1..a1492ca 100644 --- a/src/pages/chatSettings/index.vue +++ b/src/pages/chatSettings/index.vue @@ -140,6 +140,20 @@ > +
+
+ +
+
{ customInfo: 'switch', }, ] + state.chatReport = [ + // { + // label: t('chat.settings.report'), + // hasPointer: true, + // }, + ] }) //群名称 diff --git a/src/pages/complaintReport/index.vue b/src/pages/complaintReport/index.vue new file mode 100644 index 0000000..e8b22d2 --- /dev/null +++ b/src/pages/complaintReport/index.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/uni_modules/tmui/locale/zh-Hans.json b/src/uni_modules/tmui/locale/zh-Hans.json index 32fae35..cabd2b0 100644 --- a/src/uni_modules/tmui/locale/zh-Hans.json +++ b/src/uni_modules/tmui/locale/zh-Hans.json @@ -155,5 +155,6 @@ "do.phone.call": "拨打", "popup.title.phone": "电话", "pageTitle.view.deps": "查看部门", - "group.dismiss.confirm": "确定解散本群" + "group.dismiss.confirm": "确定解散本群", + "chat.settings.report": "投诉" } diff --git a/vite.config.js b/vite.config.js index 928f5a2..8804013 100644 --- a/vite.config.js +++ b/vite.config.js @@ -7,6 +7,9 @@ import UniKuRoot from '@uni-ku/root' import { resolve } from 'node:path' import UnoCSS from 'unocss/vite' +// 获取当前时间戳 +const timestamp = new Date().getTime() + export default defineConfig({ envDir: './env', // 自定义env目录 resolve: { @@ -50,7 +53,22 @@ export default defineConfig({ resolvers: [NaiveUiResolver()] }) ], + build: { + rollupOptions: { + output: { + // 输出重构 打包编译后的js文件名称,添加时间戳 + entryFileNames: `js/[name].${timestamp}.js`, + chunkFileNames: `js/[name].${timestamp}.js`, + assetFileNames: `assets/[name].${timestamp}.[ext]` + } + } + }, css: { + extract: { + // css重构 打包编译后的css文件名称,添加时间戳 + filename: `css/[name].${timestamp}.css`, + chunkFilename: `css/[name].${timestamp}.css` + }, preprocessorOptions: { scss: { additionalData: `@import "@/static/css/color.scss";`,