From 65237dd4171bc010da7c865d2bc01b9faa8f4f9a Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Tue, 23 Apr 2024 17:38:11 +0800 Subject: [PATCH] =?UTF-8?q?4.23=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../healthyOrderDetail/healthyOrderDetail.js | 51 ++++--------------- .../healthyOrderDetail.wxml | 2 +- patient/pages/expertDetail/expertDetail.wxml | 2 +- patient/pages/expertDetail/expertDetail.wxss | 4 +- patient/pages/payOrder/payOrder.js | 2 +- 5 files changed, 15 insertions(+), 46 deletions(-) diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js index acea75e..b44bf9b 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js @@ -1,6 +1,6 @@ // pages/medinceOrderDetail/medinceOrderDetail.js const app = getApp() -import {serviceDetail,cancelCheckPay,delCheckOrder,cancelCheckOrder,checkInquiry,serviceEquityDetail,createServiceChatOrder,checkService} from "../../../api/health" +import {serviceDetail,cancelCheckPay,delCheckOrder,cancelCheckOrder,serviceEquityDetail,createServiceChatOrder,checkService} from "../../../api/health" import {cancelPay} from "../../../api/consultOrder" import {cancelOrder} from "../../../api/consultOrder" import {fllowDoctor,notfllowDoctor} from "../../../api/consultExpert" @@ -168,7 +168,7 @@ Page({ goHasOrder(){ let status=this.data.status; - let {order_service_type,user_doctor,order_service_no}=this.data.order; + // let {order_service_type,user_doctor,order_service_no}=this.data.order; if(status==4){ let id=this.data.order_inquiry_id; @@ -192,15 +192,16 @@ Page({ } }, - handleCheckService(){ + handleCheckService:throttle(function(){ let {order_service_no}=this.data.order; checkService(order_service_no).then((res)=>{ if(res.status==1){ + console.log(res.data.order_no) this.setData({ showWarn:true, - status:5, - confirmNext:'前往', + status:1, + confirmText:'前往', order_no:res.data.order_no, messageWarn:'是否使用剩余问诊次数？' }) @@ -231,7 +232,7 @@ Page({ } }) -}, +}), goXuFei:throttle(function(){ let {order_service_type,user_doctor,amount_total}=this.data.order; let url=order_service_type==2?'/healthyService/pages/visitDetail/visitDetail?doctor_id='+user_doctor.doctor_id:'/healthyService/pages/healthyDetail/healthyDetail?doctor_id='+user_doctor.doctor_id+"&price="+amount_total @@ -308,7 +309,7 @@ handleCreateServiceChatOrder(id){ }) }) }, - chnageIpt(event){thi.se + chnageIpt(event){ const {value}=event.detail; this.setData({ detection_bar_code:value @@ -321,7 +322,7 @@ handleCreateServiceChatOrder(id){ title: '取消支付成功', icon:'none' }) - this.handleCheckInquiry(); + //this.handleCheckInquiry(); }) }, handelCancelInquiryOrder(){ @@ -335,39 +336,7 @@ handleCreateServiceChatOrder(id){ // this.goChat() }) }, - handleCheckInquiry:throttle(function(){ - let id=this.data.order.order_service_id; - checkInquiry(id).then(data=>{ - console.log(data); - if(data.status==1){ - this.setData({ - order_inquiry_id:data.data, - }) - this.goChat(); - }else if(data.status==2){ - this.setData({ - showCheckDialog:true, - order_inquiry_id:data.data, - checkSatus:2, - checkmessage:'当前医生有您待支付的订单，点击“继续”将为您取消订单直接进入报告解读服务。' - }) - }else if(data.status==3){ - this.setData({ - checkSatus:3, - showCheckDialog:true, - order_inquiry_id:data.data, - checkmessage:'当前医生有您待接诊的订单，点击“继续”将为您取消订单直接进入报告解读服务。' - }) - }else if(data.status==4){ - this.setData({ - showCheckDialog:true, - checkSatus:4, - order_inquiry_id:data.data, - checkmessage:'当前医生有您接诊中的订单，点击“继续”将为您直接进入报告解读服务。' - }) - } - }) - },1000), + goReport:throttle(function(){ wx.showLoading({ mask:true, diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml index 05dc089..e996452 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml @@ -327,7 +327,7 @@ - 去使用 + 去使用 去续费 diff --git a/patient/pages/expertDetail/expertDetail.wxml b/patient/pages/expertDetail/expertDetail.wxml index 8e160f6..871f810 100644 --- a/patient/pages/expertDetail/expertDetail.wxml +++ b/patient/pages/expertDetail/expertDetail.wxml @@ -160,7 +160,7 @@ - + diff --git a/patient/pages/expertDetail/expertDetail.wxss b/patient/pages/expertDetail/expertDetail.wxss index 2722942..0190df3 100644 --- a/patient/pages/expertDetail/expertDetail.wxss +++ b/patient/pages/expertDetail/expertDetail.wxss @@ -543,11 +543,11 @@ justify-content:center; top:0rpx; width: 100%; z-index:0; -height: 314rpx; +height: 300rpx; position: absolute; } .tabbg.on{ - height: 330rpx; + height: 325rpx; } .typebox{ margin-top: 158rpx; diff --git a/patient/pages/payOrder/payOrder.js b/patient/pages/payOrder/payOrder.js index 5f1597e..0085b2e 100644 --- a/patient/pages/payOrder/payOrder.js +++ b/patient/pages/payOrder/payOrder.js @@ -462,7 +462,7 @@ Page({ let tmplIds = ['5aJSrO8SU5rxqdB99zzl4rMVgcOTjt5mQh56cpZI1Hg','dNj3azLupP_w3j649v6lqz7je_ScqwgwFsnug6pKvyI']; THIS.subscription(tmplIds,callback); - }else { //药品发货通知 一次性订阅 //购药提醒 一次性订阅 + }else if(order_type==2) { //药品发货通知 一次性订阅 //购药提醒 一次性订阅 let tmplIds = ['YFdVxDclV1ZjhS7E4Cs0zFdshTRizERpwYdZizj_UWo', 'KjX4m_HOPT5zYuDJqE2rRopAC_QCCMqUTCGc8ElDeWQ','gQO5vhPQfdnvXtK0XnGns1XqNhQpOrXTjdl-5HWWMUw']; //药品订单取消通知 一次性订阅 THIS.subscription(tmplIds,callback)