diff --git a/pages.json b/pages.json index f1f98ab..8646bfe 100644 --- a/pages.json +++ b/pages.json @@ -627,10 +627,10 @@ } }, { - "path" : "pages/miniClass/giveScore", + "path" : "pages/miniClass/taskList", "style" : { - "navigationBarTitleText" : "评分" + "navigationBarTitleText" : "任务列表" } }, { @@ -646,6 +646,13 @@ { "navigationBarTitleText" : "心得详细" } + }, + { + "path" : "pages/miniClass/taskDetailForMan", + "style" : + { + "navigationBarTitleText" : "管理端任务详情" + } } ], "globalStyle": { diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue index 820e29a..fee58de 100644 --- a/pages/course/courseDetail.vue +++ b/pages/course/courseDetail.vue @@ -75,8 +75,8 @@ - {{linkClassList.length}} - 个班级正在学习本门课程 + + 加入班级开始更加系统的学习 前往查看 >> @@ -556,8 +556,8 @@ method: "POST", data: { "courseId": this.courseId, - "state": '0', //小班状态0待开班1已开班2完成 - "type": '0' + "state": '', //小班状态0待开班1已开班2完成 + "type": '' }, header: { //默认 无 说明：请求头 diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue index 9f17331..3f459f7 100644 --- a/pages/mine/mine/index.vue +++ b/pages/mine/mine/index.vue @@ -429,6 +429,24 @@ if (this.userInfo.id != undefined) { this.$http.post("common/user/getUserInfo").then((res) => { this.userMes = res.result; + var zhurenIndex = this.pageList.findIndex(item => { + return item.name == '主任教学' + }) + if (zhurenIndex > -1) { + this.pageList.splice(zhurenIndex, 1) + } + var banzhangIndex = this.pageList.findIndex(item => { + return item.name == '班级管理' + }) + if (banzhangIndex > -1) { + this.pageList.splice(banzhangIndex, 1) + } + var yonghuIndex = this.pageList.findIndex(item => { + return item.name == '我的班级' + }) + if (yonghuIndex > -1) { + this.pageList.splice(yonghuIndex, 1) + } if (res.isDirector) { var n = this.pageList.find(item => { return item.name == '主任教学' @@ -445,58 +463,39 @@ } this.pageList.splice(3, 0, item); } - } else { - var zhurenIndex = this.pageList.findIndex(item => { - return item.name == '主任教学' - }) - if (zhurenIndex > -1) { - this.pageList.splice(zhurenIndex, 1) - } - } - if (res.isMonitor) { - var n = this.pageList.find(item => { - return item.name == '班级管理' - }) - console.log('班长n找到了么', n); - if (!n) { - var item = { - // 主任之外的人显示班级管理 - name: "班级管理", - url: "/pages/miniClass/miniClassMan?type=mine", - type: "pageJump", - - } - this.pageList.splice(3, 0, item); - } - } else { - var zhurenIndex = this.pageList.findIndex(item => { - return item.name == '班级管理' - }) - if (zhurenIndex > -1) { - this.pageList.splice(zhurenIndex, 1) - } - } - if(!res.isMonitor && !res.isDirector){ - var n = this.pageList.find(item => { - return item.name == '我的班级' - }) - console.log('我的班级找到了么', n); - if (!n) { - var item = { - // 主任之外的人显示班级管理 - name: "我的班级", - url: "/pages/miniClass/myClassList?type=mine", - type: "pageJump", + } else{ + if (res.isMonitor) { + var n = this.pageList.find(item => { + return item.name == '班级管理' + }) + console.log('班长n找到了么', n); + if (!n) { + var item = { + // 主任之外的人显示班级管理 + name: "班级管理", + url: "/pages/miniClass/miniClassMan?type=mine", + type: "pageJump", + } + this.pageList.splice(3, 0, item); + } + } else { + if(!res.isMonitor && !res.isDirector){ + var n = this.pageList.find(item => { + return item.name == '我的班级' + }) + console.log('我的班级找到了么', n); + if (!n) { + var item = { + // 主任之外的人显示班级管理 + name: "我的班级", + url: "/pages/miniClass/myClassList?type=mine", + type: "pageJump", + + } + this.pageList.splice(3, 0, item); + } } - this.pageList.splice(3, 0, item); - } - }else{ - var yonghuIndex = this.pageList.findIndex(item => { - return item.name == '我的班级' - }) - if (yonghuIndex > -1) { - this.pageList.splice(yonghuIndex, 1) } } }); diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue index 18ca83a..3b93160 100644 --- a/pages/miniClass/classInfo.vue +++ b/pages/miniClass/classInfo.vue @@ -3,9 +3,16 @@ + + 班级状态：{{getClassStatus}} +

{{thisClass.title}}

- 退出班级 + 退出班级 创建日期联合班 精英班 - 班级人数{{thisClass.number}}人 + 人数{{students.length}}/{{thisClass.number}}人 管理成员点击查看 - - - 教学目标/班级简介 - - - - - + + + @@ -46,12 +48,17 @@ - - - - + + + + + + + 班内问答 @@ -87,7 +94,7 @@ - + 快来添加一条记录吧~ @@ -244,7 +251,8 @@ curTagIndex: 0, scrollable: false, pPage:0, - tabList: [{ + // 已开班 + tabList02: [{ name: '班内课程', id: '0' }, @@ -260,6 +268,20 @@ id: '3' } ], + // 待开班 + tabList01: [{ + name: '班内课程', + id: '0' + }, + // { + // name: '班内讨论', + // id: '1' + // }, + { + name: '班内学员', + id: '2' + } + ], admins: { list: [], monitor: {}, @@ -333,6 +355,30 @@ }, computed: { ...mapState(["userInfo"]), + getClassStatus(){ + var _roleName = '' + switch (this.thisClass.state) { + case '0': + _roleName = '待开班'; + break; + case '1': + _roleName = '学习中'; + break; + case '2': + _roleName = '已结班'; + break; + } + return _roleName + } + ,tabList(){ + var list = [] + if(this.thisClass.state == 0){ + list = this.tabList01 + }else{ + list = this.tabList02 + } + return list + }, }, methods: { editMyXinde(item){ @@ -423,7 +469,7 @@ method: "POST", data: { "limit": 10, - "page": 1, + "page": this.pPage, "classId": this.thisClass.id, "type": this.tijiaoTitleId+'', //类型 0班内任务1医案2心得 "myExperience": this.myExperience, //0全部心得1我的心得 @@ -437,7 +483,8 @@ if (res.code == 0) { if(res.page.records.length > 0){ console.log('数据获取成功',res.page.records); - this.taskList = res.page.records + var lis = res.page.records + this.taskList = this.taskList.concat(lis) if(res.page.pages > 1){ this.taskHaveMore = true } @@ -809,6 +856,10 @@ color: #fff; font-weight: normal; } + .classStatus{padding: 10rpx; color: #fff;} + .daikai{background-image: linear-gradient(90deg, #258feb 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100% );} + .xuexizhong{background-image: linear-gradient(90deg, #55aa00 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100% );} + .yijieban{background-image: linear-gradient(90deg, #999 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100% );} .noanser{ padding: 20rpx; background-color: rgba(255, 255, 255, .6); text-align: center; border-bottom: 1px solid #eee; @@ -907,6 +958,7 @@ } .leve2{ color: #666; + line-height: 56rpx; @include bov(3) } @@ -926,7 +978,7 @@ .nobg { background-color: transparent !important; } - + .nopad{padding-left: 0 !important;} .bottomBox { border-top: 1px solid #eee; position: fixed; padding: 20rpx 0; diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue index 0d252b4..11d90ad 100644 --- a/pages/miniClass/classInfoMan.vue +++ b/pages/miniClass/classInfoMan.vue @@ -2,16 +2,85 @@ + - -

{{thisClass.title}}

- 开班 - 结班 + + + {{getClassStatus}} + + + 【 班内职务：{{getRoleName}} 】 + + + + + + 设置班委 + + + + 修改班级 + + + + 开班 + + + 结班 + + + 删除班级 + + + + + + + + + + + + 作业 + + + + + + 医案 + + + + + + 心得 + + + + + + 表现 + + - 创建日期{{thisClass.createTime.substring(0,10)}} @@ -21,44 +90,13 @@ 联合班 精英班 - 班级人数{{thisClass.number}}人 + 人数{{students.length}}/{{thisClass.number}}人 管理成员点击查看 - - - - - - - - 作业评分 - - - - - - 医案评分 - - - - - - 心得评分 - - - - - - 表现评分 - - - - - 教学目标/班级简介 - - + - + @@ -79,7 +117,9 @@ - + + + - - - - - - - {{item.nickname}} - - - - - 匿名用户 - - 超级VIP用户 + + + + + + + + + {{item.student.nickname}} + + + + 匿名用户 + + + + + + + {{ item.buyState }} + - @@ -127,22 +172,16 @@ {{item.name}} - + - + - {{item.title}}修改 - - + {{item.title}}修改 {{item.content}} @@ -150,8 +189,8 @@ - - + + 查看全部 >> @@ -159,24 +198,12 @@ - + - - - - - - - - 管理人员设置 - - + + @@ -228,8 +255,6 @@ - - @@ -281,7 +306,7 @@ { name: '班内学员', id: '2' - }, + }, // { // name: '班内提交', // id: '3' @@ -295,7 +320,7 @@ scorer: [], counter: [] - }, + }, activeStyle: { color: '#333', fontWeight: 'bold', @@ -326,8 +351,10 @@ }, ], tijiaoTitleId: '0', - taskList:[], // 任务列表 - taskHaveMore:false, // 是否还有更多 + taskList: [], // 任务列表 + taskHaveMore: false, // 是否还有更多 + roleCode: undefined, + } }, onLoad(e) { @@ -351,16 +378,79 @@ }, computed: { ...mapState(["userInfo"]), + getRoleName() { + var _roleName = '' + switch (this.roleCode) { + case '66': + _roleName = '主任'; + break; + case '0': + _roleName = '学员'; + break; + case '1': + _roleName = '班长'; + break; + case '2': + _roleName = '副班长'; + break; + case '3': + _roleName = '学习委员'; + break; + case '4': + _roleName = '评分员'; + break; + case '5': + _roleName = '记分员'; + break; + } + return _roleName + }, + getClassStatus(){ + var _roleName = '' + switch (this.thisClass.state) { + case '0': + _roleName = '待开班'; + break; + case '1': + _roleName = '学习中'; + break; + case '2': + _roleName = '已结班'; + break; + } + return _roleName + } }, methods: { - goPingfen(url,classId,type){ + // 获取真实的身份信息 + getRealRole() { + $http.request({ + url: "common/class/getUserRole", + method: "POST", + data: { + "classId": this.thisClass.id + }, + header: { //默认 无 说明：请求头 + 'Content-Type': 'application/json' + }, + }) + .then((res) => { + console.log('res获取身份信息', res); + }).catch(e => { + uni.showToast({ + title: '获取身份信息失败', + icon: 'error' + }) + }); + }, + goPingfen(url, classId, type) { uni.navigateTo({ - url:`${url}?classId=${classId}&type=${type}` + url: `${url}?classId=${classId}&type=${type}` }) }, // 点击作业或者医案，进入详细介绍 - clickTask(){ - + clickTask() { + }, delClass() { var that = this @@ -409,8 +499,8 @@ "limit": 20, "page": 1, "classId": this.thisClass.id, - "type": textIndex+'', //类型 0班内任务1医案2心得 - "title": "" + "type": textIndex + '', //类型 0班内任务1医案2心得 + "title": "" }, header: { //默认 无 说明：请求头 'Content-Type': 'application/json' @@ -418,11 +508,11 @@ }) .then(res => { if (res.code == 0) { - console.log('数据获取成功',res.page.records); - this.taskList = res.page.records - if(res.page.pages > 1){ - this.taskHaveMore = true - } + console.log('数据获取成功', res.page.records); + this.taskList = res.page.records + if (res.page.pages > 1) { + this.taskHaveMore = true + } } }).catch(e => { console.log(e, '数据报错') @@ -440,6 +530,13 @@ this.userMes = res.result; this.isMonitor = res.isMonitor this.isDirector = res.isDirector + if (this.isDirector) { + this.roleCode = '66' + } else if (this.isMonitor) { + this.getRealRole() + } else { + + } }).catch(e => { uni.showToast({ title: '获取用户信息失败', @@ -457,10 +554,10 @@ tabClick(e) { console.log('e', e); this.tabId = e.id - if(e.id == 3){ - this.titleClick(undefined,0) + if (e.id == 3) { + this.titleClick(undefined, 0) } - + }, formatRichText(html) { if (html == '') { @@ -495,38 +592,7 @@ ); return newContent; }, - // 加入班级 - addClass() { - $http.request({ - url: "common/class/joinClass", - method: "POST", - data: { - "classId": this.classId, - }, - header: { //默认 无 说明：请求头 - 'Content-Type': 'application/json' - }, - }) - .then(res => { - if (res.code == 0) { - this.isHave = true - uni.showToast({ - title: `加入成功！`, - icon: 'success' - }) - setTimeout(() => { - this.getClassInfo() - }, 200) - } - }).catch(e => { - console.log(e, '数据报错') - // this.status = 3 - uni.showToast({ - title: `加入失败`, - icon: 'error' - }) - }); - }, + // 显示班级成员 seeManager() { this.showMan = true @@ -556,7 +622,7 @@ uni.navigateTo({ url: `${_url}?id=${this.thisClass.id}&type=${_type}` }) - }, 200) + }, 200) }, // 改变班级状态 changeClassStatu(statusCode) { @@ -604,7 +670,7 @@ }) }); }, - taskEdit(item){ + taskEdit(item) { console.log('taskEdit'.item); }, // 退出班级 // 踢出班级 @@ -665,9 +731,9 @@ } }); }, - showmoreTask(){ + showmoreTask() { uni.navigateTo({ - url:`/pages/miniClass/classCaskList?id=${this.thisClass.id}&type=${this.tijiaoTitleId}` + url: `/pages/miniClass/classCaskList?id=${this.thisClass.id}&type=${this.tijiaoTitleId}` }) }, getClassInfo() { @@ -746,7 +812,10 @@ display: flex; } - .fabBox {} + .welComeText { + // padding: 6rpx 4rpx; + color: #e58d44; + } ::v-deep .uni-fab__content--other-platform, ::v-deep .uni-fab--rightBottom { @@ -766,7 +835,33 @@ color: #fff; font-weight: normal; } - .taskEdit{color: $themeColor; display: inline-block; padding-left: 20rpx;} + .optionsBtn{ margin: 20rpx 0; + .flex_box{justify-content: space-between;} + .item{margin-right: 20rpx; width: 100%; text-align: center; color: #fff; padding: 20rpx 0; border-radius: 6rpx;} + .delClass{background-color: #ffa4a6;} + .openClass{background-color: #67c23a;} + .overClass{background-color: #258feb;} + .editClass{background-color: #258feb;} + .setBanewei{background-color: #e7b772;} + } + .classStatus{padding: 10rpx; color: #fff; text-align: right;} + .daikai{background-image: linear-gradient(-90deg, #258feb 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100% );} + .xuexizhong{background-image: linear-gradient(-90deg, #55aa00 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100% );} + .yijieban{background-image: linear-gradient(-90deg, #999 0%, rgba(255, 255, 255, 0.1) 80%, rgba(255, 255, 255, 0) 100% );} + + .courseBuyOrNo { + font-size: 28rpx; + border-top: 1px solid #eee; + padding-top: 10rpx; + margin-top: 10rpx; + } + + .taskEdit { + color: $themeColor; + display: inline-block; + padding-left: 20rpx; + } + .pingfenBox { border: 2px dotted #bed4ee; padding: 20rpx; @@ -825,13 +920,20 @@ } } -.showMore{ width: 100%; - text-align: center; margin: 20rpx 0; - text{color: $themeColor;} + + .showMore { + width: 100%; + text-align: center; + margin: 20rpx 0; + + text { + color: $themeColor; } - .submitRecode { + } + + .submitRecode { // padding: 20rpx; - + .newBox { .classmateImg { width: 60rpx !important; @@ -857,7 +959,8 @@ margin-bottom: 20rpx; // .userName{} } - .leve2{ + + .leve2 { color: #999; @include bov() } @@ -869,7 +972,8 @@ background-color: transparent !important; } - .bottomBox { border-top: 1px solid #eee; + .bottomBox { + border-top: 1px solid #eee; position: fixed; padding: 20rpx 0; text-align: center; @@ -889,7 +993,7 @@ .mainContent { color: #333; padding: 0 20rpx; - padding-bottom:120rpx; + padding-bottom: 120rpx; background-image: linear-gradient(30deg, #d4eaf0 0%, #d4eaf0 50%, #fdf0ed 100%); min-height: 100vh; } @@ -1044,10 +1148,11 @@ margin-bottom: 10rpx; } } - + .tijiaoTitle { justify-content: space-between; margin-bottom: 20rpx; + text { display: block; width: 30%; @@ -1127,17 +1232,5 @@ top: 20rpx; z-index: 1; } - - text.kaiban { - background-color: #67c23a; - } - - text.jieban { - background-color: $themeColor - } - - text.tuichu { - background-color: #f4a2a6; - } } \ No newline at end of file diff --git a/pages/miniClass/courseClassList.vue b/pages/miniClass/courseClassList.vue index cca5db2..690effa 100644 --- a/pages/miniClass/courseClassList.vue +++ b/pages/miniClass/courseClassList.vue @@ -5,38 +5,44 @@ 当前课程：{{courseTitle}} - + - + - + - + - - {{item.title}} - + + 【联合班】 + 【普通班】 + 【联合班】 + 【精英班】 + + {{item.title}} + + 目标学员人数：{{item.number}} 人 - 一键加入 - 查看班内情况 + 一键加入 + @@ -175,8 +181,7 @@ }, }) .then(res => { - if (res.code == 0) { - this.isHave = true + if (res.code == 0) { uni.showToast({ title: `加入成功！`, icon: 'success' @@ -186,13 +191,13 @@ url:`/pages/miniClass/classInfo?id=${classId}` }) },200) - } + } }).catch(e => { console.log(e, '数据报错') // this.status = 3 uni.showToast({ - title: `加入失败`, - icon: 'error' + title: '加入失败', + icon: 'none' }) }); }, @@ -230,8 +235,8 @@ method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 data: { "courseId": Number(this.courseId), - "state": this.subTabId, //小班状态0待开班1已开班2完成 - "type": this.curTagId // 班类型 0小班 1联合班 2精英班 + "state": '', //小班状态0待开班1已开班2完成 + "type": '' // 班类型 0小班 1联合班 2精英班 }, header: { //默认 无 说明：请求头 'Content-Type': 'application/json' diff --git a/pages/miniClass/giveScore.vue b/pages/miniClass/giveScore.vue deleted file mode 100644 index 11a2185..0000000 --- a/pages/miniClass/giveScore.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - - diff --git a/pages/miniClass/miniClassMan.vue b/pages/miniClass/miniClassMan.vue index 537270e..279a4e9 100644 --- a/pages/miniClass/miniClassMan.vue +++ b/pages/miniClass/miniClassMan.vue @@ -27,7 +27,7 @@ - + @@ -36,7 +36,7 @@ - + {{item.title}} @@ -46,7 +46,7 @@ --> - 进入班级 + 进入班级 diff --git a/pages/miniClass/myClassList.vue b/pages/miniClass/myClassList.vue index 8e76c43..bb2041a 100644 --- a/pages/miniClass/myClassList.vue +++ b/pages/miniClass/myClassList.vue @@ -6,11 +6,11 @@ - + - - {{item.title}} - + + 【联合班】 + 【普通班】 + 【联合班】 + 【精英班】 + + {{item.title}} + + 目标学员人数：{{item.number}} 人 @@ -217,7 +223,7 @@ method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 data: { "state": this.subTabId, //小班状态0待开班1已开班2完成 - "type": this.curTagId // 班类型 0小班 1联合班 2精英班 + "type": '' // 班类型 0小班 1联合班 2精英班 }, header: { //默认 无 说明：请求头 'Content-Type': 'application/json' diff --git a/pages/miniClass/taskDetail.vue b/pages/miniClass/taskDetail.vue index a440146..bbe575e 100644 --- a/pages/miniClass/taskDetail.vue +++ b/pages/miniClass/taskDetail.vue @@ -305,7 +305,7 @@ method: "POST", data: { "limit": 10, - "page": 1, + "page": this.pPage, "taskId": this.thisTask.id, "myReply": this.listDisplay //0全部作业1我的作业 }, diff --git a/pages/miniClass/taskDetailForMan.vue b/pages/miniClass/taskDetailForMan.vue new file mode 100644 index 0000000..b638d44 --- /dev/null +++ b/pages/miniClass/taskDetailForMan.vue @@ -0,0 +1,588 @@ +