Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
beyond-clouds-front
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
beyond-clouds-front
Commits
f603537a
Commit
f603537a
authored
Feb 20, 2020
by
yanju
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix-issue#5' into 'master'
fix-issue#5 See merge request pigbigbig/beyond-clouds-front!89
parents
c2ed937e
b6cd1e91
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
13 deletions
+45
-13
components/common/avatar/avatar.vue
+13
-3
components/pc/userCard.vue
+11
-5
components/pc/userCard2.vue
+9
-1
pages/news/index.vue
+12
-4
No files found.
components/common/avatar/avatar.vue
View file @
f603537a
<
template
>
<
template
>
<
nuxt-link
tag=
"div"
class=
"user-avatar"
:to=
"myPath
"
:style=
"
{backgroundColor:randomColor,width:size,height:size,borderRadius:borderR}">
<
div
class=
"user-avatar"
@
click=
"changeRoute2(myPath)
"
:style=
"
{backgroundColor:randomColor,width:size,height:size,borderRadius:borderR}">
<img
:src=
"src"
v-if=
"src"
/>
<img
:src=
"src"
v-if=
"src"
alt=
""
/>
<p
v-if=
"!src"
>
{{
firstWord
||
'云'
}}
</p>
<p
v-if=
"!src"
>
{{
firstWord
||
'云'
}}
</p>
</
nuxt-link
>
</
div
>
</
template
>
</
template
>
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
return
this
.
name
.
slice
(
0
,
1
)
return
this
.
name
.
slice
(
0
,
1
)
}
}
},
},
myPath
(){
myPath
(){
if
(
!
this
.
userId
){
if
(
!
this
.
userId
){
return
''
return
''
...
@@ -52,6 +53,15 @@
...
@@ -52,6 +53,15 @@
return
'/u/'
+
this
.
userId
+
'/project'
return
'/u/'
+
this
.
userId
+
'/project'
}
}
}
}
},
methods
:{
changeRoute2
(
r
){
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
r
});
window
.
open
(
routeUrl
.
href
,
'_blank'
)
},
}
}
}
}
...
...
components/pc/userCard.vue
View file @
f603537a
...
@@ -18,17 +18,17 @@
...
@@ -18,17 +18,17 @@
<yun-icon
name=
"loading"
v-if=
"followLoading"
></yun-icon><span
v-if=
"!followLoading"
>
+
</span>
关注
<yun-icon
name=
"loading"
v-if=
"followLoading"
></yun-icon><span
v-if=
"!followLoading"
>
+
</span>
关注
</div>
</div>
<div
class=
"footer"
>
<div
class=
"footer"
>
<div
class=
"footer-item"
@
click=
"changeRoute('project')"
>
<div
class=
"footer-item"
@
click=
"changeRoute
2
('project')"
>
<p>
项目
</p>
<p>
项目
</p>
<h6>
{{
statistics
.
projectNum
}}
</h6>
<h6>
{{
statistics
.
projectNum
}}
</h6>
</div>
</div>
<div
class=
"footer-item"
@
click=
"changeRoute('blog')"
>
<div
class=
"footer-item"
@
click=
"changeRoute
2
('blog')"
>
<p>
博客
</p>
<p>
博客
</p>
<h6>
{{
statistics
.
blogNum
}}
</h6>
<h6>
{{
statistics
.
blogNum
}}
</h6>
</div>
</div>
<div
class=
"footer-item"
@
click=
"changeRoute('answer')"
>
<div
class=
"footer-item"
@
click=
"changeRoute
2
('answer')"
>
<p>
回答
</p>
<p>
回答
</p>
<h6>
{{
statistics
.
questionReplyNum
}}
</h6>
<h6>
{{
statistics
.
questionReplyNum
}}
</h6>
</div>
</div>
...
@@ -40,11 +40,11 @@
...
@@ -40,11 +40,11 @@
</div>
</div>
</div>
</div>
<div
class=
"user-card2"
>
<div
class=
"user-card2"
>
<div
class=
"card2-item1"
@
click=
"changeRoute('following')"
>
<div
class=
"card2-item1"
@
click=
"changeRoute
2
('following')"
>
<p>
关注
</p>
<p>
关注
</p>
<h6>
{{
statistics
.
followedNum
}}
</h6>
<h6>
{{
statistics
.
followedNum
}}
</h6>
</div>
</div>
<div
class=
"card2-item2"
@
click=
"changeRoute('fans')"
>
<div
class=
"card2-item2"
@
click=
"changeRoute
2
('fans')"
>
<p>
粉丝
</p>
<p>
粉丝
</p>
<h6>
{{
statistics
.
fansNum
}}
</h6>
<h6>
{{
statistics
.
fansNum
}}
</h6>
</div>
</div>
...
@@ -222,6 +222,12 @@
...
@@ -222,6 +222,12 @@
changeRoute
(
path
){
changeRoute
(
path
){
this
.
$router
.
push
(
this
.
dataGet2Path
(
path
));
this
.
$router
.
push
(
this
.
dataGet2Path
(
path
));
},
},
changeRoute2
(
r
){
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
r
});
window
.
open
(
routeUrl
.
href
,
'_blank'
)
},
dataGet2Path
(
path
){
dataGet2Path
(
path
){
if
(
!
this
.
userId1
){
if
(
!
this
.
userId1
){
...
...
components/pc/userCard2.vue
View file @
f603537a
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<yun-avatar
size=
"48px"
border-r=
"24px"
:userId=
"userId"
:src=
"userAvatar"
:name=
"nickName"
></yun-avatar>
<yun-avatar
size=
"48px"
border-r=
"24px"
:userId=
"userId"
:src=
"userAvatar"
:name=
"nickName"
></yun-avatar>
<div
class=
"right__user-item__content"
>
<div
class=
"right__user-item__content"
>
<div
class=
"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>
<h6>
人气
{{
statistics
.
visitedNum
}}
·粉丝
{{
statistics
.
fansNum
}}
</h6>
</div>
</div>
<div
v-if=
"userId!==$store.state.userProfile.userId&&followedUser"
class=
"follow1"
@
click=
"dataPostToCancelFollow"
>
<div
v-if=
"userId!==$store.state.userProfile.userId&&followedUser"
class=
"follow1"
@
click=
"dataPostToCancelFollow"
>
...
@@ -79,6 +79,14 @@
...
@@ -79,6 +79,14 @@
}
}
},
},
methods
:{
methods
:{
changeRoute2
(
r
){
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
r
});
window
.
open
(
routeUrl
.
href
,
'_blank'
)
},
dataGetUserInfo
(){
dataGetUserInfo
(){
this
.
followLoading
=
true
;
this
.
followLoading
=
true
;
this
.
$axios
.
$get
(
config
.
api
.
get
.
User
.
otherInfo
+
this
.
id
+
'/baseinfo'
).
then
((
response
)
=>
{
this
.
$axios
.
$get
(
config
.
api
.
get
.
User
.
otherInfo
+
this
.
id
+
'/baseinfo'
).
then
((
response
)
=>
{
...
...
pages/news/index.vue
View file @
f603537a
...
@@ -20,10 +20,10 @@
...
@@ -20,10 +20,10 @@
>
>
<div
style=
"padding: 14px 16px;"
>
<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-time"
>
{{
dateConvert
(
val
.
createTime
)
}}
</p>
<p
class=
"information-content"
>
{{
val
.
title
}}
</p>
<p
class=
"information-content"
>
{{
val
.
title
}}
</p>
</
nuxt-link
>
</
div
>
</div>
</div>
</card-container>
</card-container>
<card-container
<card-container
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
width=
"302px"
width=
"302px"
>
>
<div
class=
"software-container"
>
<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>
<p
class=
"software-rank"
>
{{
index
+
1
}}
</p>
<div
class=
"software-img-wrap"
>
<div
class=
"software-img-wrap"
>
<img
class=
"software-img"
<img
class=
"software-img"
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
>
>
<div
class=
"software-container"
>
<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"
>
<div
class=
"software-img-wrap"
>
<img
class=
"software-img"
<img
class=
"software-img"
:src=
"val.cover"
alt=
""
>
:src=
"val.cover"
alt=
""
>
...
@@ -100,6 +100,14 @@ export default {
...
@@ -100,6 +100,14 @@ export default {
this
.
dataGetSoftwareUpdatesList
();
this
.
dataGetSoftwareUpdatesList
();
},
},
methods
:
{
methods
:
{
changeRoute2
(
r
){
let
routeUrl
=
this
.
$router
.
resolve
({
path
:
r
});
window
.
open
(
routeUrl
.
href
,
'_blank'
)
},
dataGetNewsList
(
currentPage
)
{
dataGetNewsList
(
currentPage
)
{
let
params
=
{
let
params
=
{
page
:
currentPage
,
page
:
currentPage
,
...
...
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