From 479220208112dace29a6be240f5643d4f9a9db55 Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Mon, 26 Aug 2024 17:35:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/classInfoWorkBlank.vue | 2 +- pages/course/chapterDetail.vue | 157 +------ pages/course/chapterDetailAndorid.vue | 54 ++- pages/miniClass/MonitorClassList.vue | 10 +- pages/miniClass/addClass.vue | 66 ++- pages/miniClass/addHomeWork.vue | 37 +- pages/miniClass/classInfo.vue | 573 +++++++++++++++--------- pages/miniClass/classInfoMan.vue | 109 +++-- pages/miniClass/classInfoWork.vue | 76 +--- pages/miniClass/courseClassList.vue | 15 +- pages/miniClass/memberSet.vue | 24 - pages/miniClass/miniClassMan.vue | 15 +- pages/miniClass/myClassList.vue | 10 +- pages/miniClass/sikaoQuestionList.vue | 22 +- pages/miniClass/taskDetail.vue | 46 +- pages/miniClass/taskDetailForMan.vue | 16 +- pages/miniClass/taskList.vue | 30 +- pages/miniClass/taskListForWaitOpen.vue | 23 +- pages/miniClass/xindeDetail.vue | 125 ++---- pages/miniClass/xindeList.vue | 6 +- style/common.scss | 3 + 21 files changed, 726 insertions(+), 693 deletions(-) diff --git a/components/classInfoWorkBlank.vue b/components/classInfoWorkBlank.vue index 94f99e1..f1949ba 100644 --- a/components/classInfoWorkBlank.vue +++ b/components/classInfoWorkBlank.vue @@ -25,7 +25,7 @@ - 思考题 + 思考题评分 diff --git a/pages/course/chapterDetail.vue b/pages/course/chapterDetail.vue index 62bb68b..31a384a 100644 --- a/pages/course/chapterDetail.vue +++ b/pages/course/chapterDetail.vue @@ -26,16 +26,7 @@ - - - + 本课程版权归天津众妙之门科技有限公司所有,翻版必究!

- - @@ -239,16 +95,7 @@ " v-show="screenLoading" > - - - + diff --git a/pages/course/chapterDetailAndorid.vue b/pages/course/chapterDetailAndorid.vue index 2edd4f4..953f5b3 100644 --- a/pages/course/chapterDetailAndorid.vue +++ b/pages/course/chapterDetailAndorid.vue @@ -19,7 +19,7 @@ - 视频教学 + 视频教学 @@ -65,12 +65,18 @@ - - 我的见解 - + + + 我的见解 + 修改 + + 正在评分 + + + {{myAnswer.score}}分 + @@ -79,9 +85,13 @@ + + {{myAnswer.createTime}} + + - + @@ -168,6 +178,7 @@ }, data() { return { + classList:[], // 进行中的小班 isInClass:false, // 是否加入了班级 showEditBlank: false, answerForm: { @@ -340,7 +351,7 @@ this.editorCtx = val.content this.fileList1 = [...val.fileList] } else { - this.answerForm = { + this.answerForm = { relationId: this.options.id, type: "1", //类型0任务1课后题 display: "1", //0不展示1展示 @@ -381,7 +392,9 @@ }) .then(res => { if (res.code == 0 && res.classTaskAndQuesReply != null) { - this.myAnswer = res.classTaskAndQuesReply + this.myAnswer = res.classTaskAndQuesReply + // 赋值给编辑器 + this.onEditorReady() this.myAnswer.fileList = [] if (res.classTaskAndQuesReply.img != '') { var imgList = res.classTaskAndQuesReply.img.split(',') @@ -472,9 +485,8 @@ 'common/class/editClassTaskAndQuesReply' : _url = 'common/class/addClassTaskAndQuesReply' // this.form.id ? _url = // 'common/class/editClassTaskReply' : _url = 'common/class/addClassTaskReply' - - var data1 = { + 'classId': this.answerForm.id ? undefined : this.classList[0].id, "relationId": this.answerForm.id ? undefined : this.curriculumData.id, "id": this.answerForm.id, "type": this.answerForm.type, //类型0任务1课后题 @@ -787,25 +799,27 @@ // 判断用户是否加入了小班 小班列表为0 表示已经加入 getClassList(){ $http.request({ - url: '/common/class/getClassByCourseIdNoUser', + url: '/common/class/getClassByUser', method: "POST", data: { "courseId": this.options.courseId, - "state": "", //小班状态0待开班1已开班2完成 - "type": "" // 班类型 0小班 1联合班 2精英班 + // "state": "", //小班状态0待开班1已开班2完成 + // "type": "" // 班类型 0小班 1联合班 2精英班 }, header: { //默认 无 说明:请求头 'Content-Type': 'application/json' }, }) .then(res => { - console.log('获取班级列表',res.result.length,this.options.courseId); + this.classList = [] + console.log('获取班级列表',res.result); if(res.code == 0){ - if(res.result.length > 0){ - this.isInClass = false + if(res.result.id){ + this.isInClass = true + this.classList.push(res.result) }else{ - this.isInClass = true - + this.isInClass = false + // this.classList = [] } } console.log('获取班级列表++++++',this.isInClass); @@ -988,7 +1002,7 @@ white-space: nowrap; padding: 10rpx; } - + .timeInfo{font-size: 28rpx; color: #838383; text-align: right; margin: 16rpx 0;} .imgBox { flex-wrap: wrap; @@ -1149,7 +1163,7 @@ } } } - + .score{color: #06c;} .rightBtn { float: right; diff --git a/pages/miniClass/MonitorClassList.vue b/pages/miniClass/MonitorClassList.vue index 73d8513..0c9b3ab 100644 --- a/pages/miniClass/MonitorClassList.vue +++ b/pages/miniClass/MonitorClassList.vue @@ -363,9 +363,9 @@ var _list = [] this.status = 1 // this.flag = false - uni.showLoading({ - title: '正在加载' - }) + // uni.showLoading({ + // title: '正在加载' + // }) await $http.request({ url: "common/class/MyClassList", method: "POST", // POST、GET、PUT、DELETE,具体说明查看官方文档 @@ -403,10 +403,10 @@ } // this.flag = true } - uni.hideLoading() + // uni.hideLoading() }).catch(e => { _list = [] - uni.hideLoading() + // uni.hideLoading() // this.flag = true console.log(e, '数据报错') // this.status = 3 diff --git a/pages/miniClass/addClass.vue b/pages/miniClass/addClass.vue index c95fe66..6b6e723 100644 --- a/pages/miniClass/addClass.vue +++ b/pages/miniClass/addClass.vue @@ -76,8 +76,17 @@ 班级简介:(600字以内) -