+
+
+
-
-
@@ -401,6 +432,7 @@ const state = ref({
onfocusItem: null,
sessionId: '',
localPageLoadDone: true, //分页加载缓存中的聊天记录是否完毕
+ quoteInfo: null, //引用信息
})
uniOnload((options) => {
@@ -739,6 +771,12 @@ const multipleChoose = (item) => {
const actionCite = (item) => {
console.log('引用')
+ state.value.quoteInfo = item
+}
+
+//清除引用信息
+const clearQuoteInfo = () => {
+ state.value.quoteInfo = null
}
const actionWithdraw = (item) => {
@@ -938,6 +976,27 @@ onUnmounted(() => {
.footBox {
min-height: 162rpx;
background-color: #fff;
+
+ .quote-area {
+ margin: 4rpx 0 0 0;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ justify-content: space-between;
+ overflow: hidden;
+ width: 100%;
+ span {
+ display: -webkit-inline-box;
+ text-overflow: ellipsis;
+ -webkit-line-clamp: 2;
+ -webkit-box-orient: vertical;
+ width: 100%;
+ }
+ img {
+ margin: 0 0 0 30rpx;
+ flex-shrink: 0;
+ }
+ }
}
.load-toolbar {
@@ -1084,6 +1143,7 @@ onUnmounted(() => {
text-overflow: ellipsis;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
+ overflow: hidden;
}
}
@@ -1140,6 +1200,10 @@ onUnmounted(() => {
}
.quillBox {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ justify-content: center;
:deep(.ql-clipboard) {
position: relative;
opacity: 0;
diff --git a/src/uni_modules/tmui/locale/zh-Hans.json b/src/uni_modules/tmui/locale/zh-Hans.json
index e2d6866..ad991eb 100644
--- a/src/uni_modules/tmui/locale/zh-Hans.json
+++ b/src/uni_modules/tmui/locale/zh-Hans.json
@@ -149,5 +149,6 @@
"button.multiple.choice": "多选",
"button.text.close": "关闭",
"choose.deps.all": "全部",
- "choose.deps.current": "当前"
+ "choose.deps.current": "当前",
+ "msg.type": "图片"
}
From 93428be5df41db3164834ebbd6ff70e14a56650e Mon Sep 17 00:00:00 2001
From: scout <1134087124@qq.com>
Date: Mon, 10 Mar 2025 19:07:30 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 276a74d..61be803 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,9 @@
"test:h5": "uni --mode test --port 2468",
"prod:h5": "uni --mode prod",
"build:h5:test": "uni build --mode test",
- "build:h5:prod": "uni build --mode prod"
+ "build:h5:prod": "uni build --mode prod",
+ "preview:h5": "uni preview --mode test",
+ "preview:h5:prod": "uni preview --mode prod"
},
"dependencies": {
"@dcloudio/uni-app": "3.0.0-alpha-4000020240111001",
From 8b613690060696bb056181586f0405cbb16e3e06 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Tue, 11 Mar 2025 11:35:42 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=93=E5=8C=85?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
env/.env.dev | 6 +++++-
env/.env.test | 1 -
package.json | 5 +++--
src/connect.js | 2 ++
src/store/auth/index.js | 2 +-
vite.config.cts => vite.config.js | 1 -
6 files changed, 11 insertions(+), 6 deletions(-)
rename vite.config.cts => vite.config.js (97%)
diff --git a/env/.env.dev b/env/.env.dev
index 88d99d9..1de5297 100644
--- a/env/.env.dev
+++ b/env/.env.dev
@@ -5,4 +5,8 @@ VITE_SHOW_CONSOLE = true
# 是否开启sourcemap
VITE_SHOW_SOURCEMAP = true
# baseUrl
-VITE_BASEURL = 'http://warehouse.szjixun.cn/oa_backend'
+VITE_BASEURL = 'http://172.16.100.93:8503'
+#VITE_SOCKET_API
+VITE_SOCKET_API = 'ws://172.16.100.93:8504'
+# EPRAPI baseUrl
+VITE_EPR_BASEURL = 'http://114.218.158.24:9020'
diff --git a/env/.env.test b/env/.env.test
index 83a6604..dfe98c6 100644
--- a/env/.env.test
+++ b/env/.env.test
@@ -5,7 +5,6 @@ VITE_SHOW_CONSOLE = true
# 是否开启sourcemap
VITE_SHOW_SOURCEMAP = true
# baseUrl
-# VITE_BASEURL = 'https://warehouse.szjixun.cn/oa_backend'
VITE_BASEURL = 'http://172.16.100.93:8503'
#VITE_SOCKET_API
VITE_SOCKET_API = 'ws://172.16.100.93:8504'
diff --git a/package.json b/package.json
index 58e966d..39c0185 100644
--- a/package.json
+++ b/package.json
@@ -2,14 +2,15 @@
"name": "unihelper",
"version": "0.0.0",
"private": true,
- "type": "module",
"packageManager": "pnpm@8.14.1",
"license": "MIT",
"scripts": {
"test:h5": "uni --mode test --port 2468",
"prod:h5": "uni --mode prod",
"build:h5:test": "uni build --mode test",
- "build:h5:prod": "uni build --mode prod"
+ "build:h5:prod": "uni build --mode prod",
+ "preview:h5": "uni preview --mode test",
+ "preview:h5:prod": "uni preview --mode prod"
},
"dependencies": {
"@dcloudio/uni-app": "3.0.0-alpha-4000020240111001",
diff --git a/src/connect.js b/src/connect.js
index 43ecbc2..1eaa55e 100644
--- a/src/connect.js
+++ b/src/connect.js
@@ -30,6 +30,7 @@ class Connect {
},
// Websocket 连接成功回调方法
onOpen: () => {
+ console.log("socket已连接")
// 更新 WebSocket 连接状态
useUserStore().updateSocketStatus(true)
// online.value = true;
@@ -37,6 +38,7 @@ class Connect {
},
// Websocket 断开连接回调方法
onClose: () => {
+ console.log("socket已断开")
// 更新 WebSocket 连接状态
useUserStore().updateSocketStatus(false)
// online.value = false
diff --git a/src/store/auth/index.js b/src/store/auth/index.js
index 5a482e4..43af858 100644
--- a/src/store/auth/index.js
+++ b/src/store/auth/index.js
@@ -5,7 +5,7 @@ import { userInfoApi } from "@/api/user";
import {ref} from 'vue'
export const useAuth = createGlobalState(() => {
// const token = useStorage('token', '', uniStorage)
- const token = ref('79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b897937e719454eda6de1352a14497a54063c2ae13c2b1418f2689268102faffee874777ce1312eb7d9399eaa8cf58674aa86c9b85ad9300293c0a3369ed429536bbea4fcb092b78466ea53a44a2b2b1c1a')
+ const token = ref('79b5c732d96d2b27a48a99dfd4a5566c43aaa5796242e854ebe3ffc198d6876b9628e7b764d9af65ab5dbb2d517ced88170491b74b048c0ba827c0d3741462cb89dc59ed46653a449af837a8262941caaef1334d640773710f8cd96473bacfb190cba595a5d6a9c87d70f0999a3ebb41147213b31b4bdccffca66a56acf3baab5af0154f0dce360079f37709f78e13711036899344bddb0fb4cf0f2890287cb62c3fcbe33368caa5e213624577be8b8420ab75b1f50775ee16142a4321c5d56995f37354a66a969da98d95ba6e65d142ed097e04b411c1ebad2f62866d0ec7e1838420530a9941dbbcd00490199f8b894c272b29107599e31eb0d0e227acbe3e643ffc54df2c2270430888e9f045332e4b933a9d130e41942cc8253f55a0bd20040c89278356b3901db966e868d87104beab11987eba560d658eeb9a9821c264')
const refreshToken = useStorage('refreshToken', '', uniStorage)
const userInfo = useStorage('userInfo', {}, uniStorage)
const leaderList = useStorage('leaderList', [], uniStorage)
diff --git a/vite.config.cts b/vite.config.js
similarity index 97%
rename from vite.config.cts
rename to vite.config.js
index 97bfb89..928f5a2 100644
--- a/vite.config.cts
+++ b/vite.config.js
@@ -1,4 +1,3 @@
-import vue from '@vitejs/plugin-vue'
import AutoImport from 'unplugin-auto-import/vite'
import { NaiveUiResolver } from 'unplugin-vue-components/resolvers'
import Components from 'unplugin-vue-components/vite'
查看更多
@@ -110,17 +116,25 @@ const onClipboard = () => {
position: sticky;
bottom: 0;
left: 0;
- background: linear-gradient(to bottom, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 100%);
+ background: linear-gradient(
+ to bottom,
+ rgba(255, 255, 255, 0) 0%,
+ rgba(255, 255, 255, 1) 100%
+ );
color: var(--im-text-color);
}
}
-html[theme-mode='dark'] {
+html[theme-mode="dark"] {
.im-message-code {
background: var(--im-message-bg-color);
.mask {
- background: linear-gradient(to bottom, transparent 0%, var(--im-bg-color) 100%);
+ background: linear-gradient(
+ to bottom,
+ transparent 0%,
+ var(--im-bg-color) 100%
+ );
}
}
}
diff --git a/vite.config.cts b/vite.config.cts
new file mode 100644
index 0000000..97bfb89
--- /dev/null
+++ b/vite.config.cts
@@ -0,0 +1,61 @@
+import vue from '@vitejs/plugin-vue'
+import AutoImport from 'unplugin-auto-import/vite'
+import { NaiveUiResolver } from 'unplugin-vue-components/resolvers'
+import Components from 'unplugin-vue-components/vite'
+import { defineConfig } from 'vite'
+import Uni from '@dcloudio/vite-plugin-uni'
+import UniKuRoot from '@uni-ku/root'
+import { resolve } from 'node:path'
+import UnoCSS from 'unocss/vite'
+
+export default defineConfig({
+ envDir: './env', // 自定义env目录
+ resolve: {
+ alias: [
+ {
+ find: "@",
+ replacement: resolve(process.cwd(), 'src')
+ }
+ ]
+ },
+ server: {
+ host: '0.0.0.0', // 监听所有网络接口
+ port: 2367,
+ // 选项写法
+ proxy: {
+ '/pag': {
+ target: 'https://cdn.tmui.design',
+ changeOrigin: true,
+ rewrite: (path) => path.replace(/^\/api/, '/api')
+ },
+ }
+ },
+ plugins: [
+ Uni(),
+ UniKuRoot(),
+ UnoCSS(),
+ AutoImport({
+ imports: [
+ 'vue',
+ {
+ 'naive-ui': [
+ 'useDialog',
+ 'useMessage',
+ 'useNotification',
+ 'useLoadingBar'
+ ]
+ }
+ ]
+ }),
+ Components({
+ resolvers: [NaiveUiResolver()]
+ })
+ ],
+ css: {
+ preprocessorOptions: {
+ scss: {
+ additionalData: `@import "@/static/css/color.scss";`,
+ },
+ },
+ }
+})
diff --git a/vite.config.js b/vite.config.js
deleted file mode 100644
index 6e4548b..0000000
--- a/vite.config.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import vue from '@vitejs/plugin-vue'
-import AutoImport from 'unplugin-auto-import/vite'
-import { NaiveUiResolver } from 'unplugin-vue-components/resolvers'
-import Components from 'unplugin-vue-components/vite'
-
-import { defineConfig } from 'vite'
-import Uni from '@dcloudio/vite-plugin-uni'
-import UniKuRoot from '@uni-ku/root'
-import { resolve } from "path"
-export default async () => {
- const UnoCSS = (await import('unocss/vite')).default
-
- return defineConfig({
- envDir: './env', // 自定义env目录
- resolve: {
- alias: [
- {
- find: "@",
- replacement: resolve(__dirname, 'src')
- }
- ]
- },
- server: {
- host: '0.0.0.0', // 监听所有网络接口
- port: 2367,
- // 选项写法
- proxy: {
- '/pag': {
- target: 'https://cdn.tmui.design',
- changeOrigin: true,
- rewrite: (path) => path.replace(/^\/api/, '/api')
- },
- }
- },
- plugins: [
- Uni(),
- UniKuRoot(),
- UnoCSS(),
- AutoImport({
- imports: [
- 'vue',
- {
- 'naive-ui': [
- 'useDialog',
- 'useMessage',
- 'useNotification',
- 'useLoadingBar'
- ]
- }
- ]
- }),
- Components({
- resolvers: [NaiveUiResolver()]
- })
- ],
- css: {
- preprocessorOptions: {
- scss: {
- additionalData: `@import "@/static/css/color.scss";`,
- },
- },
- }
- })
-}
From ada0bc0ee9161e4f47fe9f1444893571c3a4ca56 Mon Sep 17 00:00:00 2001
From: wangyifeng <812766448@qq.com>
Date: Mon, 10 Mar 2025 15:09:26 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=95=E5=85=A5?=
=?UTF-8?q?=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/dialog/index.vue | 120 +++++++++++++++++------
src/uni_modules/tmui/locale/zh-Hans.json | 3 +-
2 files changed, 94 insertions(+), 29 deletions(-)
diff --git a/src/pages/dialog/index.vue b/src/pages/dialog/index.vue
index b08a70c..aebfa4a 100644
--- a/src/pages/dialog/index.vue
+++ b/src/pages/dialog/index.vue
@@ -187,7 +187,7 @@
+
+ {{
+ state?.quoteInfo?.nickname +
+ ':' +
+ state?.quoteInfo?.extra?.content
+ }}
+
+
+ {{
+ state?.quoteInfo?.nickname +
+ ':' +
+ '[' +
+ $t('msg.type') +
+ ']'
+ }}
+
+
+
+ 
+
+
+
-