Merge branch 'feature/homeInvoice' into release/6.1

@@ -9,7 +9,6 @@ const index = (req, res, next) => {
 
     return req.ctx(ordersService).index(req.user.uid, page, limit, 8).then(result => {
         res.render('invoice', {
-            // meOrdersPage: true,
             meOrders: result
         });
     }).catch(next);

@@ -26,7 +26,8 @@ module.exports = class extends global.yoho.BaseModel {
         this.ORDER_EMPTY_DESC = {
             1: '您还没有任何订单',
             5: '您目前还没有成功的订单',
-            7: '您还没有任何取消的订单'
+            7: '您还没有任何取消的订单',
+            8: '您还没有相关订单'
         };
 
         this.TABS = [

@@ -18,9 +18,7 @@
                     </p>
 
                     {{#if orders.empty}}
-                        {{#with orders}}
-                            {{> empty}}
-                        {{/with}}
+                        <p class="empty-tip">您还没有相关订单<br><span>未开票的订单可以在这里补开发票</span></p>
                     {{^}}
                         {{# orders.list}}
                             <div class="order" data-id="{{orderNum}}" data-time="{{time}}" data-paytype="{{payType}}">

@@ -24,6 +24,26 @@
         }
     }
 
+    .empty-tip {
+        font-size: 16px;
+        line-height: 1.5;
+        padding: 10px 0 300px;
+
+        &:before {
+            content: "";
+            display: block;
+            width: 70px;
+            height: 90px;
+            background: resolve("home/empty-content.jpg");
+            margin: 30px auto;
+        }
+
+        > span {
+            font-size: 14px;
+            color: #ccc;
+        }
+    }
+
     &.invoice-detail-dialog {
         background: #fff;