From af075ad342bdbf4e014a45c553c26153cd7cf960 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 26 Apr 2024 09:59:59 +0800 Subject: [PATCH] 4.26 --- .../TUIChat/components/MessageInput/index.js | 4 +++ .../pages/healthyDetail/healthyDetail.js | 28 +++++++++++++++++++ .../pages/healthyDetail/healthyDetail.wxml | 7 ++++- .../healthyOrderDetail/healthyOrderDetail.js | 1 + .../healthyOrderDetail.wxml | 14 +++++----- .../pages/visitDetail/visitDetail.js | 27 ++++++++++++++++++ .../pages/visitDetail/visitDetail.wxml | 6 +++- healthyService/pages/writeSick/writeSick.js | 10 ++++--- 8 files changed, 84 insertions(+), 13 deletions(-) diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js index 5a54250..33f36fc 100644 --- a/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIService/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -243,6 +243,7 @@ Component({ message_rounds:this.data.msgData.msg_round, patient_family_data:this.data.patient_family_data, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, monthly_frequency:serviceInfo.monthly_frequency, @@ -570,6 +571,7 @@ pageLifetimes:{ message_rounds:this.data.msgData.msg_round, patient_family_data:this.data.patient_family_data, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, @@ -916,6 +918,7 @@ pageLifetimes:{ message_rounds:this.data.msgData.msg_round, patient_family_data:this.data.patient_family_data, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, @@ -981,6 +984,7 @@ pageLifetimes:{ message_rounds:this.data.msgData.msg_round, patient_family_data:this.data.patient_family_data, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, diff --git a/healthyService/pages/healthyDetail/healthyDetail.js b/healthyService/pages/healthyDetail/healthyDetail.js index af8a52d..77d2781 100644 --- a/healthyService/pages/healthyDetail/healthyDetail.js +++ b/healthyService/pages/healthyDetail/healthyDetail.js @@ -14,6 +14,15 @@ Page({ confirmNext:'确定', order_inquiry_id:'', chat_id:'', + showPicker:false, + columns:[ + {text:"本人",value:1}, + {text:"父母",value:2}, + {text:"爱人",value:3}, + {text:"子女",value:4}, + {text:"亲戚",value:5}, + {text:"其他 ",value:6} + ], showWarn:false, status:'', active:0, @@ -63,6 +72,25 @@ Page({ this.handleCreateServiceChatOrder(order_no) } }, +onConfirm(event) { + const { value} = event.detail; + this.setData({ + relationId: `${value.value}`, + relation:`${value.text}`, + showPicker:false + }); + }, +openPicker(){ + this.setData({ + showPicker:true + }) + }, + closePicker(){ + this.setData({ + showPicker:false + }) + }, + inputChange(e) { this.setData({ [e.target.dataset.id]: e.detail.value diff --git a/healthyService/pages/healthyDetail/healthyDetail.wxml b/healthyService/pages/healthyDetail/healthyDetail.wxml index 1673102..3086f84 100644 --- a/healthyService/pages/healthyDetail/healthyDetail.wxml +++ b/healthyService/pages/healthyDetail/healthyDetail.wxml @@ -166,4 +166,9 @@ cancel-button-text="取消" > - \ No newline at end of file + + + + \ No newline at end of file diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js index 53010bb..ebeb006 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js @@ -15,6 +15,7 @@ Page({ data: { confirmText:'确定', restProduct:0, + columns:[], showMoneyDetail:true, status:'', order_no:'', diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml index 1dfd2a6..0c8addd 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml @@ -2,7 +2,7 @@ - 订单详情 + 服务包订单详情 @@ -142,7 +142,7 @@ 退款关闭 - + 退款金额 ： @@ -163,7 +163,7 @@ - + 服务权益 @@ -184,7 +184,7 @@ 问诊服务 - + 内      容 ： @@ -193,7 +193,7 @@ - + 当月剩余 ： @@ -208,7 +208,7 @@ 问诊服务 - + 内      容 ： @@ -217,7 +217,7 @@ - + 当月剩余 ： diff --git a/healthyService/pages/visitDetail/visitDetail.js b/healthyService/pages/visitDetail/visitDetail.js index 75de796..d2fa65c 100644 --- a/healthyService/pages/visitDetail/visitDetail.js +++ b/healthyService/pages/visitDetail/visitDetail.js @@ -11,6 +11,14 @@ Page({ */ data: { order_no:'', + columns:[ + {text:"本人",value:1}, + {text:"父母",value:2}, + {text:"爱人",value:3}, + {text:"子女",value:4}, + {text:"亲戚",value:5}, + {text:"其他 ",value:6} + ], order_inquiry_id:'', chat_id:'', confirmText:'确定', @@ -43,6 +51,25 @@ Page({ chat_id:'', img_host:app.hostConfig().imghost }, + onConfirm(event) { + const { value} = event.detail; + this.setData({ + relationId: `${value.value}`, + relation:`${value.text}`, + showPicker:false + }); + }, + openPicker(){ + this.setData({ + showPicker:true + }) + }, + closePicker(){ + this.setData({ + showPicker:false + }) + }, + inputChange(e) { this.setData({ [e.target.dataset.id]: e.detail.value diff --git a/healthyService/pages/visitDetail/visitDetail.wxml b/healthyService/pages/visitDetail/visitDetail.wxml index fca75de..b038a67 100644 --- a/healthyService/pages/visitDetail/visitDetail.wxml +++ b/healthyService/pages/visitDetail/visitDetail.wxml @@ -171,4 +171,8 @@ confirm-button-text="{{confirmText}}" > - \ No newline at end of file + + + + \ No newline at end of file diff --git a/healthyService/pages/writeSick/writeSick.js b/healthyService/pages/writeSick/writeSick.js index 2f72ee5..80b1ff6 100644 --- a/healthyService/pages/writeSick/writeSick.js +++ b/healthyService/pages/writeSick/writeSick.js @@ -27,6 +27,7 @@ Page({ prevData: null, pathography_id:'', showdialog: false, + order_no:'', showAgreeDialog: false, message: '', order_inquiry_id:'', @@ -49,7 +50,6 @@ Page({ hideFamilysick: false, showBack: false, is_exist:false, - columns: [], fileList: [], lockBtn: false, checkSign: false, @@ -521,6 +521,7 @@ Page({ service_type:service_type, follow_package_item_id:follow_package_item_id }).then((data) => { + console.log(data); let { order_no } = data.data; @@ -538,10 +539,11 @@ Page({ url: '/patient/pages/payOrder/payOrder?doctor_id=' + doctor_id + '&inquiry_no=' + order_no + "&chat_id=" + chat_id + "&inquiry_type=" + inquiry_type + "&inquiry_mode=" + inquiry_mode + "&fromType=chat&&order_type="+order_type }) }else if(data.status==2){ + this.setData({ showdialog:true, messageTitle:"当前患者存在进行中问诊订单", - order_inquiry_id: order_inquiry_id, + order_no: order_no, cancelBtn:true }) } @@ -685,9 +687,9 @@ Page({ }) } if(this.data.messageTitle=="当前患者存在进行中问诊订单"){ - let {order_inquiry_id}=this.data; + let {order_no}=this.data; app.method.navigateTo({ - url: '/patient/pages/orderDetail/orderDetail?order_inquiry_id='+ order_inquiry_id, + url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+order_no, }) } },