调整个人主页,他们主页,个人中心

This commit is contained in:
daihh
2022-10-23 17:12:18 +08:00
parent e7d407a1eb
commit 75a8bc9310
6 changed files with 94 additions and 73 deletions

View File

@@ -4,12 +4,13 @@
<li class="answer-list-index" v-for="item in list" :key="item.id"> <li class="answer-list-index" v-for="item in list" :key="item.id">
<p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px"> <p v-if="isDynamic" class="portal-summary-text" style="margin-bottom:18px">
<span v-if="!personal || isFollow">{{item.aname}}</span> <span v-if="!personal || isFollow">{{item.aname}}</span>
{{item.cusInfo}}<span style="margin-left:28px">{{item.eventTime}}</span> {{item.cusInfo}}<span style="margin-left:28px">{{item.eventTime}}</span>
<span v-if="personal && !item.hidden" class="follow-hide pointer" style="float:right" @click="emitHide(item.id)"> <span v-if="personal && !item.hidden" class="follow-hide pointer" style="float:right" @click="emitHide(item.id)">
<svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
</span> </span>
</p> </p>
<h6 class="answer-title-info follow-home-title">{{item.contentInfo}} <h6 class="answer-title-info follow-home-title">
{{item.contentInfo}}
<span class="follow-hide" style="float:right" v-if="!isDynamic && personal && !item.hidden" @click="emitHide(item.id)"> <span class="follow-hide" style="float:right" v-if="!isDynamic && personal && !item.hidden" @click="emitHide(item.id)">
<svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
</span> </span>
@@ -21,7 +22,7 @@
</span> </span>
</p> </p>
<div> <div>
<interactBar :type="0" :data="item.info" :shares="false" :views="false" :readonly="true"></interactBar> <interactBar :type="0" :data="item.info" :shares="false" :views="false" :readonly="true"></interactBar>
</div> </div>
</li> </li>
</ul> </ul>
@@ -31,7 +32,7 @@
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import interactBar from "@/components/Portal/interactBar.vue"; import interactBar from "@/components/Portal/interactBar.vue";
import author from "@/components/Portal/authorInfo.vue"; import author from "@/components/Portal/authorInfo.vue";
@@ -83,11 +84,11 @@
changeIsAll(item) { changeIsAll(item) {
item.isAll = !item.isAll; item.isAll = !item.isAll;
}, },
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.answer-list{ .answer-list{
ul{ ul{
@@ -109,4 +110,3 @@
} }
} }
</style> </style>

View File

