合并分支

This commit is contained in:
nisen
2023-08-01 17:37:08 +08:00
parent adc5ed7afb
commit cf5a7ee4f8
22 changed files with 3525 additions and 2139 deletions

View File

@@ -50,7 +50,7 @@
</div>
<div v-else class="score-no">未评分</div>
</div>
<div class="btn-div" style="height:30px;margin-top: 15px;">
<div class="btn-div" v-if="isCrowd" style="height:30px;margin-top: 15px;">
<el-button v-if="stuStusts == 0" type="primary" @click="startSigningUp()" >开始学习</el-button>
<el-button v-if="stuStusts == 1" type="primary" @click="jumpJearning">{{btnName}}</el-button>
</div>
@@ -69,14 +69,14 @@
<el-col :span="18">
<el-card :body-style="{ padding: '0px' }" class="info" style="margin-top: 10px;">
<el-tabs v-model="activeName">
<el-tab-pane label="课程简介" name="first">
<el-tab-pane label="内容简介" name="first">
<div>
<div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset="">目标人群<div class="content-text">{{courseInfo.forUsers}}</div></div>
<div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset="">课程价值<div class="content-text">{{courseInfo.value}}</div></div>
<div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset="">详细介绍<div class="content-text" v-html="courseInfo.summary"></div></div>
</div>
</el-tab-pane>
<el-tab-pane label="大纲" name="second" v-if="courseInfo.type==20">
<el-tab-pane label="课程速览" name="second" v-if="courseInfo.type==20">
<div class="category" v-for="(item) in catalogTree" :key="item.id">
<div class="node">
<div class="title">{{item.section.name}}</div>
@@ -92,7 +92,7 @@
</div>
<div style="height: 30px;"></div>
</el-tab-pane>
<el-tab-pane label="大纲" name="second" v-if="courseInfo.type==10">
<el-tab-pane label="课程速览" name="second" v-if="courseInfo.type==10">
<div class="category" v-for="(item) in contentList" :key="item.id">
<div class="node">
<div class="title">{{item.contentName}}</div>
@@ -120,7 +120,8 @@
</div>
<div class="teacher-info">
<div class="teacher-name">{{ item.teacherName }}</div>
<div class="teacher-remark" v-html="item.remark"></div>
<!-- <div class="teacher-remark" v-html="item.remark"></div> -->
<div class="teacher-remark">{{ cutOrgNamePath(item.orgInfo,0) }} </div>
</div>
</div>
</div>
@@ -144,7 +145,7 @@ import apiCourse from '@/api/modules/course.js';
import apiUser from '@/api/system/user.js';
import courseStudy from '@/api/modules/courseStudy.js';
import apiCoursePortal from '@/api/modules/coursePortal.js';
import { courseType,getType,toScore,userAvatarText} from '@/utils/tools.js';
import { courseType,getType,toScore,userAvatarText,cutOrgNamePath } from '@/utils/tools.js';
import courseImage from "@/components/Course/courseImage.vue"
export default {
name: "atticle",
@@ -154,6 +155,7 @@ export default {
},
data() {
return {
cutOrgNamePath,
userAvatarText,
getType,
showQrcode: false,
@@ -174,6 +176,7 @@ export default {
commentsTtoal:0,
toUsers:[],//可以@的用户列表
btnName:'开始学习',
isCrowd:false, //根据受众展示不展示
};
},
mounted() {
@@ -185,13 +188,17 @@ export default {
let $this=this;
//页面只支取一次,所以先直接写在这里面
apiCoursePortal.detail(id,false).then(rs=>{
apiCoursePortal.detail(id,false,true).then(rs=>{
if(rs.status==200){
if(!rs.result.course.enabled || rs.result.course.deleted){
$this.$message.error('十分抱歉,此课程已停用,如需使用,请联系管理员。');
return;
}
if(!rs.result.isCrowd){
$this.$message.error('您没有查看该课程的权限');
}
this.isCrowd = rs.result.isCrowd
if(rs.result.teachers && rs.result.teachers.length > 0){
let userIds=[];
@@ -347,6 +354,7 @@ export default {
item.avatar=this.fileBaseUrl + author.avatar;
}
item.sex = author.sex;
item.orgInfo = author.orgInfo
return true;
}else{
return false;
@@ -363,7 +371,7 @@ export default {
};
</script>
<style scoped lang="scss" scoped>
<style scoped lang="scss">
::v-deep .teacher .teacher-avator .teacher-text {
background: none;
border: none;
@@ -400,6 +408,7 @@ export default {
}
.course-title{
position: relative;
height: 90px;
display: flex;
justify-content: space-between;
@@ -411,7 +420,6 @@ export default {
margin-bottom: 10px;
word-break:break-all;
}
position: relative;
// .course-title-right{
// position: absolute;
// right: 0;