From 67d6aa0e67a4b9ea93d41dc74fb73a970961d7ba Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Fri, 26 Apr 2024 14:53:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=97=85=E6=83=85=E6=8F=90?=
=?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
filters/filter.wxs | 2 ++
healthyService/pages/healthyDetail/healthyDetail.js | 2 +-
.../pages/healthyOrderDetail/healthyOrderDetail.js | 2 +-
.../pages/healthyOrderDetail/healthyOrderDetail.wxml | 12 ++++++------
healthyService/pages/visitDetail/visitDetail.js | 2 +-
healthyService/pages/writeSick/writeSick.js | 11 +++++++++--
6 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/filters/filter.wxs b/filters/filter.wxs
index d941699..bde33a7 100644
--- a/filters/filter.wxs
+++ b/filters/filter.wxs
@@ -91,6 +91,8 @@ function transforDay(time, type) {
time_str = y + '-' + m + '-' + d;
} else if(type == 'dateminute'){
time_str = y + '-' + m + '-' + d + ' ' + h + ':' + i
+ }else if(type == 'dotdateminute'){
+ time_str = y + '.' + m + '.' + d + ' ' + h + ':' + i
}else if (type == 'datetime') {
time_str = y + '-' + m + '-' + d + ' ' + h + ':' + i + ':' + s;
} else if (type == 'onlyMonth') {
diff --git a/healthyService/pages/healthyDetail/healthyDetail.js b/healthyService/pages/healthyDetail/healthyDetail.js
index 77d2781..6ffb9fd 100644
--- a/healthyService/pages/healthyDetail/healthyDetail.js
+++ b/healthyService/pages/healthyDetail/healthyDetail.js
@@ -315,7 +315,7 @@ openPicker(){
showWarn:true,
status:3,
confirmNext:'前往',
- message:'本月问诊次数已用完，您可选择医生其他服'
+ message:'本月问诊次数已用完，您可选择医生其他服务'
})
}else if(res.status==4){
this.setData({
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js
index ebeb006..9c69453 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js
@@ -220,7 +220,7 @@ Page({
showWarn:true,
status:3,
confirmNext:'前往',
- messageWarn:'本月问诊次数已用完，您可选择医生其他服'
+ messageWarn:'本月问诊次数已用完，您可选择医生其他服务'
})
}else if(res.status==4){
this.setData({
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
index 0c8addd..621a871 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
@@ -172,7 +172,7 @@
：
接诊后有效
- {{filter.transforDay(equity.order_service_package.start_time,'dateminute')+'-'+filter.transforDay(equity.order_service_package.finish_time,'dateminute')}}
+ {{filter.transforDay(equity.order_service_package.start_time,'dotdateminute')+'-'+filter.transforDay(equity.order_service_package.finish_time,'dotdateminute')}}
@@ -197,7 +197,7 @@
当月剩余
：
- {{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package.month_inquiry_count)}}次图文
+ {{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package_detail.month_inquiry_count)}}次图文
{{showExpand?'收起':'展开'}}
@@ -221,12 +221,12 @@
当月剩余
：
- {{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package.month_inquiry_count)}}次图文
+ {{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.remaining_inquiry_count)}}次图文
{{showExpand?'收起':'展开'}}
- 问诊时间：{{item.created_at}}11
+ 问诊时间：{{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?'已结束':'已取消'}}
@@ -245,7 +245,7 @@
药品剩余
：
- {{restProduct}}盒肝爽颗粒(步长)
+ {{equity.order_service_package_detail.remaining_quantity}}盒肝爽颗粒(步长)
{{showProduct?'收起':'展开'}}
@@ -339,7 +339,7 @@
去使用
-
+
去续费
diff --git a/healthyService/pages/visitDetail/visitDetail.js b/healthyService/pages/visitDetail/visitDetail.js
index d2fa65c..c10178e 100644
--- a/healthyService/pages/visitDetail/visitDetail.js
+++ b/healthyService/pages/visitDetail/visitDetail.js
@@ -329,7 +329,7 @@ Page({
showWarn:true,
status:3,
confirmNext:'前往',
- message:'本月问诊次数已用完，您可选择医生其他服'
+ message:'本月问诊次数已用完，您可选择医生其他服务'
})
}else if(res.status==4){
this.setData({
diff --git a/healthyService/pages/writeSick/writeSick.js b/healthyService/pages/writeSick/writeSick.js
index 80b1ff6..1988e42 100644
--- a/healthyService/pages/writeSick/writeSick.js
+++ b/healthyService/pages/writeSick/writeSick.js
@@ -542,10 +542,17 @@ Page({
this.setData({
showdialog:true,
- messageTitle:"当前患者存在进行中问诊订单",
+ messageTitle:"存在未支付订单",
order_no: order_no,
cancelBtn:true
})
+ }else if(data.status==4){
+ this.setData({
+ showdialog:true,
+ messageTitle:"当前患者存在进行中问诊订单",
+ order_no: order_no,
+ cancelBtn:true
+ })
}
@@ -686,7 +693,7 @@ Page({
showdialog: false
})
}
- if(this.data.messageTitle=="当前患者存在进行中问诊订单"){
+ if(this.data.messageTitle=="当前患者存在进行中问诊订单" || this.data.messageTitle=="存在未支付订单"){
let {order_no}=this.data;
app.method.navigateTo({
url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+order_no,