Commit 671bec5d authored by zhangyanni's avatar zhangyanni

搜索关系处理

parent 04ae7d5d
...@@ -612,7 +612,7 @@ ...@@ -612,7 +612,7 @@
//人脉圈列表推荐 //人脉圈列表推荐
//relationType 1共同联系人 2校友 3同事 4关注者 5共同加入话题 6共同标签 0无关系 //relationType 1共同联系人 2校友 3同事 4关注者 5共同加入话题 6共同标签 0无关系
if (this.circleType == 13 || this.circleType == 7 || this.circleType == 11 || this.circleType == 5 || this.circleType == 21) { if (this.circleType == 13 || this.circleType == 7 || this.circleType == 11 || this.circleType == 5||(this.circleType==21&&data.isFriend==0&&data.isFollowed==0) ) {
if (data.relationType == 1 || data.relationType == 2 || data.relationType == 3) { if (data.relationType == 1 || data.relationType == 2 || data.relationType == 3) {
//@ApiModelProperty(value ="添加联系人状态 0未添加 1等待通过 2已同意") //@ApiModelProperty(value ="添加联系人状态 0未添加 1等待通过 2已同意")
...@@ -631,6 +631,17 @@ ...@@ -631,6 +631,17 @@
} }
} }
if(this.circleType==21&&(data.isFriend>0||data.isFollowed>0)){
if (data.isFriend == 0) return "+联系人";
else if (data.isFriend == 1) return "等待通过";
else {
//(this.circleType==5||this.circleType==11)&&!this.circleList
if (!this.circleList) return "电子名片";
else return "互为联系人";
}
if (data.isFollowed == 0) return "+关注";
else return "已关注";
}
if (this.circleType == 1) { if (this.circleType == 1) {
return "已关注"; return "已关注";
} }
......
...@@ -1249,7 +1249,7 @@ ...@@ -1249,7 +1249,7 @@
color: #565B79; color: #565B79;
position: fixed; position: fixed;
width: 100%; width: 100%;
top: 2.4rem; top: 2.35rem;
left: 0; left: 0;
height: 1rem; height: 1rem;
background: #fff; background: #fff;
......
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