diff --git a/healthyService/pages/writeSick/writeSick.js b/healthyService/pages/writeSick/writeSick.js index a02e091..7f8face 100644 --- a/healthyService/pages/writeSick/writeSick.js +++ b/healthyService/pages/writeSick/writeSick.js @@ -550,7 +550,7 @@ Page({ this.setData({ showdialog:true, messageTitle:"当前患者存在进行中问诊订单", - order_no: order_no, + order_no:order_no, cancelBtn:true }) } @@ -699,6 +699,7 @@ Page({ url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+order_no, }) }else if(this.data.messageTitle=="当前患者存在进行中问诊订单"){ + let {order_no}=this.data; app.method.navigateTo({ url: '/patient/pages/orderDetail/orderDetail?order_inquiry_id='+order_no, }) diff --git a/patient/pages/writeSick/writeSick.js b/patient/pages/writeSick/writeSick.js index 6b96ca7..d583aab 100644 --- a/patient/pages/writeSick/writeSick.js +++ b/patient/pages/writeSick/writeSick.js @@ -25,6 +25,7 @@ Page({ */ data: { prevData: null, + order_no:'', pathography_id:'', showdialog: false, showAgreeDialog: false, @@ -533,7 +534,8 @@ Page({ }).then((data) => { let { inquiry_no, - order_inquiry_id + order_inquiry_id, + order_no, } = data.data; let { chat_id, @@ -554,6 +556,13 @@ Page({ order_inquiry_id: order_inquiry_id, cancelBtn:true }) + }else if(data.status==3){ + this.setData({ + showdialog:true, + messageTitle:"当前患者存在服务包订单", + order_no:order_no, + cancelBtn:true + }) } @@ -699,6 +708,11 @@ Page({ app.method.navigateTo({ url: '/patient/pages/orderDetail/orderDetail?order_inquiry_id='+ order_inquiry_id, }) + }else if(this.data.messageTitle=="当前患者存在服务包订单"){ + let {order_no}=this.data; + app.method.navigateTo({ + url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+order_no, + }) } }, cancelAlert(){ diff --git a/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js b/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js index 19efd73..36fec21 100644 --- a/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js +++ b/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js @@ -13,6 +13,7 @@ Page({ * 页面的初始数据 */ data: { + order_no:'', time: 30 * 60 * 60 * 1000, showCover:true, isWait:true, @@ -227,16 +228,17 @@ Page({ handleCheckInquiry:throttle(function(){ let id=this.data.order.order_detection_id; checkInquiry(id).then(data=>{ + let {order_inquiry_id,order_no}=data.data; console.log(data); if(data.status==1){ this.setData({ - order_inquiry_id:data.data, + order_inquiry_id:order_inquiry_id, }) this.goChat(); }else if(data.status==2){ this.setData({ showCheckDialog:true, - order_inquiry_id:data.data, + order_inquiry_id:order_inquiry_id, checkSatus:2, checkmessage:'当前医生有您待支付的订单,点击“继续”将为您取消订单直接进入报告解读服务。' }) @@ -244,16 +246,23 @@ Page({ this.setData({ checkSatus:3, showCheckDialog:true, - order_inquiry_id:data.data, + order_inquiry_id:order_inquiry_id, checkmessage:'当前医生有您待接诊的订单,点击“继续”将为您取消订单直接进入报告解读服务。' }) }else if(data.status==4){ this.setData({ showCheckDialog:true, checkSatus:4, - order_inquiry_id:data.data, + order_inquiry_id:order_inquiry_id, checkmessage:'当前医生有您接诊中的订单,点击“继续”将为您直接进入报告解读服务。' }) + }else if(data.status==5){ + this.setData({ + showCheckDialog:true, + checkSatus:5, + order_no:order_no, + checkmessage:'存在未支付的服务包订单,点击“继续”将为您直接进入服务包订单详情。' + }) } }) },1000), @@ -471,6 +480,11 @@ confirmCheck:throttle(function(){ this.handelCancelInquiryOrder(); }else if(this.data.checkSatus==4){ this.goChat(); + }else if(this.data.checkSatus==5){ + let {order_no}=this.data; + app.method.navigateTo({ + url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+order_no, + }) } }), handelCancelCheckOrder(flag=true){