From ba20d0c7d6854bea740615584cd19ea30433bd50 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 26 Apr 2024 16:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../healthyOrderDetail.wxml                   | 20 +++++++++++--------
 .../healthyOrderDetail.wxss                   |  3 +++
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
index 621a871..18fbf5c 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
@@ -163,10 +163,10 @@
    
   
 </view>
-<view class="quanyibox rowbox " wx:if="{{(order.order_service_status==1 || order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">
+<view class="quanyibox rowbox " wx:if="{{(order.order_service_status==1 || order.order_service_status==2 || order.order_service_status==3 || order.order_service_status==4)}}">
    <view class="topbox">
     <view class="title">服务权益</view>
-    <view class="row"  wx:if="{{order.order_service_status==2 || order.order_service_status==3 || order.order_service_status==4}}">
+    <view class="row {{order.order_service_status==2?'mb':''}}"  wx:if="{{order.order_service_status==2 || order.order_service_status==3 || order.order_service_status==4}}">
         <view class="namebox">
       <view class="name">有 效 期</view>
       <view  class="dot">：</view>
@@ -174,7 +174,7 @@
      <view class="desc time" wx:if="{{order.order_service_status==2}}"><text class="red">接诊后有效</text></view>
      <view class="desc time" wx:elif="{{order.order_service_status==3}}"><text class="red">{{filter.transforDay(equity.order_service_package.start_time,'dotdateminute')+'-'+filter.transforDay(equity.order_service_package.finish_time,'dotdateminute')}}</text></view>
     </view>
-    <view class="row" style="align-items: flex-start;" wx:if="{{order.order_service_status==2 || order.order_service_status==3 || order.order_service_status==4}}">
+    <view class="row" style="align-items: flex-start;" wx:if="{{ order.order_service_status==3 || order.order_service_status==4}}">
         <view class="namebox">
       <view class="name">当月时间</view>
       <view  class="dot">：</view>
@@ -200,7 +200,9 @@
      <view class="desc"  wx:if="{{!(equity.order_inquiry.length==0 && equity.product.length==0)}}"><text class="red">{{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package_detail.month_inquiry_count)}}次</text>图文</view>
      <view class="expand" wx:if="{{ equity.order_inquiry.length>0 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}" bind:tap="toggleExpand">{{showExpand?'收起':'展开'}} <van-icon name="{{showExpand?'arrow-down':'arrow-up'}}" /></view>
     </view>
-    <view class="usebox" wx:for="{{inquriyList}}" wx:key="order_inquiry_id"  bind:tap="goInquiry" data-id="{{item.order_inquiry_id}}">
+    <view class="usebox" wx:for="{{inquriyList}}" 
+     wx:if="{{ equity.order_inquiry.length>0 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}"
+    wx:key="order_inquiry_id"  bind:tap="goInquiry" data-id="{{item.order_inquiry_id}}">
         <view class="time">问诊时间：{{item.created_at}}</view>
         <view class="detail">{{item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':'已取消'}}<van-icon name="arrow" size="12px"  color="#999"/></view>
     </view>
@@ -208,7 +210,7 @@
    </view>
    <view class="medbox" wx:if="{{equity.order_service_package.order_service_type==1}}">
      <view class="title">问诊服务</view>
-     <view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==1 || order.order_service_status==2 || (order.order_service_status==5 && order.pay_status==5)}}">
+     <view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==1 || order.order_service_status==2 || order.order_service_status==5 }}">
         <view class="namebox">
       <view class="name"><text 	decode>内&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;容</text></view>
       <view  class="dot">：</view>
@@ -225,7 +227,9 @@
      <view class="expand" wx:if="{{ equity.order_inquiry.length>1 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}"  bind:tap="toggleExpand">{{showExpand?'收起':'展开'}} <van-icon name="{{showExpand?'arrow-down':'arrow-up'}}" /></view>
     </view>
  
-    <view class="usebox" wx:for="{{inquriyList}}" wx:key="order_inquiry_id"  bind:tap="goInquiry" data-id="{{item.order_inquiry_id}}">
+    <view class="usebox" wx:for="{{inquriyList}}" 
+    wx:if="{{ equity.order_inquiry.length>0 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}"
+    wx:key="order_inquiry_id"  bind:tap="goInquiry" data-id="{{item.order_inquiry_id}}">
         <view class="time">问诊时间：{{item.created_at}}</view>
         <view class="detail">{{item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':'已取消'}}<van-icon name="arrow" size="12px"  color="#999"/></view>
     </view>
@@ -233,7 +237,7 @@
    </view>
    <view class="medbox" wx:if="{{equity.order_service_package.order_service_type==1}}">
      <view class="title">药品服务</view>
-     <view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==1 || order.order_service_status==2 || (order.order_service_status==5 && order.pay_status==5)}}">
+     <view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==1 || order.order_service_status==2 || order.order_service_status==5 }}">
         <view class="namebox">
       <view class="name"><text 	decode>内&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;容</text></view>
       <view  class="dot">：</view>
@@ -271,7 +275,7 @@
         <view class="time">{{item.coupon_name}}</view>
         <view class="detail">{{item.user_coupon_status==0?'未使用':item.user_coupon_status==1?'已使用':'已过期'}}<van-icon name="arrow" size="12px"  color="#999"/></view>
     </view>
-    <view  class="usebox" bind:tap="goApp" wx:if="{{order.order_service_status!=1 && !(order.order_service_status==5 && order.pay_status==5)}}"> 
+    <view  class="usebox" bind:tap="goApp" wx:if="{{order.order_service_status!=1 && order.order_service_status!=2 && !(order.order_service_status==5 && order.pay_status==5)}}"> 
      <view class="time">100元的肝胆商城优惠劵</view>
       <view class="detail">注册即发放<van-icon name="arrow" size="12px"  color="#999"/></view>
     </view>
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss
index 3b894bf..198272b 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss
@@ -1134,4 +1134,7 @@ color:#999;
 }
 .red{
     color:#EF4F20  
+}
+.row.mb{
+  margin-bottom: 10rpx;
 }
\ No newline at end of file