Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
techbook
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
front-end-dev
techbook
Commits
671bec5d
Commit
671bec5d
authored
Dec 16, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
搜索关系处理
parent
04ae7d5d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
mineFollowCmpt.vue
src/components/mobile/mineFollowCmpt.vue
+12
-1
search.vue
src/views/mobile/search/search.vue
+1
-1
No files found.
src/components/mobile/mineFollowCmpt.vue
View file @
671bec5d
...
...
@@ -612,7 +612,7 @@
//人脉圈列表推荐
//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
)
{
//@ApiModelProperty(value ="添加联系人状态 0未添加 1等待通过 2已同意")
...
...
@@ -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
)
{
return
"已关注"
;
}
...
...
src/views/mobile/search/search.vue
View file @
671bec5d
...
...
@@ -1249,7 +1249,7 @@
color
:
#565B79
;
position
:
fixed
;
width
:
100%
;
top
:
2
.
4
rem
;
top
:
2
.
35
rem
;
left
:
0
;
height
:
1rem
;
background
:
#fff
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment