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 @@ + + + + + \ 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 @@ + \ 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 @@ - + \ 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 @@ - + \ 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 @@ - 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 @@ + + + + + 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