Commit f603537a by yanju

Merge branch 'fix-issue#5' into 'master'

fix-issue#5

See merge request pigbigbig/beyond-clouds-front!89
parents c2ed937e b6cd1e91
<template>
<nuxt-link tag="div" class="user-avatar" :to="myPath" :style="{backgroundColor:randomColor,width:size,height:size,borderRadius:borderR}">
<img :src="src" v-if="src"/>
<div class="user-avatar" @click="changeRoute2(myPath)" :style="{backgroundColor:randomColor,width:size,height:size,borderRadius:borderR}">
<img :src="src" v-if="src" alt=""/>
<p v-if="!src">{{firstWord||'云'}}</p>
</nuxt-link>
</div>
</template>
......@@ -44,6 +44,7 @@
return this.name.slice(0,1)
}
},
myPath(){
if(!this.userId){
return ''
......@@ -52,6 +53,15 @@
return '/u/'+this.userId+'/project'
}
}
},
methods:{
changeRoute2(r){
let routeUrl = this.$router.resolve({
path: r
});
window.open(routeUrl.href,'_blank')
},
}
}
......
......@@ -18,17 +18,17 @@
<yun-icon name="loading" v-if="followLoading"></yun-icon><span v-if="!followLoading">+</span>关注
</div>
<div class="footer">
<div class="footer-item" @click="changeRoute('project')">
<div class="footer-item" @click="changeRoute2('project')">
<p>项目</p>
<h6>{{statistics.projectNum}}</h6>
</div>
<div class="footer-item" @click="changeRoute('blog')">
<div class="footer-item" @click="changeRoute2('blog')">
<p>博客</p>
<h6>{{statistics.blogNum}}</h6>
</div>
<div class="footer-item" @click="changeRoute('answer')">
<div class="footer-item" @click="changeRoute2('answer')">
<p>回答</p>
<h6>{{statistics.questionReplyNum}}</h6>
</div>
......@@ -40,11 +40,11 @@
</div>
</div>
<div class="user-card2">
<div class="card2-item1" @click="changeRoute('following')">
<div class="card2-item1" @click="changeRoute2('following')">
<p>关注</p>
<h6>{{statistics.followedNum}}</h6>
</div>
<div class="card2-item2" @click="changeRoute('fans')">
<div class="card2-item2" @click="changeRoute2('fans')">
<p>粉丝</p>
<h6>{{statistics.fansNum}}</h6>
</div>
......@@ -222,6 +222,12 @@
changeRoute(path){
this.$router.push(this.dataGet2Path(path));
},
changeRoute2(r){
let routeUrl = this.$router.resolve({
path: r
});
window.open(routeUrl.href,'_blank')
},
dataGet2Path(path){
if(!this.userId1){
......
......@@ -4,7 +4,7 @@
<yun-avatar size="48px" border-r="24px" :userId="userId" :src="userAvatar" :name="nickName"></yun-avatar>
<div class="right__user-item__content">
<div class="content">
<p @click="$router.push('/u/'+userId+'/project')">{{nickName}}</p>
<p @click="changeRoute2('/u/'+userId+'/project')">{{nickName}}</p>
<h6>人气{{statistics.visitedNum}}·粉丝{{statistics.fansNum}}</h6>
</div>
<div v-if="userId!==$store.state.userProfile.userId&&followedUser" class="follow1" @click="dataPostToCancelFollow">
......@@ -79,6 +79,14 @@
}
},
methods:{
changeRoute2(r){
let routeUrl = this.$router.resolve({
path: r
});
window.open(routeUrl.href,'_blank')
},
dataGetUserInfo(){
this.followLoading=true;
this.$axios.$get(config.api.get.User.otherInfo+this.id+'/baseinfo').then((response) => {
......
......@@ -20,10 +20,10 @@
>
<div style="padding: 14px 16px;">
<nuxt-link tag="div" :to="'/news/detail/'+val.contentId" class="information-wrap" v-for="(val,index) in informationList" :key="val.contentId">
<div @click="changeRoute2('/news/detail/'+val.contentId)" class="information-wrap" v-for="(val,index) in informationList" :key="val.contentId">
<p class="information-time">{{dateConvert(val.createTime)}}</p>
<p class="information-content">{{val.title}}</p>
</nuxt-link>
</div>
</div>
</card-container>
<card-container
......@@ -33,7 +33,7 @@
width="302px"
>
<div class="software-container">
<div class="software-wrap" v-for="(val,index) in recruitmentList" :key="val.contentId">
<div @click="changeRoute2('/news/detail/'+val.contentId)" class="software-wrap" v-for="(val,index) in recruitmentList" :key="val.contentId">
<p class="software-rank">{{index + 1}}</p>
<div class="software-img-wrap">
<img class="software-img"
......@@ -55,7 +55,7 @@
>
<div class="software-container">
<div class="software-wrap" v-for="(val,index) in recruitmentList" :key="val.contentId">
<div @click="changeRoute2('/news/detail/'+val.contentId)" class="software-wrap" v-for="(val,index) in recruitmentList" :key="val.contentId">
<div class="software-img-wrap">
<img class="software-img"
:src="val.cover" alt="">
......@@ -100,6 +100,14 @@ export default {
this.dataGetSoftwareUpdatesList();
},
methods: {
changeRoute2(r){
let routeUrl = this.$router.resolve({
path: r
});
window.open(routeUrl.href,'_blank')
},
dataGetNewsList(currentPage) {
let params = {
page: currentPage,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment