diff --git a/healthyService/pages/healthyOrder/healthyOrder.wxml b/healthyService/pages/healthyOrder/healthyOrder.wxml index bcc540b..df64cc9 100644 --- a/healthyService/pages/healthyOrder/healthyOrder.wxml +++ b/healthyService/pages/healthyOrder/healthyOrder.wxml @@ -57,16 +57,16 @@ {{item.patient_name}}(未知{{item.patient_age}}岁) - + --> diff --git a/healthyService/pages/writeSick/writeSick.js b/healthyService/pages/writeSick/writeSick.js index 1988e42..a02e091 100644 --- a/healthyService/pages/writeSick/writeSick.js +++ b/healthyService/pages/writeSick/writeSick.js @@ -693,11 +693,15 @@ Page({ showdialog: false }) } - if(this.data.messageTitle=="当前患者存在进行中问诊订单" || this.data.messageTitle=="存在未支付订单"){ + if(this.data.messageTitle=="存在未支付订单"){ let {order_no}=this.data; app.method.navigateTo({ url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+order_no, }) + }else if(this.data.messageTitle=="当前患者存在进行中问诊订单"){ + app.method.navigateTo({ + url: '/patient/pages/orderDetail/orderDetail?order_inquiry_id='+order_no, + }) } }, cancelAlert(){ diff --git a/patient/pages/myWelfare/myWelfare.wxml b/patient/pages/myWelfare/myWelfare.wxml index c65aea3..187dbb5 100644 --- a/patient/pages/myWelfare/myWelfare.wxml +++ b/patient/pages/myWelfare/myWelfare.wxml @@ -13,11 +13,13 @@ 单品补贴 {{item.coupon_name}} - 使用范围:全场通用 + + 使用范围:全场通用 使用范围:问诊适用 使用范围:购药 使用范围:购药 使用范围:购药 + 有效期:{{item.valid_end_time}} diff --git a/patient/pages/myWelfare/myWelfare.wxss b/patient/pages/myWelfare/myWelfare.wxss index ccb5bcf..3214bb8 100644 --- a/patient/pages/myWelfare/myWelfare.wxss +++ b/patient/pages/myWelfare/myWelfare.wxss @@ -94,9 +94,13 @@ border-radius: 10rpx; display: inline; word-break: break-all; } +.fulibox .left .rangbox{ + margin-top: 20rpx; + height: 30rpx; +} .fulibox .left .range{ color: #E34D59; - margin-top: 20rpx; + font-size: 28rpx; } .fulibox .left .date{ @@ -124,6 +128,7 @@ border-radius: 10rpx; } .fulibox .right .use{ margin-top: 10rpx; + margin-bottom: 10rpx; width: 152rpx; height: 60rpx; background: #FFFFFF;