diff --git a/src/App.vue b/src/App.vue index c22e5e4..ca335be 100644 --- a/src/App.vue +++ b/src/App.vue @@ -36,4 +36,13 @@ height: 100%; vertical-align: middle; } + .uni-scroll-view-refresher { + background-color: transparent !important; + } + .wd-tabs__nav { + background-color: transparent !important; + } + .wd-tabs { + background-color: transparent !important; + } diff --git a/src/pages/attendance/allowed-time.vue b/src/pages/attendance/allowed-time.vue index ce78681..94610c8 100644 --- a/src/pages/attendance/allowed-time.vue +++ b/src/pages/attendance/allowed-time.vue @@ -56,6 +56,18 @@ import CommonItem from '@/components/CommonItemItem/CommonItem.vue' const times = ref([ + { + times: ['07:00', '09:00'], + switch: [true, false] + }, + { + times: ['07:00', '09:00'], + switch: [true, false] + }, + { + times: ['07:00', '09:00'], + switch: [true, false] + }, { times: ['07:00', '09:00'], switch: [true, false] diff --git a/src/pages/attendance/attendance-add-group/attendance-add-group.vue b/src/pages/attendance/attendance-add-group/attendance-add-group.vue index 9f2ef00..fc3bab1 100644 --- a/src/pages/attendance/attendance-add-group/attendance-add-group.vue +++ b/src/pages/attendance/attendance-add-group/attendance-add-group.vue @@ -135,6 +135,7 @@ :value="wayList[wayIndex].title" > { + uni.navigateTo({ + url: '/pages/attendance/attendance-add-group/attendance-device' + }) + } diff --git a/src/pages/attendance/attendance-add-group/special-date-set.vue b/src/pages/attendance/attendance-add-group/special-date-set.vue index 5c975ff..ef38cb4 100644 --- a/src/pages/attendance/attendance-add-group/special-date-set.vue +++ b/src/pages/attendance/attendance-add-group/special-date-set.vue @@ -15,46 +15,44 @@ - - - - - - - - + + - - {{ tabs[tabsIndex].title }}({{ index + 1 }}) - - 删除 - - - - - + + + + + + {{ tabs[tabsIndex].title }} ({{ index + 1 }}) + + 删除 - - + + + + + + 确定 diff --git a/src/pages/attendance/classes-manage.vue b/src/pages/attendance/classes-manage.vue index f4b2ccc..2272aad 100644 --- a/src/pages/attendance/classes-manage.vue +++ b/src/pages/attendance/classes-manage.vue @@ -33,7 +33,6 @@ scroll-y class="mt-2 flex-1 px-3 box-border" refresher-enabled - :refresher-threshold="45" @refresherrefresh="onRefresh()" :refresher-triggered="scrollViewStatus" > @@ -88,10 +87,10 @@ const key = ref('') const onRefresh = () => { console.log('refresh') + scrollViewStatus.value = true setTimeout(() => { - scrollViewStatus.value = true scrollViewStatus.value = false - }, 2000) + }, 500) } onLoad(options => { isSelect.value = options.isSelect ?? false