hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-12 04:16:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master-0623-lyc' into test20250220

Browse Source 
# Conflicts:
#	src/views/study/coursenew.vue
This commit is contained in:
670788339
2025-06-23 11:11:10 +08:00
parent 0662d2bc5f 231e9ed09b
commit ff62a0ce49
2 changed files with 328 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/images/grateful/gratefulFooter20250612.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 657 KiB

39
src/views/study/coursenew.vue
View File

@@ -277,11 +277,14 @@
<div class="teacher" v-for="(item, idx) in teachers" :key="idx"> <div class="teacher" v-for="(item, idx) in teachers" :key="idx">
<div class="teacher-avator" @click="toUserHome(item)" title="点击进入他的主页"> <div class="teacher-avator" @click="toUserHome(item)" title="点击进入他的主页">
<!-- <div class="teacher-text" v-if="item.authorInfo.avatar == ''">{{userAvatarText(item.teacherName)}}</div> --> <!-- <div class="teacher-text" v-if="item.authorInfo.avatar == ''">{{userAvatarText(item.teacherName)}}</div> -->
<div v-if="item.authorInfo.avatar !== ''"> <div v-if="item.authorInfo && item.authorInfo.avatar">
<el-avatar :src="fileBaseUrl + item.authorInfo.avatar" shape="circle" :size="50"></el-avatar> <el-avatar :src="fileBaseUrl + item.authorInfo.avatar" shape="circle" :size="50"></el-avatar>
</div> </div>
<div v-else-if="item.photo">
<el-avatar :src="fileBaseUrl + item.photo" shape="circle" :size="50"></el-avatar>
</div>
<div v-else class="teacher-text"> <div v-else class="teacher-text">
<div v-if="item.authorInfo.sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div> <div v-if="item.authorInfo && item.authorInfo.sex === 1"><img src="../../../public/images/Avatarman.png" alt=""></div>
<div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div> <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
</div> </div>
</div> </div>
@@ -1412,9 +1415,7 @@
} }
} }
con.lastStudyTime = scon.lastStudyTime; con.lastStudyTime = scon.lastStudyTime;
console.log('====视频处理progressVideo1',scon.progressVideo);
con.progressVideo = scon.progressVideo || 0; con.progressVideo = scon.progressVideo || 0;
console.log('====视频处理progressVideo2',con.progressVideoo);
//以下判断是为了兼容之前的问题，学习状态 //以下判断是为了兼容之前的问题，学习状态
if (scon.status) { if (scon.status) {
con.status = scon.status; con.status = scon.status;
@@ -1690,31 +1691,31 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-icon-arrow-down{ ::v-deep .el-icon-arrow-down{
color: #000; color: #000;
font-weight: 900; font-weight: 900;
font-size: 16px; font-size: 16px;
} }
.el-menu, .el-menu,
.el-menu-item, .el-menu-item,
.el-submenu__title { .el-submenu__title {
background-color: transparent !important; /* 设置背景色为透明，以移除默认的背景颜色变化 */ background-color: transparent !important; /* 设置背景色为透明，以移除默认的背景颜色变化 */
color: inherit !important; /* 确保文字颜色不变，如果需要的话 */ color: inherit !important; /* 确保文字颜色不变，如果需要的话 */
} }
/* 取消选中效果 */ /* 取消选中效果 */
.el-menu-item.is-active, .el-menu-item.is-active,
.el-submenu__title.is-active { .el-submenu__title.is-active {
background-color: transparent !important; /* 移除选中时的背景色 */ background-color: transparent !important; /* 移除选中时的背景色 */
color: inherit !important; /* 保持文字颜色与未选中时一致，如果需要的话 */ color: inherit !important; /* 保持文字颜色与未选中时一致，如果需要的话 */
} }
/* 如果有特定的 hover 样式，也可以取消 */ /* 如果有特定的 hover 样式，也可以取消 */
.el-menu-item:hover, .el-menu-item:hover,
.el-submenu__title:hover { .el-submenu__title:hover {
background-color: transparent !important; /* 移除鼠标悬停时的背景色变化 */ background-color: transparent !important; /* 移除鼠标悬停时的背景色变化 */
color: inherit !important; /* 保持文字颜色不变 */ color: inherit !important; /* 保持文字颜色不变 */
} }
//内容块样式定义 //内容块样式定义
.course-content { .course-content {
min-height: 745px; min-height: 745px;
@@ -1842,7 +1843,7 @@
padding: 10px 30px 30px 30px; padding: 10px 30px 30px 30px;
} }
//以下是未整理的样式，上面的整理之后的样式 //以下是未整理的样式，上面的整理之后的样式
.coures-note { .coures-note {
min-height: 500px; min-height: 500px;
padding-left: 17px; padding-left: 17px;