Merge branch '开发分支' into 演示站点

components/slideshow.vue

@@ -5,6 +5,7 @@
         :style="{
           width: tovw(width),
           height: tovw(height),
+          marginBottom: tovw(marginBottom),
         }"
         :autoplay="autoplay"
         :interval="interval"
@@ -52,6 +53,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    marginBottom:{
+      type: [Number, String],
+      default: 0,
+    }
   },
   data() {
     return {

pages/index/index/index.vue

@@ -13,7 +13,7 @@
       <view class="head-shop-distance"> 距您{{ shopDetail.distance }} </view>
     </view>
 
-    <slideshow ref="indexTop" />
+    <slideshow ref="indexTop" :marginBottom="10" />
     <apps ref="apps" />
 
     <view class="shop" v-if="shopDetail.storename">

pages/index/index/modules/apps.vue

@@ -47,17 +47,16 @@ export default {
 .apps-box {
     display: flex;
     flex-wrap: wrap;
-    padding: 10px;
     box-sizing: border-box;
     justify-content: space-between;
-    padding-top: 0;
+    padding: 0 10px;
 
     .item {
         width: 173px;
         height: 94px;
         background: #FFFFFF;
         border-radius: 8px;
-        margin-top: 10px;
+        margin-bottom: 10px;
         box-sizing: border-box;
         padding: 15px;
         padding-right: 10px;