Merge branch 'zhy' of http://git.luyuan.tk/luyuan/deming into xbx

components/shop/list/index.vue

@@ -6,10 +6,10 @@
 		</view>
 		<swiper class="swiper-box" :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
 			<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
-				<view class="goods-item">
+				<view class="goods-item" v-if="goodsList.length">
 					<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
 				</view>
-				<u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty>
+				<u-empty text="暂无商品" mode="list" color="#000" margin-top="20" v-else></u-empty>
 			</swiper-item>
 		</swiper>
 		<!-- 加载更多 -->
@@ -138,13 +138,13 @@ export default {
         height: 100%;
         margin-bottom: 10rpx;
         .swiper-item {
-            height: 100%;
+            // height: 100%;
             .goods-item {
             	display: flex;
             	flex-wrap: wrap;
             	justify-content: space-between;
                 width: 100%;
-                height: 100%;
+                // height: 100%;
                 overflow-y: scroll;
             }
         }