From ee010e7160f0a4dee5e0c2fde55d488f4f2f9788 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 六月 2024 09:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/vehicle/shinei.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/h5/pages/staff/vehicle/shinei.vue b/h5/pages/staff/vehicle/shinei.vue
index 63ea472..a4df2c9 100644
--- a/h5/pages/staff/vehicle/shinei.vue
+++ b/h5/pages/staff/vehicle/shinei.vue
@@ -75,7 +75,7 @@
selDatetime: '',
colorOptions: [
- { color: '#279BAA', name: '宸查�夋嫨' },
+ { color: this.$store.state.primaryColor, name: '宸查�夋嫨' },
{ color: '#F7F7F7', name: '鍙绾�' },
{ color: '#cccccc', name: '涓嶅彲棰勭害' },
]
@@ -155,9 +155,6 @@
} else {
this.selDatetime = this.param.queryDate.slice(5) + ' ' + selTimeLists[0].startHours + '-' + selTimeLists[selTimeLists.length - 1].endHours
}
- // if(true){
- // this.selDatetime.push(item)
- // }
},
confirmDate(e) {
this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
@@ -228,7 +225,7 @@
padding: 20rpx 30rpx 84rpx;
box-shadow: 0rpx -3rpx 6rpx 0rpx #eeeeee;
.sel_time {
- color: #279baa;
+ color: $uni-color-primary;
}
.btns {
margin-top: 10rpx;
@@ -253,7 +250,7 @@
height: 72rpx;
line-height: 72rpx;
text-align: center;
- background: #279baa;
+ background: $uni-color-primary;
box-shadow: 0rpx -1rpx 0rpx 0rpx #eeeeee;
border-radius: 36rpx;
font-size: 30rpx;
@@ -277,7 +274,7 @@
font-size: 30rpx;
}
.active {
- background-color: #279baa;
+ background-color: $uni-color-primary;
color: #fff;
}
.disable {
--
Gitblit v1.9.3