Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat
@@ -17,13 +17,13 @@
|
||||
<h6> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{orgInfo}}</span> </h6>
|
||||
</div>
|
||||
<div class="grade" style="margin-top:5px">
|
||||
<div class="level">{{statData.level}}</div>
|
||||
<div class="level" style="margin-top:4px">{{statData.level}}</div>
|
||||
<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" style="line-height: 30px;">个人设置</span></router-link>
|
||||
<span style="margin-left:10px;line-height: 30px;" 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>
|
||||
<router-link v-if="pageId == userInfo.aid" to="/user/Setting"><span class="content-one-info pointer" style="line-height: 30px;">个人设置</span></router-link>
|
||||
<span v-if="pageId == userInfo.aid" style="margin-left:10px;line-height: 30px;" class="content-one-info" ><router-link to="/uc/study/courses" class="pointer" style="color:#0060FF;">个人中心</router-link></span>
|
||||
<span class="content-one-info" v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</span>
|
||||
<spap class="Followed" @click="cancelFollow()" v-if="isFollowHas">已关注</spap>
|
||||
<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 style="height: 30px;margin-top: 10px;"> -->
|
||||
|
||||
@@ -358,6 +358,19 @@
|
||||
font-size: 14px;
|
||||
color: #387DF7;
|
||||
|
||||
}
|
||||
.Followed{
|
||||
width: 80px;
|
||||
height: 30px;
|
||||
padding: 0;
|
||||
font-size: 14px;
|
||||
text-align: center;
|
||||
border-radius: 20px;
|
||||
display: inline-block;
|
||||
line-height: 30px;
|
||||
border: 1px solid #999;
|
||||
color: #999;
|
||||
|
||||
}
|
||||
.editbutt{
|
||||
font-size: 14px;
|
||||
|
||||
@@ -102,7 +102,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
|
||||
statData:{
|
||||
evalue: 0,//经验值
|
||||
level: "LV1",//级别
|
||||
monthStudyHour:0,//当月学习时长
|
||||
monthStudyHour:0,//
|
||||
totalStudyHour: 0, //累计学习时长
|
||||
monthStudyDays:0, //当月学习天数
|
||||
totalStudyDays:0, //累计学习天数
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 16</title>
|
||||
<!-- <title>编组 16</title> -->
|
||||
<defs>
|
||||
<linearGradient x1="16.2168629%" y1="8.69510057%" x2="75.502055%" y2="93.9759603%" id="linearGradient-1">
|
||||
<stop stop-color="#BFA1FF" offset="0%"></stop>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="27px" height="32px" viewBox="0 0 27 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 16</title>
|
||||
<!-- <title>编组 16</title> -->
|
||||
<defs>
|
||||
<linearGradient x1="18.6372428%" y1="0%" x2="85.7988166%" y2="100%" id="linearGradient-1">
|
||||
<stop stop-color="#FF924A" offset="0%"></stop>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 25</title>
|
||||
<!-- <title>编组 25</title> -->
|
||||
<defs>
|
||||
<linearGradient x1="55.2577877%" y1="2.78092619%" x2="44.5221274%" y2="93.6949416%" id="linearGradient-1">
|
||||
<stop stop-color="#71D999" offset="0%"></stop>
|
||||
|
||||
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.2 KiB |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 16</title>
|
||||
<!-- <title>编组 16</title> -->
|
||||
<defs>
|
||||
<linearGradient x1="10.4646798%" y1="3.92289046%" x2="90.7234539%" y2="87.3752585%" id="linearGradient-1">
|
||||
<stop stop-color="#65A0FF" offset="0%"></stop>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 28</title>
|
||||
<!-- <title>编组 28</title> -->
|
||||
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="22.他人主页-动态备份" transform="translate(-257.000000, -340.000000)">
|
||||
<g id="编组-33" transform="translate(257.000000, 340.000000)">
|
||||
|
||||
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 14</title>
|
||||
<!-- <title>编组 14</title> -->
|
||||
<defs>
|
||||
<linearGradient x1="18.5275919%" y1="16.3477214%" x2="76.0845854%" y2="96.3648834%" id="linearGradient-1">
|
||||
<stop stop-color="#0CD1DC" offset="0%"></stop>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.8 KiB |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="27px" height="32px" viewBox="0 0 27 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 16</title>
|
||||
<!-- <title>编组 16</title> -->
|
||||
<defs>
|
||||
<linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
|
||||
<stop stop-color="#FF915E" offset="0%"></stop>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 16</title>
|
||||
<!-- <title>编组 16</title> -->
|
||||
<defs>
|
||||
<linearGradient x1="10.4646798%" y1="3.92289046%" x2="90.7234539%" y2="87.3752585%" id="linearGradient-1">
|
||||
<stop stop-color="#ABBFFF" offset="0%"></stop>
|
||||
|
||||
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="31px" height="32px" viewBox="0 0 31 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 16</title>
|
||||
<!-- <title>编组 16</title> -->
|
||||
<defs>
|
||||
<linearGradient x1="50%" y1="0%" x2="50%" y2="98.6964939%" id="linearGradient-1">
|
||||
<stop stop-color="#8F82FF" offset="0%"></stop>
|
||||
|
||||
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
@@ -74,7 +74,7 @@
|
||||
<p><span>{{userData.level}}</span></p>
|
||||
</li> -->
|
||||
<li>
|
||||
<router-link to="/user/ucurrency">
|
||||
<router-link @click.native="setCurIdentity(1)" to="/user/ucurrency">
|
||||
<span class="label">我的U币</span>
|
||||
<p><span>{{userData.uvalue}}</span>个</p>
|
||||
</router-link>
|
||||
@@ -653,6 +653,9 @@
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
setCurIdentity(iden){
|
||||
this.$store.dispatch('SetCurIdentity',iden);
|
||||
},
|
||||
closeJinian(){
|
||||
this.showLoginMedal=false;
|
||||
},
|
||||
|
||||