diff --git a/miniprogram/image/ui/last_semester_0.svg b/miniprogram/image/ui/last_semester.svg similarity index 100% rename from miniprogram/image/ui/last_semester_0.svg rename to miniprogram/image/ui/last_semester.svg diff --git a/miniprogram/image/ui/next_semester_0.svg b/miniprogram/image/ui/next_semester.svg similarity index 100% rename from miniprogram/image/ui/next_semester_0.svg rename to miniprogram/image/ui/next_semester.svg diff --git a/miniprogram/image/ui/selectArror.svg b/miniprogram/image/ui/selectArror.svg new file mode 100644 index 0000000..33e99ef --- /dev/null +++ b/miniprogram/image/ui/selectArror.svg @@ -0,0 +1,12 @@ + + + + + + diff --git a/miniprogram/image/ui/selectArror_0.svg b/miniprogram/image/ui/selectArror_0.svg deleted file mode 100644 index ce8565e..0000000 --- a/miniprogram/image/ui/selectArror_0.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/miniprogram/pages/Timetable/StatusBar.scss b/miniprogram/pages/Timetable/StatusBar.scss index 02b431a..3e5863f 100644 --- a/miniprogram/pages/Timetable/StatusBar.scss +++ b/miniprogram/pages/Timetable/StatusBar.scss @@ -1,5 +1,7 @@ @import "../../app.scss"; + $status-bar-left-top-icon-width: 30px; +$status-bar-middle-icon-width: 15px; view.status-bar { top: 0; @@ -31,10 +33,15 @@ view.status-bar { view.semester-title { @extend %status-bar-title; + font-size: .9em; + line-height: .9em; + margin-bottom: 5px; } view.semester-intro { @extend %status-bar-subtitle; + font-size: .9em; + line-height: .9em; } } } @@ -48,8 +55,15 @@ view.status-bar { flex: 1; height: 100%; display: flex; + align-items: center; justify-content: center; + image { + width: $status-bar-middle-icon-width; + height: $status-bar-middle-icon-width; + filter: $black-filter; + } + view.week { display: flex; flex-direction: column; @@ -59,10 +73,16 @@ view.status-bar { view.week-title { @extend %status-bar-title; + font-weight: 600; + font-size: 1.15em; + line-height: 1.15em; + margin-bottom: 5px; } view.week-intro { @extend %status-bar-subtitle; + font-size: .85em; + line-height: .85em; } } } @@ -73,15 +93,10 @@ view.status-bar-blank { } %status-bar-title { - font-size: 1.15em; - line-height: 1.15em; - margin-bottom: 5px; color: $theme-color-light-title; } %status-bar-subtitle { - font-size: .85em; - line-height: .85em; color: $theme-color-light-text; } diff --git a/miniprogram/pages/Timetable/StatusBar.ts b/miniprogram/pages/Timetable/StatusBar.ts index a72f395..380a6b9 100644 --- a/miniprogram/pages/Timetable/StatusBar.ts +++ b/miniprogram/pages/Timetable/StatusBar.ts @@ -35,7 +35,7 @@ implements Partial { /** * 导航栏高度补偿 */ - public static readonly StatusBarHeightExtend:number = 5; + public static readonly StatusBarHeightExtend:number = 2; /** * 页面日志输出标签 diff --git a/miniprogram/pages/Timetable/Timetable.wxml b/miniprogram/pages/Timetable/Timetable.wxml index 5f761d9..b94473d 100644 --- a/miniprogram/pages/Timetable/Timetable.wxml +++ b/miniprogram/pages/Timetable/Timetable.wxml @@ -4,20 +4,20 @@ - + - 大四 + 大四-上 2021-2022 - 第1周 - 非本周 + 双击返回本周 +