From 3e0a92622625600ca41f3163987643a85715f52e Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Sun, 28 Apr 2024 13:23:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../healthyOrderDetail/healthyOrderDetail.wxml    |  4 ++--
 patient/pages/payOrder/payOrder.js                | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
index 9aabb75..0a71c49 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
@@ -84,9 +84,9 @@
       <view class="desc  price rightbox">
       ￥{{pay_money}}
       </view>
-      <view class="moneydetail" bind:tap="toggleDetail">明细<van-icon name="{{showMoneyDetail?'arrow-down':'arrow-up'}}" color="#fff" size="12"/></view>
+      <view class="moneydetail" bind:tap="toggleDetail" wx:if="{{order.order_service_type==1}}">明细<van-icon name="{{showMoneyDetail?'arrow-down':'arrow-up'}}" color="#fff" size="12"/></view>
     </view>
-    <view class="detaibox" wx:if="{{showMoneyDetail}}">
+    <view class="detaibox" wx:if="{{showMoneyDetail && order.order_service_type==1}}">
       <view class="row">
         <view class="namebox">
         <view class="name">药 品 费</view>
diff --git a/patient/pages/payOrder/payOrder.js b/patient/pages/payOrder/payOrder.js
index 8c5987f..6d64bdc 100644
--- a/patient/pages/payOrder/payOrder.js
+++ b/patient/pages/payOrder/payOrder.js
@@ -363,7 +363,7 @@ Page({
             }
           }
         }
-      }else{
+      }else if(result.status==2){
         //inquiry_status '问诊订单状态（1:待支付 2:待分配 3:待接诊 4:已接诊 5:已完成 6:已结束 7:已取消）',
         //inquiry_pay_status//1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款）;
          let order_status='order_status';
@@ -431,6 +431,19 @@ Page({
          
         })
 
+      }else if(result.status==3){
+       this.setData({
+        message_error:'当前有问诊中的订单，结束后才可购买'
+       })
+       Dialog.confirm({
+        title: '温馨提示',
+        showCancelButton:false,
+        selector:"#hasPayDialog"
+      }).then(() => {
+        wx.redirectTo({
+            url: '/patient/pages/orderDetail/orderDetail?order_inquiry_id='+data.order_id+ "&fromType=list",
+          })
+      })
       }
      
     })