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 @@
待接诊
服务中
- 服务完成
+ 服务完成
服务取消
支付超时
@@ -208,13 +208,13 @@
:
{{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package_detail.month_inquiry_count)}}次图文
- {{showExpand?'收起':'展开'}}
+ {{showExpand?'收起':'展开'}}
问诊时间:{{item.created_at}}
- {{item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':'已取消'}}
+ {{item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'问诊中':item.inquiry_status==5?'问诊完成':item.inquiry_status==6?'问诊结束':'问诊取消'}}
@@ -234,14 +234,14 @@
:
{{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.remaining_inquiry_count)}}次图文
- {{showExpand?'收起':'展开'}}
+ {{showExpand?'收起':'展开'}}
问诊时间:{{item.created_at}}
- {{item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':'已取消'}}
+ {{item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'问诊中':item.inquiry_status==5?'问诊完成':item.inquiry_status==6?'问诊结束':'问诊取消'}}
@@ -260,7 +260,7 @@
:
{{equity.order_service_package_detail.remaining_quantity}}盒肝爽颗粒(步长)
- {{showProduct?'收起':'展开'}}
+ {{showProduct?'收起':'展开'}}
下单时间:{{item.created_at}}
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 @@
-
+
@@ -42,11 +44,18 @@
单品补贴
{{item.coupon_name}}
- 使用范围:全场通用
+
+ 使用范围:全场通用
使用范围:问诊适用
使用范围:购药
使用范围:购药
使用范围:购药
+
+
有效期:{{item.valid_end_time}}
@@ -68,11 +77,18 @@
单品补贴
{{item.coupon_name}}
- 使用范围:全场通用
+
+ 使用范围:全场通用
使用范围:问诊适用
使用范围:购药
使用范围:购药
使用范围:购药
+
+
有效期:{{item.valid_end_time}}