diff --git a/api/health.js b/api/health.js
index c685e43..3217afb 100644
--- a/api/health.js
+++ b/api/health.js
@@ -34,7 +34,7 @@ function serviceEquityDetail(id){ //获取患者服务包订单服务权益详
return request('/case/service/'+id,'GET',{})
};
function checkService(id){ //检测是否可创建服务包问诊订单
- return request('/patient/service/check/'+id,'GET',{})
+ return request('/patient/service/check/'+id,'GET',{},true)
};
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js
index 9b077a8..7fd3534 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js
@@ -150,9 +150,9 @@ Page({
})
}),
goWelfare:throttle(function(e){
-
+ let {status}=e.currentTarget.dataset;
app.method.navigateTo({
- url:'/patient/pages/myWelfare/myWelfare'
+ url:'/patient/pages/myWelfare/myWelfare?status='+status
})
}),
goInquiry:throttle(function(e){
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
index fef057c..7a2a15a 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
@@ -264,7 +264,7 @@
下单时间:{{item.created_at}}
- {{item.order_product_status==1?'待支付':item.order_product_status==2?'待发货':item.order_product_status==3?'已发货':item.order_product_status==42?'已签收':'已取消'}}
+ {{item.order_product_status==1?'待支付':item.order_product_status==2?'待发货':item.order_product_status==3?'已发货':item.order_product_status==4?'已签收':'已取消'}}
@@ -281,7 +281,7 @@
{{showJuan?'收起':'展开'}}
-
+
{{item.coupon.coupon_name}}
{{item.user_coupon_status==0?'未使用':item.user_coupon_status==1?'已使用':'已过期'}}
diff --git a/patient/pages/myWelfare/myWelfare.js b/patient/pages/myWelfare/myWelfare.js
index 6efd93d..6f0e401 100644
--- a/patient/pages/myWelfare/myWelfare.js
+++ b/patient/pages/myWelfare/myWelfare.js
@@ -72,7 +72,23 @@ Page({
})
},
onLoad(options) {
- this.getcoupon()
+ console.log('状态');
+ console.log(options.status)
+ if(options.status==0){
+ this.setData({
+ user_coupon_status:0
+ })
+ }else if(options.status==1){
+ this.setData({
+ user_coupon_status:1
+ })
+ }else if(options.status==3){
+ this.setData({
+ user_coupon_status:3
+ })
+ }
+ this.getcoupon();
+
},
/**