Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop

@@ -7,7 +7,6 @@
         :options="options"
         :data="orderList"
         class="order-list-scroll-wrap"
-        v-show="!isShowEmpty"
       >
         <ul class="list-wrapper">
           <li v-for="(order, i) in orderList" :key="i">
@@ -23,12 +22,13 @@
             </div>
           </li>
         </ul>
+
+        <empty-list
+          class="empty-wrapper"
+          tip="这里什么都没有..."
+          v-show="isShowEmpty"
+        />
       </scroll>
-      <empty-list
-        class="empty-wrapper"
-        tip="这里什么都没有..."
-        v-show="isShowEmpty"
-      />
     </div>
   </layout-app>
 </template>
@@ -111,16 +111,13 @@ export default {
 </script>
 <style lang="scss" scoped>
 .content-wrapper {
-  height: calc(100vh - 100px);
+  height: 100%;
   overflow-x: hidden;
   overflow-y: auto;
   -webkit-box-orient: vertical;
 
   .empty-wrapper {
-    margin: auto 0;
-    position: absolute;
-    top: 0;
-    bottom: 0;
+    margin: 20vh 0;
   }
 
   .footer-wrapper {

@@ -8,7 +8,6 @@
         :options="options"
         :data="orderList"
         class="order-list-scroll-wrap"
-        v-show="!isShowEmpty"
       >
         <ul class="list-wrapper">
           <li v-for="order in orderList" :key="order.orderCode">
@@ -39,14 +38,14 @@
             </div>
           </li>
         </ul>
-      </scroll>
 
-      <empty-list
-        @touch.prevent
-        class="empty-wrapper"
-        tip="这里什么都没有..."
-        v-show="isShowEmpty"
-      />
+        <empty-list
+          @touch.prevent
+          class="empty-wrapper"
+          tip="这里什么都没有..."
+          v-show="isShowEmpty"
+        />
+      </scroll>
     </div>
   </layout-app>
 </template>
@@ -155,10 +154,7 @@ export default {
   }
 
   .empty-wrapper {
-    margin: auto 0;
-    position: absolute;
-    top: 0;
-    bottom: 0;
+    margin: 20vh 0;
   }
 
   .order-list-scroll-wrap {