diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js index 1b01a2c..ffa1f73 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js @@ -22,6 +22,7 @@ Page({ order_inquiry_id:'', messageWarn:'', showJuan:true, + refund:{}, time: 30 * 60 * 60 * 1000, showCover:true, showExpand:true, @@ -446,6 +447,7 @@ handleCreateServiceChatOrder(id){ order:data, detection_bar_code:data.detection_bar_code, user_doctor:data.user_doctor, + refund:data.order_refund[0], pay_money }); @@ -542,7 +544,9 @@ handelCancelCheckOrder(flag=true){ icon:"none" }) this.handleServiceDetail(); - }) + this.handelServiceEquityDetail(this.data.order_service_id) + + })this.data. }, handelCancelPayProduct(flag=true){ let id =this.data.order.order_service_no; diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml index e996452..1dfd2a6 100644 --- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml +++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml @@ -106,41 +106,51 @@ - + - 主动取消 + {{order.cancel_remarks}} + - + 退款进度 - + 无退款 - + 申请退款 - + 退款中 - + 退款成功 - + 拒绝退款 - + 退款关闭 + + + 退款金额 + + + + {{refund.refund_total}} + + 取消订单 @@ -188,7 +198,7 @@ {{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package.month_inquiry_count)}}次图文 - {{showExpand?'收起':'展开'}} + {{showExpand?'收起':'展开'}} 问诊时间:{{item.created_at}} @@ -212,7 +222,7 @@ {{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package.month_inquiry_count)}}次图文 - {{showExpand?'收起':'展开'}} + {{showExpand?'收起':'展开'}} @@ -236,7 +246,7 @@ {{restProduct}}盒肝爽颗粒(步长) - {{showProduct?'收起':'展开'}} + {{showProduct?'收起':'展开'}} 下单时间:{{item.created_at}} @@ -255,7 +265,7 @@ {{item.name}} - {{showJuan?'收起':'展开'}} + {{showJuan?'收起':'展开'}} {{item.coupon_name}} diff --git a/patient/pages/expertConsult/expertConsult.js b/patient/pages/expertConsult/expertConsult.js index 00c31be..ab89b11 100644 --- a/patient/pages/expertConsult/expertConsult.js +++ b/patient/pages/expertConsult/expertConsult.js @@ -71,10 +71,10 @@ Page({ onScroll(event) { wx.createSelectorQuery().select('#scroller') .boundingClientRect((res) => { - // console.log(event.detail.scrollTop) + //console.log(event.detail.scrollTop) let H=0; if(event.detail.scrollTop>=175){ - H=0; + H=1; }else{ H=150 } diff --git a/patient/pages/expertConsult/expertConsult.wxml b/patient/pages/expertConsult/expertConsult.wxml index dcef1a9..99882e2 100644 --- a/patient/pages/expertConsult/expertConsult.wxml +++ b/patient/pages/expertConsult/expertConsult.wxml @@ -4,7 +4,7 @@ - +