This commit is contained in:
daihh
2022-11-01 21:09:24 +08:00
7 changed files with 110 additions and 52 deletions

BIN
public/images/Recent.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 976 B

View File

@@ -11,30 +11,33 @@
</div>
<div class="user-content">
<div style="display: flex;justify-content: start;">
<div style="min-width: 260px;">
<div style="display: flex;justify-content: start;margin-left:25px">
<div style="min-width: 240px;">
<div class="content-top">
<h6 content-bottom> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{orgInfo}}</span> </h6>
<h6> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{orgInfo}}</span> </h6>
</div>
<div class="content-bottom">
<div class="grade" style="margin-top:5px">
<div class="level">{{statData.level}}</div>
<span style="color: #A3680A;margin-left:5px;line-height: 24px;margin-right: 10px;">经验值{{statData.evalue}}</span>
<div style="float:right">
<el-button type="text" round class="btn-user" v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</el-button>
<el-button type="text" round class="btn-user" @click="cancelFollow()" v-if="isFollowHas">已关注</el-button>
<el-button type="text" round class="btn-user" > <router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}<i class="el-icon-arrow-right"></i> </router-link> </el-button>
</div>
</div>
<div class="content-bottom" style="margin-top:20px">
<p v-if="userData.sign" class="portal-summary-text">{{userData.sign}} </p>
<p v-else class="portal-summary-text">暂无签名</p>
</div>
<div class="grade">
<div>{{statData.level}}</div>
<span style="color: #A3680A;margin-left:5px;line-height: 24px;margin-right: 10px;">经验值{{statData.evalue}}</span>
</div>
</div>
<div style="text-align: center;">
<div style="height: 30px;margin-top: 10px;">
<router-link v-if="pageId == userInfo.aid" to="/user/Setting"><span class="content-one-info pointer">个人设置</span></router-link>
<span style="margin-left:10px" class="content-one-info" ><router-link v-if="pageId == userInfo.aid" to="/uc/study/courses" class="pointer" style="color:#0060FF;">个人中心</router-link></span>
</div>
<div style="height: 30px;margin-top: 16px;font-size: 14px;"><router-link v-if="pageId == userInfo.aid" to="/uc/study/courses" class="pointer" style="color:#0060FF;">个人中心>></router-link></div>
<div style="height: 30px;margin-top: 8px;">
<el-button round plain class="btn-user" size="small" v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</el-button>
<el-button round plain class="btn-user" size="small" @click="cancelFollow()" v-if="isFollowHas">已关注</el-button>
<el-button round plain class="btn-user" size="small"><router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}</router-link></el-button></div>
</div>
</div>
</div>
@@ -190,6 +193,16 @@
</script>
<style lang="scss" scoped>
.level{
float: left;
width: 57px;
height: 24px;
text-align: center;
line-height: 28px;
background-image: url(../../../public/images/lvbg.png);
background-repeat: no-repeat;
background-size:100%;
}
.ranking-link{
font-size: 16px;
font-weight: 600;
@@ -270,16 +283,13 @@
margin-top: 10px;
}
.btn-user{
margin-top: -6px;
// margin-left: 68px;
height: 30px;
border-radius: 20px;
border: 1px solid #0060FF;
color: #0060FF;
color: #387DF7;
margin: 0;
font-size: 16px;
padding: 0;
}
.grade{
float: left;
margin-top: 20px;
// margin-top: 20px;
div{
// margin-left: 22px;
@@ -314,7 +324,8 @@
flex: 1;
.content-top{
// margin-top: 15px;
height: 56px;
height: 46px;
line-height: 46px;
h6{
color: #333333;
@@ -335,14 +346,16 @@
}
.content-one-info{
display: inline-block;
width: 97px;
height: 30px;
line-height: 30px;
text-align: center;
border-radius: 4px;
color: #588afc;
font-weight: normal;
border: 1px solid #387DF7;
width: 80px;
height: 30px;
text-align: center;
border-radius: 20px;
padding: 0;
border: 1px solid #619DFF;
font-size: 14px;
color: #387DF7;
}
.editbutt{
font-size: 14px;
@@ -437,6 +450,7 @@
}
}
.content-bottom{
.medalbutt{
margin-right: 20px;
}

View File

@@ -52,8 +52,11 @@
</div>
</a>
<div class="last-study-info">
<div class="one-line-ellipsis" style="color: #000000;">
<router-link :to="'/course/studyindex?id='+lastStudy.courseId" >最近学习 {{lastStudy.courseName}} </router-link>
<div class="one-line-ellipsis" style="color: #387DF7;font-size: 16px;">
<router-link :to="'/course/studyindex?id='+lastStudy.courseId" >
<img class="Recent" :src="`${webBaseUrl}/images/Recent.png`" alt="">
最近学习 {{lastStudy.courseName}}
</router-link>
</div>
<!-- <div class="tobe-icon">
<img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt="">
@@ -1091,6 +1094,11 @@
</script>
<style scoped lang="scss">
.Recent{
vertical-align: top;
width: 22px;
height: 22px;
}
.jinian-medal-img{
text-align: center;
padding-top: 10px;
@@ -1224,7 +1232,7 @@
right: 8%;
top: 105px;
// background: url('/images/homeWu/personal-bgimg.png');
background: rgba($color: #fff, $alpha: 0.2);
background: rgba($color: #fff, $alpha: 0.85);
border-radius: 8px;
z-index: 999;
backdrop-filter: blur(10px);
@@ -1292,7 +1300,7 @@
text-align: center;
}
.label {
color: #333;
color: #999999;
font-size: 12px;
text-align: center;
}
@@ -1305,6 +1313,7 @@
font-size: 22px;
text-align: center;
color: #333;
font-weight: 500;
}
}
}

View File

@@ -16,7 +16,7 @@
<div class="cont-left">{{item.study}}</div>
<div class="cont-right">{{item.day}}</div>
<div class="cont-right">{{item.steadily}}</div>
<div class="cont-left">{{item.popularity}}</div>
<div class="cont-left" style="margin-left:6%;margin-right:20px">{{item.popularity}}</div>
</div>
</div>
</div>
@@ -88,8 +88,8 @@ export default {
height: 58px;
.cont-left{
flex: 1;
margin-left: 8%;
text-align: center;
margin-left: 10%;
// text-align: center;
font-size: 14px;
color: #666666;
font-weight: 400;
@@ -103,8 +103,8 @@ export default {
}
.cont-right{
flex: 2;
margin-left: 8%;
text-align: center;
margin-left: 4%;
// text-align: center;
font-size: 14px;
color: #666666;
font-weight: 400;

View File

@@ -114,11 +114,14 @@
</div>
</div>
<div v-if="currentUserRankingData.rankingNo>4" class="omit">
<div>.</div>
<div>.</div>
<div>.</div>
<div v-if="currentUserRankingData.rankingNo>5" style="margin-top:20px;border-bottom: 1px solid #ddd;padding-bottom:40px">
<div v-if="currentUserRankingData.rankingNo>5" class="omit">
<div>.</div> <div>.</div> <div>.</div>
</div>
</div>
<div v-if="currentUserRankingData.rankingNo>4" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
<div style="color: #0059FF;line-height: 40px;padding-left:15px;font-size: 16px;" class="tab-rank">
{{currentUserRankingData.rankingNo}}</div>

View File

@@ -6,13 +6,13 @@
<span>{{isShowTip}}</span>
<span class="his-info pointer" @click="isShowList = true">历史记录</span>
</div>
<div class="edit-content">
<div :class="editContent">
<div class="note-tit">
<div @click="toCoursePage()" v-if="editdata.playTime != ''" :style="{cursor:editdata.type==1? 'pointer':''}"><img :src="`${webBaseUrl}/images/coteplay.png`" alt="">{{getHMS(editdata.playTime)}}</div>
</div>
<div class="note-text" v-if="editdata.contentType != 3">
<!-- <input style="vertical-align:top;outline:none;" type="textarea" :rows="4" v-model="editdata.content"> -->
<textarea v-model="editdata.content" name="" id="" cols="" rows="16" style="vertical-align:top;outline:none;width:100%;border:none; font-size: 14px;font-weight: 400;color: #333333;" maxlength="200"
<textarea v-model="editdata.content" name="" id="" cols="" :rows="rowNum" style="vertical-align:top;outline:none;width:100%;border:none;padding-left:20px; background-color: #F5F5F5;font-size: 14px;font-weight: 400;color: #333333;" maxlength="200"
show-word-limit></textarea>
</div>
<div class="note-text" v-else>
@@ -64,6 +64,7 @@ export default {
data () {
return {
getHMS,
editContent: 'edit-content',
imgContent:[],
fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
isShowList:false,
@@ -79,6 +80,7 @@ export default {
histdata:[],
id:'',
timer:null,
rowNum:16
};
},
mounted(){
@@ -87,6 +89,13 @@ export default {
this.timer = setInterval(()=>{
this.savedata(1);
},30000);
let screenWidth = window.screen.availWidth;
if (screenWidth <= 1440) {
this.editContent = 'edit-content-low';
this.rowNum = 11;
}
},
methods:{
toCoursePage(){
@@ -292,6 +301,7 @@ export default {
}
}
.edit-footer{
margin-top:10px;
button{
float: right;
margin-left: 25px;
@@ -302,11 +312,19 @@ export default {
}
.edit-content{
min-height: 380px;
background-color: #F5F5F5;
}
.edit-content-low{
min-height: 200px;
background-color: #F5F5F5;
}
.note-text{
font-size: 14px;
font-weight: 400;
color: #333333;
background-color: #F5F5F5;
display: flex;
flex-wrap: wrap;
.img-box{

View File

@@ -81,9 +81,14 @@
</div>
</div>
</div>
<div v-if="experience.data.rankingNo>5" class="omit">
<div>.</div> <div>.</div> <div>.</div>
<div v-if="experience.data.rankingNo>5" style="margin-top:20px;border-bottom: 1px solid #ddd;padding-bottom:40px">
<div v-if="experience.data.rankingNo>5" class="omit">
<div>.</div> <div>.</div> <div>.</div>
</div>
</div>
<div v-if="experience.data.rankingNo>5" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
<div style="color: #0059FF;line-height: 40px;padding-left:15px;font-size: 16px;" class="tab-rank" >{{experience.data.rankingNo}}</div>
<div class="tab-name" v-if="userInfo.aid">
@@ -141,7 +146,7 @@
<div class="table-hear">
<div style="margin-left:5px">排名</div>
<div style="margin-left:5px">姓名</div>
<div style="margin-left:37%;">学习时长:小时</div>
<div style="margin-left:34%;">学习时长:小时</div>
</div>
<div>
<div class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px" v-for="(lan,idx) in learningDuration.list" :key="lan.id">
@@ -166,9 +171,13 @@
</div>
</div>
</div>
<div v-if="learningDuration.data.rankingNo>5" class="omit">
<div>.</div> <div>.</div> <div>.</div>
<div v-if="learningDuration.data.rankingNo>5" style="margin-top:20px;border-bottom: 1px solid #ddd;padding-bottom:40px">
<div v-if="learningDuration.data.rankingNo>5" class="omit">
<div>.</div> <div>.</div> <div>.</div>
</div>
</div>
<div v-if="learningDuration.data.rankingNo>5" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
<div style="color: #0059FF;line-height: 40px;padding-left:15px;font-size: 16px;" class="tab-rank" >{{learningDuration.data.rankingNo}}</div>
<div class="tab-name" v-if="userInfo.aid">
@@ -250,9 +259,14 @@
</div>
</div>
</div>
<div v-if="learningDays.data.rankingNo>5" class="omit">
<div>.</div> <div>.</div> <div>.</div>
<div v-if="learningDays.data.rankingNo>5" style="margin-top:20px;border-bottom: 1px solid #ddd;padding-bottom:40px">
<div v-if="learningDays.data.rankingNo>5" class="omit">
<div>.</div> <div>.</div> <div>.</div>
</div>
</div>
<div v-if="learningDays.data.rankingNo>5" class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px">
<div style="color: #0059FF;line-height: 40px;padding-left:15px;font-size: 16px;" class="tab-rank" >{{learningDays.data.rankingNo}}</div>
<div class="tab-name" v-if="userInfo.aid">