diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 9e7a09e..905f51f 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -4,9 +4,9 @@ const install = (Vue, vm) => {
// baseUrl: 'http://2087p773d1.wicp.vip', // 请求的本域名
// baseUrl: 'https://lchighpass.zhieasy.cn',
// baseUrl: 'http://speaking.viphk.91tunnel.com',//测试https://speaking.iava.top/
- baseUrl: 'http://yml.dev.bc3.top',//
+ // baseUrl: 'http://yml.dev.bc3.top',//
// baseUrl: 'https://ielts.zhieasy.cn',//正式
- // baseURL: 'https://api.admin-v2.langsi.online',
+ baseURL: 'https://api.admin-v2.langsi.online',
// baseUrl: 'http://i3qsdb.natappfree.cc',//正式
// baseUrl: 'http://hwihh5.natappfree.cc',
@@ -42,7 +42,7 @@ const install = (Vue, vm) => {
// 所以哪怕您重新登录修改了Storage,下一次的请求将会是最新值
// const token = uni.getStorageSync('token');
- const token = " Bearer f545811267c149bc85fb14e8e8638e94"
+ const token = " Bearer ca5a6cd7473c4b18b22044321b1fba91"
// console.log("我是token", token)
config.header.Authorization = token;
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
new file mode 100644
index 0000000..6cdc447
--- /dev/null
+++ b/components/tab-bar/tab-bar.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a4d67f3..173704d 100644
--- a/pages.json
+++ b/pages.json
@@ -34,16 +34,7 @@
}
},
- {
- "path" : "pages/pages_index/teacher_index",
- "style" :
- {
- "navigationBarTitleText": "首页",
- "navigationBarBackgroundColor": "#4473f6",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
+
{
@@ -138,7 +129,28 @@
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "pages/user/user",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#4473f6",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path" : "pages/Mystudent/addTeacher",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "navigationBarBackgroundColor": "#4473f6",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
}
+
],
"subPackages": [
{
@@ -218,6 +230,32 @@
],
+ "tabBar": {
+ "color": "#a9b7b7",
+ "selectedColor": "#5185fd",
+ "borderStyle": "white",
+ "backgroundColor": "#ffffff",
+ "list": [
+ {
+ "selectedIconPath": "/static/tabbar/home.png",
+ "iconPath": "/static/tabbar/home-active.png",
+ "pagePath": "pages/index/index",
+ "text": "首页"
+ },
+ {
+ "selectedIconPath": "/static/tabbar/tiku.png",
+ "iconPath": "/static/tabbar/tiku-act.png",
+ "pagePath": "pages/Mystudent/student",
+ "text": "题库"
+ }
+ ,{
+ "selectedIconPath": "/static/tabbar/my.png",
+ "iconPath": "/static/tabbar/my-active.png",
+ "pagePath": "pages/user/user",
+ "text": "我的"
+ }
+ ]
+ },
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
diff --git a/pages/Mystudent/addTeacher.vue b/pages/Mystudent/addTeacher.vue
new file mode 100644
index 0000000..28d0e2a
--- /dev/null
+++ b/pages/Mystudent/addTeacher.vue
@@ -0,0 +1,371 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.roleText}}
+
+
+
+
+
+
+
+
+
+
+ 确定添加({{selectedIds.length}})
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/Mystudent/addclass.vue b/pages/Mystudent/addclass.vue
index cb90847..ddeaa05 100644
--- a/pages/Mystudent/addclass.vue
+++ b/pages/Mystudent/addclass.vue
@@ -1,41 +1,34 @@
-
+
-
-
-
-
+
+
+
-
+
+
+
-
+
+
+
+ + {{ checkindex == "0" ? "创建班级" : '添加学生' }}
-
-
- + {{ checkindex == "0" ? "创建班级" : '添加学生' }}
-
-
-
+
-
+
@@ -51,23 +44,23 @@
-
-
- 平均成绩/分
-
-
- 6
-
+
+
+ 平均成绩/分
-
-
- 作业完成度
-
-
- 80%
-
+
+ 6
-
+
+
+
+ 作业完成度
+
+
+ 80%
+
+
+
@@ -85,23 +78,23 @@
-
-
- 平均成绩/分
-
-
- 6
-
+
+
+ 平均成绩/分
-
-
- 作业完成度
-
-
- 80%
-
+
+ 6
-
+
+
+
+ 作业完成度
+
+
+ 80%
+
+
+
@@ -121,23 +114,23 @@
-
-
- 平均成绩/分
-
-
- 6
-
+
+
+ 平均成绩/分
-
-
- 作业完成度
-
-
- 80%
-
+
+ 6
-
+
+
+
+ 作业完成度
+
+
+ 80%
+
+
+
@@ -155,26 +148,26 @@
-
-
- 平均成绩/分
-
-
- 6
-
+
+
+ 平均成绩/分
-
-
- 作业完成度
-
-
- 80%
-
+
+ 6
-
+
+
+
+ 作业完成度
+
+
+ 80%
+
+
+
-
+
@@ -182,521 +175,544 @@
-
-
- 创建班级
-
-
- 班级头像
-
-
-
-
-
-
+
+
+ 创建班级
+
+
+ 班级头像
+
+
+
+
-
-
- 班级名称
-
-
-
-
-
-
- 班级标签
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 班级学生
- 点击头像选择班级学员
-
-
-
-
-
-
+
+
+
+
+ 班级名称
+
+
+
+
+
+
+ 班级标签
+
+
+
+
+
+
+
+
+
+
+
+
+
+
班级学生
点击头像选择班级学员
-
+
+
+
- 添加
+
+
+
+ 班级学生
+ 点击头像选择班级学员
-
+
+
+
+
+
+
+ 添加
+
+
+
\ No newline at end of file
diff --git a/pages/Mystudent/arrange_work.vue b/pages/Mystudent/arrange_work.vue
index 3f1a6f4..31dacfc 100644
--- a/pages/Mystudent/arrange_work.vue
+++ b/pages/Mystudent/arrange_work.vue
@@ -1,21 +1,15 @@
-
+
-
+
@@ -33,38 +27,44 @@
+ :class="item.iswork === '1' ? 'act1' : (item.iswork === '2' ? 'act3' : 'default')">
- {{item.name}}
+
+
+
+
-
+
进行中
-
+
{{items.paperName}}-{{items.testName}}
-
+
听力
-
+
阅读
-
+
写作
-
+
口语
-
+
@@ -95,7 +95,7 @@
{{item.doneTime}}
-
+
@@ -109,288 +109,333 @@
-
+
\ No newline at end of file
diff --git a/pages/Mystudent/student.vue b/pages/Mystudent/student.vue
index f7ccdf5..64cb0ce 100644
--- a/pages/Mystudent/student.vue
+++ b/pages/Mystudent/student.vue
@@ -1,14 +1,9 @@
-
+
-
+
@@ -22,8 +17,7 @@
-
+
@@ -33,21 +27,16 @@
+ mode="scaleToFill">
-
+
-
+
学生人数
@@ -73,71 +62,56 @@
-
+
班级
-
+
学生
-
+
+ 添加
-
+
-
+
班级人数
-
-
+
+
降序
-
+
升序
-
+
标签文字
-
-
+
+
听力
-
+
阅读
-
+
写作
-
+
口语
@@ -151,39 +125,32 @@
-
+
-
+
-
+
听力
-
+
阅读
-
+
写作
-
+
口语
-
+
班级人数
@@ -215,10 +182,8 @@
-
-
+
+
@@ -232,10 +197,8 @@
学员名称
-
+
@@ -243,18 +206,15 @@
学员ID
-
+
添加
-
+
@@ -265,516 +225,661 @@
+
+
+ 创建班级
+
+
+ 班级头像
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 班级名称
+
+
+
+
+
+
+ 班级标签
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 班级学生
+ 点击头像选择班级学员
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 班级老师
+ 点击加号选择班级老师
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+ 添加
+
+
-
+
\ No newline at end of file
diff --git a/pages/compoents/pages_my.vue b/pages/compoents/pages_my.vue
deleted file mode 100644
index 9ccacc0..0000000
--- a/pages/compoents/pages_my.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
- 暂无学生,快去添加吧!
-
-
- 主要按钮
-
-
-
-
-
-
-
-
-
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bafc371..7882b02 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,55 +1,468 @@
-
-
-
-
-
- {{title}}
+
+
+
+
+
+
+
+
+
+
+
+ 32
+ 已完成人数(人)
+
+
+ 90%
+ 已完成作业正确率
+
+
+
+
+
+ 作业完成情况
+
+ 本周
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 当前暂无学习数据,快去布置作业吧!
+
+ 去安排
+
+
+
+
+
+
+
+ 作业完成情况
+
+ 本周
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 8月31日
+
+
+
+
+
+ 21
+
+
+ 完成人数
+
+
+
+
+ 6
+
+
+ 平均成绩/分
+
+
+
+
+ 80%
+
+
+ 作业正确率
+
+
+
+
+
+
+
+
+
+
+ 口语单科模考
+ 李斯丹妮
+
+
+
+ 正确率80%
+ 2023/02/23 12:00
+
+
+
+
+
+
+
+
+ 口语单科模考
+ 李斯丹妮
+
+
+
+ 正确率80%
+ 2023/02/23 12:00
+
+
+
+
+
+
+
+
+
-
diff --git a/pages/pages_index/teacher_index.vue b/pages/pages_index/teacher_index.vue
deleted file mode 100644
index a0dc876..0000000
--- a/pages/pages_index/teacher_index.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
-
- 首页
-
- 学生
-
- 我的
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
new file mode 100644
index 0000000..6247059
--- /dev/null
+++ b/pages/user/user.vue
@@ -0,0 +1,279 @@
+
+
+
+
+
+
+
+
+ 学生人数
+ 320
+
+
+ 安排题数(道)
+ 4300
+
+
+ 总完成度
+ 43
+
+
+ 今日完成度
+ 43
+
+
+
+
+
+
+
+ 作业安排
+
+
+
+
+
+ 学生管理
+
+
+
+
+
+ 班级管理
+
+
+
+
+
+ 切换题库
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages_teacher/teacher_teachers/teacher_addOperation.vue b/pages_teacher/teacher_teachers/teacher_addOperation.vue
index 140f900..e258d07 100644
--- a/pages_teacher/teacher_teachers/teacher_addOperation.vue
+++ b/pages_teacher/teacher_teachers/teacher_addOperation.vue
@@ -312,7 +312,7 @@
onLoad(option) {
uni.removeStorageSync('selectedClassInfo');
uni.removeStorageSync('selectedStuInfo');
- // uni.removeStorageSync('selectforwork');
+ uni.removeStorageSync('selectforwork');
this.classinfo = JSON.parse(decodeURIComponent(option.classinfo))
// let classinofs = [{
// name: '阅读5班',
diff --git a/static/logo.png b/static/logo.png
deleted file mode 100644
index b5771e2..0000000
Binary files a/static/logo.png and /dev/null differ
diff --git a/static/tabbar/chuanti-act.png b/static/tabbar/chuanti-act.png
new file mode 100644
index 0000000..7f69dcc
Binary files /dev/null and b/static/tabbar/chuanti-act.png differ
diff --git a/static/tabbar/chuanti.png b/static/tabbar/chuanti.png
new file mode 100644
index 0000000..54c6015
Binary files /dev/null and b/static/tabbar/chuanti.png differ
diff --git a/static/tabbar/class-active.png b/static/tabbar/class-active.png
new file mode 100644
index 0000000..71bf564
Binary files /dev/null and b/static/tabbar/class-active.png differ
diff --git a/static/tabbar/class.png b/static/tabbar/class.png
new file mode 100644
index 0000000..24cf9cd
Binary files /dev/null and b/static/tabbar/class.png differ
diff --git a/static/tabbar/course-active.png b/static/tabbar/course-active.png
new file mode 100644
index 0000000..71bf564
Binary files /dev/null and b/static/tabbar/course-active.png differ
diff --git a/static/tabbar/course.png b/static/tabbar/course.png
new file mode 100644
index 0000000..24cf9cd
Binary files /dev/null and b/static/tabbar/course.png differ
diff --git a/static/tabbar/home-active.png b/static/tabbar/home-active.png
new file mode 100644
index 0000000..06bc184
Binary files /dev/null and b/static/tabbar/home-active.png differ
diff --git a/static/tabbar/home.png b/static/tabbar/home.png
new file mode 100644
index 0000000..2d6a553
Binary files /dev/null and b/static/tabbar/home.png differ
diff --git a/static/tabbar/memory-active.png b/static/tabbar/memory-active.png
new file mode 100644
index 0000000..192af6f
Binary files /dev/null and b/static/tabbar/memory-active.png differ
diff --git a/static/tabbar/my-active.png b/static/tabbar/my-active.png
new file mode 100644
index 0000000..a972b7d
Binary files /dev/null and b/static/tabbar/my-active.png differ
diff --git a/static/tabbar/my.png b/static/tabbar/my.png
new file mode 100644
index 0000000..244d8cc
Binary files /dev/null and b/static/tabbar/my.png differ
diff --git a/static/tabbar/signup-active.png b/static/tabbar/signup-active.png
new file mode 100644
index 0000000..b4ecb61
Binary files /dev/null and b/static/tabbar/signup-active.png differ
diff --git a/static/tabbar/signup.png b/static/tabbar/signup.png
new file mode 100644
index 0000000..b10c410
Binary files /dev/null and b/static/tabbar/signup.png differ
diff --git a/static/tabbar/tiku-act.png b/static/tabbar/tiku-act.png
new file mode 100644
index 0000000..b9d9e92
Binary files /dev/null and b/static/tabbar/tiku-act.png differ
diff --git a/static/tabbar/tiku.png b/static/tabbar/tiku.png
new file mode 100644
index 0000000..2dbb1a2
Binary files /dev/null and b/static/tabbar/tiku.png differ
diff --git a/static/tabbar/writing-active.png b/static/tabbar/writing-active.png
new file mode 100644
index 0000000..763a2f8
Binary files /dev/null and b/static/tabbar/writing-active.png differ
diff --git a/static/tabbar/writing.png b/static/tabbar/writing.png
new file mode 100644
index 0000000..2a57332
Binary files /dev/null and b/static/tabbar/writing.png differ