diff --git a/Pages/yishi/appraise/index.wxml b/Pages/yishi/appraise/index.wxml index 4850809..26609cf 100644 --- a/Pages/yishi/appraise/index.wxml +++ b/Pages/yishi/appraise/index.wxml @@ -13,7 +13,7 @@ {{item.name_mask}} - + {{item.content}} @@ -29,7 +29,7 @@ {{item.name_mask}} - + {{item.content}} @@ -45,7 +45,7 @@ {{item.name_mask}} - + {{item.content}} diff --git a/Pages/yishi/bindcard/index.js b/Pages/yishi/bindcard/index.js index 88d3f4c..9228588 100644 --- a/Pages/yishi/bindcard/index.js +++ b/Pages/yishi/bindcard/index.js @@ -67,8 +67,8 @@ Page({ console.log(response); if(response.data){ this.setData({ - realname:response.data.card_name, - idcard:response.data.card_num + realname:response.data.card_name_mask, + idcard:response.data.card_num_mask }); } }).catch(errors => { diff --git a/Pages/yishi/identity/index.js b/Pages/yishi/identity/index.js index 702f372..f470d13 100644 --- a/Pages/yishi/identity/index.js +++ b/Pages/yishi/identity/index.js @@ -62,8 +62,8 @@ Page({ return; } this.setData({ - realname:response.data.card_name, - idcard:response.data.card_num, + realname:response.data.card_name_mask, + idcard:response.data.card_num_mask, next_btn_txt: "已认证，不可修改", next_btn_disabled: true, panel_2_disabled: false, diff --git a/Pages/yishi/index/index.wxss b/Pages/yishi/index/index.wxss index e3915bd..57662b4 100644 --- a/Pages/yishi/index/index.wxss +++ b/Pages/yishi/index/index.wxss @@ -218,8 +218,25 @@ page{ line-height: 100rpx; } .dialog_cancel_btn{ - border-top: 1px solid #E9E9E9; - border-right: 1px solid #E9E9E9; + position: relative; +} +.dialog_cancel_btn::before { + content: ' '; + position: absolute; + box-sizing: border-box; + top: 0; + left: 0; + border-top: 2px solid var(--td-border-color, #e7e7e7); + border-right: 2px solid var(--td-border-color, #e7e7e7); + transform: scale(0.5); + transform-origin: 0 0; + width: 200%; + height: 200%; + border-radius: 0; + border-top-left-radius: 0px; + border-top-right-radius: 0px; + border-bottom-right-radius: 0px; + border-bottom-left-radius: 0px; } .dialog_confirm_btn{ border-top: 1px solid #E9E9E9; @@ -227,4 +244,9 @@ page{ } .t-button__content{ color: #3CC7C0 !important; +} +.t-dialog__button--text:before { + border-top: 2px solid #E9E9E9 !important; + border-left: 2px solid var(--td-border-color, #E9E9E9); + border-top-color: #E9E9E9 !important; } \ No newline at end of file diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml index 4eae707..75dcfe1 100644 --- a/Pages/yishi/service_notice/index.wxml +++ b/Pages/yishi/service_notice/index.wxml @@ -5,7 +5,7 @@ 在线问诊 - + 快速问诊 diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIKit/components/TUIChat/components/MessageInput/index.js index 7631ec4..5c89212 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -247,6 +247,7 @@ Component({ ext2: wx.$chat_reportType, ext3: wx.$chat_SDKAppID, }); + let targetFlag = 'extension'; if (this.data.displayFlag === 'extension') { targetFlag = ''; @@ -305,47 +306,63 @@ Component({ // 发送图片消息 handleSendImageMessage(file) { - // 获取最后一条消息 - let last_message = this.data.conversation.lastMessage; - console.log("last_message: ", last_message); - let cloudCustomData = ""; - let cloudCustomDataJson = ""; - if(last_message.cloudCustomData){ - cloudCustomData = last_message.cloudCustomData; - } - if(cloudCustomData){ - cloudCustomDataJson = JSON.parse(cloudCustomData); - } - let message_rounds = 0; - let patient_family_data = {}; - patient_family_data.patient_name = this.data.baseInfo.patient_family_name; - patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex; - patient_family_data.patient_age = this.data.baseInfo.patient_family_age; - if(cloudCustomDataJson){ - message_rounds = cloudCustomDataJson.message_rounds; - } + let _this = this; + let conversationID = this.data.conversation.conversationID + let promise = wx.$TUIKit.getConversationProfile(conversationID); + promise.then(function(imResponse) { + console.log("getConversationProfile 正在执行") + // 获取成功 + console.log(imResponse.data.conversation); // 会话资料 + _this.setData({ + conversation: imResponse.data.conversation + }) + }).catch(function(imError) { + console.warn('getConversationProfile error:', imError); // 获取会话资料失败的相关信息 + }); - const mycloudCustomData = JSON.stringify({ - order_inquiry_id: this.data.order_inquiry_id, - inquiry_type: this.data.inquiry_type, - message_type: 0, - is_system: 0, - message_rounds: message_rounds, - patient_family_data: patient_family_data - }); - - const message = wx.$TUIKit.createImageMessage({ - to: this.getToAccount(), - conversationType: this.data.conversation.type, - payload: { - file, - }, - cloudCustomData: mycloudCustomData, - onProgress: (percent) => { - message.percent = percent; - }, - }); - this.$sendTIMMessage(message); + Promise.all([promise]).then(res => { + // 获取最后一条消息 + let last_message = this.data.conversation.lastMessage; + console.log("last_message: ", last_message); + let cloudCustomData = ""; + let cloudCustomDataJson = ""; + if(last_message.cloudCustomData){ + cloudCustomData = last_message.cloudCustomData; + } + if(cloudCustomData){ + cloudCustomDataJson = JSON.parse(cloudCustomData); + } + let message_rounds = 0; + let patient_family_data = {}; + patient_family_data.patient_name = this.data.baseInfo.patient_family_name; + patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex; + patient_family_data.patient_age = this.data.baseInfo.patient_family_age; + if(cloudCustomDataJson){ + message_rounds = cloudCustomDataJson.message_rounds; + } + + const mycloudCustomData = JSON.stringify({ + order_inquiry_id: this.data.order_inquiry_id, + inquiry_type: this.data.inquiry_type, + message_type: 0, + is_system: 0, + message_rounds: message_rounds, + patient_family_data: patient_family_data + }); + + const message = wx.$TUIKit.createImageMessage({ + to: this.getToAccount(), + conversationType: this.data.conversation.type, + payload: { + file, + }, + cloudCustomData: mycloudCustomData, + onProgress: (percent) => { + message.percent = percent; + }, + }); + this.$sendTIMMessage(message); + }) }, // 发送视频消息 @@ -562,55 +579,71 @@ Component({ ext2: wx.$chat_reportType, ext3: wx.$chat_SDKAppID, }); - - //获取最后一条消息 - let last_message = this.data.conversation.lastMessage; - console.log("last_message: ", last_message); - let cloudCustomData = ""; - let cloudCustomDataJson = ""; - if(last_message.cloudCustomData){ - cloudCustomData = last_message.cloudCustomData; - } - if(cloudCustomData){ - cloudCustomDataJson = JSON.parse(cloudCustomData); - } - let message_rounds = 0; - let patient_family_data = {}; - patient_family_data.patient_name = this.data.baseInfo.patient_family_name; - patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex; - patient_family_data.patient_age = this.data.baseInfo.patient_family_age; - if(cloudCustomDataJson){ - message_rounds = cloudCustomDataJson.message_rounds; - } - - const to = this.getToAccount(); - const text = flag ? msg : this.data.message; - - const { FEAT_NATIVE_CODE } = constant; - const mycloudCustomData = JSON.stringify({ - order_inquiry_id: this.data.order_inquiry_id, - inquiry_type: this.data.inquiry_type, - message_type: 0, - is_system: 0, - message_rounds: message_rounds, - patient_family_data: patient_family_data + let _this = this; + let conversationID = this.data.conversation.conversationID + let promise = wx.$TUIKit.getConversationProfile(conversationID); + promise.then(function(imResponse) { + console.log("getConversationProfile 正在执行") + // 获取成功 + console.log(imResponse.data.conversation); // 会话资料 + _this.setData({ + conversation: imResponse.data.conversation + }) + }).catch(function(imError) { + console.warn('getConversationProfile error:', imError); // 获取会话资料失败的相关信息 }); - console.log("mycloudCustomData: ", mycloudCustomData); - console.log("text: ", text); - const message = wx.$TUIKit.createTextMessage({ - to, - conversationType: this.data.conversation.type, - payload: { - text, - }, - cloudCustomData: mycloudCustomData - }); - this.setData({ - message: '', - sendMessageBtn: false, - }); - this.$sendTIMMessage(message); + Promise.all([promise]).then(res => { + console.log("getConversationProfile 执行完毕") + //获取最后一条消息 + let last_message = this.data.conversation.lastMessage; + console.log("last_message: ", last_message); + let cloudCustomData = ""; + let cloudCustomDataJson = ""; + if(last_message.cloudCustomData){ + cloudCustomData = last_message.cloudCustomData; + } + if(cloudCustomData){ + cloudCustomDataJson = JSON.parse(cloudCustomData); + } + let message_rounds = 0; + let patient_family_data = {}; + patient_family_data.patient_name = this.data.baseInfo.patient_family_name; + patient_family_data.patient_sex = this.data.baseInfo.patient_family_sex; + patient_family_data.patient_age = this.data.baseInfo.patient_family_age; + if(cloudCustomDataJson){ + message_rounds = cloudCustomDataJson.message_rounds; + } + + const to = this.getToAccount(); + const text = flag ? msg : this.data.message; + + const { FEAT_NATIVE_CODE } = constant; + const mycloudCustomData = JSON.stringify({ + order_inquiry_id: this.data.order_inquiry_id, + inquiry_type: this.data.inquiry_type, + message_type: 0, + is_system: 0, + message_rounds: message_rounds, + patient_family_data: patient_family_data + }); + + console.log("mycloudCustomData: ", mycloudCustomData); + console.log("text: ", text); + const message = wx.$TUIKit.createTextMessage({ + to, + conversationType: this.data.conversation.type, + payload: { + text, + }, + cloudCustomData: mycloudCustomData + }); + this.setData({ + message: '', + sendMessageBtn: false, + }); + this.$sendTIMMessage(message); + }) }, // 监听输入框value值变化 diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml index 04b47e9..d6685d7 100644 --- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml +++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml @@ -6,7 +6,7 @@ -