From 48a5c3400ed083a7870ea9df923da7bb61d3c79a Mon Sep 17 00:00:00 2001 From: "@fawn-nine" <1271023382@qq.com> Date: Tue, 27 Aug 2024 17:10:44 +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 --- package (2).json | 16 + pages.json | 7 + pages/course/chapterDetailAndorid.vue | 51 +-- pages/course/courseDetail.vue | 49 ++- pages/miniClass/DirectorModalList.vue | 11 +- pages/miniClass/MonitorClassList.vue | 1 + pages/miniClass/addClass.vue | 2 +- pages/miniClass/allLearningClassList.vue | 445 +++++++++++++++++++++++ pages/miniClass/classInfo.vue | 60 ++- pages/miniClass/classInfoMan.vue | 8 +- pages/miniClass/myClassList.vue | 2 +- pages/miniClass/sikaoQuestionList.vue | 7 +- pages/miniClass/taskDetail.vue | 25 +- pages/miniClass/taskDetailForMan.vue | 51 +-- pages/miniClass/taskListForWaitOpen.vue | 2 +- pages/peanut/home.vue | 98 ++++- static/class.png | Bin 0 -> 1578 bytes style/common.scss | 2 +- 18 files changed, 735 insertions(+), 102 deletions(-) create mode 100644 package (2).json create mode 100644 pages/miniClass/allLearningClassList.vue create mode 100644 static/class.png diff --git a/package (2).json b/package (2).json new file mode 100644 index 0000000..aabd29e --- /dev/null +++ b/package (2).json @@ -0,0 +1,16 @@ +{ + "id": "yk-screenRecord", + "name": "实现微信小程序安卓IOS禁止截屏、录屏功能", + "displayName": "实现微信小程序安卓IOS禁止截屏、录屏功能", + "version": "1.0.0", + "description": "禁止截屏、录屏功能，支持安卓、IOS、小程序等多端通用，哪里需要那里应引用即可，方便快捷", + "keywords": [ + "uniapp、微信小程序、截屏、录屏、方便快捷" + ], + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ] + } +} \ No newline at end of file diff --git a/pages.json b/pages.json index 0f5bf63..9f92567 100644 --- a/pages.json +++ b/pages.json @@ -599,6 +599,13 @@ "navigationBarTitleText" : "课程下可加入班级列表" } }, + { + "path" : "pages/miniClass/allLearningClassList", + "style" : + { + "navigationBarTitleText" : "全部可加入班级列表" + } + }, { "path" : "pages/miniClass/myClassList", "style" : diff --git a/pages/course/chapterDetailAndorid.vue b/pages/course/chapterDetailAndorid.vue index 953f5b3..2ffec53 100644 --- a/pages/course/chapterDetailAndorid.vue +++ b/pages/course/chapterDetailAndorid.vue @@ -66,8 +66,11 @@ - - 我的见解 + + + 我的见解 + @{{classList[0].title}} + 修改 @@ -104,9 +107,10 @@ 欢迎留下你的见解 + 提交到{{classList[0].title}} - - 写见解 + + 写见解 @@ -365,6 +369,11 @@ } this.showEditBlank = true }, + gotoClass(item){ + uni.navigateTo({ + url: `/pages/miniClass/classInfo?id=${item.id}` + }); + }, closePup() { this.showEditBlank = false this.answerForm = { @@ -796,7 +805,7 @@ checkDisable() { console.log("点击了"); }, - // 判断用户是否加入了小班 小班列表为0 表示已经加入 + // 判断用户是否加入了小班 getClassList(){ $http.request({ url: '/common/class/getClassByUser', @@ -937,34 +946,7 @@ \ No newline at end of file diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue index 990d3da..7b9d9dd 100644 --- a/pages/miniClass/classInfo.vue +++ b/pages/miniClass/classInfo.vue @@ -12,11 +12,8 @@

{{thisClass.title}}

- 退出班级 - - + 退出班级 + 创建日期 思考题分 {{performanceScore.questionScore}}分 - + + @@ -168,11 +180,15 @@ {{item.title}} - - {{item.content}} + + + {{item.content}} + + + {{item.zhedie ? '收起' : '展开'}} 日期：{{item.createTime}} @@ -203,12 +219,10 @@ --> - - - + @@ -264,7 +278,7 @@ - + @@ -454,6 +468,10 @@ }, }, methods: { + changeZheDie(item, index){ + + this.taskList[index].zhedie = !this.taskList[index].zhedie + }, // 查询平时表现分 getScore() { $http.request({ @@ -565,7 +583,6 @@ this.loadFlag = true; this.pPage++; var data = { - "limit": 10, "page": this.pPage, "classId": this.thisClass.id, @@ -587,6 +604,9 @@ if (res.page.records.length > 0) { console.log('数据获取成功', res.page.records); var lis = res.page.records + lis.forEach(item => { + item.zhedie = false + }) this.taskList = this.taskList.concat(lis) if (res.page.pages > 1) { this.taskHaveMore = true @@ -1078,7 +1098,13 @@ } } } - + .zhengshu{color: #ffaa7f; border:1px solid #ffaa7f} + .chongxiu{color: #00aaff; border:1px solid #00aaff} + .greenScore{color: #55aa00;} + .blueScore{color: #00aaff;} + .redScore{color: #ff8a8c;} + .scoreNumber{font-size: 60rpx;} +.chengji{padding-top: 20rpx; margin-top: 20rpx; border-top: 1px solid #eee; } .manBtnBox { justify-content: center; @@ -1167,7 +1193,7 @@ } .date {} - +.btn1{color: $themeColor; font-size: 30rpx;} .btn { border: 1px solid $themeColor; margin-top: 20rpx; @@ -1185,7 +1211,9 @@ } } } - +.zhedie{ + @include bov(2); + } .nobg { background-color: transparent !important; } diff --git a/pages/miniClass/classInfoMan.vue b/pages/miniClass/classInfoMan.vue index 04666b3..a2769a4 100644 --- a/pages/miniClass/classInfoMan.vue +++ b/pages/miniClass/classInfoMan.vue @@ -26,7 +26,7 @@ + @click="goEditClass('/pages/miniClass/addClass',thisClass.id, classModel.type)"> 修改班级 @@ -672,6 +672,11 @@ import { ref, onMounted } from 'vue'; url: `${url}?id=${id}&type=${modeType}` }); }, + goEditClass(url, id, modeType){ + uni.navigateTo({ + url: `${url}?id=${id}&type=${modeType}&modelTitle=${this.classModel.title}` + }); + }, tabClick(e) { console.log('e', e); this.tabId = e.id @@ -954,6 +959,7 @@ import { ref, onMounted } from 'vue'; var off70 = undefined // 时长过70%显示结班按钮天数 off70 = Math.ceil(parseInt(this.classModel.days) * 0.7 ) var off70miniSecond = off70 * 1000*60*60*24 + console.log('时间比较',(off70miniSecond + time3), nowTime) if((off70miniSecond + time3) <= nowTime){ console.log('显示结班按钮'); this.thisClass.showOverBtn = true diff --git a/pages/miniClass/myClassList.vue b/pages/miniClass/myClassList.vue index 617b708..7e9a615 100644 --- a/pages/miniClass/myClassList.vue +++ b/pages/miniClass/myClassList.vue @@ -379,7 +379,7 @@ onPageJump(url, id, have) { // console.log('进来了',url,id); uni.navigateTo({ - url: `${url}?id=${id}&have=${have}` + url: `${url}?id=${id}` }); }, diff --git a/pages/miniClass/sikaoQuestionList.vue b/pages/miniClass/sikaoQuestionList.vue index fe30207..cb21e8d 100644 --- a/pages/miniClass/sikaoQuestionList.vue +++ b/pages/miniClass/sikaoQuestionList.vue @@ -15,6 +15,9 @@ + + 来源：{{item.courseTitle}}>{{item.chapterTitle}} + 收起 查看原题 @@ -418,7 +421,7 @@ border-bottom: 1px dashed #eee; padding-bottom: 20rpx; margin-bottom: 20rpx; - .pp{font-size: 30rpx !important;} + .pp{font-size: 30rpx !important; @include bov(2); line-height: 50rpx;} // .userName{} } @@ -427,7 +430,7 @@ justify-content: center; color: #666; font-size: 28rpx; - + .laiyuan{font-size: 22rpx; padding: 10rpx; background-color: #eee; margin-top: 16rpx;} .btn { display: block;padding: 10rpx; text-align: center; diff --git a/pages/miniClass/taskDetail.vue b/pages/miniClass/taskDetail.vue index a757c21..fb3d052 100644 --- a/pages/miniClass/taskDetail.vue +++ b/pages/miniClass/taskDetail.vue @@ -70,19 +70,20 @@ - - + + + {{item.content}} + + - - {{item.content}} - - + {{item.createTime}} + {{item.zhedie ? '收起' : '展开'}} @@ -351,6 +352,9 @@ }, }); }, + changeZheDie(item, index){ + this.zuoyeList[index].zhedie = !this.zuoyeList[index].zhedie + }, getZuoyeList() { this.status = 1; if (this.loadFlag) { @@ -589,7 +593,12 @@ background-color: $themeColor; } } - + .contentss{ + + } + .zhedie{ + @include bov(2); + } .anserBox { border: 4rpx dotted #2bb447; margin-top: 30rpx; @@ -642,9 +651,11 @@ // .userName{} } .leve2{ overflow: hidden; + .imgBox{margin-top: 20rpx;} .score{ margin-top: 20rpx; float: left; } + .btn{color: $themeColor;} .date{color: #999; float: right; text-align: right; font-size: 26rpx;} } } diff --git a/pages/miniClass/taskDetailForMan.vue b/pages/miniClass/taskDetailForMan.vue index c1178c2..105f986 100644 --- a/pages/miniClass/taskDetailForMan.vue +++ b/pages/miniClass/taskDetailForMan.vue @@ -11,15 +11,14 @@

题目内容

{{thisTask.title}} + + - - - + + + + + + 班级列表 + + + 更多班级 + + + + + + + + + + + + + + + {{item.title}} + 目标学员人数：{{item.number}} + + + + + + + + + + + + @@ -289,6 +338,7 @@ sbuMedicalTagsList: [], newsList: [], // 播报新闻列表 weburl: '', + classList : [], // webviewStyles: { // progress: true, // width: '100%', @@ -307,13 +357,17 @@ this.page = 1 }, //页面显示 - onShow() { + async onShow() { uni.hideTabBar(); // #ifdef APP-PLUS plus.screen.unlockOrientation(); plus.screen.lockOrientation("portrait-primary"); // #endif this.requestAll() + this.classList = await this.getClassNoUser() + if(this.classList.length > 6){ + this.classList = this.classList.slice(0,6) + } }, onTabItemTap() { @@ -357,6 +411,29 @@ //方法 methods: { ...mapMutations(['setUserInfo']), + + // 查询可加入的小班 + async getClassNoUser(){ + var _list = [] + await $http.request({ + url: "common/class/getClassNoUser", + method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档 + header: { //默认 无 说明：请求头 + 'Content-Type': 'application/json' + }, + }) + .then(async res => { + if (res.code == 0) { + if (res.result.length > 0) { + _list = res.result + } + } + + }).catch(e => { + console.log(e, '获取医学班级列表错误') + }); + return _list + }, goGoodsDetail(v,isMiaosha) { console.log(v); uni.navigateTo({ @@ -1000,7 +1077,9 @@ font-weight: bold; } } - + .moreBtn{ + color: $themeColor; font-size: 26rpx; + } .learnBox { background-color: #fff; margin-top: 10px; @@ -1505,4 +1584,19 @@ .imgcontainer { background-color: $imgBg; } + .classItemBox{margin-top: 20rpx; height: 250rpx; + swiper-item{ padding: 10rpx; width: 90% !important; + .wid90{width: 90% !important;} + .classItem{border: 1px solid #eee; border-radius: 10rpx; padding: 10rpx;} + padding-right:20rpx ; box-sizing:border-box} + + } + .classItem{ + .className{font-weight: bold; font-size: 32rpx;} + .textBox{margin-left: 20rpx; flex: 1; align-items: center;} + .img{width: 200rpx; height: 200rpx; overflow: hidden; + imgage{ + width: 100%; height: 100%; + }} + } \ No newline at end of file diff --git a/static/class.png b/static/class.png new file mode 100644 index 0000000000000000000000000000000000000000..2cb26e3f87a246c7f9b230492d3d13607aef06a1 GIT binary patch literal 1578 zcmV+_2G#kAP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1;0r|K~z{r?Us8` zR8<_u&%L_~E(jr*JdCG`iISj(Z^{Rfsb%G3Bug8uaI7hFbW&_|)TU_+E6Yrad?YAk zlQ@lIQ=~@!m^S#>$tS`(AovJzcNM|iJ$=8I6&Kq@6#SzZzRZWa_w3o<{hikbv`xfx|VX18pX*ejRXvF|PZ5pa2wtI~55|fz==aaDFzRqpyHAQwm^&c4&7^ z#fN&5>bl+%qgW0qKoAF7D?K;>m{;K(XobcDMvc*LwcY|WHcz{2y?y|UK6l~16$LE7 z1bjKr28sbTa0uL28)1&*16C8uzAd#7a2L26_bgT)t1wTyYg=^y$3Zm+<3LO04^D%B zKqvy(woGsqFhaNN)PlW$j-3FU=T&T$?B@J2jSyDP3h+Ak0Q?1LxC#sa z&56$M2ee1WJ_B<=7T5#o0KX$|1FxcE3@<0LO-u!B6X}7$!D+eXnz&DjOi`+8n1!+H zfStSx@Ff234?tV108=7KRn?ha9z4};Tglb<*gi>V7^4l&Sqi+0j(rc<0Mh|a12pc8 zA28UNTWWFSnyq$F`R3=F58xq;+;%|cmV=)Gw}-2L1Mq>2GT$C+fTM$dNBPCUGmbp7 z)sb6ft;^n9d?+9|g!5QzUVCLU;GS;*G*+nUbaF!GJegxUFZ0Z{MqpGXJvoL3dBV5| z=p^5R++vRN{v_bp?LCh5eIiY+-hZTt9rDuB4>_N_02<}~vV97$dUE0twJ?tuJ8Q0( zwrGVg2JjtxTZ*EHkr~=SfeT~u(K})jQ*}+85#bF?7Q8Q9~bj;@iEn?xjV+=3L1j3Bqp)n5`0odPk&V#@}$t{IM+2c7nj|DDZq;U6;S5L z$VX>8old{O&rA|}gXe><9~SK&7z8^pLxhx#rxka{uJPZbIrIA^k4zt&Fle|43FmRj zv+8P@|LByHrccm5+!oV8B2xY-PfwiPt#5ykFetU*8xN9F3VVH>h)qmR%&)M-yM~)M z#*?O~xllE`f7&=@$@bj{vG;fPu_7Kw(fCq^M15zH?%`mi-SmGbXiS&r*oYMc`$Tj? zV#7BcRAxFNu34^%N8)>ln+}!DSChMA`#|~8qQbFt*AYDAkvG*^Eut_tM|AEQDdGnV zag8>LO}OB?)sk9%`na(Q2?# zEMonFIilv$1(A{UzR>A)l~ejC%rAFkIqdej>{(NF)s-yP|H|obh=R4*;^3ZLB6ad~ z5gylrrO6|fM{#-I02$G}r=0&)zT9;3lH6KqksD83l=C)hlSq24ywhi9Hk5psjmH>I zngO__a>lY%a(%H`v$N&Q6}f!pUinz+D9sLXOM6Ccna$*${GOy5e2vR|IvBMiMm5P! zq2W@e*K3B19RuW)1xqCwE}c5Pt3tA?d(%W;qu*s*rJ|}bs7si{y=F(JH%M%s{MuB( zzG%-YwXt0_%8Q3mS-9!P%<_|euQ_|HSZ}SqECNG1iyr+4ij=VvMQ|9ZRmyUmsvj{m z%6P{0Bad42?aqWMbLlT7hYv+mSDhE={vxtxf*3gNIb3_w0VfJ`!Hcm0A7eV5*3@k1 zww76jDniA3Ob$a1`@(=kGG9ht-{Ek`