From 084d30592fe619d9cf9b325bbb51f249a5470fc3 Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Wed, 8 May 2024 15:34:52 +0800
Subject: [PATCH] 3.8

---
 app.json                                           |  4 ++--
 patient/pages/expertConsult/expertConsult.js       | 14 ++++++++++----
 patient/pages/expertConsult/expertConsult.wxml     |  2 +-
 patient/pages/expertDetail/expertDetail.wxml       |  4 ++--
 .../medinceOrderDetail/medinceOrderDetail.wxml     |  5 +++++
 patient/pages/myWelfare/myWelfare.wxml             |  4 ++++
 patient/pages/payInfo/payInfo.wxml                 |  2 +-
 patient/pages/payOrder/payOrder.js                 |  3 ++-
 patient/pages/payOrder/payOrder.wxml               |  4 ++++
 9 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/app.json b/app.json
index d6887cc..625e269 100644
--- a/app.json
+++ b/app.json
@@ -77,7 +77,7 @@
         "pages/checkOrder/checkOrder",
         "pages/checkOrderDetail/checkOrderDetail"
       ],
-      "independent": true
+      "independent": false
     },
     {
       "root": "TUICallKit",
@@ -100,7 +100,7 @@
         "pages/visitList/visitList",
         "pages/sickInfo/sickInfo"
       ],
