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
6ec9bbfd
Commit
6ec9bbfd
authored
Jan 19, 2020
by
yanju
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify
parent
cc76258c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
37 deletions
+5
-37
pages/index.vue
+5
-37
No files found.
pages/index.vue
View file @
6ec9bbfd
...
...
@@ -3,16 +3,6 @@
<div>
<h1
class=
"title"
>
</h1>
<<<<<<<
HEAD
<notice-card></notice-card>
=======
<comment-card></comment-card>
<project-card></project-card>
<answer-card></answer-card>
<my-answer></my-answer>
<topic-list-card></topic-list-card>
<fan-card></fan-card>
<card-container
title=
"最新回答"
label=
"换一换"
...
...
@@ -28,8 +18,6 @@
height=
"446px"
></card-container>
<nav-wrap></nav-wrap>
<alerts-card></alerts-card>
>>>>>>> 18d89db9cb5e1f22707495f57833b6d5f5f26f8a
<h2
class=
"subtitle"
@
click=
"showAlert"
>
beyond-clouds project
</h2>
...
...
@@ -39,28 +27,11 @@
<
script
>
import
Banner
from
'../components/pc/banner'
;
import
ProjectCard
from
'../components/pc/projectCard'
;
import
Pagination
from
'../components/pc/pagination'
;
import
Avatar
from
'../components/common/avatar/avatar'
;
import
socialContactCard
from
'../components/pc/socialContactCard'
;
import
ReleaseCard
from
'../components/pc/releaseCard'
;
import
ProjectRankCard
from
'../components/pc/projectRankCard'
;
import
UserCard
from
'../components/pc/userCard'
;
import
NoticeCard
from
'../components/pc/noticeCard'
;
<<<<<<<
HEAD
=======
import
AnswerCard
from
'../components/pc/answerCard'
;
import
MyAnswer
from
'../components/pc/myAnswer'
;
import
TopicListCard
from
'../components/pc/topicListCard'
;
import
FanCard
from
'../components/pc/fanCard'
;
import
CardContainer
from
'../components/pc/cardContainer'
;
import
NavWrap
from
'../components/pc/nav/navWrap'
;
import
AlertsCard
from
'../components/pc/altersMessage/alertsCard'
;
>>>>>>>
18
d89db9cb5e1f22707495f57833b6d5f5f26f8a
import
PopupBox
from
'../components/common/popup-box/src/main.vue'
export
default
{
data
(){
...
...
@@ -69,13 +40,10 @@ export default {
}
},
components
:{
<<<<<<<
HEAD
Banner
,
ProjectCard
,
Pagination
,
Avatar
,
socialContactCard
,
ReleaseCard
,
ProjectRankCard
,
UserCard
,
NoticeCard
,
PopupBox
=======
Banner
,
ProjectCard
,
Pagination
,
Avatar
,
CommentCard
,
FanCard
,
AnswerCard
,
MyAnswer
,
TopicListCard
,
CardContainer
,
NavWrap
,
AlertsCard
>>>>>>>
18
d89db9cb5e1f22707495f57833b6d5f5f26f8a
CardContainer
,
NavWrap
},
methods
:{
...
...
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