Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -104,10 +104,10 @@
                         if (result.data.orderList.length > 0) {
                             this.$set('orderList', _that.orderList.concat(result.data.orderList));
                             _that.pageTotal = result.data.pageTotal;
-                        } else {
-                            _that.emptybox = '';
                         }
-                    } else {
+                    }
+
+                    if (_that.orderList.length === 0) {
                         _that.emptybox = '';
                     }
                 }).fail(() => {

@@ -37,6 +37,11 @@
             </div>
         </li>
     </ul>
+    <div class="order-empty {{emptybox}}">
+        <p>您暂时还没有订单</p>
+        <p>Your do not have an order <br>for the time being</p>
+        <a href="/new">随便逛逛</a>
+    </div>
 </template>
 <script>
     'use strict';
@@ -51,6 +56,7 @@
                 pageTotal: 1,
                 orderList: [],
                 busy: false,
+                emptybox: 'hide'
             };
         },
 
@@ -78,6 +84,10 @@
                         this.$set('orderList', _that.orderList.concat(result.data.list));
                         _that.pageTotal = result.data.totalPage;
                     }
+
+                    if (_that.orderList.length === 0) {
+                        _that.emptybox = '';
+                    }
                 }).fail(() => {
                     tip('网络错误');
                 });