Merge branch 'master' of https://gitee.com/zc_gcb/gcb

# Conflicts:
#	assets/a.scss

components/bidding.vue

@@ -0,0 +1,5 @@
+<template>
+ <div>
+     4245454554545
+ </div>
+</template>

layouts/default.vue

@@ -25,4 +25,7 @@ export default {
 </script>
 
 <style>
+html{
+  font-size: 10px;
+}
 </style>

pages/index.vue

@@ -1,8 +1,8 @@
 <template>
-  <section class="container">
-    <div>
-      dddsdsd 
-      
+  <section>
+    <div class="search">
+     <input type="text" >
+      <span>我的订阅</span>
     </div>
   </section>
 </template>

pages/me/index.vue

@@ -1,7 +1,6 @@
 <template>
   <section class="container">
-    <div>
-      dddsdsd 
+    <div class="top_info">
       
     </div>
   </section>

pages/projectList.vue

@@ -2,8 +2,8 @@
   <section class="container">
   <div class="list-gcxm">
     <ul>
-    <li>
-      <gcxmItem />
+    <li class="">
+     
     </li>
   </ul>
   </div>
@@ -15,14 +15,8 @@
 <script>
 
 import '~/assets/a.scss'
-import gcxmItem from'~/components/gcxm.vue'
-
-
-
 export default {
-  components: {
-   'gcxmItem':gcxmItem,
-  }
+ 
 }
 </script>