From 0d1af8ef0e45dac21759f09f37a36b386b345ba8 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Mon, 4 Sep 2023 09:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pages/yishi/wenzhen_v2/wenzhen.js | 23 ++++++++++++------- Pages/yishi/wenzhen_v2/wenzhen.wxml | 1 + .../MessageElements/ImageMessage/index.json | 6 ++++- .../MessageElements/ImageMessage/index.wxml | 11 +++++++-- .../TUIChat/components/MessageInput/index.js | 1 + TUIKit/components/TUIChat/index.js | 16 ++++++++++++- 6 files changed, 46 insertions(+), 12 deletions(-) diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index 819a833..2897e4a 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -169,7 +169,7 @@ Page({ }) }, onSDKReady(){ - //console.log("onSDKReady from wenzhen"); + console.log("onSDKReady from wenzhen"); this.getConversationList(); }, getConversationList(){ @@ -299,10 +299,12 @@ Page({ let order_inquiry_id_list = []; order_inquiry_id_list.push("");//初始化一个，防止失败 console.log(this.data.conversationList.length) - this.data.conversationList.forEach(item => { + let arr=this.data.conversationList.filter(item => item.conversationID != 'C2Cadministrator'); + + arr.forEach(item => { let conversationID = item.conversationID; console.warn("conversationID: ", conversationID) - if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过 + // if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过 let lastMessage = item.lastMessage; if(!lastMessage) return; let cloudCustomData = lastMessage.cloudCustomData; @@ -320,14 +322,14 @@ Page({ let order_inquiry_id = cloudCustomDataJson.order_inquiry_id; order_inquiry_id_list.push(order_inquiry_id);//准备去请求后端那订单状态 }) - let conversationList = this.data.conversationList; + let conversationList = arr; //this.data.conversationList; //获取医生问诊消息用户属性 api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => { let new_conversationList = []; if(response.data.length > 0){ conversationList.forEach(item => { let conversationID = item.conversationID; - if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过 + //if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过 let lastMessage = item.lastMessage; if(!lastMessage) return; let cloudCustomData = lastMessage.cloudCustomData; @@ -359,7 +361,7 @@ Page({ new_conversationList.push(item); }) }; - //console.log(new_conversationList); + console.log(new_conversationList); this.setData({ conversationList: new_conversationList }) @@ -576,7 +578,8 @@ Page({ current_page:0, data_list_6:[] }) - this.getDoctorInquiryFinishMessage(); + //点击请求数据为0，则重新渲染页面 + this.getDoctorInquiryFinishMessage('end'); } }, vanTabsChange(e){ @@ -600,13 +603,14 @@ Page({ } } }, - getDoctorInquiryFinishMessage(){ + getDoctorInquiryFinishMessage(from=''){ let data_list_6= this.data.data_list_6; let params = {}; params.page = this.data.current_page + 1; this.setData({data_list_6_loading: true}) api.getDoctorInquiryFinishMessage(params).then(response => { // console.log(response); + this.setData({ "data_list_6": data_list_6.concat(response.data.data), current_page: response.data.current_page, @@ -614,6 +618,9 @@ Page({ per_page: response.data.per_page, last_page: response.data.last_page }) + if(from && response.data.data.length==0){ + this.formatStatus(); + } // this.selectComponent('#tabs').resize(); }).then(res =>{ this.setData({ data_list_6_loading: false}) diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index 8797461..82259ab 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -404,6 +404,7 @@ 到底了~ + diff --git a/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.json b/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.json index e8cfaaf..2d67c18 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.json +++ b/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.json @@ -1,4 +1,8 @@ { "component": true, - "usingComponents": {} + "usingComponents": { + "van-image": "@vant/weapp/image/index", + "van-loading": "@vant/weapp/loading/index" + + } } \ No newline at end of file diff --git a/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.wxml b/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.wxml index a2e9964..7d57c93 100644 --- a/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageElements/ImageMessage/index.wxml @@ -1,5 +1,12 @@ - - + + + + + + + + + diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js index 33f23b6..e8fb78d 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -152,6 +152,7 @@ Component({ // wx.showToast({ // title: '网络类型：'+res.networkType, // }) + _this.setData({ networkstatus: res.networkType }) diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js index 5b1ad44..5d1ac3e 100644 --- a/TUIKit/components/TUIChat/index.js +++ b/TUIKit/components/TUIChat/index.js @@ -124,7 +124,20 @@ Component({ finsh_btn: false }) - + wx.onNetworkStatusChange((res) => { + let msg = '' + if (!res.isConnected) { + msg = '当前网络不可用，请检查你的网络设置' + } else if (res.networkType === 'none') { + msg = '网络开小差了,请在网络良好后重试' + } + if (msg) { + wx.showToast({ + title: msg, + icon: 'none', + }) + } + }) } }, @@ -280,6 +293,7 @@ Component({ }).catch(errors => { console.error(errors); this.setData({ + message_rounds:this.data.total_rounds, finsh_btn: false }) })