diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js index 30bc02c..92f162e 100644 --- a/Pages/yishi/my/index.js +++ b/Pages/yishi/my/index.js @@ -35,7 +35,9 @@ Page({ stateHeight: stateHeight + top, // 状态栏高度 }); }, - + onLoad(){ + console.log("onLoad "); + }, onShow: function () { // console.log("onshow "); if (typeof this.getTabBar === 'function' && this.getTabBar()) { @@ -44,8 +46,7 @@ Page({ }) } this.getMenuButtonBound(); - }, - onLoad(){ + // console.log("my onLoad"); //获取个人中心数据 api.getDoctorCenter().then(response => { diff --git a/Pages/yishi/onlinechufang/index.js b/Pages/yishi/onlinechufang/index.js index b20a3e1..49321b2 100644 --- a/Pages/yishi/onlinechufang/index.js +++ b/Pages/yishi/onlinechufang/index.js @@ -36,7 +36,7 @@ Page({ case_detail: {}, sub_disabled: false, from: "", - now_filed_focus: 'save_durg_single_use' + now_filed_focus: 'save_durg_prescription_product_num' }, changeFocus(e){ let next_filed_focus = e.currentTarget.dataset.next_filed_focus; @@ -70,13 +70,23 @@ Page({ order_prescription_id: order_prescription_id, from: from }) + if(from == 'chat'){ + this.setData({ + "navbarData.title": '处方详情' + }) + } }, select_drug(e){ this.setData({ drug_content_show: true, product_name: e.currentTarget.dataset.product_name, select_drug_id: e.currentTarget.dataset.product_id, - save_durg_product_id: e.currentTarget.dataset.product_id + save_durg_product_id: e.currentTarget.dataset.product_id, + save_durg_single_use: e.currentTarget.dataset.single_use, + save_durg_frequency_use: e.currentTarget.dataset.frequency_use, + save_durg_single_unit: e.currentTarget.dataset.single_unit, + save_durg_available_days: e.currentTarget.dataset.available_days, + save_durg_packaging_unit: e.currentTarget.dataset.packaging_unit, }); }, showPopup() { diff --git a/Pages/yishi/onlinechufang/index.wxml b/Pages/yishi/onlinechufang/index.wxml index 5c0e90d..4dcf76c 100644 --- a/Pages/yishi/onlinechufang/index.wxml +++ b/Pages/yishi/onlinechufang/index.wxml @@ -106,6 +106,11 @@ {{item.product_name}} diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index 85904ea..dc016d5 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -49,7 +49,7 @@ order_inquiry_id="{{ item.order_inquiry_id }}" inquiry_type="{{item.inquiry_type}}" from_account="{{item.from_account}}" - status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}" + status_text="{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}" note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}" message_dot="{{item.message_dot}}" wx:for="{{ data_list_1 }}" @@ -59,7 +59,7 @@ - + - 去接诊 + 去接诊 + + + + 身份证示例 + + + + + + + + + \ No newline at end of file diff --git a/Pages/yishi/zhiye_identity/index.wxss b/Pages/yishi/zhiye_identity/index.wxss index f7b6729..eb1d61d 100644 --- a/Pages/yishi/zhiye_identity/index.wxss +++ b/Pages/yishi/zhiye_identity/index.wxss @@ -38,4 +38,20 @@ display: flex; justify-content: center; align-items: center; +} +.zhiye_popup{ + display: flex; + flex-direction: column; + align-items: center; + padding-bottom: 20rpx; + min-height: 550rpx; +} +.zhiye_popup_title{ + margin-top: 16px; + font-size: 32rpx; + font-weight: 600; + letter-spacing: 5rpx; +} +.zhiye_popup_img{ + margin-top: 30rpx; } \ No newline at end of file diff --git a/TUIKit/components/TUIChat/components/MessageList/index.js b/TUIKit/components/TUIChat/components/MessageList/index.js index 26ad364..b4154de 100644 --- a/TUIKit/components/TUIChat/components/MessageList/index.js +++ b/TUIKit/components/TUIChat/components/MessageList/index.js @@ -159,11 +159,11 @@ Component({ }).then((res) => { let HMM_data = res.data;//HMM let HMM_messageList_del = []; - console.log("HMM getMessageList: ", HMM_data); + // console.log("HMM getMessageList: ", HMM_data); let HMM_messageList = HMM_data.messageList; HMM_messageList.forEach(item => { - let HMM_type = item.type; - console.log(item) + // let HMM_type = item.type; + // console.log(item) //去除自定义消息 // if(HMM_type == "TIMCustomElem") return; let show_avatar = this.checkShowAvatar(item); @@ -186,9 +186,9 @@ Component({ } }, checkShowAvatar(message){ - console.log("checkShowAvatar "); + // console.log("checkShowAvatar "); let type = message.type; - console.log("message type: ", type); + // console.log("message type: ", type); let show_avatar = true; if(type === "TIMCustomElem"){ const customMessage = JSON.parse(message.payload.data); @@ -268,7 +268,7 @@ Component({ }); } catch (error) { } - if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING) || item.type !== MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM) { + if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING)) { this.data.showNewMessageCount.push(message); this.setData({ showNewMessageCount: this.data.showNewMessageCount, diff --git a/TUIKit/components/TUIChat/index.js b/TUIKit/components/TUIChat/index.js index 059ab26..2658ad2 100644 --- a/TUIKit/components/TUIChat/index.js +++ b/TUIKit/components/TUIChat/index.js @@ -103,11 +103,11 @@ Component({ ready() { //修改为组件传值 // this.getInquiryMessageBasic() - console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene); + // console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene); let pages = getCurrentPages(); - console.log("pages:", pages) - console.log("pages.length:", pages.length) - console.log("pages:", pages[0]) + // console.log("pages:", pages) + // console.log("pages.length:", pages.length) + // console.log("pages:", pages[0]) if(pages.length == 1){ console.log("navbarData.showCapsule"); this.setData({ @@ -171,7 +171,9 @@ Component({ confirmDialog(){ api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => { console.log(response); - this.getInquiryMessageBasic() + this.getInquiryMessageBasic(); + //调用子组件中的跳到最新消息 + this.selectComponent('#MessageList').handleJumpNewMessage(); }).catch(errors => {console.error(errors);}) this.setData({ dialog_visible: false diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml index 34faedb..ab2caac 100644 --- a/TUIKit/components/TUIChat/index.wxml +++ b/TUIKit/components/TUIChat/index.wxml @@ -5,7 +5,7 @@ {{baseInfo.patient_family_name}} {{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁 - {{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'已接诊':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}} + {{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'接诊中':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}} 结束问诊 @@ -16,7 +16,7 @@ {{conversationName}} --> - +