diff --git a/src/App.vue b/src/App.vue index dbc803e..40fdd98 100644 --- a/src/App.vue +++ b/src/App.vue @@ -60,5 +60,31 @@ border-right: 16upx solid transparent; border-top: 16upx solid #333; } + } + + // 底部按钮 + .fixed-bot-padding{ + padding-bottom: 108upx; + padding-bottom: calc( 108upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ + padding-bottom: calc( 108upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ + } + .fixed-bot-btn{ + position: fixed; + left: 0; + bottom: 0; + padding: 10upx 24upx; + padding-bottom: calc( 10upx + constant(safe-area-inset-bottom)); /* 兼容 iOS < 11.2 */ + padding-bottom: calc( 10upx + env(safe-area-inset-bottom)); /* 兼容 iOS >= 11.2 */ + width: 100%; + background-color: #fff; + >view{ + height: 88upx; + line-height: 88upx; + text-align: center; + font-size: 32upx; + border-radius: 44upx; + background-color: $themeColor; + color: #fff; + } } diff --git a/src/pages.json b/src/pages.json index 2b6c9ca..9550c17 100644 --- a/src/pages.json +++ b/src/pages.json @@ -66,6 +66,36 @@ } }, { + "path": "pages/course/task/task", + "style": { + "navigationBarTitleText": "作业" + } + }, + { + "path": "pages/course/task/task", + "style": { + "navigationBarTitleText": "作业" + } + }, + { + "path": "pages/course/task_finish/task_finish", + "style": { + "navigationBarTitleText": "作业完成列表" + } + }, + { + "path": "pages/course/task_info/task_info", + "style": { + "navigationBarTitleText": "作业情况" + } + }, + { + "path": "pages/course/task_publish/task_publish", + "style": { + "navigationBarTitleText": "布置作业" + } + }, + { "path": "pages/login/login", "style": { } diff --git a/src/pages/course/list/list.vue b/src/pages/course/list/list.vue index 223965a..6d4ac16 100644 --- a/src/pages/course/list/list.vue +++ b/src/pages/course/list/list.vue @@ -5,7 +5,7 @@ 体验课 - + 羽毛球课包学会(带体验课) 训练课 @@ -21,8 +21,11 @@ 班级 + + + - + 选择班级 @@ -66,6 +69,7 @@ + diff --git a/src/pages/course/roll_call/roll_call.vue b/src/pages/course/roll_call/roll_call.vue index cb1167d..ce8418e 100644 --- a/src/pages/course/roll_call/roll_call.vue +++ b/src/pages/course/roll_call/roll_call.vue @@ -8,12 +8,19 @@ 5/2 - + - + + Adjoin + + + + 12345679083 + + 剩余次数: 10次 @@ -83,6 +90,36 @@ export default { } .ri-content{ flex-grow: 1; + .rc-info{ + margin-bottom: 12upx; + @include centerFlex(space-between); + .ri-name,.ri-phone{ + max-width: 50%; + @include centerFlex(flex-start); + >view{ + font-weight: 500; + font-size: 32upx; + line-height: 44upx; + color: #333; + @include textHide(1); + } + >image{ + flex-shrink: 0; + margin-left: 12upx; + width: 36upx; + height: 36upx; + background-color: skyblue; + } + } + .ri-phone{ + margin-left: 10upx; + >view{ + font-weight: 400; + font-size: 28upx; + @include textHide(1); + } + } + } .rc-tip{ @include centerFlex(space-between); >view{ diff --git a/src/pages/course/student_list/student_list.vue b/src/pages/course/student_list/student_list.vue index 1587624..dd7d383 100644 --- a/src/pages/course/student_list/student_list.vue +++ b/src/pages/course/student_list/student_list.vue @@ -27,6 +27,18 @@ + + + 确定点名吗? 学员信息如下 + 学员: 张三 + 上课时间: 2020-08-22 10:30~11:30 + 当前次数/课程次数: 12/15 + + 取消 + 确定 + + + @@ -120,4 +132,62 @@ export default { } } } + .l-mask{ + position: fixed; + left: 0; + top: 0; + bottom: 0; + right: 0; + background-color: rgba($color: #000000, $alpha: .5); + .m-modal{ + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + padding: 50upx; + width: 620upx; + border-radius: 10upx; + background-color: #fff; + .m-tit{ + margin-bottom: 36upx; + text-align: center; + line-height: 44upx; + font-size: 32upx; + font-weight: 500; + color: #333; + } + .m-line{ + font-size: 28upx; + line-height: 52upx; + color: #333; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + >text{ + margin-right: 10upx; + color: #9A9A9D; + } + } + .m-btns{ + padding-top: 50upx; + @include centerFlex(center); + >view{ + margin: 0 14upx; + width: 240upx; + height: 88upx; + line-height: 84upx; + text-align: center; + border: 2upx solid #D8D8D8; + border-radius: 44upx; + font-size: 32upx; + color: #9A9A9D; + &+view{ + border-color: $themeColor; + background-color: $themeColor; + color: #fff; + } + } + } + } + } \ No newline at end of file diff --git a/src/pages/course/student_review/student_review.vue b/src/pages/course/student_review/student_review.vue index 859f6bb..326643c 100644 --- a/src/pages/course/student_review/student_review.vue +++ b/src/pages/course/student_review/student_review.vue @@ -1,5 +1,5 @@