Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

This commit is contained in:
dongruihua
2022-11-04 02:32:51 +08:00
4 changed files with 14 additions and 12 deletions

View File

@@ -6,7 +6,7 @@
</div>
<div v-if="!onlyAvatar" style="padding-left: 5px;padding-top: 6px;font-size: 14px;color: #666666;">
<span>{{userName}}</span>
<span class="author-text" v-if="userInfo && userInfo!=''">({{userInfo}})</span>
<span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
</div>
</div>
</template>

View File

@@ -14,7 +14,7 @@
</div>
<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
<span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
<span class="author-text" v-if="userInfo && userInfo!=''">({{userInfo}})</span>
<span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
</div>
</div>
</template>

View File

@@ -660,7 +660,9 @@
this.showLoginMedal=false;
},
banJump(item) {
window.open(item.JumpUrl);
if(item.JumpUrl){
window.open(item.JumpUrl);
}
},
//上次学习记录
getLastStudy() {
@@ -702,7 +704,7 @@
}
});
}else {
if(this.userHobby.needShow){
if(this.userHobby.needShow){
this.$refs.userCollection.show();
}else{
if(this.needLoginMedal){

View File

@@ -22,9 +22,9 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="total">累计</el-dropdown-item>
<el-dropdown-item command="weeks">本周</el-dropdown-item>
<!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
<el-dropdown-item command="months">本月</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item> -->
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -127,9 +127,9 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="total">累计</el-dropdown-item>
<el-dropdown-item command="weeks">本周</el-dropdown-item>
<!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
<el-dropdown-item command="months">本月</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item> -->
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -214,9 +214,9 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="total">累计</el-dropdown-item>
<el-dropdown-item command="weeks">本周</el-dropdown-item>
<!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
<el-dropdown-item command="months">本月</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item> -->
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -259,13 +259,13 @@
</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:14px;font-size: 16px;" class="tab-rank" >{{learningDays.data.rankingNo}}</div>