diff --git a/pages.json b/pages.json index deb3a7a..926c7c7 100644 --- a/pages.json +++ b/pages.json @@ -151,11 +151,13 @@ } }, { - "path" : "pages/Mystudent/all_arrange/all_arrange", + "path" : "pages/Mystudent/all_arrange", "style" : { - "navigationBarTitleText" : "", - "enablePullDownRefresh" : false + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" } } @@ -265,20 +267,20 @@ "backgroundColor": "#ffffff", "list": [ { - "selectedIconPath": "/static/tabbar/home.png", - "iconPath": "/static/tabbar/home-active.png", + "selectedIconPath": "/static/tabbar/home-active.png", + "iconPath": "/static/tabbar/home.png", "pagePath": "pages/index/index", "text": "首页" }, { - "selectedIconPath": "/static/tabbar/tiku.png", - "iconPath": "/static/tabbar/tiku-act.png", + "selectedIconPath": "/static/tabbar/tiku-act.png", + "iconPath": "/static/tabbar/tiku.png", "pagePath": "pages/Mystudent/student", "text": "班级" } ,{ - "selectedIconPath": "/static/tabbar/my.png", - "iconPath": "/static/tabbar/my-active.png", + "selectedIconPath": "/static/tabbar/my-active.png", + "iconPath": "/static/tabbar/my.png", "pagePath": "pages/user/user", "text": "我的" } diff --git a/pages/Mystudent/all_arrange/all_arrange.vue b/pages/Mystudent/all_arrange.vue similarity index 97% rename from pages/Mystudent/all_arrange/all_arrange.vue rename to pages/Mystudent/all_arrange.vue index 39fc0e7..8e536ee 100644 --- a/pages/Mystudent/all_arrange/all_arrange.vue +++ b/pages/Mystudent/all_arrange.vue @@ -110,7 +110,7 @@ - + 添加作业 @@ -145,13 +145,26 @@ searchKeyword: '', } }, - onLoad(option) { + onLoad() { // console.log(option); // this.classid = option.classId // this.classid=15 this.getworklist() }, + onShow() { + this.getworklist() + }, methods: { + addwork(){ + + uni.navigateTo({ + url: "/pages_teacher/teacher_teachers/teacher_addOperation" + }).then(res => { + + }).catch(err => { + + }); + }, toworkdetail(id){ uni.navigateTo({ url: "/pages_teacher/teacher_teachers/operation_detail?id=" + id @@ -181,6 +194,7 @@ }, getworklist() { + console.log('调用看了'); this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/work-record/all-list`).then(res => { diff --git a/pages/Mystudent/arrange_work.vue b/pages/Mystudent/arrange_work.vue index 82588ef..5c53857 100644 --- a/pages/Mystudent/arrange_work.vue +++ b/pages/Mystudent/arrange_work.vue @@ -110,7 +110,7 @@ - + 添加作业 @@ -152,6 +152,16 @@ this.getworklist() }, methods: { + addwork(){ + + uni.navigateTo({ + url: "/pages_teacher/teacher_teachers/teacher_addOperation" + }).then(res => { + + }).catch(err => { + + }); + }, toworkdetail(id){ uni.navigateTo({ url: "/pages_teacher/teacher_teachers/operation_detail?id=" + id diff --git a/pages/Mystudent/student.vue b/pages/Mystudent/student.vue index 04f7b31..1dfabe1 100644 --- a/pages/Mystudent/student.vue +++ b/pages/Mystudent/student.vue @@ -65,9 +65,9 @@ 班级 - + + 添加 diff --git a/pages/user/user.vue b/pages/user/user.vue index 6247059..65a2f97 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -37,29 +37,29 @@ - + 作业安排 - + 班级管理 - + @@ -109,7 +109,17 @@ } }, methods: { - + topage(num){ + if(num==1){ + uni.navigateTo({ + url: "/pages/Mystudent/all_arrange" + }).then(res => { + + }).catch(err => { + + }); + } + } } } diff --git a/pages_teacher/teacher_teachers/teacher_addOperation.vue b/pages_teacher/teacher_teachers/teacher_addOperation.vue index 11cc65b..d6ab060 100644 --- a/pages_teacher/teacher_teachers/teacher_addOperation.vue +++ b/pages_teacher/teacher_teachers/teacher_addOperation.vue @@ -303,15 +303,15 @@ selectwritelist: [], selectlistenlist: [], selectreadlist: [], - classword: 'aaa', + classword: '', mocktype:'0' } }, onLoad(option) { - // uni.removeStorageSync('selectedClassInfo'); - // uni.removeStorageSync('selectedStuInfo'); - // uni.removeStorageSync('selectforwork'); + uni.removeStorageSync('selectedClassInfo'); + uni.removeStorageSync('selectedStuInfo'); + uni.removeStorageSync('selectforwork'); this.classinfo = JSON.parse(decodeURIComponent(option.classinfo)) // let classinofs = [{ // name: '阅读5班',