From 554750b145e38efceccd0339829e8229c56062de Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Tue, 30 Apr 2024 17:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../healthyOrderDetail.wxml                   | 12 +++++-----
 .../healthyOrderDetail.wxss                   |  2 +-
 patient/pages/myWelfare/myWelfare.js          | 12 +++++++---
 patient/pages/myWelfare/myWelfare.wxml        | 22 ++++++++++++++++---
 4 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
index 7a2a15a..72e5036 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
@@ -30,7 +30,7 @@
       </view>
       <view class="status waitpay" wx:elif="{{order.order_service_status==2}}">待接诊</view>
       <view class="status waitpay" wx:elif="{{order.order_service_status==3}}">服务中</view>
-      <view class="status" wx:elif="{{order.order_service_status==4}}" style="color:#3CC7C0">服务完成</view>
+      <view class="status" wx:elif="{{order.order_service_status==4}}" >服务完成</view>
       <view class="status"  wx:elif="{{order.order_service_status==5 && order.pay_status!=5 }}">服务取消</view>
       <view class="status waitpay"  wx:elif="{{order.order_service_status==5 && order.pay_status==5}}">支付超时</view>
     </view>
@@ -208,13 +208,13 @@
       <view  class="dot">：</view>
      </view>
      <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 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: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 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>
    
    </view>
@@ -234,14 +234,14 @@
       <view  class="dot">：</view>
      </view>
      <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.remaining_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 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: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 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>
    
    </view>
@@ -260,7 +260,7 @@
       <view  class="dot">：</view>
      </view>
      <view class="desc"  wx:if="{{!(equity.order_inquiry.length==0 && equity.order_product.length==0)}}"><text class="red">{{equity.order_service_package_detail.remaining_quantity}}盒</text>肝爽颗粒(步长) </view>
-     <view class="expand" bind:tap="toggleProduct" wx:if="{{productList.length>0 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">{{showProduct?'收起':'展开'}} <van-icon name="{{showProduct?'arrow-down':'arrow-up'}}" /></view>
+     <view class="expand" bind:tap="toggleProduct" wx:if="{{yaoList.length>1 && (order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">{{showProduct?'收起':'展开'}} <van-icon name="{{showProduct?'arrow-down':'arrow-up'}}" /></view>
     </view>
     <view class="usebox" wx:for="{{productList}}" wx:key="order_product_id" bind:tap="goProduct" data-id="{{item.order_product_id}}">
         <view class="time">下单时间：{{item.created_at}}</view>
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss
index 198272b..de4f5db 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss
@@ -334,7 +334,7 @@ page {
 
 .waitpay {
     text-align: right;
-    color: #EF4F20
+    /* color: #EF4F20 */
 }
 
 .headicon {
diff --git a/patient/pages/myWelfare/myWelfare.js b/patient/pages/myWelfare/myWelfare.js
index 6f0e401..47cb2f9 100644
--- a/patient/pages/myWelfare/myWelfare.js
+++ b/patient/pages/myWelfare/myWelfare.js
@@ -11,6 +11,7 @@ Page({
     nouseList: [],
     useList: [],
     expireList: [],
+    active:0,
     user_coupon_status:0,
   },
   goIndex() {
@@ -55,10 +56,12 @@ Page({
    */
   onChange(event) {
     let tabIndex = `${event.detail.index}`
+    console.log(event.detail.index);
     if(tabIndex==2){
       tabIndex=3
     }
     this.setData({
+    active:`${event.detail.index}`,
       nouseList: [],
       useList: [],
       expireList: [],
@@ -76,15 +79,18 @@ Page({
       console.log(options.status)
       if(options.status==0){
         this.setData({
-            user_coupon_status:0
+            user_coupon_status:0,
+            active:0
         })
       }else if(options.status==1){
         this.setData({
-            user_coupon_status:1
+            user_coupon_status:1,
+            active:1
         })
       }else if(options.status==3){
         this.setData({
-            user_coupon_status:3
+            user_coupon_status:3,
+            active:2
         })
       }
     this.getcoupon();
diff --git a/patient/pages/myWelfare/myWelfare.wxml b/patient/pages/myWelfare/myWelfare.wxml
index 187dbb5..5f78e34 100644
--- a/patient/pages/myWelfare/myWelfare.wxml
+++ b/patient/pages/myWelfare/myWelfare.wxml
@@ -3,7 +3,9 @@
 <nav navName="我的福利"></nav>
 <view class="page">
   
-    <van-tabs animated type="line" tab-class="tabdiv" wrap-class="tabwrap" custom-class="tabbox" line-width="50rpx" tab-active-class="tabactive" title-inactive-color="#1C2023;" line-height="height: 10rpx;" swipeable title-active-color="#3CC7C0" color="#3CC7C0" bind:change="onChange">
+    <van-tabs animated type="line" tab-class="tabdiv" wrap-class="tabwrap" custom-class="tabbox" 
+    active="{{ active }}"
+    line-width="50rpx" tab-active-class="tabactive" title-inactive-color="#1C2023;" line-height="height: 10rpx;" swipeable title-active-color="#3CC7C0" color="#3CC7C0" bind:change="onChange">
     <van-tab title="未使用" class="vantab">
       <scroll-view scroll-y class="scrollwraper" bindrefresherrefresh="handleRefresher" refresher-triggered="{{isTriggered}}"	refresher-threshold="100"	refresher-enabled="true" >
       <view class="listbox" wx:if="{{nouseList.length>0}}">
@@ -42,11 +44,18 @@
             <view class="name">
               <view class="tag" wx:if="{{item.application_scope==5}}">单品补贴</view>
              <view class="names">{{item.coupon_name}}</view></view>
-             <view class="range" wx:if="{{item.application_scope==1}}">使用范围：全场通用</view>
+             <view class="rangbox">
+                <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>
             <view class="range" wx:elif="{{item.application_scope==4}}">使用范围：购药</view>
             <view class="range" wx:elif="{{item.application_scope==5}}">使用范围：购药</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>
+            <view class="range" wx:elif="{{item.application_scope==4}}">使用范围：购药</view>
+            <view class="range" wx:elif="{{item.application_scope==5}}">使用范围：购药</view> -->
             <view class="date">有效期：{{item.valid_end_time}}</view>
           </view>
           <view class="right">
@@ -68,11 +77,18 @@
             <view class="name">
               <view class="tag" wx:if="{{item.application_scope==5}}">单品补贴</view>
              <view class="names">{{item.coupon_name}}</view></view>
-             <view class="range" wx:if="{{item.application_scope==1}}">使用范围：全场通用</view>
+             <view class="rangbox">
+                <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>
             <view class="range" wx:elif="{{item.application_scope==4}}">使用范围：购药</view>
             <view class="range" wx:elif="{{item.application_scope==5}}">使用范围：购药</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>
+            <view class="range" wx:elif="{{item.application_scope==4}}">使用范围：购药</view>
+            <view class="range" wx:elif="{{item.application_scope==5}}">使用范围：购药</view> -->
             <view class="date">有效期：{{item.valid_end_time}}</view>
           </view>
           <view class="right">