@@ -11,22 +11,31 @@
</div> </div>
<div class="user-content"> <div class="user-content">
<div class="content-top"> <div style="display: flex;justify-content: start;">
<h6 content-bottom> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{orgInfo}}</span> <div style="min-width: 260px;">
<router-link v-if="pageId == userInfo.aid" to="/user/Setting"><span class="content-one-info pointer">个人设置</span></router-link> <div class="content-top">
</h6> <h6 content-bottom> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{orgInfo}}</span> </h6>
</div> </div>
<div class="content-bottom"> <div class="content-bottom">
<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> <p v-if="userData.sign" class="portal-summary-text">{{userData.sign}} </p>
</div> <p v-else class="portal-summary-text">暂无签名</p>
<div class="grade"> </div>
<div>{{statData.level}}</div> <div class="grade">
<span style="color: #A3680A;margin-left:12px;line-height: 24px;">经验值{{statData.evalue}}</span> <div>{{statData.level}}</div>
<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> <span style="color: #A3680A;margin-left:5px;line-height: 24px;margin-right: 10px;">经验值{{statData.evalue}}</span>
<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 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>
<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 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"><router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}</router-link></el-button></div>
</div>
</div>
</div> </div>
</div> </div>
<div class="learningData"> <div class="learningData">
@@ -259,27 +268,28 @@
float: left; float: left;
margin-top: 10px; margin-top: 10px;
} }
.btn-user{
margin-top: -6px;
// margin-left: 68px;
height: 30px;
border-radius: 20px;
border: 1px solid #0060FF;
color: #0060FF;
}
.grade{ .grade{
float: left; float: left;
margin-top: 20px; margin-top: 20px;
.btn-user{
margin-top: -6px;
// margin-left: 68px;
height: 30px;
border-radius: 20px;
border: 1px solid #0060FF;
color: #0060FF;
}
div{ div{
// margin-left: 22px; // margin-left: 22px;
font-weight: 600; font-weight: 600;
float: left; float: left;
width: 57px; width: 57px;
height: 24px; height: 24px;
text-align: center; //text-align: center;
line-height: 24px; line-height: 24px;
color: #9D6110 ; color: #9D6110 ;
background: url('../../../public/images/lvbg.png') no-repeat 100% / 100%; //background: url('../../../public/images/lvbg.png') no-repeat 100% / 100%;
} }
} }
// } // }
@@ -310,18 +320,7 @@
font-size: 26px; font-size: 26px;
margin:0; margin:0;
float: left; 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{ span{
color: #999999; color: #999999;
@@ -329,16 +328,25 @@
margin-left: 5px; margin-left: 5px;
margin-right: 24px; margin-right: 24px;
} }
.editbutt{
font-size: 14px;
color: #333333;
}
} }
} }
} }
.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;
}
.editbutt{
font-size: 14px;
color: #333333;
}
.upicon{ .upicon{
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;

View File

@@ -13,19 +13,27 @@
<div v-if="sex === 2 "><img src="../../../public/images/Avatarwoman.png" style="width: 100%" alt=""></div> <div v-if="sex === 2 "><img src="../../../public/images/Avatarwoman.png" style="width: 100%" alt=""></div>
</div> </div>
</router-link> </router-link>
</div> </div>
<div class="user-content"> <div class="user-content">
<div class="content-top"> <div style="display: flex;justify-content:start;">
<h6>{{userInfo.name}}</h6> <div>
<span>{{orgInfo}}</span> <div class="content-top" style="min-width: 260px;">
<el-link @click="toPage('/user/Setting')" type="info" :underline="false"> <el-button class="editbutt">个人设置</el-button></el-link> <h6>{{userInfo.name}}</h6>
<span>{{orgInfo}}</span>
</div>
<div class="grade" style="min-width: 260px;">
<div>{{statData.level}}</div>
<span>经验值{{statData.evalue}}</span>
</div>
</div>
<div style="text-align: center;">
<div>
<el-link @click="toPage('/user/Setting')" type="info" :underline="false"> <el-button class="editbutt">个人设置</el-button></el-link>
</div>
<div style="margin-top:10px;"> <span style="color:#0060FF;font-size: 14px;"><router-link :to="'/home/'+userInfo.aid">个人主页>></router-link></span></div>
</div>
</div> </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="content-bottom">
<div class="medal-list"> <div class="medal-list">
<div class="medal-info" v-for="(m,midx) in medalList" :key="m.id" v-if="midx<3"> <div class="medal-info" v-for="(m,midx) in medalList" :key="m.id" v-if="midx<3">
@@ -269,19 +277,21 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
margin-left: 5px; margin-left: 5px;
margin-right: 24px; margin-right: 24px;
} }
.editbutt{
width: 97px;
height: 30px;
line-height: 10px;
border-radius: 4px;
border: 1px solid #387DF7;
font-size: 14px;
color: #387DF7;
}
} }
} }
} }
.editbutt{
width: 97px;
height: 30px;
line-height: 10px;
border-radius: 4px;
border: 1px solid #588afc;
font-size: 14px;
color: #588afc;
}
.uc-header-box{ .uc-header-box{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

View File

@@ -36,7 +36,7 @@
</div> </div>
<!-- </el-card> --> <!-- </el-card> -->
<div style="margin-top:10px;"> <div style="margin-top:10px;">
<interactBar :type="2" :data="articleDetailData" :theme='1' :shares="false" ></interactBar> <interactBar :type="2" :data="articleDetailData" :theme='1' :shares="true" ></interactBar>
</div> </div>
</div> </div>
<!--评论, 修改边距调整--> <!--评论, 修改边距调整-->

View File

@@ -108,7 +108,7 @@
<div class="top">授课讲师</div> <div class="top">授课讲师</div>
<div> <div>
<div class="teacher" v-for="(item, idx) in teachers" :key="idx" > <div class="teacher" v-for="(item, idx) in teachers" :key="idx" >
<div class="teacher-avator"> <div class="teacher-avator" style="cursor: pointer;" @click="toUserHome(item)">
<el-avatar v-if="item.avatar !=='' " :src="item.avatar" shape="circle" :size="50"></el-avatar> <el-avatar v-if="item.avatar !=='' " :src="item.avatar" shape="circle" :size="50"></el-avatar>
<div class="teacher-text" v-if="item.sex !== null && item.avatar ==''"> <div class="teacher-text" v-if="item.sex !== null && item.avatar ==''">
<div v-if="item.sex === 1 "><img src="../../../../public/images/Avatarman.png" alt=""></div> <div v-if="item.sex === 1 "><img src="../../../../public/images/Avatarman.png" alt=""></div>
@@ -247,6 +247,9 @@ export default {
getSysTypeTree:'sysType/getSysTypeTree', getSysTypeTree:'sysType/getSysTypeTree',
loadSysTypes:'sysType/loadSysTypes' loadSysTypes:'sysType/loadSysTypes'
}), }),
toUserHome(tea){
this.$router.push({path:this.$xpage.getHomePath(tea.teacherId)})
},
showQrimage(){ showQrimage(){
let urlPre=window.location.protocol+'//'+window.location.host; let urlPre=window.location.protocol+'//'+window.location.host;
let returnUrl='https://u.boe.com/mobile/pages/login/loading?returnUrl=/pages/resource/courseDetail?id='+this.courseInfo.id; let returnUrl='https://u.boe.com/mobile/pages/login/loading?returnUrl=/pages/resource/courseDetail?id='+this.courseInfo.id;

View File

@@ -31,7 +31,7 @@
</div> </div>
</div> </div>
<div class="content-inter"> <div class="content-inter">
<interactBar v-if="detailData.id" :type="4" :shares="false" :comments="false" :data="detailData" :answers="true" :clickAnswer="true" :views="false"> </interactBar> <interactBar v-if="detailData.id" :type="4" :shares="true" :comments="false" :data="detailData" :answers="true" :clickAnswer="true" :views="false"> </interactBar>
</div> </div>
</div> </div>