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 @@ @@ -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 @@ -