From 710171a5534c115eb064f71120ca62efa54b8204 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 19 Apr 2024 13:20:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E8=AF=8A=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/health.js | 4 ++-- .../pages/healthyOrderDetail/healthyOrderDetail.js | 9 ++++++++- .../healthyOrderDetail/healthyOrderDetail.wxml | 13 +++++++------ .../healthyOrderDetail/healthyOrderDetail.wxss | 1 + patient/pages/orderDetail/orderDetail.wxml | 4 +++- patient/pages/payOrder/payOrder.js | 14 +++++++++++++- patient/pages/payPlatform/payPlatform.js | 6 +++++- 7 files changed, 39 insertions(+), 12 deletions(-) diff --git a/api/health.js b/api/health.js index dc7c5bc..c685e43 100644 --- a/api/health.js +++ b/api/health.js @@ -12,7 +12,7 @@ function serviceList(data){ //获取患者检测订单列表 return request('/patient/order/service','GET',data) }; function serviceDetail(id){ //获取患者检测订单详情 - return request('/patient/order/service/'+id,'GET',{}) + return request('/patient/order/service/'+id,'GET',{},true) }; function cancelCheckPay(id){ //取消支付 @@ -28,7 +28,7 @@ function serviceList(data){ //获取患者检测订单列表 return request('/patient/service/inquiry/'+id,'POST',{},true) } function serviceEquityDetail(id){ //获取患者服务包订单服务权益详情 - return request('/patient/order/service/detail/'+id,'GET',{}) + return request('/patient/order/service/detail/'+id,'GET',{},true) }; function serviceSickInfo(id){ //获取服务包订单病例详情-基础益详情 return request('/case/service/'+id,'GET',{}) diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js index b54163a..691ca3e 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js @@ -15,6 +15,7 @@ Page({ data: { confirmText:'确定', restProduct:0, + showMoneyDetail:true, status:'', order_no:'', showWarn:false, @@ -79,6 +80,11 @@ Page({ urls: urls // 需要预览的图片http链接列表 }) }, + toggleDetail(){ + this.setData({ + showMoneyDetail:!this.data.showMoneyDetail + }) + }, toggleJuan(){ this.setData({ showJuan:!this.data.showJuan @@ -291,13 +297,14 @@ handleCreateServiceChatOrder(id){ handelServiceEquityDetail(id){ serviceEquityDetail(id).then(res=>{ let package_product=res.order_service_package_product; + console.log(res.order_inquiry); this.setData({ equity:res, inquriyList:res.order_inquiry, toggleList:res.order_inquiry, productList:res.order_product, yaoList:res.order_product, - restProduct:package_product>0?package_product[0].quantity-package_product[0].used_quantity:0 + restProduct:package_product.length>0?package_product[0].quantity-package_product[0].used_quantity:0 }) }) }, diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml index 0a2dbf3..112bda0 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml @@ -84,9 +84,9 @@ ￥{{pay_money}} - 明细 + 明细 - + 药 品 费 @@ -214,8 +214,9 @@ {{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package.month_inquiry_count)}}次图文 {{showExpand?'收起':'展开'}} + - 问诊时间：{{item.created_at}} + 问诊时间：{{item.created_at}}11 {{item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':'已取消'}} @@ -227,14 +228,14 @@ 内      容 ： - 30盒干爽颗粒(步长) + 30盒肝爽颗粒(步长) - + 药品剩余 ： - {{restProduct}}盒干爽颗粒 + {{restProduct}}盒肝爽颗粒(步长) {{showProduct?'收起':'展开'}} diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss index cf75460..3b894bf 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss @@ -1097,6 +1097,7 @@ page { .medbox { border-bottom: 1rpx solid #E3E4E5; + } .medbox:last-child { diff --git a/patient/pages/orderDetail/orderDetail.wxml b/patient/pages/orderDetail/orderDetail.wxml index dde729d..80eef06 100644 --- a/patient/pages/orderDetail/orderDetail.wxml +++ b/patient/pages/orderDetail/orderDetail.wxml @@ -47,6 +47,8 @@ 专家问诊-视频 专家问诊-疑难会诊 专家问诊-附赠回复 + 健康包服务 + 随访包服务 快速问诊 快速问诊-附赠回复 公益问诊 @@ -106,7 +108,7 @@ - + diff --git a/patient/pages/payOrder/payOrder.js b/patient/pages/payOrder/payOrder.js index 15f80e1..5f1597e 100644 --- a/patient/pages/payOrder/payOrder.js +++ b/patient/pages/payOrder/payOrder.js @@ -304,7 +304,8 @@ Page({ order_inquiry_id, order_detection_id, order_type, - fromType + fromType, + order_service_id } = this.data; if (order_type == 1) { if (fromType) { @@ -334,6 +335,17 @@ Page({ }) } + }else if(order_type == 4 || order_type == 5){ + if (fromType) { + wx.redirectTo({ + url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id=' + order_service_id + "&fromType=" + fromType, + }) + } else { + wx.navigateBack({ + delta: 1, + }) + + } }else { if (fromType) { wx.redirectTo({ diff --git a/patient/pages/payPlatform/payPlatform.js b/patient/pages/payPlatform/payPlatform.js index 39a19be..f543920 100644 --- a/patient/pages/payPlatform/payPlatform.js +++ b/patient/pages/payPlatform/payPlatform.js @@ -101,7 +101,11 @@ Page({ wx.redirectTo({ url: '/patient/pages/medinceOrderDetail/medinceOrderDetail?order_product_id='+data.order_id+ "&fromType=" +encodeURIComponent("patient/pages/medinceOrder/medinceOrder"), }) - }else{ + }else if(order_type == 4 || order_type == 5){ + wx.redirectTo({ + url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id=' + data.order_no + "&fromType=" + +encodeURIComponent("healthyService/pages/healthyOrder/healthyOrder"), + }) + }else{ wx.redirectTo({ url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id='+data.order_no+ "&fromType=" +encodeURIComponent("sugarCheck/pages/checkOrder/checkOrder"), })