diff --git a/common/css/common.css b/common/css/common.css index 14dc78e..1c8d2ad 100644 --- a/common/css/common.css +++ b/common/css/common.css @@ -16,4 +16,7 @@ image { width: 100%; height: 100%; } - +@font-face { + font-family: 'YOUSHEBIAOTIHEI-2'; + src: url('https://file.langsi.online/ttf/YOUSHEBIAOTIHEI-2.TTF') +} diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 905f51f..c62fbe8 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -42,7 +42,7 @@ const install = (Vue, vm) => { // 所以哪怕您重新登录修改了Storage,下一次的请求将会是最新值 // const token = uni.getStorageSync('token'); - const token = " Bearer ca5a6cd7473c4b18b22044321b1fba91" + const token = " Bearer 794bed8faaf14a00b07befd07b8402b2" // console.log("我是token", token) config.header.Authorization = token; diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue index 6cdc447..4a7d363 100644 --- a/components/tab-bar/tab-bar.vue +++ b/components/tab-bar/tab-bar.vue @@ -11,7 +11,7 @@ - \ No newline at end of file diff --git a/pages_teacher/teacher_class/class_add.vue b/pages_teacher/teacher_class/class_add.vue index 37937ce..e69de29 100644 --- a/pages_teacher/teacher_class/class_add.vue +++ b/pages_teacher/teacher_class/class_add.vue @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages_teacher/teacher_class/class_detail.vue b/pages_teacher/teacher_class/class_detail.vue index cf85757..f0466fb 100644 --- a/pages_teacher/teacher_class/class_detail.vue +++ b/pages_teacher/teacher_class/class_detail.vue @@ -330,7 +330,7 @@ width: 36rpx; height: 36rpx; font-size: 20rpx; - font-family: PingFang SC, PingFang SC; + font-family: 'PingFang', 'PingFang'; font-weight: 800; color: #F18F21; diff --git a/pages_teacher/teacher_class/class_members.vue b/pages_teacher/teacher_class/class_members.vue index 0d38515..cc4d372 100644 --- a/pages_teacher/teacher_class/class_members.vue +++ b/pages_teacher/teacher_class/class_members.vue @@ -1,9 +1,583 @@ - \ No newline at end of file diff --git a/pages_teacher/teacher_teachers/operation_detail.vue b/pages_teacher/teacher_teachers/operation_detail.vue index 594d919..ae98431 100644 --- a/pages_teacher/teacher_teachers/operation_detail.vue +++ b/pages_teacher/teacher_teachers/operation_detail.vue @@ -2,7 +2,8 @@ - + @@ -12,7 +13,7 @@ - 听力题库作业 + {{workinfo.name}} @@ -25,7 +26,7 @@ 描述 - 最好在中午十二点之前完成交上作业,过期不候 + {{workinfo.des}} @@ -34,7 +35,7 @@ 时间 - 02-12 12:00 + {{workinfo.doneTime}} @@ -42,7 +43,11 @@ 已完成 - + + + {{ uploadspeath }}% + + @@ -50,29 +55,17 @@ - 安排班级 + 班级安排 - - + + - - - - - - - - - - - - - - + + {{workinfo.classrooms.length}} @@ -85,177 +78,164 @@ - - + + + - - - - - - - - - - - - - - + + {{workinfo.members.length}} - - - - - + + - + \ No newline at end of file diff --git a/pages_teacher/teacher_teachers/teacher_addOperation.vue b/pages_teacher/teacher_teachers/teacher_addOperation.vue index e258d07..4ef5879 100644 --- a/pages_teacher/teacher_teachers/teacher_addOperation.vue +++ b/pages_teacher/teacher_teachers/teacher_addOperation.vue @@ -32,8 +32,7 @@ - + @@ -41,7 +40,7 @@ - + {{ item.name }} @@ -693,7 +692,7 @@ .text1 { margin-left: 12rpx; font-size: 24rpx; - font-family: PingFang SC, PingFang SC; + font-family: 'PingFang', 'PingFang'; font-weight: 500; color: #627698; } @@ -701,7 +700,7 @@ .text2 { margin-left: 12rpx; font-size: 24rpx; - font-family: PingFang SC, PingFang SC; + font-family: 'PingFang', 'PingFang'; font-weight: 500; color: #2D7CE6; border-bottom: 2px solid #2D7CE6; @@ -723,6 +722,7 @@ width: 56rpx; height: 56rpx; margin-right: 12rpx; + border-radius: 50%; } .Ielts { diff --git a/static/tabbar/chuanti-act.png b/static/tabbar/chuanti-act.png deleted file mode 100644 index 7f69dcc..0000000 Binary files a/static/tabbar/chuanti-act.png and /dev/null differ diff --git a/static/tabbar/chuanti.png b/static/tabbar/chuanti.png deleted file mode 100644 index 54c6015..0000000 Binary files a/static/tabbar/chuanti.png and /dev/null differ diff --git a/static/tabbar/class-active.png b/static/tabbar/class-active.png deleted file mode 100644 index 71bf564..0000000 Binary files a/static/tabbar/class-active.png and /dev/null differ diff --git a/static/tabbar/class.png b/static/tabbar/class.png deleted file mode 100644 index 24cf9cd..0000000 Binary files a/static/tabbar/class.png and /dev/null differ diff --git a/static/tabbar/course-active.png b/static/tabbar/course-active.png deleted file mode 100644 index 71bf564..0000000 Binary files a/static/tabbar/course-active.png and /dev/null differ diff --git a/static/tabbar/course.png b/static/tabbar/course.png deleted file mode 100644 index 24cf9cd..0000000 Binary files a/static/tabbar/course.png and /dev/null differ diff --git a/static/tabbar/home-active.png b/static/tabbar/home-active.png index 06bc184..31a88ae 100644 Binary files a/static/tabbar/home-active.png and b/static/tabbar/home-active.png differ diff --git a/static/tabbar/home.png b/static/tabbar/home.png index 2d6a553..addc7cc 100644 Binary files a/static/tabbar/home.png and b/static/tabbar/home.png differ diff --git a/static/tabbar/memory-active.png b/static/tabbar/memory-active.png deleted file mode 100644 index 192af6f..0000000 Binary files a/static/tabbar/memory-active.png and /dev/null differ diff --git a/static/tabbar/my-active.png b/static/tabbar/my-active.png index a972b7d..d19f1eb 100644 Binary files a/static/tabbar/my-active.png and b/static/tabbar/my-active.png differ diff --git a/static/tabbar/my.png b/static/tabbar/my.png index 244d8cc..dba3a32 100644 Binary files a/static/tabbar/my.png and b/static/tabbar/my.png differ diff --git a/static/tabbar/signup-active.png b/static/tabbar/signup-active.png deleted file mode 100644 index b4ecb61..0000000 Binary files a/static/tabbar/signup-active.png and /dev/null differ diff --git a/static/tabbar/signup.png b/static/tabbar/signup.png deleted file mode 100644 index b10c410..0000000 Binary files a/static/tabbar/signup.png and /dev/null differ diff --git a/static/tabbar/tiku-act.png b/static/tabbar/tiku-act.png index b9d9e92..e0ae510 100644 Binary files a/static/tabbar/tiku-act.png and b/static/tabbar/tiku-act.png differ diff --git a/static/tabbar/tiku.png b/static/tabbar/tiku.png index 2dbb1a2..8274e0e 100644 Binary files a/static/tabbar/tiku.png and b/static/tabbar/tiku.png differ diff --git a/static/tabbar/writing-active.png b/static/tabbar/writing-active.png deleted file mode 100644 index 763a2f8..0000000 Binary files a/static/tabbar/writing-active.png and /dev/null differ diff --git a/static/tabbar/writing.png b/static/tabbar/writing.png deleted file mode 100644 index 2a57332..0000000 Binary files a/static/tabbar/writing.png and /dev/null differ