diff --git a/components/CreateServiceOrder/index.vue b/components/CreateServiceOrder/index.vue
index 6c42208..774cb87 100644
--- a/components/CreateServiceOrder/index.vue
+++ b/components/CreateServiceOrder/index.vue
@@ -6,14 +6,28 @@
-
- 加一台麻将机
+
+
+ {{ workOrderTypeName }}
房间号:
- 302
+
+ {{ roomId }}
服务时间:
@@ -42,12 +56,12 @@
{{ contactPhone }}
-
+
-
+
@@ -106,35 +106,35 @@ const swiperStyle = computed(() => {
// 默认图片数据
const defaultImages = [
{
- photoUrl:
- "https://fastly.picsum.photos/id/866/654/400.jpg?hmac=z3vI4CYrpnXEgimSlJCDwXRxEa-UDHiRwzGEyB8V-po",
- photoName: "瑶山古寨",
+ imageUrl:
+ "https://one-feel-image-bucket.oss-cn-chengdu.aliyuncs.com/DH04006.jpg",
+ name: "瑶山古寨",
},
{
- photoUrl:
- "https://fastly.picsum.photos/id/284/654/400.jpg?hmac=89XRCJxYTblKIFGLOp6hJ9U0GC8BQrcnJwE5pG21NAk",
- photoName: "民俗表演",
+ imageUrl:
+ "https://one-feel-image-bucket.oss-cn-chengdu.aliyuncs.com/DH04002.JPG",
+ name: "民俗表演",
},
{
- photoUrl:
- "https://fastly.picsum.photos/id/281/654/400.jpg?hmac=hcAJB7y2Xz3DVuz6S4XeQZgzaTJ_QWnxtbnaagZL6Fs",
- photoName: "特色美食",
+ imageUrl:
+ "https://one-feel-image-bucket.oss-cn-chengdu.aliyuncs.com/DH04007.jpg",
+ name: "特色美食",
},
{
- photoUrl:
- "https://fastly.picsum.photos/id/435/654/400.jpg?hmac=TSVDxfo-zXbunxNQK0erSG_nmKcS20xfhbQsCAXLlHo",
- photoName: "传统服饰",
+ imageUrl:
+ "https://one-feel-image-bucket.oss-cn-chengdu.aliyuncs.com/DH04014.JPG",
+ name: "传统服饰",
},
{
- photoUrl:
- "https://fastly.picsum.photos/id/737/654/400.jpg?hmac=VED05oEK3XB0Aa_DUVoZjTAf0bHjAmNYyJky4lq5vVo",
- photoName: "其他",
+ imageUrl:
+ "https://one-feel-image-bucket.oss-cn-chengdu.aliyuncs.com/DH04020.JPG",
+ name: "其他",
},
];
// 使用传入的图片数据或默认数据
const thumbnails = computed(() => {
- return props.images.length ? props.images : defaultImages;
+ return props.images;
});
const handleThumbnailClick = (index) => {
diff --git a/components/ImageSwiper/styles/index.scss b/components/ImageSwiper/styles/index.scss
index e9a73f6..5c5038f 100644
--- a/components/ImageSwiper/styles/index.scss
+++ b/components/ImageSwiper/styles/index.scss
@@ -29,7 +29,7 @@
position: absolute;
left: 12px;
right: 12px;
- bottom: 36px;
+ bottom: 0px;
height: 60px;
}
diff --git a/pages/chat/ChatMainList.vue b/pages/chat/ChatMainList.vue
index 827db63..626b4be 100644
--- a/pages/chat/ChatMainList.vue
+++ b/pages/chat/ChatMainList.vue
@@ -57,6 +57,12 @@
item.toolCall.componentName === CompName.createWorkOrderCard
"
/>
+
@@ -140,6 +146,7 @@ import ActivityListComponent from "../module/banner/ActivityListComponent.vue";
import RecommendPostsComponent from "../module/recommend/RecommendPostsComponent.vue";
import AttachListComponent from "../module/attach/AttachListComponent.vue";
import CreateServiceOrder from "@/components/CreateServiceOrder/index.vue";
+import DetailCardCompontent from "../module/detail/DetailCardCompontent.vue";
import { mainPageData } from "@/request/api/MainPageDataApi";
import {
conversationMsgList,
@@ -344,12 +351,12 @@ const initWebSocket = () => {
// 错误回调
onError: (error) => {
+ isSessionActive.value = false;
console.error("WebSocket错误:", error);
},
// 消息回调
onMessage: (data) => {
- console.log("onMessage:", data);
handleWebSocketMessage(data);
},
@@ -368,12 +375,16 @@ const initWebSocket = () => {
// 处理WebSocket消息
const handleWebSocketMessage = (data) => {
+ if(loadingTimer) {
+ clearInterval(loadingTimer);
+ loadingTimer = null;
+ }
const aiMsgIndex = chatMsgList.value.length - 1;
if (!chatMsgList.value[aiMsgIndex] || aiMsgIndex < 0) {
return;
}
- console.log("处理WebSocket消息:", data);
+ //console.log("处理WebSocket消息:", data);
// 确保消息内容是字符串类型
if (data.content && typeof data.content !== "string") {
@@ -405,6 +416,15 @@ const handleWebSocketMessage = (data) => {
return;
}
+ const msg = chatMsgList.value[aiMsgIndex].msg;
+ console.log('全量消息内容:', msg)
+ if (!msg || msg === '加载中.' || msg.startsWith('加载中')) {
+ chatMsgList.value[aiMsgIndex].msg = '未获取到内容,请重试';
+ if(data.toolCall) {
+ chatMsgList.value[aiMsgIndex].msg = '';
+ }
+ }
+
// 处理toolCall
if (data.toolCall) {
chatMsgList.value[aiMsgIndex].toolCall = data.toolCall;
@@ -444,7 +464,7 @@ const initTypewriterManager = () => {
// 双重保险,确保滚动生效
setTimeout(() => {
scrollTop.value = 99999 + Math.random();
- }, 5);
+ }, 20);
});
},
// 内容更新时的回调
@@ -492,7 +512,7 @@ const addNoticeListener = () => {
if (value && value.length > 0) {
commonType = "Command.quickBooking";
sendMessage(value, true);
- scrollToBottom();
+ setTimeoutScrollToBottom();
}
});
};
@@ -564,8 +584,6 @@ const sendMessage = (message, isInstruct = false) => {
// 通用WebSocket消息发送函数
const sendWebSocketMessage = (messageType, messageContent, options = {}) => {
- console.error("WebSocket未连接");
-
const args = {
conversationId: conversationId.value,
agentId: agentId.value,
@@ -589,7 +607,6 @@ const sendWebSocketMessage = (messageType, messageContent, options = {}) => {
const sendChat = (message, isInstruct = false) => {
if (!webSocketManager || !webSocketManager.isConnected()) {
console.error("WebSocket未连接");
-
return;
}
diff --git a/pages/module/attach/AttachListComponent.vue b/pages/module/attach/AttachListComponent.vue
index 204257b..8aaeb00 100644
--- a/pages/module/attach/AttachListComponent.vue
+++ b/pages/module/attach/AttachListComponent.vue
@@ -30,7 +30,7 @@ const handleClick = (item) => {
}
onMounted(() => {
- tags.value = props.question.split('&').filter(tag => tag.trim() !== '')
+ tags.value = props.question.split(/[&|;]/).filter(tag => tag.trim() !== '')
nextTick(() => {
setTimeout(() => {
uni.$emit(SCROLL_TO_BOTTOM, true)
diff --git a/pages/module/detail/DetailCardCompontent.vue b/pages/module/detail/DetailCardCompontent.vue
new file mode 100644
index 0000000..739faa7
--- /dev/null
+++ b/pages/module/detail/DetailCardCompontent.vue
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/module/detail/DetailCardGoodsContentList.vue b/pages/module/detail/DetailCardGoodsContentList.vue
new file mode 100644
index 0000000..9c8e517
--- /dev/null
+++ b/pages/module/detail/DetailCardGoodsContentList.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+ {{ item.commodityName }}
+
+ {{ tag }}
+
+
+
+ · {{ serviceItem.serviceTitle }}
+
+
+
+ ¥
+ {{ item.specificationPrice }}
+ /人
+
+
+ 下单
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/module/discovery/DiscoveryCardComponent.vue b/pages/module/discovery/DiscoveryCardComponent.vue
index 39f5848..0f82e38 100644
--- a/pages/module/discovery/DiscoveryCardComponent.vue
+++ b/pages/module/discovery/DiscoveryCardComponent.vue
@@ -21,13 +21,14 @@
themeDTOList.value = res.data.themeDTOList
nextTick(() => {
- uni.$emit(SCROLL_TO_BOTTOM, true)
+ setTimeout(() => {
+ uni.$emit(SCROLL_TO_BOTTOM, true)
+ }, 300)
});
}
}
onMounted(() => {
- console.log('=============')
loadDiscoveryCradComponent()
})
diff --git a/pages/module/recommend/RecommendPostsList.vue b/pages/module/recommend/RecommendPostsList.vue
index 5095f37..8f89d7c 100644
--- a/pages/module/recommend/RecommendPostsList.vue
+++ b/pages/module/recommend/RecommendPostsList.vue
@@ -32,7 +32,8 @@
diff --git a/uni_modules/uni-data-select/package.json b/uni_modules/uni-data-select/package.json
new file mode 100644
index 0000000..f944770
--- /dev/null
+++ b/uni_modules/uni-data-select/package.json
@@ -0,0 +1,88 @@
+{
+ "id": "uni-data-select",
+ "displayName": "uni-data-select 下拉框选择器",
+ "version": "1.0.10",
+ "description": "通过数据驱动的下拉框选择器",
+ "keywords": [
+ "uni-ui",
+ "select",
+ "uni-data-select",
+ "下拉框",
+ "下拉选"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": "^3.1.1"
+ },
+ "directories": {
+ "example": "../../temps/example_temps"
+ },
+"dcloudext": {
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+ "type": "component-vue"
+ },
+ "uni_modules": {
+ "dependencies": ["uni-load-more"],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y",
+ "alipay": "n"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "n",
+ "app-harmony": "u",
+ "app-uvue": "u"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
diff --git a/uni_modules/uni-data-select/readme.md b/uni_modules/uni-data-select/readme.md
new file mode 100644
index 0000000..eb58de3
--- /dev/null
+++ b/uni_modules/uni-data-select/readme.md
@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名:uni-data-select**
+> 代码块: `uDataSelect`
+
+当选项过多时,使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839
diff --git a/uni_modules/uni-load-more/changelog.md b/uni_modules/uni-load-more/changelog.md
new file mode 100644
index 0000000..667abdb
--- /dev/null
+++ b/uni_modules/uni-load-more/changelog.md
@@ -0,0 +1,25 @@
+## 1.3.6(2024-10-15)
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.5(2024-10-12)
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.4(2024-10-12)
+- 修复 微信小程序中的getSystemInfo警告
+## 1.3.3(2022-01-20)
+- 新增 showText属性 ,是否显示文本
+## 1.3.2(2022-01-19)
+- 修复 nvue 平台下不显示文本的bug
+## 1.3.1(2022-01-19)
+- 修复 微信小程序平台样式选择器报警告的问题
+## 1.3.0(2021-11-19)
+- 优化 组件UI,并提供设计资源,详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移,详见:[https://uniapp.dcloud.io/component/uniui/uni-load-more](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+## 1.2.1(2021-08-24)
+- 新增 支持国际化
+## 1.2.0(2021-07-30)
+- 组件兼容 vue3,如何创建vue3项目,详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.8(2021-05-12)
+- 新增 组件示例地址
+## 1.1.7(2021-03-30)
+- 修复 uni-load-more 在首页使用时,h5 平台报 'uni is not defined' 的 bug
+## 1.1.6(2021-02-05)
+- 调整为uni_modules目录规范
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
new file mode 100644
index 0000000..6f45b0e
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/en.json
@@ -0,0 +1,5 @@
+{
+ "uni-load-more.contentdown": "Pull up to show more",
+ "uni-load-more.contentrefresh": "loading...",
+ "uni-load-more.contentnomore": "No more data"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
new file mode 100644
index 0000000..fa8f0f3
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+ en,
+ 'zh-Hans': zhHans,
+ 'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
new file mode 100644
index 0000000..3a14ca0
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hans.json
@@ -0,0 +1,5 @@
+{
+ "uni-load-more.contentdown": "上拉显示更多",
+ "uni-load-more.contentrefresh": "正在加载...",
+ "uni-load-more.contentnomore": "没有更多数据了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
new file mode 100644
index 0000000..ee99b06
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/i18n/zh-Hant.json
@@ -0,0 +1,5 @@
+{
+ "uni-load-more.contentdown": "上拉顯示更多",
+ "uni-load-more.contentrefresh": "正在加載...",
+ "uni-load-more.contentnomore": "沒有更多數據了"
+}
diff --git a/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
new file mode 100644
index 0000000..aa43c55
--- /dev/null
+++ b/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,404 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ status === 'more' ? contentdownText : status === 'loading' ? contentrefreshText : contentnomoreText }}
+
+
+
+
+
+
diff --git a/uni_modules/uni-load-more/package.json b/uni_modules/uni-load-more/package.json
new file mode 100644
index 0000000..cf44bff
--- /dev/null
+++ b/uni_modules/uni-load-more/package.json
@@ -0,0 +1,84 @@
+{
+ "id": "uni-load-more",
+ "displayName": "uni-load-more 加载更多",
+ "version": "1.3.6",
+ "description": "LoadMore 组件,常用在列表里面,做滚动加载使用。",
+ "keywords": [
+ "uni-ui",
+ "uniui",
+ "加载更多",
+ "load-more"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": ""
+ },
+ "directories": {
+ "example": "../../temps/example_temps"
+ },
+"dcloudext": {
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+ "type": "component-vue"
+ },
+ "uni_modules": {
+ "dependencies": ["uni-scss"],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y",
+ "alipay": "n"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "y"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
diff --git a/uni_modules/uni-load-more/readme.md b/uni_modules/uni-load-more/readme.md
new file mode 100644
index 0000000..54dc1fa
--- /dev/null
+++ b/uni_modules/uni-load-more/readme.md
@@ -0,0 +1,14 @@
+
+
+### LoadMore 加载更多
+> **组件名:uni-load-more**
+> 代码块: `uLoadMore`
+
+
+用于列表中,做滚动加载使用,展示 loading 的各种状态。
+
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-load-more)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839
+
+
diff --git a/utils/WebSocketManager.js b/utils/WebSocketManager.js
index 83b5aed..12c5fa3 100644
--- a/utils/WebSocketManager.js
+++ b/utils/WebSocketManager.js
@@ -342,7 +342,7 @@ export class WebSocketManager {
data: messageStr,
success: () => {
this.stats.messagesSent++;
- console.log("消息发送成功:", messageData);
+ //console.log("消息发送成功:", messageData);
},
fail: (error) => {
console.error("发送消息失败:", error);
@@ -356,7 +356,7 @@ export class WebSocketManager {
// 标准 WebSocket 环境
this.ws.send(messageStr);
this.stats.messagesSent++;
- console.log("消息发送成功:", messageData);
+ //console.log("消息发送成功:", messageData);
}
return true;