From ca3de8b5830983f99a26aa41279cc6b18835d00d Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Mon, 29 Apr 2024 10:20:14 +0800
Subject: [PATCH] =?UTF-8?q?4.29=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/healthyOrder/healthyOrder.wxml         |  2 +-
 .../healthyOrderDetail/healthyOrderDetail.wxml   | 16 +++++++++++++---
 healthyService/pages/writeSick/writeSick.wxss    |  9 +++++++++
 patient/pages/expertDetail/expertDetail.wxml     |  6 +++---
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/healthyService/pages/healthyOrder/healthyOrder.wxml b/healthyService/pages/healthyOrder/healthyOrder.wxml
index df64cc9..3c0a1a3 100644
--- a/healthyService/pages/healthyOrder/healthyOrder.wxml
+++ b/healthyService/pages/healthyOrder/healthyOrder.wxml
@@ -101,7 +101,7 @@
   </scroll-view>
   <view class="nodata" wx:elif="{{!isLoading && orderList.length==0}}">
     <image src="{{img_host+'/nocheck.png'}}" class="noorder"></image>
-    <view class="tips">暂无检测订单</view>
+    <view class="tips">暂无服务包订单</view>
     <!-- <view class="btn" bindtap="goExpertList">专家问诊</view> -->
   </view>
 
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
index 0a71c49..fef057c 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
@@ -117,6 +117,16 @@
         <view class="desc rightbox" wx:elif="{{order.cancel_reason==2}}">客服取消</view>
         <view class="desc rightbox" wx:elif="{{order.cancel_reason==3}}">支付超时</view> -->
     </view>
+    <view class="row beizhu" wx:if="{{order.order_service_status==2}}">
+      <view class="namebox">
+        <view class="name"><text>备</text><text>注</text></view>
+      <view  class="dot">：</view>
+      </view>
+      <!-- 取消订单原因（1:主动取消 2:客服取消 3:支付超时） -->
+      <view class="desc rightbox">
+医生接诊前可点击取消订单按钮，自动退款</view>
+     
+    </view>
     <!-- 商品订单退款状态（0:无退款 1:申请退款 2:退款中 3:退款成功 4:拒绝退款 5:退款关闭） -->
     <view class="row"  wx:if="{{order.order_refund.length>0}}">
      <view class="namebox">
@@ -267,12 +277,12 @@
      </view>
      <view class="desc">
          <view wx:for="{{juanList}}" wx:key="id">{{item.name}}</view> 
-        </view>
+    </view>
      
      <view class="expand" bind:tap="toggleJuan" wx:if="{{juanList.length>0 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">{{showJuan?'收起':'展开'}} <van-icon name="{{showJuan?'arrow-down':'arrow-up'}}" /></view>
     </view>
-    <view wx:if="{{order.order_service_status!=1 && !(order.order_service_status==5 && order.pay_status==5)}}" wx:for="{{equity.order_service_package_coupo}}" wx:key="coupon_name" bind:tap="goWelfare" class="usebox">
-        <view class="time">{{item.coupon_name}}</view>
+    <view wx:if="{{order.order_service_status!=1 && !(order.order_service_status==5 && order.pay_status==5)}}" wx:for="{{equity.order_service_package_coupon}}" wx:key="coupon_name" bind:tap="goWelfare" class="usebox">
+        <view class="time">{{item.coupon.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!=2 && !(order.order_service_status==5 && order.pay_status==5)}}"> 
diff --git a/healthyService/pages/writeSick/writeSick.wxss b/healthyService/pages/writeSick/writeSick.wxss
index d503454..cfc5bc0 100644
--- a/healthyService/pages/writeSick/writeSick.wxss
+++ b/healthyService/pages/writeSick/writeSick.wxss
@@ -354,3 +354,12 @@ margin-bottom: 20rpx;
 .van-uploader__preview{
   margin: 0 6px 8px 0;
 }
+.slotmsg{
+    -webkit-overflow-scrolling: touch;
+      font-size: 28rpx;
+      line-height:40rpx;
+      max-height:60vh;
+      overflow-y: auto;
+      padding:48rpx;
+      text-align: center;
+  }
\ No newline at end of file
diff --git a/patient/pages/expertDetail/expertDetail.wxml b/patient/pages/expertDetail/expertDetail.wxml
index 871f810..8752d19 100644
--- a/patient/pages/expertDetail/expertDetail.wxml
+++ b/patient/pages/expertDetail/expertDetail.wxml
@@ -112,7 +112,7 @@
             <view class="typebox" >
               <view class="name">随访包</view>
               <view class="price" wx:if="{{visitPrice}}">￥{{visitPrice}}起</view>
-               <view class="price" wx:else>暂未开通</view>
+               <view class="price" wx:else style="color: #999999;">暂未开通</view>
            </view> 
            <!-- <view class="typebox disable" wx:else >
               <view class="name">视频问诊</view>
@@ -122,10 +122,10 @@
         <view class="tab add" bindtap="switchTab" data-id="2" id="item2">
             <image src="{{img_host+'/healthy_on.png'}}" alt="" class="tabbg"  wx:if="{{canHealthy}}"></image>
              <image src="{{img_host+'/healthy_disable.png'}}" alt="" class="tabbg"  wx:else></image>
-            <view class="typebox" >
+            <view class="typebox " >
               <view class="name">健康包</view>
               <view class="price" wx:if="{{healthyPrice}}">￥{{healthyPrice}}/次</view>
-               <view class="price" wx:else>暂未开通</view>
+               <view class="price" wx:else style="color: #999999;">暂未开通</view>
            </view> 
         </view>
         <view class="tab " bindtap="switchTab" data-id="3" id="item3">