Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/goods/list.vue

@@ -36,7 +36,7 @@
 				 :margin-bottom="20" bg-color="#F5F5F5" />
 			</scroll-view>
 		</view>
-		<u-empty text="没有找到商品信息" font-size="36" mode="list" v-if="g.length == 0 && !loading"></u-empty>
+		<u-empty text="没有找到商品信息" font-size="36" mode="list" v-if="g.length == 0 "></u-empty>
 		<view class="quick" v-if="!loading">
 			<view class="item">
 				<u-icon name="cart-o" size="48" color="#333" />