mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-10 11:26:43 +08:00
Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat
This commit is contained in:
@@ -18,12 +18,18 @@
|
||||
</div>
|
||||
<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">
|
||||
<span style="color: #A3680A;margin-left:5px;line-height: 24px;margin-right: 20px;">经验值:{{statData.evalue}}</span>
|
||||
<!-- <div style="float:right"> -->
|
||||
<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>
|
||||
<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 style="height: 30px;margin-top: 10px;"> -->
|
||||
|
||||
|
||||
<!-- </div> -->
|
||||
<!-- </div> -->
|
||||
</div>
|
||||
<div class="content-bottom" style="margin-top:20px">
|
||||
<p v-if="userData.sign" class="portal-summary-text">{{userData.sign}} </p>
|
||||
@@ -31,14 +37,10 @@
|
||||
</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="text-align: center;"> -->
|
||||
|
||||
|
||||
</div>
|
||||
<!-- </div> -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<div style="line-height: 58px;" class="grade">LV.{{item.level}}</div>
|
||||
<div class="cont-left">{{item.study}}</div>
|
||||
<div class="cont-right">{{item.day}}</div>
|
||||
<div class="cont-right">{{item.steadily}}</div>
|
||||
<div class="cont-right" style="margin-left:-1%">{{item.steadily}}</div>
|
||||
<div class="cont-left" style="margin-left:6%;margin-right:20px">{{item.popularity}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -114,14 +114,14 @@
|
||||
|
||||
</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>
|
||||
@@ -747,9 +747,10 @@
|
||||
.myexperience {
|
||||
text-align: right;
|
||||
line-height: 75px;
|
||||
margin-left: auto;
|
||||
margin-left: 120px;
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
margin-right: -45px;
|
||||
color: #666666;
|
||||
|
||||
span {
|
||||
|
||||
@@ -7,8 +7,12 @@
|
||||
<span class="his-info pointer" @click="isShowList = true">历史记录</span>
|
||||
</div>
|
||||
<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 v-if="editdata.playTime != '' " class="note-tit">
|
||||
<div :style="{cursor:editdata.type==1? 'pointer':''}">
|
||||
<img :src="`${webBaseUrl}/images/coteplay.png`" @click="toCoursePage()" alt="">
|
||||
<span @click="toCoursePage()">{{getHMS(editdata.playTime)}}</span>
|
||||
<img :src="`${webBaseUrl}/images/cotedetel.png`" style="margin-top:4px;margin-left:5px;" @click="timeDel()" />
|
||||
</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"> -->
|
||||
@@ -106,6 +110,9 @@ export default {
|
||||
imgDel(index) {
|
||||
this.imgContent.splice(index,1);
|
||||
},
|
||||
timeDel() {
|
||||
this.editdata.playTime = '';
|
||||
},
|
||||
comeback(){
|
||||
clearInterval(this.timer);
|
||||
this.timer = null;
|
||||
|
||||
Reference in New Issue
Block a user