mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-10 03:16:42 +08:00
Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat
This commit is contained in:
daihh
@@ -12,20 +12,21 @@
|
||||
|
||||
<div class="user-content">
|
||||
<div class="content-top">
|
||||
<h6 content-bottom><router-link to="/home/index"> {{userData.name}}</router-link>
|
||||
<h6 content-bottom> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{userData.orgInfo}}</span>
|
||||
<router-link v-if="pageId == userInfo.aid" to="/user/Setting"><span class="content-one-info pointer">个人设置</span></router-link>
|
||||
</h6>
|
||||
<div class="grade">
|
||||
<div>{{statData.level}}</div>
|
||||
<span style="color: #A3680A;margin-left:12px;line-height: 24px;">经验值：{{statData.evalue}}</span>
|
||||
</div>
|
||||
<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 class="content-bottom">
|
||||
<p class="portal-summary-text">{{userData.sign}}</p>
|
||||
<p class="portal-summary-text">{{userData.sign}} <router-link v-if="pageId == userInfo.aid" to="/uc/study/courses" class="pointer" style="margin-left:50px;color:#0060FF;">个人中心>></router-link></p>
|
||||
</div>
|
||||
<div class="grade">
|
||||
<div>{{statData.level}}</div>
|
||||
<span style="color: #A3680A;margin-left:12px;line-height: 24px;">经验值：{{statData.evalue}}</span>
|
||||
<el-button round plain class="btn-user" style="margin-left:168px" size="small"><router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}</router-link></el-button>
|
||||
<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>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="learningData">
|
||||
@@ -260,9 +261,17 @@
|
||||
}
|
||||
.grade{
|
||||
float: left;
|
||||
margin-top: 10px;
|
||||
margin-top: 20px;
|
||||
.btn-user{
|
||||
margin-top: -6px;
|
||||
// margin-left: 68px;
|
||||
height: 30px;
|
||||
border-radius: 20px;
|
||||
border: 1px solid #0060FF;
|
||||
color: #0060FF;
|
||||
}
|
||||
div{
|
||||
margin-left: 22px;
|
||||
// margin-left: 22px;
|
||||
font-weight: 600;
|
||||
float: left;
|
||||
width: 57px;
|
||||
@@ -293,20 +302,26 @@
|
||||
.user-content{
|
||||
flex: 1;
|
||||
.content-top{
|
||||
margin-top: 15px;
|
||||
// margin-top: 15px;
|
||||
height: 56px;
|
||||
.btn-user{
|
||||
margin-top: 6px;
|
||||
height: 30px;
|
||||
border-radius: 20px;
|
||||
border: 1px solid #0060FF;
|
||||
color: #0060FF;
|
||||
}
|
||||
|
||||
h6{
|
||||
color: #333333;
|
||||
font-size: 26px;
|
||||
margin:0;
|
||||
float: left;
|
||||
.content-one-info{
|
||||
display: inline-block;
|
||||
width: 97px;
|
||||
height: 30px;
|
||||
margin-left: 130px;
|
||||
line-height: 30px;
|
||||
text-align: center;
|
||||
border-radius: 4px;
|
||||
color: #588afc;
|
||||
font-weight: normal;
|
||||
border: 1px solid #387DF7;
|
||||
}
|
||||
}
|
||||
span{
|
||||
color: #999999;
|
||||
|
||||
@@ -19,12 +19,14 @@
|
||||
<div class="content-top">
|
||||
<h6>{{userInfo.name}}</h6>
|
||||
<span>{{orgInfo}}</span>
|
||||
<div class="grade">
|
||||
<div>{{statData.level}}</div>
|
||||
<span>经验值：{{statData.evalue}}</span>
|
||||
</div>
|
||||
|
||||
<el-link @click="toPage('/user/Setting')" type="info" :underline="false"> <el-button class="editbutt">编辑资料</el-button></el-link>
|
||||
</div>
|
||||
<div class="grade">
|
||||
<div>{{statData.level}}</div>
|
||||
<span>经验值：{{statData.evalue}}</span>
|
||||
<span style="margin-left:60px;color:#0060FF;"><router-link :to="'/home/'+userInfo.aid">个人主页>></router-link></span>
|
||||
</div>
|
||||
<div class="content-bottom">
|
||||
<div class="medal-list">
|
||||
<div class="medal-info" v-for="(m,midx) in medalList" :key="m.id" v-if="midx<3">
|
||||
@@ -186,7 +188,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
|
||||
}
|
||||
}
|
||||
.content-bottom{
|
||||
margin-top: 30px;
|
||||
margin-top: 10px;
|
||||
display: flex;
|
||||
.medal-list{
|
||||
//float: left;
|
||||
@@ -233,17 +235,15 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
|
||||
}
|
||||
.user-content{
|
||||
flex: 1;
|
||||
.content-top{
|
||||
margin-top: 15px;
|
||||
line-height: 25px;
|
||||
.grade{
|
||||
display: inline-block;
|
||||
.grade{
|
||||
margin-top: 10px;
|
||||
// display: inline-block;
|
||||
div{
|
||||
font-weight: 600;
|
||||
float: left;
|
||||
width: 58px;
|
||||
height: 24px;
|
||||
text-align: center;
|
||||
// text-align: center;
|
||||
line-height: 34px;
|
||||
color: #9D6110 ;
|
||||
}
|
||||
@@ -254,6 +254,10 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
|
||||
|
||||
}
|
||||
}
|
||||
.content-top{
|
||||
// margin-top: 10px;
|
||||
line-height: 25px;
|
||||
|
||||
h6{
|
||||
color: #333333;
|
||||
font-size: 26px;
|
||||
|
||||
@@ -81,11 +81,11 @@
|
||||
</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="experience.data.authorInfo && experience.data.authorInfo.aid">
|
||||
<author-img :avatar="userInfo.avatar" :aid="experience.data.authorInfo.aid" :sex="experience.data.authorInfo.sex"></author-img>
|
||||
<div class="tab-name" v-if="userInfo.aid">
|
||||
<author-img :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
|
||||
<div>
|
||||
<span style="color: #0059FF;">{{experience.data.authorInfo.name}}</span>
|
||||
<div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(experience.data.authorInfo.orgInfo)}}</div>
|
||||
<span style="color: #0059FF;">{{userInfo.name}}</span>
|
||||
<div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(userInfo.orgInfo)}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -166,8 +166,8 @@
|
||||
</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="learningDuration.data.authorInfo && learningDuration.data.authorInfo.aid">
|
||||
<author-img :avatar="userInfo.avatar" :aid="learningDuration.data.authorInfo.aid" :sex="learningDuration.data.authorInfo.sex"></author-img>
|
||||
<div class="tab-name" v-if="userInfo.aid">
|
||||
<author-img :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
|
||||
<div>
|
||||
<span style="color: #0059FF;">{{learningDuration.data.authorInfo.name}}</span>
|
||||
<div class="tab-bm" style="color: #0059FF;">{{cutOrgNamePath(learningDuration.data.authorInfo.orgInfo)}}</div>
|
||||
|
||||
Reference in New Issue
Block a user