From f5a6ea91d2c1bf41730620809d447cd328bb427f Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 16 Jun 2022 09:54:36 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=94=BE=E5=A4=A7=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Detail.vue | 8 ++++---- src/views/portal/course/Micro.vue | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/portal/course/Detail.vue b/src/views/portal/course/Detail.vue index 72ce79af..71b52607 100644 --- a/src/views/portal/course/Detail.vue +++ b/src/views/portal/course/Detail.vue @@ -240,8 +240,8 @@ export default { }, crateQrcode(){ this.qr = new QRCode('qrcode', { - width: 80, - height: 80, // 高度 + width: 150, + height: 150, // 高度 text: this.qrcode // 二维码内容 }); }, @@ -465,8 +465,8 @@ export default { vertical-align:bottom; } .qrcode{ - width: 80px; - height: 80px; + width: 150px; + height: 150px; display: inline-block; margin: 1px; img { diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index 314f3405..6844ccb2 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -531,8 +531,8 @@ export default { }, crateQrcode(){ this.qr = new QRCode('qrcode', { - width: 80, - height: 80, // 高度 + width: 150, + height: 150, // 高度 text: this.qrcode // 二维码内容 // render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas) // background: '#f0f' From 71230bf79cc6e1c103f15d90e6dd4c8504b49184 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 16 Jun 2022 10:04:37 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Detail.vue | 1 + src/views/portal/course/Micro.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/portal/course/Detail.vue b/src/views/portal/course/Detail.vue index 71b52607..e0b379cf 100644 --- a/src/views/portal/course/Detail.vue +++ b/src/views/portal/course/Detail.vue @@ -244,6 +244,7 @@ export default { height: 150, // 高度 text: this.qrcode // 二维码内容 }); + this.qr._el.title = ''; }, showCommentsTotal(total){ this.commentsTtoal=total; diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index 6844ccb2..e8460052 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -538,6 +538,7 @@ export default { // background: '#f0f' // foreground: '#ff0' }); + this.qr._el.title = ''; }, ...mapActions({ getResOwnerTree:'resOwner/getResOwnerTree', From c9562cef9482c9bc754d61dc95313e95c526bf2e Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 16 Jun 2022 10:44:48 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PortalHeader.vue | 39 +---------- src/views/portal/course/Index.vue | 113 +----------------------------- src/views/portal/course/Micro.vue | 110 +---------------------------- 3 files changed, 5 insertions(+), 257 deletions(-) diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 5d953cc7..0dd9fb52 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -51,39 +51,12 @@
-
- 个人中心 - 退出 - - - - - - - - - - - - - - - @@ -145,14 +118,11 @@ export default { // cmtask_name:this.cmtask_name, }; apiBoeCourse.cmtaskList(params).then(res => { - if (res.result.count > 0) { + if (res.status == 200 && res.result.count > 0) { this.isTiao = true; - // this.$router.push('/uc/study/task');// 学习任务 } else { this.isTiao = false; - // this.$router.push('/uc/study/courses')// 自主学习 } - // this.pageData.list = res.result.list; }); }, handleCommand(val) { @@ -355,21 +325,16 @@ export default { div{ border-radius: 50%; img{ - border-radius: 50%; - + border-radius: 50%; width: 40px; height: 40px; } } - // border: 1px solid #73adfe; - // color: #73adfe; - // text-align: center; width: 40px; height: 40px; line-height: 40px; font-size: 14px; margin-right: 8px; border-radius: 50%; - // background: #d9e9ff; } diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index cc968786..5c1ac0b9 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -25,47 +25,22 @@
全部 - 录播课 线下课 学习项目
- - - - - - -
- -
内容分类
- 全部 {{item.name}} @@ -91,51 +66,19 @@
- -
- 最热 最新 - - -
@@ -191,12 +114,9 @@ 数据加载中 没有更多数据了
-
-
-
做课程 @@ -207,8 +127,6 @@
- - @@ -220,7 +138,6 @@ {{ item.name }} -
@@ -231,8 +148,6 @@
- - @@ -244,11 +159,9 @@ {{ item.name }} -
-
@@ -256,8 +169,6 @@
- - @@ -269,7 +180,6 @@ {{ item.courseName }} -
@@ -335,7 +245,6 @@ export default { sysTypes: null, oneSubList: [], towSubList: [], - scenes: 0, }, course: { orderField: "studys", @@ -355,8 +264,6 @@ export default { ankingList:[], scorelist: [], searchTags: [], - type1Sub3Level1: "0", - type1Sub3Level2: "0", queryExpand: true, // true更多,false收起 category: null, categorySub: 0, @@ -520,10 +427,6 @@ export default { if (i === "sysType3") { this.types.subTow = ""; } - if(i === "scenes"){ - this.types.scenes = ""; - } - if(i === 'type') { this.category = ""; this.categorySub = ""; @@ -589,14 +492,11 @@ export default { this.course.pageIndex += 1; this.search(); }, - async search(num) { + async search() { let that = this; if(this.course.keyword){ apiSearchterm.save({keyword:this.course.keyword,type:1}); } - // if(num !== 1) { - // this.course.pageIndex =1; - // } this.isFind = true; if (this.category === 0) { this.course.type = null; @@ -609,11 +509,6 @@ export default { } else { this.course.type = this.category; } - if(this.types.scenes == 0) { - this.course.scenes = ''; - } else{ - this.course.scenes = this.types.scenes; - } if(this.types.sysTypes == 0 || this.types.sysTypes == null) { this.course.sysType1 = ''; this.course.sysType2 = ''; @@ -828,12 +723,6 @@ export default { if (i == "type" && courseData[i] !== 0) { courseData[i] = courseType(courseData[i]); } - if (i == "scenes") { - let name = this.sceneList.filter(item => { - return item.id === courseData[i]; - }); - courseData[i] = name[0].name; - } if (i == "sysType1" || i == "sysType2" || i == "sysType3") { if(courseData[i] !== '0') { courseData[i] = this.sysTypeName(courseData[i]); diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index e8460052..1c5ac985 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -16,7 +16,6 @@
-
@@ -29,19 +28,16 @@ @onFullscreen="onFullscreen" @onPlayerEnded="onPlayerEnded"> -
-
-
@@ -112,7 +108,6 @@
-
@@ -155,47 +150,22 @@
{{courseInfo.name}}
{{courseInfo.studys}}人学习
- -
录播课
{{item}} -
-
{{toScore(courseInfo.score)}}
未评分
-
- - - - - - -
-
- - @@ -233,12 +203,9 @@
- -
-
@@ -264,23 +231,13 @@ import portalHeader from "@/components/PortalHeader.vue"; import comments from "@/components/Portal/comments.vue"; import portalFooter from "@/components/PortalFooter.vue"; import interactBar from "@/components/Portal/interactBar.vue"; -import apiCourse from "@/api/modules/course.js"; import apiCourseFile from "@/api/modules/courseFile.js"; import apiCoursePortal from "@/api/modules/coursePortal.js"; import apiUser from '@/api/system/user.js'; import exam from '@/components/Course/exam'; import homework from '@/components/Course/homework'; import assess from '@/components/Course/assess'; -import { - formatDate, - resListMap, - toScore, - courseType, - getType, - numberToLetter, - correctJudgment, - userAvatarText -} from "@/utils/tools.js"; +import {toScore,courseType, getType, numberToLetter, correctJudgment,userAvatarText} from "@/utils/tools.js"; import apicourseStudy from "@/api/modules/courseStudy.js"; import apiVideoStudy from "@/api/modules/videoStudy.js"; import apiCourseGrade from "@/api/modules/courseGrade.js"; @@ -288,7 +245,6 @@ import apiPraises from "@/api/modules/praises.js"; import apiTrample from "@/api/modules/trample.js"; import FileUpload from "@/components/FileUpload/index.vue"; import pdfPreview from "@/components/PdfPreview/index.vue"; -// import {resOwnerIndexName} from '@/utils/type.js'; import { setTimeout } from "timers"; import videoPlayer from '@/components/VideoPlayer/index.vue'; import audioPlayer from '@/components/AudioPlayer/index.vue'; @@ -330,7 +286,6 @@ export default { studyId: "", tags: [], numberToLetter: numberToLetter, - // resOwnerListMap: resOwnerIndexName, fileBaseUrl: this.$Constants.fileBaseUrl, blobUrl:'',//播放的文件地址,新添加,采用blob方式 getType: getType, @@ -406,16 +361,13 @@ export default { this.showQrimage(); this.$watermark.set(this.userInfo.name+this.userInfo.loginName); this.loadResOwners(); - let $this = this; //页面只支取一次,所以先直接写在这里面 apiCoursePortal.detail(id).then(rs => { if (rs.status == 200) { this.courseInfo = rs.result.course; - // this.courseInfo.score = this.toScore(rs.result.course.score); if(rs.result.course.tags != '') this.tags = rs.result.course.tags.split(","); this.teachers = rs.result.teachers; - if(rs.result.teachers && rs.result.teachers.length > 0){ let userIds=[]; let ctoUsers=[]; @@ -448,7 +400,6 @@ export default { } //对url进行加密处理 $this.createPlayUrl(con.contentRefId,this.curriculumData.url); - } else if (con.contentType == 40) { //需要读取pdf的路径 apiCourseFile.detail($this.coursewareInfo.content.contentRefId).then(cfrs=>{ @@ -461,12 +412,10 @@ export default { $this.coursewareInfo.content.content=cfrs.result.filePath; $this.curCFile=2; } - }else{ $this.$message.error('加载pdf课件文件失败'); } }); - //let url = this.fileBaseUrl + r.content; }else if(con.contentType ==52){ if(con.content.startsWith('\{')){ this.conLink=JSON.parse(con.content); @@ -507,9 +456,7 @@ export default { let nowDate=new Date(); let ctime=parseInt(nowDate.getTime()/1000); let beforeUrl=parseInt(nowDate.getTime()/1000)+'/'+fid; - //console.log(beforeUrl,'beforeUrl'); let urlSign=encodeURIComponent(encrypt(beforeUrl)); - //console.log(urlSign,'urlSign'); cookies.set('PLAYSIGN_TIME', ctime);//写客户端的cookie保存 //以下判断是为了区分本地环境和服务器环境 if(process.env.NODE_ENV == 'development'){ @@ -524,7 +471,6 @@ export default { // this.qrcode = this.webBaseUrl+'/mobile/pages/resource/microDetail?id='+this.courseInfo.id; urlPre='https://u.boe.com/m?returnUrl=https://u.boe.com/mobile/pages/login/loading?returnUrl='; this.qrcode =urlPre+ '/pages/resource/microDetail?id='+this.courseInfo.id; - //console.log(this.qrcode,'qrcode'); this.$nextTick(() => { this.crateQrcode(); }); @@ -633,11 +579,9 @@ export default { this.playerBoxShow = false; //console.log("开始播放"); this.isAppendTime=false; - //视频类的内容,开始播放时才会记录完成情况 //2022-05-24修改,判断播放的 let $this=this; - //console.log(this.curriculumData,'this.curriculumData'); //完成类型 completeSetup 0表默认,打开后5秒算学完,1表按进度,2表按时间 //完成值(非默认情况下起作用) setupTage if(!$this.coursewareInfo.finish){ @@ -676,7 +620,6 @@ export default { if(!completeSecond){ completeSecond=5;//如果没有就采用默认的时间了 } - if(completeType>0 && !this.coursewareInfo.finish){ //因为1按进度,2按时长都是计算时间,所以这里直接大于0处理 if(completeType==1){ let finishPercent=this.curriculumData.setupTage; @@ -690,7 +633,6 @@ export default { this.finishStudyItem(); } } - } //以下是每10秒记录一次学习时长 let saveTime=Math.floor(intTime%10); @@ -711,14 +653,12 @@ export default { }, audioPlaying(item,currentTime){ let intTime=parseInt(currentTime);//秒 - //console.log("当前播放时间="+item+',currentTime='+intTime); //判断是否完成 let completeType=this.curriculumData.completeSetup; let completeSecond=this.curriculumData.second; if(!completeSecond){ completeSecond=5;//如果没有就采用默认的时间了 } - if(completeType>0 && !this.coursewareInfo.finish){ //因为1按进度,2按时长都是计算时间,所以这里直接大于0处理 if(completeType==1){ let finishPercent=this.curriculumData.setupTage; @@ -770,7 +710,6 @@ export default { }, audioEnd(){ // this.playerBoxShow = true; - //console.log("播放结束"); if(!this.coursewareInfo.finish){ this.finishStudyItem(); } @@ -882,7 +821,6 @@ export default { //首先从本地读取 let duration=studyUtil.getStudyDuration(); - //追加学习时间 let $this = this; if(this.appendStartTime == null) { @@ -893,14 +831,10 @@ export default { } return; } - //当前进行的时间 let now = new Date(); let m = now.getTime() - this.appendStartTime.getTime(); //相差的毫秒数 let sen = parseInt(m / 1000); //计算秒数 - - //console.log(duration,'duration') - //console.log(sen,'sen') duration=duration+sen; if(flag){ //这个时候才进行存储 ,否则只能是存储在本地 @@ -943,14 +877,12 @@ export default { if(res.result.signup) { //this.bootTabActive = 'commnets';//系统自动报名,这里不进行切换了 this.studyId = res.result.studyId; //设置学习id - //需要判断此内容是否已学习完成,如果已学习完成,不需要再请不说了 res.result.contents.forEach(con => { if (con.contentId == $this.coursewareInfo.content.id) { $this.coursewareInfo.studyItemId=con.id; $this.coursewareInfo.status=con.status; $this.coursewareInfo.progress=con.progress; - if(con.contentType==10 || con.contentType==20){ if(con.progress==100 || con.status==9){ $this.coursewareInfo.finish = true; @@ -960,7 +892,6 @@ export default { }else{ $this.coursewareInfo.finish = true; //课件已学习 } - if(con.lastStudyTime){ //如果上次课件已经播放完成,此处应该是$this.coursewareInfo.content.duration //也就是从头开开始 @@ -1028,7 +959,6 @@ export default { if (rs.status == 200 && rs.result) { this.scoreInfo.has = true; } - //console.log(rs.result,'rs.result'); }); //} apiPraises.has(1, this.courseInfo.id).then(rs => { @@ -1183,12 +1113,8 @@ export default { background: none; border: none; } - - .player-box{ position: absolute; - // top: 62px; - // left: 184px; width: 300px; left: 50%; top: 50%; @@ -1210,24 +1136,10 @@ export default { } } ::v-deep .el-tabs__nav-wrap::after { - // content: ""; - // position: absolute; - // left: 0; - // bottom: 0; - // width: 100%; - // height: 2px; background-color: #fff; - // z-index: 1; } ::v-deep .el-tabs__nav-wrap::after { - // content: ""; - // position: absolute; - // left: 0; - // bottom: 0; - // width: 100%; - // height: 2px; background-color: #fff; - // z-index: 1; } .qrcode{ display: inline-block; @@ -1240,16 +1152,7 @@ export default { } } .ref-score{ - // background: #e4e4e4; - // width: 64px; - // height: 32px; - // border-radius: 17px; - // line-height: 32px; - // // opacity: 0.24; - // color: #000; - // font-size: 14px; - // border: none; - // text-align: center; + } .portal-content ::v-deep .el-rate__icon{ font-size: 24px !important; @@ -1392,13 +1295,6 @@ export default { transform: rotate(180deg); } } - // margin-bottom: 50px; - // line-height: 20px; - // .el-link{ - // font-size: 30px; - // color: #70a5f4; - // margin: 0 30px; - // } } } } @@ -1416,9 +1312,7 @@ export default { color: #FFB30F ; font-family: "Arial"; margin-left: 23px; - // font-weight: 600; } - // margin-bottom: 19px; .score-no{ color: #FFB30F; padding: 5px 0; From 3caf41231d0a49f0e0e9eb7b4bbf0e248d937072 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 16 Jun 2022 14:54:20 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index cc968786..11ab6cad 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -117,7 +117,7 @@ 最热 - 最新 + 最新 From 91d774aa32bb2aa09d6e466e71c0960a710a553e Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 16 Jun 2022 14:56:06 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 11ab6cad..7295b45a 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -6,7 +6,7 @@
-->
-
+
-
+
-
{{ orgDomainTranslate(item.orgDomain) }}
-
{{ orgDomainTranslate(item.orgDomainParent) }}
-
{{ majorTypeTranslate(item.majorType) }}
+
{{ orgDomainTranslate(item.orgDomain) }}
+
{{ orgDomainTranslate(item.orgDomainParent) }}
+
{{ majorTypeTranslate(item.majorType) }}
{{ item.keyword1 }}
{{ item.keyword2 }}
{{ item.keyword3 }}
@@ -147,7 +147,7 @@ {{index+1}} - + {{ item.sysCreateUname }} @@ -296,8 +296,8 @@ export default { orderField: "comments", // breCommend:null, keyWord: "", - majorType: "", //专业分类 - orgDomain: "", // 组织领域 + majorType:'', //专业分类 + orgDomain: '', // 组织领域 orderAsc: false }, keyWord: "", @@ -604,10 +604,10 @@ export default { for (let i in this.queryCondition) { if (tag.type === i) { if (i == "majorType") { - this.queryCondition.majorType = null; + this.queryCondition.majorType = 0; } if (i == "orgDomain") { - this.queryCondition.orgDomain = null; + this.queryCondition.orgDomain = 0; } if (i == "keyWord") { this.queryCondition.keyWord = ""; @@ -670,7 +670,6 @@ export default { border-radius: 0px; } .case-titdiv { - line-height: 30px; display: flex; .case-tittext { @@ -699,15 +698,14 @@ export default { .keyword-text { div { + padding:1px 7px; margin-top: 5px; float: left; - height: 19px; - line-height: 19px; - font-size: 12px; - color: #9c9c9c; - border: 1px solid #c2c3c8; - padding: 0px 5px; - border-radius: 2px; + // line-height: 22px; + font-size: 14px; + color: #2974D6; + border: 1px solid #2974D6; + border-radius: 10px; margin-right: 8px; } } @@ -900,7 +898,7 @@ export default { } } .case-info-summary { - margin-top:3px; + margin-top:8px; cursor: pointer; margin-bottom: 5px; word-break: break-all; diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index 1c5ac985..aa2bc658 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -130,14 +130,14 @@
- + {{courseInfo.praises}}
- + diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue index 61913898..7d130e76 100644 --- a/src/views/study/PortalIndex.vue +++ b/src/views/study/PortalIndex.vue @@ -132,14 +132,14 @@
- + {{ courseInfo.praises }}
- + From 6ce70d06c91a095b318793847c6bfc911e4caf91 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Mon, 20 Jun 2022 14:24:58 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/case/Index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index 251a7efa..f76e8cae 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -529,6 +529,14 @@ export default { if (this.keyWord != this.queryCondition.keyWord) { this.queryCondition.keyWord = this.keyWord; } + if(this.queryCondition.orgDomain == 0){ + this.queryCondition.orgDomain = null + } + if(this.queryCondition.majorType == 0){ + this.queryCondition.majorType = null + } + + this.getCaseData(); }, async getCaseData() { From 689cbccfabd7a75b5141714abbecf7af99174918 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Mon, 20 Jun 2022 14:29:13 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 858a2455..b0102f65 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -573,9 +573,9 @@ export default { if(this.totalPages<3){ this.noDataList = false; } - // if(this.totalPages == 1 && this.course.pageIndex ==1){ - // this.noDataList = true; - // } + if(this.totalPages == 1 && this.course.pageIndex ==1){ + this.noDataList = true; + } } if(this.course.type == 30 || this.course.type == 40) { this.noPageList = false; From 2ac1b7168e0799153fc05ba34de3ee9d954032aa Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Mon, 20 Jun 2022 15:33:33 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/case/Detail.vue | 12 ++++++------ src/views/portal/case/Index.vue | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 0befcd82..89c42516 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -25,9 +25,9 @@
-->
-
{{ orgDomainTranslate(caseDetail.orgDomain) }}
-
{{ orgDomainTranslate(caseDetail.orgDomainParent) }}
-
{{ majorTypeTranslate(caseDetail.majorType) }}
+
{{ orgDomainTranslate(caseDetail.orgDomain) }}
+
{{ orgDomainTranslate(caseDetail.orgDomainParent) }}
+
{{ majorTypeTranslate(caseDetail.majorType) }}
{{ caseDetail.keyword1 }}
{{ caseDetail.keyword2 }}
{{ caseDetail.keyword3 }}
@@ -523,15 +523,15 @@ export default { .item { float: left; margin: 7px 10px 0px 0px; - border: 1px solid #c2c3c8; + border: 1px solid #2974D6; padding: 0px 10px; line-height: 24px; text-align: center; height: 24px; box-sizing: border-box; - border-radius: 2px; + border-radius: 10px; font-size: 14px; - color: #9c9c9c; + color: #2974D6; } .item-right { float: right; diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index f76e8cae..0686a6e1 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -706,10 +706,10 @@ export default { .keyword-text { div { - padding:1px 7px; + padding:0px 7px; margin-top: 5px; float: left; - // line-height: 22px; + line-height: 22px; font-size: 14px; color: #2974D6; border: 1px solid #2974D6; From c181c130480aa28ef7893dd75572a237ac7ee48e Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 20 Jun 2022 17:49:44 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/coursePortal.js | 2 +- src/layout/components/TopNav/Index.vue | 102 ++++++++++--------------- src/utils/constants.js | 3 +- src/views/Loading.vue | 1 + src/views/Login.vue | 1 + 5 files changed, 44 insertions(+), 65 deletions(-) diff --git a/src/api/modules/coursePortal.js b/src/api/modules/coursePortal.js index bc94d3ba..8e514d9b 100644 --- a/src/api/modules/coursePortal.js +++ b/src/api/modules/coursePortal.js @@ -5,7 +5,7 @@ import ajax from '@/utils/xajax.js' /** - * 查询指定条数的课程,用于首页提取 + * post 请求 查询指定条数的课程,用于首页提取 * @param {Object} query * num:多少条记录 * orderType:排序方式,1表最新,3表最热 diff --git a/src/layout/components/TopNav/Index.vue b/src/layout/components/TopNav/Index.vue index 5101f2eb..855b9528 100644 --- a/src/layout/components/TopNav/Index.vue +++ b/src/layout/components/TopNav/Index.vue @@ -79,32 +79,15 @@ 提交修改 -