Merge branch 'develop' of git.yoho.cn:fe/xianyu-ufo-app-web into develop
Showing
2 changed files
with
16 additions
and
23 deletions
@@ -7,7 +7,6 @@ | @@ -7,7 +7,6 @@ | ||
7 | :options="options" | 7 | :options="options" |
8 | :data="orderList" | 8 | :data="orderList" |
9 | class="order-list-scroll-wrap" | 9 | class="order-list-scroll-wrap" |
10 | - v-show="!isShowEmpty" | ||
11 | > | 10 | > |
12 | <ul class="list-wrapper"> | 11 | <ul class="list-wrapper"> |
13 | <li v-for="(order, i) in orderList" :key="i"> | 12 | <li v-for="(order, i) in orderList" :key="i"> |
@@ -23,12 +22,13 @@ | @@ -23,12 +22,13 @@ | ||
23 | </div> | 22 | </div> |
24 | </li> | 23 | </li> |
25 | </ul> | 24 | </ul> |
25 | + | ||
26 | + <empty-list | ||
27 | + class="empty-wrapper" | ||
28 | + tip="这里什么都没有..." | ||
29 | + v-show="isShowEmpty" | ||
30 | + /> | ||
26 | </scroll> | 31 | </scroll> |
27 | - <empty-list | ||
28 | - class="empty-wrapper" | ||
29 | - tip="这里什么都没有..." | ||
30 | - v-show="isShowEmpty" | ||
31 | - /> | ||
32 | </div> | 32 | </div> |
33 | </layout-app> | 33 | </layout-app> |
34 | </template> | 34 | </template> |
@@ -111,16 +111,13 @@ export default { | @@ -111,16 +111,13 @@ export default { | ||
111 | </script> | 111 | </script> |
112 | <style lang="scss" scoped> | 112 | <style lang="scss" scoped> |
113 | .content-wrapper { | 113 | .content-wrapper { |
114 | - height: calc(100vh - 100px); | 114 | + height: 100%; |
115 | overflow-x: hidden; | 115 | overflow-x: hidden; |
116 | overflow-y: auto; | 116 | overflow-y: auto; |
117 | -webkit-box-orient: vertical; | 117 | -webkit-box-orient: vertical; |
118 | 118 | ||
119 | .empty-wrapper { | 119 | .empty-wrapper { |
120 | - margin: auto 0; | ||
121 | - position: absolute; | ||
122 | - top: 0; | ||
123 | - bottom: 0; | 120 | + margin: 20vh 0; |
124 | } | 121 | } |
125 | 122 | ||
126 | .footer-wrapper { | 123 | .footer-wrapper { |
@@ -8,7 +8,6 @@ | @@ -8,7 +8,6 @@ | ||
8 | :options="options" | 8 | :options="options" |
9 | :data="orderList" | 9 | :data="orderList" |
10 | class="order-list-scroll-wrap" | 10 | class="order-list-scroll-wrap" |
11 | - v-show="!isShowEmpty" | ||
12 | > | 11 | > |
13 | <ul class="list-wrapper"> | 12 | <ul class="list-wrapper"> |
14 | <li v-for="order in orderList" :key="order.orderCode"> | 13 | <li v-for="order in orderList" :key="order.orderCode"> |
@@ -39,14 +38,14 @@ | @@ -39,14 +38,14 @@ | ||
39 | </div> | 38 | </div> |
40 | </li> | 39 | </li> |
41 | </ul> | 40 | </ul> |
42 | - </scroll> | ||
43 | 41 | ||
44 | - <empty-list | ||
45 | - @touch.prevent | ||
46 | - class="empty-wrapper" | ||
47 | - tip="这里什么都没有..." | ||
48 | - v-show="isShowEmpty" | ||
49 | - /> | 42 | + <empty-list |
43 | + @touch.prevent | ||
44 | + class="empty-wrapper" | ||
45 | + tip="这里什么都没有..." | ||
46 | + v-show="isShowEmpty" | ||
47 | + /> | ||
48 | + </scroll> | ||
50 | </div> | 49 | </div> |
51 | </layout-app> | 50 | </layout-app> |
52 | </template> | 51 | </template> |
@@ -155,10 +154,7 @@ export default { | @@ -155,10 +154,7 @@ export default { | ||
155 | } | 154 | } |
156 | 155 | ||
157 | .empty-wrapper { | 156 | .empty-wrapper { |
158 | - margin: auto 0; | ||
159 | - position: absolute; | ||
160 | - top: 0; | ||
161 | - bottom: 0; | 157 | + margin: 20vh 0; |
162 | } | 158 | } |
163 | 159 | ||
164 | .order-list-scroll-wrap { | 160 | .order-list-scroll-wrap { |
-
Please register or login to post a comment