diff --git a/manifest.json b/manifest.json index 489f2c0..fdeb0e6 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "src" : "图片路径" } ], - "versionName" : "1.0.14", - "versionCode" : 1014, + "versionName" : "1.0.15", + "versionCode" : 1015, "app-plus" : { "nvueCompiler" : "weex", "compatible" : { diff --git a/pages/course/courseDetail.vue b/pages/course/courseDetail.vue index fee58de..2ed8049 100644 --- a/pages/course/courseDetail.vue +++ b/pages/course/courseDetail.vue @@ -487,14 +487,14 @@ // this.pageTitle = e.title console.log(e, "传入分类id"); this.getUserInfo(); - this.courseId = e.id; - this.getLinkClassList() + this.courseId = e.id; // await this.getData(e.id); this.getSayList(); this.getOS() }, + onPageScroll(e) { this.scrollTop = e.scrollTop; if (this.scrollTop > 500) { @@ -515,7 +515,8 @@ // #ifdef APP-PLUS plus.screen.unlockOrientation(); plus.screen.lockOrientation("portrait-primary"); - // #endif + // #endif + this.getLinkClassList() }, onUnload() { this.selectGoodsData = {}; diff --git a/pages/miniClass/addClass.vue b/pages/miniClass/addClass.vue index 61b6e15..c831849 100644 --- a/pages/miniClass/addClass.vue +++ b/pages/miniClass/addClass.vue @@ -52,6 +52,14 @@ + + 群二维码: + + + + + *目标人数: @@ -90,6 +98,7 @@ data() { return { fileList1: [], + fileList2:[], playData: {}, modeType:undefined, // 模型type //手机号账号 @@ -100,6 +109,7 @@ content: '', // 描述 icon: '', //封面 number: '', // 联系电话 + qrcode:'' // 群二维码 }, telError: false, range:[ @@ -150,6 +160,10 @@ //页面显示 onShow() { + }, + beforeDestroy() { + this.fileList1 = [] + this.fileList2 = [] }, onPullDownRefresh(){ uni.stopPullDownRefresh() @@ -191,6 +205,9 @@ if(this.form.icon != ''){ this.fileList1.push({url:this.form.icon}) } + if(this.form.qrcode != ''){ + this.fileList2.push({url:this.form.qrcode}) + } this.form.modelId = res.result.classModel.id } console.log('this.form',res.result); @@ -251,21 +268,7 @@ }, addPic(e) { console.log("添加图片"); - let that = this; - // for (var i = 0; i < e.file.length; i++) { - // console.log(i,e.file[i].url) - // uni.uploadFile({ - // url: this.$baseUrl + "oss/fileoss", //仅为示例，非真实的接口地址 - // filePath: tempFilePaths[0], - // name: 'file', - // formData: { - // 'user': 'test' - // }, - // success: (uploadFileRes) => { - // console.log(uploadFileRes.data); - // } - // }); - // return + let that = this; uni.uploadFile({ url: this.$baseUrl + "oss/fileoss", filePath: e.file.url, @@ -289,6 +292,32 @@ deletePic(event) { this.fileList1.splice(event.index, 1) }, + addPic2(e) { + console.log("添加图片"); + let that = this; + uni.uploadFile({ + url: this.$baseUrl + "oss/fileoss", + filePath: e.file.url, + //files:e.file, + name: "file", + formData: {}, + success: (res) => { + // console.log("that.uploadPicLIst", res); + that.fileList2.push({ + url: JSON.parse(res.data).url, + }); + + // console.log(that.fileList1, "that.uploadPicLIst"); + }, + fail: (error) => { + console.log("上传失败", error); + }, + }); + // } + }, + deletePic2(event) { + this.fileList2.splice(event.index, 1) + }, onSubmit() { this.$refs.form.validate().then(res => { if (this.fileList1.length > 0) { @@ -297,6 +326,12 @@ // console.log('this.fileList1',_list); this.form.icon = _list.join(',') } + if (this.fileList2.length > 0) { + let _list = this.fileList2 + _list = _list.map(item => item.url) + // console.log('this.fileList1',_list); + this.form.qrcode = _list.join(',') + } if(this.form.number <= 0){ uni.showToast({ title: '目标人数必须大于0个人', @@ -317,7 +352,8 @@ "icon": this.form.icon, "state": this.form.id ? this.form.state : undefined, "content": this.form.content, - "number": Number(this.form.number) + "number": Number(this.form.number), + "qrcode": this.form.qrcode }, header: { //默认 无 说明：请求头 'Content-Type': 'application/json' @@ -329,6 +365,7 @@ icon:'success'}); setTimeout(()=> { this.fileList1 = [] + this.fileList2 = [] uni.navigateTo({ url:'/pages/miniClass/miniClassMan' }) @@ -336,7 +373,7 @@ // uni.navigateBack({ // delta: 1 // }); - },300) + },1000) }).catch(e => { // console.log('表单错误信息：', err); uni.showToast({ diff --git a/pages/miniClass/addHomeWork.vue b/pages/miniClass/addHomeWork.vue index e183778..f7b0fe0 100644 --- a/pages/miniClass/addHomeWork.vue +++ b/pages/miniClass/addHomeWork.vue @@ -14,7 +14,7 @@ class="addType" v-model="form.type" :localdata="range" - + @change="chageType" placement="top" > @@ -171,6 +171,14 @@ }, //方法 methods: { + chageType(e){ + // console.log('e',e); + if(e == 0){ + this.pageType = '作业' + }else if(e == 1){ + this.pageType = '医案' + } + }, // 获取医案任务详情 getTaskInfo(){ $http.request({ diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue index d396ab2..58e709c 100644 --- a/pages/miniClass/classInfo.vue +++ b/pages/miniClass/classInfo.vue @@ -13,7 +13,10 @@

{{thisClass.title}}

退出班级 - + + + 去考试 + 创建日期{{thisClass.createTime.substring(0,10)}} @@ -48,7 +51,10 @@ - + + + ——— 教学时长：{{classModel.days}} 天 ——— + @@ -56,8 +62,12 @@ - + + + + + @@ -732,7 +742,7 @@ _txt = '即将踢出该学员，是否继续？' } else { _useId = this.userInfo.id - _txt = '您即将退出当前班级，是否继续？' + _txt = '您即将退出当前班级，退出班级后，在本班级提交的作业、医案、心得都将被删除，是否继续？' } uni.showModal({ @@ -1021,15 +1031,24 @@ border-radius: 40rpx; } } - + .qrcode{width:100%; + image{ + width: 200rpx;height: 200rpx; + + } + } .mainContent { - color: #333; + color: #333; padding: 0 20rpx; padding-bottom:120rpx; background-image: linear-gradient(30deg, #d4eaf0 0%, #d4eaf0 50%, #fdf0ed 100%); min-height: 100vh; } - + .gotoExams{ margin: 20rpx 0; margin-top: -10rpx; + text{ display: block; text-align: center; width: 100%; border-radius: 10rpx; box-sizing: border-box; padding: 20rpx; color:#fff ; + background-image: linear-gradient(-90deg, #576afc 0%, #97a1ff 100%); + } + } .classMateBox { .newBox{justify-content: space-between; flex-wrap: wrap;} .zmVip { diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue index 5dc3d99..231af73 100644 --- a/pages/miniClass/classInfoMan.vue +++ b/pages/miniClass/classInfoMan.vue @@ -22,39 +22,33 @@ - + - 设置班委 - + 修改班级 - + 开班 - + 结班 - + 删除班级 - - + + - + @@ -77,7 +71,13 @@ 心得 - + + + + + + 思考题 + @@ -118,51 +118,19 @@ + + ——— 教学时长：{{classModel.days}} 天 ——— + - - - - - - {{item.name}} - - - - - - - - - - {{item.title}}修改 - - - {{item.content}} - - - - - - - 查看全部 >> - - - - - - - - - + + + + @@ -961,6 +929,12 @@ } } +.qrcode{width:100%; + image{ + width: 200rpx;height: 200rpx; + + } + } .manBtnBox { justify-content: center; diff --git a/pages/miniClass/courseClassList.vue b/pages/miniClass/courseClassList.vue index 140c7f3..0b5b7b7 100644 --- a/pages/miniClass/courseClassList.vue +++ b/pages/miniClass/courseClassList.vue @@ -4,17 +4,8 @@ - 当前课程：{{courseTitle}} - - - + 当前课程：{{courseTitle}} + @@ -46,9 +37,7 @@ - + @@ -160,6 +149,7 @@ onShow() { // 隐藏原生的tabbar // uni.hideTabBar(); + this.getData() }, components: { musicPlay diff --git a/pages/miniClass/memberSet.vue b/pages/miniClass/memberSet.vue index dcd2b14..aa18e3a 100644 --- a/pages/miniClass/memberSet.vue +++ b/pages/miniClass/memberSet.vue @@ -7,110 +7,200 @@ - + *班长： - + - - - - - {{form.monitor.tel}} - 删除 - 添加人员 + + + + 添加人员 + + + + + + + + + + + {{form.monitor && form.monitor.nickname != '' && form.monitor.nickname != null ? form.monitor.nickname : '匿名用户'}} + + - {{form.monitor.tel}} + + + + + 删除 + + - + - + 副班长： - + - - - - - {{form.dmonitor.tel}} - 删除 - 添加人员 + + + + 添加人员 + + + + + + + + + + + {{form.dmonitor && form.dmonitor.nickname != '' && form.dmonitor.nickname != null ? form.dmonitor.nickname : '匿名用户'}} + + - {{form.dmonitor.tel}} + + + + + 删除 + + - + - + 学习委员： - + - - - - - {{form.learner.tel}} - 删除 - 添加人员 + + + + 添加人员 + + + + + + + + + + + {{form.learner && form.learner.nickname != '' && form.learner.nickname != null ? form.learner.nickname : '匿名用户'}} + + - {{form.learner.tel}} + + + + + 删除 + + - + - + - 评分员： - + 评分员： + - - - - - {{item.tel}} - 删除 - 添加人员 + + + + 添加人员 + + + + + + + + + + + {{item && item.nickname != '' && item.nickname != null ? item.nickname : '匿名用户'}} + + - {{item.tel}} + + + + + 删除 + + - + - + - 记分员： - + 记分员： + - - - - - {{item.tel}} - 删除 - 添加人员 + + + + 添加人员 + + + + + + + + + + + {{item && item.nickname != '' && item.nickname != null ? item.nickname : '匿名用户'}} + + - {{item.tel}} + + + + + 删除 + + + + - + @@ -148,7 +238,7 @@ export default { data() { return { - memeberRefsh:true, + memeberRefsh: true, fileList1: [], searchValue: '', searchList: [], @@ -166,8 +256,8 @@ "monitor": undefined, //班长 "dmonitor": undefined, //2班长 "learner": undefined, //学习委员 - "scorer": [undefined,undefined], //评分员 - "counter": [undefined,undefined] //记分员 + "scorer": [undefined, undefined], //评分员 + "counter": [undefined, undefined] //记分员 }, telError: false, // relationError: false, @@ -180,8 +270,8 @@ } ] - } - // , + } + // , // dmonitor: { // rules: [{ // required: true, @@ -195,7 +285,7 @@ modelLIst: [ // { value: 0, text: "请选择" }, ], - roleCode:'' + roleCode: '' }; }, //第一次加载 @@ -205,7 +295,7 @@ this.roleCode = e.roleCode if (e.id) { this.form.classId = e.id - this.getClassInfo() + this.getClassInfo() } else { this.form.id = undefined } @@ -215,7 +305,7 @@ }, computed: { - ...mapState(['userInfo']) + ...mapState(['userInfo']) }, //方法 methods: { @@ -259,7 +349,7 @@ if (res.code == 0) { if (res.result.admins.length > 0) { var scorerIndex = 0 - var counterIndex = 0 + var counterIndex = 0 res.result.admins.forEach(item => { if (item.role == '1') { this.form.monitor = item.user @@ -270,18 +360,18 @@ if (item.role == '3') { this.form.learner = item.user } - if (item.role == '4') { + if (item.role == '4') { this.form.scorer[scorerIndex] = item.user scorerIndex += 1 } - if (item.role == '5') { + if (item.role == '5') { this.form.counter[counterIndex] = item.user counterIndex += 1 } - + }) } - console.log('this.form.scorer',this.form.scorer.length); + console.log('this.form.scorer', this.form.scorer.length); } console.log('this.form', this.form); uni.hideLoading() @@ -352,12 +442,12 @@ this.getSearch() } }, - delMemeber(dataName,index){ - console.log(dataName,index); + delMemeber(dataName, index) { + console.log(dataName, index); this.memeberRefsh = false switch (dataName) { case 'counter': - this.form.counter[index] = undefined + this.form.counter[index] = undefined break; case 'scorer': this.form.scorer[index] = undefined @@ -373,7 +463,7 @@ break; } this.memeberRefsh = true - + }, setMember(item) { console.log('选中了值', item); @@ -419,8 +509,8 @@ // icon: 'none' // }) }, - - + + relationInput(e) { // this.relationError = false // this.relationErrorPattern = false @@ -437,18 +527,18 @@ }, addPic(e) { console.log("添加图片"); - let that = this; + let that = this; uni.uploadFile({ url: this.$baseUrl + "oss/fileoss", filePath: e.file.url, //files:e.file, name: "file", formData: {}, - success: (res) => { + success: (res) => { that.fileList1.push({ url: JSON.parse(res.data).url, }); - + }, fail: (error) => { console.log("上传失败", error); @@ -460,8 +550,8 @@ this.fileList1.splice(event.index, 1) }, onSubmit() { - console.log('form',this.form); - if(!this.form.monitor){ + console.log('form', this.form); + if (!this.form.monitor) { uni.showToast({ title: '请添加班长人选', icon: 'none' @@ -476,92 +566,94 @@ // return // } // this.$refs.form.validate().then(res => { - var newScorer = [...this.form.scorer] - var newCounter = [...this.form.counter] - if(!this.form.scorer[0] && !this.form.scorer[1]){ - newScorer = [0,0] - }else{ - console.log('newScorer',newScorer); - this.form.scorer.forEach((item, index) => { - console.log('item',item); - if(!item || item == null){ - console.log('进来了'); - newScorer[index] = { - id:0 - } + var newScorer = [...this.form.scorer] + var newCounter = [...this.form.counter] + if (!this.form.scorer[0] && !this.form.scorer[1]) { + newScorer = [0, 0] + } else { + console.log('newScorer', newScorer); + this.form.scorer.forEach((item, index) => { + console.log('item', item); + if (!item || item == null) { + console.log('进来了'); + newScorer[index] = { + id: 0 } - }) - // console.log('删除后的newScorer',newScorer); - if(newScorer[0].id == newScorer[1].id){ - uni.showToast({ - title:'两名评分员不能是同一人', - icon:'none' - }) - return - } - newScorer = newScorer.map(item => { - return item.id - }) - // console.log('删除后的newScorer',newScorer); - } - - if(!this.form.counter[0] && !this.form.counter[1]){ - newCounter = [0,0] - }else{ - this.form.counter.forEach((item, index) => { - if(!item || item == null){ - newCounter[index] = {id:0} - // newCounter.splice(index, 1) - } - }) - if(newCounter[0].id == newCounter[1].id){ - uni.showToast({ - title:'两名记分员不能是同一人', - icon:'none' - }) - return } - - newCounter = newCounter.map(item => { - return item.id + }) + // console.log('删除后的newScorer',newScorer); + if (newScorer[0].id == newScorer[1].id) { + uni.showToast({ + title: '两名评分员不能是同一人', + icon: 'none' }) - // console.log('删除后的newCounter',newCounter); + return } - - var _url = 'common/class/setUserRole' - // this.form.classId ? _url = 'common/class/editClass' : _url = "common/class/addClass" - $http.request({ - url: _url, - method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 - data: { - "classId": this.form.classId, - "monitor": this.form.monitor.id+'', //班长 - "dmonitor": this.form.dmonitor ? this.form.dmonitor.id+'' : '0', //2班长 - "learner": this.form.learner ? this.form.learner.id+'' : '0', //学习委员 - "scorer": newScorer.join(','), //评分员 - "counter": newCounter.join(',') //记分员 - }, - header: { //默认 无 说明：请求头 - 'Content-Type': 'application/json' - }, + newScorer = newScorer.map(item => { + return item.id + }) + // console.log('删除后的newScorer',newScorer); + } + + if (!this.form.counter[0] && !this.form.counter[1]) { + newCounter = [0, 0] + } else { + this.form.counter.forEach((item, index) => { + if (!item || item == null) { + newCounter[index] = { + id: 0 + } + // newCounter.splice(index, 1) + } + }) + if (newCounter[0].id == newCounter[1].id) { + uni.showToast({ + title: '两名记分员不能是同一人', + icon: 'none' }) - .then(res => { - uni.showToast({ - title: "操作成功", - icon: 'success' - }); - setTimeout(() => { - uni.navigateBack({ - delta: 1 - }); - }, 1000) - }).catch(e => { - // console.log('表单错误信息：', err); - uni.showToast({ - title: '操作失败', - icon: 'error' - }) + return + } + + newCounter = newCounter.map(item => { + return item.id + }) + // console.log('删除后的newCounter',newCounter); + } + + var _url = 'common/class/setUserRole' + // this.form.classId ? _url = 'common/class/editClass' : _url = "common/class/addClass" + $http.request({ + url: _url, + method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + data: { + "classId": this.form.classId, + "monitor": this.form.monitor.id + '', //班长 + "dmonitor": this.form.dmonitor ? this.form.dmonitor.id + '' : '0', //2班长 + "learner": this.form.learner ? this.form.learner.id + '' : '0', //学习委员 + "scorer": newScorer.join(','), //评分员 + "counter": newCounter.join(',') //记分员 + }, + header: { //默认 无 说明：请求头 + 'Content-Type': 'application/json' + }, + }) + .then(res => { + uni.showToast({ + title: "操作成功", + icon: 'success' }); + setTimeout(() => { + uni.navigateBack({ + delta: 1 + }); + }, 1000) + }).catch(e => { + // console.log('表单错误信息：', err); + uni.showToast({ + title: '操作失败', + icon: 'error' + }) + }); // }).catch(err => { // console.log('表单错误信息：', err); // uni.showToast({ @@ -648,26 +740,44 @@ margin-bottom: 20rpx; } } - + .addBtnBox { .item { .box { color: #999; - margin: 20rpx; + // margin: 20rpx; align-items: center; font-size: 28rpx; - background-color: #eee; + padding: 4rpx 8rpx; border-radius: 6rpx; justify-content: start; width: 100%; padding: 10rpx 8rpx; + + .haveNoPerson { + height: 120rpx; border-radius: 10rpx; align-items: center; justify-content: center; + background-color: #eee; + } + + .havePerson { + width: 100%; + padding: 20rpx; + border-radius: 10rpx; + border: 1px solid #eee; + } + .delBtn { + display: block; padding: 20rpx 0; box-sizing: border-box; + width: 100%; text-align: center; background-color: #f1f1f1; color: #e60000 !important; - display: inline-block; - border-radius: 6rpx; margin-left: 20rpx; + font-size: 26rpx; + margin-top: 20rpx; + // display: inline-block; + border-radius: 6rpx; + } text { @@ -749,6 +859,17 @@ } } + .classmateImg { + width: 60rpx !important; + height: 60rpx !important; + margin-right: 16rpx; + + image { + width: 60rpx !important; + height: 60rpx; + } + } + .btn_box { margin-top: 70rpx; padding-bottom: 20rpx; diff --git a/pages/miniClass/studentsInClass.vue b/pages/miniClass/studentsInClass.vue index 65f64e8..02307a6 100644 --- a/pages/miniClass/studentsInClass.vue +++ b/pages/miniClass/studentsInClass.vue @@ -307,7 +307,7 @@ } .redBorder{ border: 1px solid #ff8f8f !important;} .greenBorder{border: 1px solid #55aa00 !important;} - .studentsNumber{color: #666; font-size: 28rpx; } + .studentsNumber{color: #666; font-size: 28rpx; margin: 20rpx 0; display: block;} .studentsList{ background-color: rgba(255, 255, 255, .8); padding: 10rpx; border-radius: 10rpx; flex-wrap: wrap; justify-content: space-around; .item{width: 32% !important; font-size: 26rpx; padding: 6rpx !important;} } diff --git a/pages/miniClass/taskDetailForMan.vue b/pages/miniClass/taskDetailForMan.vue index 6b3416b..08d816c 100644 --- a/pages/miniClass/taskDetailForMan.vue +++ b/pages/miniClass/taskDetailForMan.vue @@ -73,7 +73,7 @@ - +

提交的内容

@@ -106,7 +106,7 @@ - + @@ -142,7 +142,7 @@ score: undefined, //分数 id: undefined, }, - ispreviewImage :false, + // ispreviewImage :false, curReplay: {}, rules: { score: { @@ -194,11 +194,11 @@ }, onShow() { this.form.taskId = this.thisTask.id - console.log('this.ispreviewImage',this.ispreviewImage); - if(this.ispreviewImage){ - this.showEditBlank = true - this.ispreviewImage = false - } + // console.log('this.ispreviewImage',this.ispreviewImage); + // if(this.ispreviewImage){ + // this.showEditBlank = true + // this.ispreviewImage = false + // } this.FileList11 = [] this.getTaskInfo() }, @@ -253,11 +253,7 @@ } this.curReplay = {} this.fileList1 = [] - setTimeout(()=>{ - this.pPage = 0 - this.zuoyeList = [] - this.getReplayList() - },1000) + }, deletePic(event) { this.fileList1.splice(event.index, 1) @@ -281,8 +277,8 @@ }, previewImage(url) { console.log(url); - this.ispreviewImage = true - this.showEditBlank = false + // this.ispreviewImage = true + // this.showEditBlank = false uni.previewImage({ urls: [url], longPressActions: { @@ -381,9 +377,9 @@ }, onSubmit() { this.$refs.form.validate().then(res => { - if(this.form.score > 100){ + if(this.form.score > 2.5){ uni.showToast({ - title:'分数不能大于100', + title:'分数不能大于2.5', icon:'none' }) return @@ -416,7 +412,13 @@ icon: 'success' }) this.FileList = [] - this.closePup() + setTimeout(()=>{ + this.closePup() + this.pPage = 0 + this.zuoyeList = [] + this.getReplayList() + },1000) + }).catch(e => { uni.showToast({ title: '操作失败', diff --git a/pages/miniClass/taskList.vue b/pages/miniClass/taskList.vue index 6f53beb..706aa84 100644 --- a/pages/miniClass/taskList.vue +++ b/pages/miniClass/taskList.vue @@ -16,7 +16,7 @@ - 已交 {{item.otherInfo.setGiveHomeWorkNumber}} 人 + 已交 {{item.otherInfo.setGiveHomeWorkNumber}} 人 @@ -24,7 +24,7 @@ - 未交 {{item.otherInfo.setNoGiveHomeWorkNumber}} 人 + 未交 {{item.otherInfo.setNoGiveHomeWorkNumber}} 人 @@ -32,7 +32,7 @@ - 已评分 {{item.otherInfo.setGiveScoreNumber}} 人 + 已评分 {{item.otherInfo.setGiveScoreNumber}} 人 @@ -40,7 +40,7 @@ - 未评分 {{item.otherInfo.setNoGiveScoreNumber}} 人 + 未评分 {{item.otherInfo.setNoGiveScoreNumber}} 人 @@ -227,7 +227,7 @@ .leve2 { justify-content: space-between; color: #666; font-size: 24rpx; - + b{font-size: 34rpx; padding: 0 4rpx; font-weight: normal;} .item{text-align: center; padding-top: 0; padding-bottom: 0; margin-bottom: 0;} } diff --git a/pages/miniClass/xindeList.vue b/pages/miniClass/xindeList.vue index 67f416d..1cb61f9 100644 --- a/pages/miniClass/xindeList.vue +++ b/pages/miniClass/xindeList.vue @@ -30,7 +30,7 @@ - +

心得详情

@@ -59,12 +59,12 @@ 未评分 - -