xsl/meida_applet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/yudaocode/yudao-mall-uniapp

Browse Source 
# Conflicts:
#	pages/chat/components/messageList.vue
#	uni_modules/z-paging/changelog.md
#	uni_modules/z-paging/components/z-paging-cell/z-paging-cell.vue
#	uni_modules/z-paging/components/z-paging-empty-view/z-paging-empty-view.vue
#	uni_modules/z-paging/components/z-paging-swiper-item/z-paging-swiper-item.vue
#	uni_modules/z-paging/components/z-paging-swiper/z-paging-swiper.vue
#	uni_modules/z-paging/components/z-paging/components/z-paging-load-more.vue
#	uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue
#	uni_modules/z-paging/components/z-paging/css/z-paging-main.css
#	uni_modules/z-paging/components/z-paging/js/modules/back-to-top.js
#	uni_modules/z-paging/components/z-paging/js/modules/common-layout.js
#	uni_modules/z-paging/components/z-paging/js/modules/data-handle.js
#	uni_modules/z-paging/components/z-paging/js/modules/i18n.js
#	uni_modules/z-paging/components/z-paging/js/modules/load-more.js
#	uni_modules/z-paging/components/z-paging/js/modules/nvue.js
#	uni_modules/z-paging/components/z-paging/js/modules/refresher.js
#	uni_modules/z-paging/components/z-paging/js/modules/scroller.js
#	uni_modules/z-paging/components/z-paging/js/modules/virtual-list.js
#	uni_modules/z-paging/components/z-paging/js/z-paging-constant.js
#	uni_modules/z-paging/components/z-paging/js/z-paging-enum.js
#	uni_modules/z-paging/components/z-paging/js/z-paging-main.js
#	uni_modules/z-paging/components/z-paging/js/z-paging-utils.js
#	uni_modules/z-paging/components/z-paging/z-paging.vue
#	uni_modules/z-paging/package.json
#	uni_modules/z-paging/readme.md
This commit is contained in:
YunaiV
2025-05-12 21:26:31 +08:00
parent 5071816ea0 c17228b0d7
commit f6e74b12cb
46 changed files with 365 additions and 7817 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/chat/index.vue
+8 -1
View File
@@ -13,6 +13,9 @@
v-model="chat.msg"
@on-tools="onTools"
@send-message="onSendMessage"
:auto-focus="false"
:show-char-count="true"
:max-length="500"
></message-input>
</template>
</MessageList>
@@ -29,6 +32,9 @@
v-model="chat.msg"
@on-tools="onTools"
@send-message="onSendMessage"
:auto-focus="false"
:show-char-count="true"
:max-length="500"
></message-input>
</tools-popup>
<!-- 商品订单选择 -->
@@ -77,7 +83,6 @@
content: JSON.stringify({ text: chat.msg }),
};
await KeFuApi.sendKefuMessage(data);
await messageListRef.value.refreshMessageList();
chat.msg = '';
} finally {
chat.showTools = false;
@@ -181,6 +186,8 @@
// 2.3 消息类型：KEFU_MESSAGE_ADMIN_READ
if (type === WebSocketMessageTypeConstants.KEFU_MESSAGE_ADMIN_READ) {
console.log('管理员已读消息');
// 更新消息已读状态
sheep.$helper.toast('客服已读您的消息');
}
},
});