-      "independent": true
+      "independent": false
     }
   ],
   "preloadRule": {
diff --git a/patient/pages/expertConsult/expertConsult.js b/patient/pages/expertConsult/expertConsult.js
index ab89b11..e4fdb5e 100644
--- a/patient/pages/expertConsult/expertConsult.js
+++ b/patient/pages/expertConsult/expertConsult.js
@@ -69,12 +69,17 @@ Page({
     this.onfresh();
   },
   onScroll(event) {
+    let {doctorList}=this.data;
     wx.createSelectorQuery().select('#scroller')
       .boundingClientRect((res) => {
-        //console.log(event.detail.scrollTop)
-         let H=0;
-        if(event.detail.scrollTop>=175){
-          H=1;
+          let H=0;
+        if(event.detail.scrollTop>175){
+            if(doctorList.length<=3){
+                H=150;
+            }else{
+                H=1;  
+            }
+         
         }else{
           H=150
         }
@@ -83,6 +88,7 @@ Page({
           // offsetTop: res.top,
           scrollHeight:H
         });
+        
       }).exec();
   },
   transforpage(arr) {
diff --git a/patient/pages/expertConsult/expertConsult.wxml b/patient/pages/expertConsult/expertConsult.wxml
index 99882e2..95f2531 100644
--- a/patient/pages/expertConsult/expertConsult.wxml
+++ b/patient/pages/expertConsult/expertConsult.wxml
@@ -4,7 +4,7 @@
 
 <view class="wraper">
 
-  <view class="containexpert" style="{{'height:'+scrollHeight+'px'}}">
+  <view class="containexpert" style="{{'height:'+scrollHeight+'px'}}" >
     <view class="searchbox">
       <input type="text" placeholder="输入姓名或医院查找医生"  disabled="{{true}}"		bindtap="goSearch"	bindconfirm="getIptvalue"/>
       <image src="{{img_host+'/ss.png'}}"></image>
diff --git a/patient/pages/expertDetail/expertDetail.wxml b/patient/pages/expertDetail/expertDetail.wxml
index 8752d19..e51d3dc 100644
--- a/patient/pages/expertDetail/expertDetail.wxml
+++ b/patient/pages/expertDetail/expertDetail.wxml
@@ -109,7 +109,7 @@
        
             <image src="{{img_host+'/suifang_on.png'}}" alt="" class="tabbg"   wx:if="{{canVisit}}"></image>
               <image src="{{img_host+'/suifang_disable.png'}}" alt="" class="tabbg"   wx:else></image>
-            <view class="typebox" >
+            <view class="typebox {{!canVisit?'disable':''}}" >
               <view class="name">随访包</view>
               <view class="price" wx:if="{{visitPrice}}">￥{{visitPrice}}起</view>
                <view class="price" wx:else style="color: #999999;">暂未开通</view>
@@ -122,7 +122,7 @@
         <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 {{!canHealthy?'disable':''}}" >
               <view class="name">健康包</view>
               <view class="price" wx:if="{{healthyPrice}}">￥{{healthyPrice}}/次</view>
                <view class="price" wx:else style="color: #999999;">暂未开通</view>
diff --git a/patient/pages/medinceOrderDetail/medinceOrderDetail.wxml b/patient/pages/medinceOrderDetail/medinceOrderDetail.wxml
index 1628f39..d36b8ff 100644
--- a/patient/pages/medinceOrderDetail/medinceOrderDetail.wxml
+++ b/patient/pages/medinceOrderDetail/medinceOrderDetail.wxml
@@ -71,6 +71,11 @@
       <view  class="dot">：</view>
       <view class="desc  price">￥{{order_product.logistics_fee}}</view>
     </view>
+    <view class="row">
+      <view class="name">优惠金额</view>
+      <view  class="dot">：</view>
+      <view class="desc  price">-￥{{order_product.discount_amount}}</view>
+    </view>
     <view class="row">
       <view class="name">支付金额</view>
       <view  class="dot">：</view>
diff --git a/patient/pages/myWelfare/myWelfare.wxml b/patient/pages/myWelfare/myWelfare.wxml
index 5f78e34..a89518c 100644
--- a/patient/pages/myWelfare/myWelfare.wxml
+++ b/patient/pages/myWelfare/myWelfare.wxml
@@ -21,6 +21,7 @@
             <view class="range" wx:elif="{{item.application_scope==3}}">使用范围：购药</view>
             <view class="range" wx:elif="{{item.application_scope==4}}">使用范围：购药</view>
             <view class="range" wx:elif="{{item.application_scope==5}}">使用范围：购药</view>
+            <view class="range" wx:elif="{{item.application_scope==6}}">使用范围：购药</view>
              </view>
             <view class="date">有效期：{{item.valid_end_time}}</view>
           </view>
@@ -50,6 +51,7 @@
             <view class="range" wx:elif="{{item.application_scope==3}}">使用范围：购药</view>
             <view class="range" wx:elif="{{item.application_scope==4}}">使用范围：购药</view>
             <view class="range" wx:elif="{{item.application_scope==5}}">使用范围：购药</view>
+            <view class="range" wx:elif="{{item.application_scope==6}}">使用范围：购药</view>
              </view>
              <!-- <view class="range" wx:if="{{item.application_scope==1}}">使用范围：全场通用</view>
             <view class="range" wx:elif="{{item.application_scope==2}}">使用范围：问诊适用</view>
@@ -83,7 +85,9 @@
             <view class="range" wx:elif="{{item.application_scope==3}}">使用范围：购药</view>
             <view class="range" wx:elif="{{item.application_scope==4}}">使用范围：购药</view>
             <view class="range" wx:elif="{{item.application_scope==5}}">使用范围：购药</view>
+            <view class="range" wx:elif="{{item.application_scope==6}}">使用范围：购药</view>
              </view>
+            
              <!-- <view class="range" wx:if="{{item.application_scope==1}}">使用范围：全场通用</view>
             <view class="range" wx:elif="{{item.application_scope==2}}">使用范围：问诊适用</view>
             <view class="range" wx:elif="{{item.application_scope==3}}">使用范围：购药</view>
diff --git a/patient/pages/payInfo/payInfo.wxml b/patient/pages/payInfo/payInfo.wxml
index 2e662d2..4bdb10a 100644
--- a/patient/pages/payInfo/payInfo.wxml
+++ b/patient/pages/payInfo/payInfo.wxml
@@ -66,7 +66,7 @@
       <view class="row">
          <view class="name">优惠金额</view>
          <view class="dot" >：</view>
-         <view class="desc price">￥{{order.discount_amount}}</view>
+         <view class="desc price">-￥{{order.discount_amount}}</view>
       </view>
       <view class="row">
          <view class="name"> 支付金额</view>
diff --git a/patient/pages/payOrder/payOrder.js b/patient/pages/payOrder/payOrder.js
index 6d64bdc..71cf4bc 100644
--- a/patient/pages/payOrder/payOrder.js
+++ b/patient/pages/payOrder/payOrder.js
@@ -28,6 +28,7 @@ Page({
     time: '',
     inquiry_no: '',
     amount_total: "",
+    discount_amount:'',
     cannot_use_coupon_reason:'',
     coupon_amount_total: 0,
     logistics_fee: 0,
@@ -711,7 +712,7 @@ Page({
       })
      
     }
-    console.log(options.inquiry_mode,options.order_type)
+    //console.log(options.inquiry_mode,options.order_type)
   },
   /**
    * 生命周期函数--监听页面初次渲染完成
diff --git a/patient/pages/payOrder/payOrder.wxml b/patient/pages/payOrder/payOrder.wxml
index 2e140db..2b9fed5 100644
--- a/patient/pages/payOrder/payOrder.wxml
+++ b/patient/pages/payOrder/payOrder.wxml
@@ -42,6 +42,10 @@
       <view class="desc nodiscount" wx:elif="{{order_type==3 && !inquiry_type}}">暂不可用</view>
       
     </view>
+    <view class="row"  wx:if="{{order_type==2 && !inquiry_type && discount_amount}}">
+        <view class="name">优惠金额</view>
+        <view class="desc nodiscount">-￥{{discount_amount}}</view>
+    </view>
   </view>
   <view class="bottom">
     <view class="realprice">支付金额：<text class="price">￥{{payment_amount_total}}</text></view>