Commit 0f1c6b5c authored by zhangyanni's avatar zhangyanni

提交

parent 1d91b0e5
......@@ -137,7 +137,10 @@
type:Boolean,
default:false
},
type:0
type:{
type:Number,
default:0
}
},
methods:{
handleClose(data){
......
......@@ -15,4 +15,9 @@ export default {
logoutAxios(params){
return api.fetchPost("/base/login/out");
},
//我评论的文章
myCommentArticle(params){
return api.fetchLoadingPost("/business/my/selectMyCommentsContentList",params);
}
}
\ No newline at end of file
......@@ -15,9 +15,6 @@
</div>
<div style="padding-top: 1rem;">
<commentList :commentType="addprojecttype"></commentList>
<!--<router-view v-if="addprojecttype==1"></router-view>-->
<!--<router-view name="second" v-if="addprojecttype==2"></router-view>-->
<!--<router-view name="other" v-if="addprojecttype==3"></router-view>-->
</div>
</div>
</template>
......@@ -32,12 +29,13 @@
},
data() {
return {
addprojecttype: this.$route.query.selectedTab?this.$route.query.selectedTab:1,
addprojecttype: window.sessionStorage.getItem("myComment")?Number(window.sessionStorage.getItem("myComment")):1,
isVisible: false,
}
},
methods:{
addtype(val) {
window.sessionStorage.setItem("myComment",val);
if (val == 1) {
this.addprojecttype = 1;
} else if (val == 2) {
......
......@@ -307,7 +307,9 @@
//去专家的个人中心
handleToMasterDetail(data){
this.$router.push({path:"/masterDetail",query:{id:data.createdBy,isTopic:true}});
if(data.isProfessor>0){
this.$router.push({path:"/masterDetail",query:{id:data.createdBy,isTopic:true}});
}
},
},
......
......@@ -1112,7 +1112,9 @@
//去专家的个人中心
handleToMasterDetail(data){
this.$router.push({path:"/masterDetail",query:{id:data.userInfo.empId,isTopic:true}});
if(data.userInfo.isProfessor){
this.$router.push({path:"/masterDetail",query:{id:data.userInfo.empId,isTopic:true}});
}
},
//去勋章
......
......@@ -5,17 +5,17 @@
<div class="topicContent" v-if="detailInfo">
<div class="discussInfo">
<div class="leftInfo"
:style="{backgroundImage:detailInfo.empLogo==null?'url('+require('../../../assets/img/defaultlogo.png')+')':'url('+detailInfo.empLogo+')'}"
:style="{backgroundImage:detailInfo.userInfo.empLogo==null?'url('+require('../../../assets/img/defaultlogo.png')+')':'url('+detailInfo.userInfo.empLogo+')'}"
@click="handleToMasterDetail(detailInfo)">
<img src="../../../assets/img/proFeedBack/vip.png" alt="" class="masterVipImg"
v-if="detailInfo.isProfessor>0">
v-if="detailInfo.userInfo.isProfessor">
</div>
<div class="rightInfo">
<div>
<span>{{detailInfo.isProfessor>0?detailInfo.empName:detailInfo.nickName}}</span>
<span class="medal" :class="'medal'+detailInfoMedal.id" @click="handleToMedal(item)"
v-if="detailInfo.empMedalList.length>0"
v-for="detailInfoMedal in detailInfo.empMedalList"></span>
<span>{{detailInfo.userInfo.isProfessor>0?detailInfo.userInfo.empName:detailInfo.userInfo.nickName}}</span>
<span class="medal" :class="'medal'+detailInfoMedal.id" @click="handleToMedal(detailInfo)"
v-if="detailInfo.userInfo.empMedalList.length>0"
v-for="detailInfoMedal in detailInfo.userInfo.empMedalList"></span>
<span class="rightPoint"
@click="handleOperate(detailInfo)"></span>
<div class="operateWrap" :class="operateVisible?'showOpearte':'hideOperate'">
......@@ -299,7 +299,9 @@
//去专家的个人中心
handleToMasterDetail(data) {
this.$router.push({path: "/masterDetail", query: {id: data.userInfo.empId, isTopic: true}});
if(data.userInfo.isProfessor){
this.$router.push({path: "/masterDetail", query: {id: data.userInfo.empId, isTopic: true}});
}
},
......
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