modify

pages/index.vue

@@ -3,16 +3,6 @@
     <div>
     <div>
       <h1 class="title">
       <h1 class="title">
       </h1>
       </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
       <card-container
         title="最新回答"
         title="最新回答"
         label="换一换"
         label="换一换"
@@ -28,8 +18,6 @@
         height="446px"
         height="446px"
       ></card-container>
       ></card-container>
       <nav-wrap></nav-wrap>
       <nav-wrap></nav-wrap>
-      <alerts-card></alerts-card>
->>>>>>> 18d89db9cb5e1f22707495f57833b6d5f5f26f8a
       <h2 class="subtitle" @click="showAlert">
       <h2 class="subtitle" @click="showAlert">
         beyond-clouds project
         beyond-clouds project
       </h2>
       </h2>
@@ -39,28 +27,11 @@
 
 
 <script>
 <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 CardContainer from '../components/pc/cardContainer';
 import NavWrap from '../components/pc/nav/navWrap';
 import NavWrap from '../components/pc/nav/navWrap';
-import AlertsCard from '../components/pc/altersMessage/alertsCard';
->>>>>>> 18d89db9cb5e1f22707495f57833b6d5f5f26f8a
 
 
-import PopupBox from '../components/common/popup-box/src/main.vue'
+
 
 
 export default {
 export default {
   data(){
   data(){
@@ -69,13 +40,10 @@ export default {
     }
     }
   },
   },
   components:{
   components:{
-<<<<<<< HEAD
-    Banner,ProjectCard,Pagination,Avatar,socialContactCard,ReleaseCard,ProjectRankCard,UserCard,NoticeCard,PopupBox
-=======
-    Banner,ProjectCard,Pagination,Avatar,CommentCard,FanCard,AnswerCard,MyAnswer,TopicListCard,
-    CardContainer,NavWrap,AlertsCard
 
 
->>>>>>> 18d89db9cb5e1f22707495f57833b6d5f5f26f8a
+    CardContainer,NavWrap
+
+
   },
   },
 
 
   methods:{
   methods:{