tianyabing 2 år sedan
förälder
incheckning
aa12b7e607

+ 1 - 1
src/components/doubleCarbon/doubleCarbon.vue

@@ -5,7 +5,7 @@
       <Breadcrumb></Breadcrumb>
 
       <div class="pageContainer-content" >
-        <happy-scroll color="#dedfe1" size="5" resize v-if="contentShow">
+        <happy-scroll color="#dedfe1" size="5" resize v-if="contentShow" hide-horizontal>
           <router-view />
         </happy-scroll>
       </div>

+ 1 - 1
src/components/life/life.vue

@@ -5,7 +5,7 @@
       <Breadcrumb></Breadcrumb>
 
         <div class="pageContainer-content" >
-          <happy-scroll color="#dedfe1" size="5" resize v-if="contentShow">
+          <happy-scroll color="#dedfe1" size="5" resize v-if="contentShow" hide-horizontal>
             <router-view />
           </happy-scroll>
         </div>

+ 25 - 1
src/components/life/restaurant/lifeRestaurant.vue

@@ -15,7 +15,15 @@ export default {
 
 <template>
   <div class="lifeRestaurant">
-    123
+    <div class="lifeRestaurant-query"></div>
+    <div class="lifeRestaurant-core"></div>
+    <div class="lifeRestaurant-left">
+      <div class="lifeRestaurant-eat"></div>
+      <div class="lifeRestaurant-consume"></div>
+      <div class="lifeRestaurant-profit"></div>
+      <div class="lifeRestaurant-pay"></div>
+    </div>
+    <div class="lifeRestaurant-right"></div>
   </div>
 </template>
 
@@ -25,5 +33,21 @@ export default {
   height: 1500px;
   display: inline-block;
   vertical-align: top;
+  .lifeRestaurant-query {
+    width: 100%;
+    height: 60px;
+    border: 1px solid red;
+  }
+  .lifeRestaurant-core {
+    width: 100%;
+    height: 200px;
+    border: 1px solid red;
+  }
+  .lifeRestaurant-left {
+
+  }
+  .lifeRestaurant-right {
+
+  }
 }
 </style>

+ 1 - 1
src/components/work/work.vue

@@ -5,7 +5,7 @@
       <Breadcrumb></Breadcrumb>
 
       <div class="pageContainer-content" >
-        <happy-scroll color="#dedfe1" size="5" resize v-if="contentShow">
+        <happy-scroll color="#dedfe1" size="5" resize v-if="contentShow" hide-horizontal>
           <router-view />
         </happy-scroll>
       </div>

+ 3 - 0
src/views/HomeView.vue

@@ -97,4 +97,7 @@ export default {
   border: 1px solid #e7eaf1;
   padding: 8px 2px 2px 10px;
 }
+.happy-scroll-content {
+  width: 99% !important;
+}
 </style>