From a0ddcd673daa4b7d040a0fa08a758048bc5a3227 Mon Sep 17 00:00:00 2001
From: jinhhanhan <1683105490@qq.com>
Date: Wed, 10 Dec 2025 14:52:52 +0800
Subject: [PATCH] Squashed commit of the following:
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.json | 7 +
pages/index/index.vue | 496 ++++++------
pages_tool/ai-chat/index.vue | 1206 +++++++++++++++++++++++++++-
project.config.json | 27 +-
6 files changed, 1885 insertions(+), 415 deletions(-)
diff --git a/App.vue b/App.vue
index 061c99f..c1b448d 100644
--- a/App.vue
+++ b/App.vue
@@ -1,51 +1,43 @@
+
\ No newline at end of file
diff --git a/components/hover-nav/hover-nav.vue b/components/hover-nav/hover-nav.vue
index 65fa30e..9f677f6 100644
--- a/components/hover-nav/hover-nav.vue
+++ b/components/hover-nav/hover-nav.vue
@@ -1,4 +1,5 @@
+<<<<<<< HEAD
@@ -22,6 +23,26 @@
+=======
+
+
+
+
+
+
+
+
+>>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac
@@ -137,7 +200,10 @@
.btn-item {
display: flex;
justify-content: center;
+<<<<<<< HEAD
align-items: center; /* 新增:让🤖表情垂直居中 */
+=======
+>>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac
text-align: center;
flex-direction: column;
line-height: 1;
@@ -163,14 +229,21 @@
transform: rotate(180deg);
}
+<<<<<<< HEAD
&.switch {}
+=======
+>>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac
&.icon-xiala {
margin: 0;
margin-top: 0.1rpx;
}
+<<<<<<< HEAD
// 未读消息小红点
+=======
+ // 未读消息小红点(已无使用,可保留样式)
+>>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac
.unread-badge {
position: absolute;
top: -5rpx;
@@ -194,6 +267,7 @@
// #endif
}
}
+<<<<<<< HEAD
// AI图标样式优化(让🤖表情居中显示)
.ai-icon {
@@ -204,6 +278,8 @@
width: 100%;
height: 100%;
}
+=======
+>>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac
}
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index e72cc97..7de3451 100644
--- a/pages.json
+++ b/pages.json
@@ -104,7 +104,14 @@
"navigationStyle": "custom"
// #endif
}
+ },
+ {
+ "path": "pages/dify-chat/dify-chat",
+ "style": {
+ "navigationBarTitleText": "智能客服"
+ }
}
+
],
"subPackages": [
{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2fad2c5..e863f2f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,236 +1,266 @@
-
-
-
-
-
-
-
-
-
- {{ siteInfo.site_name }}
- {{ followOfficialAccount.welcomeMsg }}
-
-
- 关注公众号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 关注了解更多
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ siteInfo.site_name }}
+ {{ followOfficialAccount.welcomeMsg }}
+
+
+ 关注公众号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 关注了解更多
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/pages_tool/ai-chat/index.vue b/pages_tool/ai-chat/index.vue
index 39b3658..d4ddfa6 100644
--- a/pages_tool/ai-chat/index.vue
+++ b/pages_tool/ai-chat/index.vue
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
@@ -647,4 +648,1207 @@ export default {
background-color: transparent;
}
-
\ No newline at end of file
+
+=======
+
+
+
+
+
+
+
+ {{ langConfig.navbarTitle }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ product.name }}
+ {{ product.spec }}
+ {{ langConfig.currency }}{{ product.price }}
+ ×{{ product.count }}
+
+ {{ langConfig.consult }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ msg.content }}
+
+
+
+
+
+ {{ formatTime(msg.timestamp) }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ userNickname }}
+ {{ msg.content }}
+ {{ formatTime(msg.timestamp) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 😊
+ 😂
+ 👍
+ {{ langConfig.thanks }}
+ ?
+ {{ langConfig.ok }}
+ 👌
+ {{ langConfig.trouble }}
+ 🙏
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> 2416eab34fc318a92df6c2cb10784d90d6977aac
diff --git a/project.config.json b/project.config.json
index 14f0be7..20ba0f6 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,7 +1,8 @@
{
"description": "项目配置文件",
"packOptions": {
- "ignore": []
+ "ignore": [],
+ "include": []
},
"setting": {
"urlCheck": true,
@@ -37,20 +38,20 @@
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
- "minifyWXSS": true
+ "minifyWXSS": true,
+ "compileWorklet": false,
+ "minifyWXML": true,
+ "localPlugins": false,
+ "disableUseStrict": false,
+ "useCompilerPlugins": false,
+ "condition": false,
+ "swc": false,
+ "disableSWC": true
},
"compileType": "miniprogram",
- "libVersion": "2.16.1",
+ "libVersion": "3.12.0",
"appid": "wx29215aa1bd97bbd6",
"projectname": "niushop_b2c_v4_uniapp",
- "debugOptions": {
- "hidedInDevtools": []
- },
- "scripts": {},
- "staticServerOptions": {
- "baseURL": "",
- "servePath": ""
- },
"isGameTourist": false,
"condition": {
"search": {
@@ -71,5 +72,7 @@
"miniprogram": {
"list": []
}
- }
+ },
+ "simulatorPluginLibVersion": {},
+ "editorSetting": {}
}
\ No newline at end of file