From 848342516d3da32e86689f7f9ffd21b8d04afc12 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Thu, 24 Apr 2025 18:41:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88=E3=80=81?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/preBookList.vue | 15 +++++++++++----
components/tabbar.vue | 10 +++++-----
components/userCard.vue | 9 ++++++++-
components/visitorAccount.vue | 12 ++++++------
pages.json | 2 +-
pages/index/index.vue | 8 ++++----
pages/prebook/prebook.vue | 34 +++-------------------------------
pages/usercenter/usercenter.vue | 2 +-
pages/visit_detail/visit_detail.vue | 22 +++++++++++++++++++---
9 files changed, 58 insertions(+), 56 deletions(-)
diff --git a/components/preBookList.vue b/components/preBookList.vue
index 528283f..2306204 100644
--- a/components/preBookList.vue
+++ b/components/preBookList.vue
@@ -152,8 +152,8 @@ export default {
&.status_wait{
view{
background: #F8FFF7;
- border: 1rpx solid #5BD07A;
- color: #58CA7F;
+ border: 1rpx solid #58CA7F;
+ color: #30C563;
}
}
&.status_out_num{
@@ -170,18 +170,25 @@ export default {
color: #999999;
}
}
- &.status_expire,&.status_cancle{
+ &.status_cancle{
view{
background: #FCFCFC;
border: 1rpx solid #AEB0B8;
color: #B6B8BF;
}
}
+ &.status_expire{
+ view{
+ background: #FFEEEE;
+ border: 1rpx solid #FD0000;
+ color: #FD3B3B;
+ }
+ }
&.status_ing{
view{
border: 1rpx solid #5FA1CB;
background: #F7FCFF;
- color: #5FA1CB;
+ color: #007FD0;
}
}
}
diff --git a/components/tabbar.vue b/components/tabbar.vue
index f7badaf..7c4dd3b 100644
--- a/components/tabbar.vue
+++ b/components/tabbar.vue
@@ -13,7 +13,7 @@
- 扫码报道
+ 扫码报到
@@ -37,10 +37,10 @@
is_admin:{
type: Boolean,
default: false
- },
- leftButtonText: {
- type: String,
- default: '文章'
+ },
+ leftButtonText: {
+ type: String,
+ default: '文章'
}
},
data() {
diff --git a/components/userCard.vue b/components/userCard.vue
index 2a1ae3e..81c60a8 100644
--- a/components/userCard.vue
+++ b/components/userCard.vue
@@ -145,6 +145,12 @@ export default {
margin: 0;
width: calc(50% - 14rpx);
box-sizing: border-box;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .checklist-content{
+ flex: none;
+ }
.checklist-content .checklist-text{
font-size: 30rpx;
font-weight: normal;
@@ -162,7 +168,8 @@ export default {
&.is--button{
margin-right: 0rpx;
- padding: 20rpx;
+ padding: 20rpx 42rpx 20rpx 24rpx;
+ box-sizing: border-box;
border: none;
min-height: 82rpx;
border-radius: 8rpx;
diff --git a/components/visitorAccount.vue b/components/visitorAccount.vue
index 58cc4cd..9bd201b 100644
--- a/components/visitorAccount.vue
+++ b/components/visitorAccount.vue
@@ -8,11 +8,11 @@
单次项目
针灸
- 余1次
+ 治疗1次
麦粒灸
- 余3次
+ 治疗3次
艾灸
@@ -26,11 +26,11 @@
上热下寒疗程包
针灸
- 余1次
+ 治疗1次
麦粒灸
- 余3次
+ 治疗3次
艾灸
@@ -43,11 +43,11 @@
上热下寒疗程包
针灸
- 余1次
+ 治疗1次
麦粒灸
- 余3次
+ 治疗3次
艾灸
diff --git a/pages.json b/pages.json
index cde2d69..83333cf 100644
--- a/pages.json
+++ b/pages.json
@@ -74,7 +74,7 @@
"path" : "pages/visitors/visitors",
"style" :
{
- "navigationBarTitleText": "就诊人",
+ "navigationBarTitleText": "选择就诊人",
"enablePullDownRefresh": false
}
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 4149106..de1fb06 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -107,7 +107,7 @@
-
+
@@ -501,11 +501,11 @@
}
.right{
// width: 200rpx;
- width: 172rpx;
+ width: 172rpx;
flex-shrink: 0;
height: 100%;
- color: #666666;
- display: flex;
+ color: #666666;
+ display: flex;
justify-content: flex-end;
img{
width: 52rpx;
diff --git a/pages/prebook/prebook.vue b/pages/prebook/prebook.vue
index ba3d03a..4e0bab8 100644
--- a/pages/prebook/prebook.vue
+++ b/pages/prebook/prebook.vue
@@ -134,29 +134,8 @@
depart_id:this.departId,
date:date?date:''
}
- //仅测试
- // const data1={"date2work":{"2024-12-09":{"date":"2024-12-09","week_desc":"周三","work_desc":"上午出诊"},"2024-12-10":{"date":"2024-12-10","week_desc":"周四","work_desc":"上午出诊"},"2024-12-11":{"date":"2024-12-11","week_desc":"周五","work_desc":"不出诊"},"2024-09-30":{"date":"2024-09-30","week_desc":"周一","work_desc":"下午出诊"},"2024-10-01":{"date":"2024-10-01","week_desc":"周二","work_desc":"全天出诊"},"2024-10-02":{"date":"2024-10-02","week_desc":"周三","work_desc":"上午出诊"},"2024-10-03":{"date":"2024-10-03","week_desc":"周四","work_desc":"上午出诊"}},
- // "date2time":{
- // "am":[
- // "8:00-08:30","08:30-09:00","09:00-09:30","09:30-10:00","10:00-10:30","10:30-11:00","11:00-11:30","11:30-12:00"
- // ],"pm":[
- // "13:00-13:30",
- // "13:30-14:00",
- // "14:00-14:30",
- // "14:30-15:00",
- // "15:00-15:30",
- // "15:30-16:00",
- // "14:00-14:30",
- // "14:30-15:00",
- // "15:00-15:30",
- // "15:30-16:00",
- // "16:00-16:30",
- // "16:30-17:00",
- // ]},
- // "time2remain":{"8:00-08:30":1,"08:30-09:00":2,"09:00-09:30":20,"09:30-10:00":20,"10:00-10:30":20,"10:30-11:00":20,"11:00-11:30":20,"11:30-12:00":20}}
this.$http.req('/user/get_appoint_times',param, 'POST').then(data=>{
let date2work = data.date2work
- // let date2work = data1.date2work;//后续可删除
let regxp = /^0/;
for(let key in date2work){
let itemObj = date2work[key];
@@ -169,16 +148,9 @@
itemObj['month'] = month
}
}
- // this.RegistrationTimeList = date2work
- // if(this.RegistrationTimeList.length>0) {
- if(flag) {
- // this.$refs.book.dataInit(data1['date2time'],data1['time2remain'])
- this.$refs.book.dataInit(data,date)
- // this.$refs.book.dataInit(data['date2time'],data['time2remain'],date)
- // }else{
- // this.$refs.book.chooseDay(chooseDay, this.RegistrationTimeList[chooseDay])
- }
- // }
+ if(flag) {
+ this.$refs.book.dataInit(data,date)
+ }
});
},
closeConfirm() {
diff --git a/pages/usercenter/usercenter.vue b/pages/usercenter/usercenter.vue
index f16a0c2..3685c3f 100644
--- a/pages/usercenter/usercenter.vue
+++ b/pages/usercenter/usercenter.vue
@@ -14,7 +14,7 @@
![]()
- 候诊记录
+ 就诊记录
diff --git a/pages/visit_detail/visit_detail.vue b/pages/visit_detail/visit_detail.vue
index cafa652..e7c9959 100644
--- a/pages/visit_detail/visit_detail.vue
+++ b/pages/visit_detail/visit_detail.vue
@@ -51,7 +51,7 @@
export default {
data() {
return {
- statusList:['status_wait', 'status_ing', 'status_down', 'status_out_num', 'status_expire', 'status_cancle'],
+ statusList:{'9':'text_wait', '1':'text_ing', '2':'text_down', '3':'text_out_num', '4':'text_expire', '5':'text_cancle'},
statusStyleList:{'0':'status_wait', '1':'status_ing', '2':'status_down', '3':'status_out_num', '4':'status_expire','5':'status_cancle'},
statusDescList:['候诊', '就诊中', '已完成','过号', '已过期', '已取消'],
status:'',
@@ -189,7 +189,8 @@
// this.list[5].custom = "前方"+bookInfo.wait_visit_count+"人"
// if(bookInfo.wait_visit_count<=0 || bookInfo.status!=0) this.list[5].show = false
this.list[6].show = false
- this.list[7].custom = ""+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+""
+ // this.list[7].custom = ""+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+""
+ this.list[7].custom = ""+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+""
this.notice = bookInfo.notice;
});
}
@@ -278,7 +279,7 @@
border-radius: 6rpx;
font-size: 26rpx;
height: 40rpx;
- line-height: 40rpx;
+ line-height: 38rpx;
padding: 0 10rpx;
box-sizing: border-box;
min-width: 90rpx;
@@ -348,6 +349,21 @@
color: #FD7B13;
}
}
+ .text_wait{
+ color: #58CA7F;
+ }
+ .text_ing{
+ color: #5FA1CB;
+ }
+ .text_down{
+ color: #999999;
+ }
+ .text_out_num{
+ color: #FE6710;
+ }
+ .text_expire,.text_cancle{
+ color: #B6B8BF;
+ }
}
}
}