From 80c172ed777da2d0e38b7897fb123faba610fa0a Mon Sep 17 00:00:00 2001 From: jinhhanhan <1683105490@qq.com> Date: Wed, 10 Dec 2025 15:21:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=20Squashed=20commit=20of=20t?= =?UTF-8?q?he=20following:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 2416eab34fc318a92df6c2cb10784d90d6977aac Author: jinhhanhan <1683105490@qq.com> Date: Fri Dec 5 17:12:14 2025 +0800 chore:加了dify commit c4f2cea1a915d71a370d95c46c5e5ddfe2279218 Author: jinhhanhan <1683105490@qq.com> Date: Fri Dec 5 16:47:53 2025 +0800 chore:加了智能体 commit 227ab42e5aab27926289ffdd806a6128256c40b4 Author: jinhhanhan <1683105490@qq.com> Date: Thu Dec 4 14:27:46 2025 +0800 chore:挂上了智能客服 --- App.vue | 488 ++---- components/hover-nav/hover-nav.vue | 76 - pages/index/index.vue | 36 +- pages_tool/ai-chat/index.vue | 2466 +++++++--------------------- 4 files changed, 803 insertions(+), 2263 deletions(-) diff --git a/App.vue b/App.vue index c1b448d..061c99f 100644 --- a/App.vue +++ b/App.vue @@ -1,43 +1,51 @@ - \ No newline at end of file diff --git a/components/hover-nav/hover-nav.vue b/components/hover-nav/hover-nav.vue index 9f677f6..65fa30e 100644 --- a/components/hover-nav/hover-nav.vue +++ b/components/hover-nav/hover-nav.vue @@ -1,5 +1,4 @@ @@ -200,10 +137,7 @@ .btn-item { display: flex; justify-content: center; -<<<<<<< HEAD align-items: center; /* 新增:让🤖表情垂直居中 */ -======= ->>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac text-align: center; flex-direction: column; line-height: 1; @@ -229,21 +163,14 @@ transform: rotate(180deg); } -<<<<<<< HEAD &.switch {} -======= ->>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac &.icon-xiala { margin: 0; margin-top: 0.1rpx; } -<<<<<<< HEAD // 未读消息小红点 -======= - // 未读消息小红点(已无使用,可保留样式) ->>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac .unread-badge { position: absolute; top: -5rpx; @@ -267,7 +194,6 @@ // #endif } } -<<<<<<< HEAD // AI图标样式优化(让🤖表情居中显示) .ai-icon { @@ -278,8 +204,6 @@ width: 100%; height: 100%; } -======= ->>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac } } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index e863f2f..57f1420 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,4 +1,3 @@ - \ No newline at end of file diff --git a/pages_tool/ai-chat/index.vue b/pages_tool/ai-chat/index.vue index d4ddfa6..82a6773 100644 --- a/pages_tool/ai-chat/index.vue +++ b/pages_tool/ai-chat/index.vue @@ -1,1854 +1,650 @@ -<<<<<<< HEAD - - - - - -=======