hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-12 12:26:44 +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

9
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;