Merge branch 'dev' of yuanyuan/legend_raex_front into master

src/views/Discover.vue

@@ -19,7 +19,7 @@
             </div>
         </div>
         <!-- 商品展示 -->
-        <div class="commodity_display">
+        <div class="commodity_display" v-if="commodityDisplayList.length > 0">
             <swiper
                 v-if="commodityDisplayList.length > 0"
                 :slides-offset-after="0"