diff --git a/.prettierrc.json b/.prettierrc.json index 66e2335..5c4cd51 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -5,4 +5,4 @@ "singleQuote": true, "printWidth": 100, "trailingComma": "none" -} \ No newline at end of file +} \ No newline at end of file diff --git a/env/.env.test b/env/.env.test index d9f7529..1238c3b 100644 --- a/env/.env.test +++ b/env/.env.test @@ -2,7 +2,7 @@ ENV = 'development' VITE_BASE=/ VUE_APP_PREVIEW=false -VITE_BASE_API=http://172.16.100.93:8503 +VITE_BASE_API=http://114.218.158.24:8503 VITE_EPR_BASEURL=http://114.218.158.24:9020 -VITE_SOCKET_API=ws://172.16.100.93:8504 +VITE_SOCKET_API=ws://114.218.158.24:8504 VUE_APP_WEBSITE_NAME="Lumen IM" \ No newline at end of file diff --git a/package.json b/package.json index 2fdc685..f6da329 100644 --- a/package.json +++ b/package.json @@ -34,11 +34,11 @@ "xgplayer": "^3.0.4" }, "devDependencies": { - "vite-plugin-vue-devtools": "^7.7.6", "@icon-park/vue-next": "^1.4.2", "@tsconfig/node18": "^18.2.2", "@types/node": "^18.18.5", "@types/vue": "^2.0.0", + "@unocss/reset": "^66.1.1", "@vitejs/plugin-vue": "^4.4.0", "@vitejs/plugin-vue-jsx": "^3.0.2", "@vue/tsconfig": "^0.4.0", @@ -53,6 +53,7 @@ "unocss": "^66.1.1", "vite": "^4.5.1", "vite-plugin-compression": "^0.5.1", + "vite-plugin-vue-devtools": "^7.7.6", "vue-tsc": "^1.8.25", "wait-on": "^6.0.1" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48ff789..665f7a0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -75,6 +75,9 @@ importers: '@types/vue': specifier: ^2.0.0 version: 2.0.0(typescript@5.2.2) + '@unocss/reset': + specifier: ^66.1.1 + version: 66.1.1 '@vitejs/plugin-vue': specifier: ^4.4.0 version: 4.6.2(vite@4.5.14(@types/node@18.19.99)(less@4.3.0)(terser@5.39.0))(vue@3.5.13(typescript@5.2.2)) diff --git a/src/assets/css/define/global.less b/src/assets/css/define/global.less index 96b14d1..e74b9df 100644 --- a/src/assets/css/define/global.less +++ b/src/assets/css/define/global.less @@ -1,6 +1,7 @@ * { margin: 0; padding: 0; + box-sizing: border-box!important; } @font-face { diff --git a/src/assets/css/define/theme.less b/src/assets/css/define/theme.less index cf71cad..ada3007 100644 --- a/src/assets/css/define/theme.less +++ b/src/assets/css/define/theme.less @@ -4,7 +4,7 @@ html { --im-bg-color: #ffffff; --line-border-color: #f5f5f5; --border-color: #eeeaea; - --im-text-color: #333; + --im-text-color: #BABABA; --im-text-color-grey: #333; --im-active-bg-color: #f5f5f5; --im-hover-bg-color: #f5f5f5; @@ -21,10 +21,10 @@ html { // message --im-message-bg-color: #f7f7f7; --im-message-border-color: #efeff5; - --im-message-left-bg-color: #eff0f1; + --im-message-left-bg-color: #F4F4FC; --im-message-left-text-color: #333; - --im-message-right-bg-color: #daf3fd; - --im-message-right-text-color: #333; + --im-message-right-bg-color: #46299D; + --im-message-right-text-color: #fff; } // 黑色主题 diff --git a/src/assets/image/groupDepartment.png b/src/assets/image/groupDepartment.png index b217515..fec10f7 100644 Binary files a/src/assets/image/groupDepartment.png and b/src/assets/image/groupDepartment.png differ diff --git a/src/assets/image/groupProject.png b/src/assets/image/groupProject.png index cc4c12f..d4b301d 100644 Binary files a/src/assets/image/groupProject.png and b/src/assets/image/groupProject.png differ diff --git a/src/assets/image/pcyyb_2100100012_installer.exe b/src/assets/image/pcyyb_2100100012_installer.exe new file mode 100644 index 0000000..b304caa Binary files /dev/null and b/src/assets/image/pcyyb_2100100012_installer.exe differ diff --git a/src/assets/image/zu6299@2x.png b/src/assets/image/zu6299@2x.png new file mode 100644 index 0000000..31332b5 Binary files /dev/null and b/src/assets/image/zu6299@2x.png differ diff --git a/src/assets/image/zu6300@2x.png b/src/assets/image/zu6300@2x.png new file mode 100644 index 0000000..9ddea01 Binary files /dev/null and b/src/assets/image/zu6300@2x.png differ diff --git a/src/assets/image/zu6302@2x.png b/src/assets/image/zu6302@2x.png new file mode 100644 index 0000000..757c390 Binary files /dev/null and b/src/assets/image/zu6302@2x.png differ diff --git a/src/assets/image/zu6306@2x.png b/src/assets/image/zu6306@2x.png new file mode 100644 index 0000000..bae59c1 Binary files /dev/null and b/src/assets/image/zu6306@2x.png differ diff --git a/src/components/avatar-module/index.vue b/src/components/avatar-module/index.vue index e903e5f..7023c27 100644 --- a/src/components/avatar-module/index.vue +++ b/src/components/avatar-module/index.vue @@ -87,8 +87,8 @@ const text_avatar = computed(() => { background: linear-gradient(to right, #674bbc, #46299d); flex-shrink: 0; img { - width: 100%; - height: 100%; + width: 42px; + height: 42px; object-fit: cover; } } diff --git a/src/components/talk/message/ImageMessage.vue b/src/components/talk/message/ImageMessage.vue index df3c846..dfedf6f 100644 --- a/src/components/talk/message/ImageMessage.vue +++ b/src/components/talk/message/ImageMessage.vue @@ -46,7 +46,8 @@ const img = (src: string, width = 200) => { background: var(--im-message-left-bg-color); min-width: 30px; min-height: 30px; - + max-width:240px; + max-height:300px &.left { background: var(--im-message-right-bg-color); } diff --git a/src/components/talk/message/TextMessage.vue b/src/components/talk/message/TextMessage.vue index 023241b..9920c42 100644 --- a/src/components/talk/message/TextMessage.vue +++ b/src/components/talk/message/TextMessage.vue @@ -45,7 +45,7 @@ textContent = textReplaceEmoji(textContent) color: var(--im-message-left-text-color); background: var(--im-message-left-bg-color); border-radius: 0px 10px 10px 10px; - + font-size: 14px; &.right { background-color: var(--im-message-right-bg-color); color: var(--im-message-right-text-color); diff --git a/src/constant/theme.ts b/src/constant/theme.ts index 756703c..81c1e3f 100644 --- a/src/constant/theme.ts +++ b/src/constant/theme.ts @@ -1,14 +1,28 @@ // 主题配置 +const primaryColor='#46299D' export const overrides = { - common: { - primaryColor: '#1890ff', - primaryColorHover: '#1890ff', - primaryColorPressed: '#1890ff', - primaryColorSuppl: '#1890ff', - bodyColor: '#ffffff' + DataTable: { + sorterIconColor:'#fff', + thColorHover: primaryColor, + thTextColor: "#fff", + thColor: primaryColor, + thBackgroundColor: primaryColor, + itemColorActive:primaryColor, }, - - Dialog: { - borderRadius: '10px' + Button: { + textColor: primaryColor, + }, + Dropdown:{ + optionTextColorHover:'#46299D', + optionColorHover:'#EEE9F8' + }, + common: { + primaryColorPressed: primaryColor, + primaryHover:primaryColor, + primaryDefault: primaryColor, + primaryActive: primaryColor, + primarySuppl: primaryColor, + primaryColor: primaryColor, + primaryColorHover: primaryColor } } diff --git a/src/layout/MainLayout.vue b/src/layout/MainLayout.vue index 2747cf6..074486f 100644 --- a/src/layout/MainLayout.vue +++ b/src/layout/MainLayout.vue @@ -7,21 +7,21 @@ const settingsStore = useSettingsStore()