brand

@@ -514,6 +514,8 @@ const getOrderDetail = (uid, code) => {
             title: '订单详情'
         };
 
+        let btns = [];
+
         detail.orderGoods.forEach(good => {
             let cnAlphabet = good.cnAlphabet ? good.cnAlphabet : '';
 
@@ -534,7 +536,12 @@ const getOrderDetail = (uid, code) => {
 
         if (detail.isCancel !== 'Y') {
             detail.steps = _getStepByOrderStatus(st);
-            detail.btns = statusMap[st].btns;
+
+            statusMap[st].btns.forEach(function(btn) {
+                btns.push(btn);
+            });
+
+            detail.btns = btns;
 
             _.forEach(detail.btns, btn => {
                 if (btn.isPayBtn) {

@@ -18,9 +18,15 @@
 <div class="info-box">
     <h4 class="status-title">发票信息</h4>
     {{# invoice}}
+        {{#if typeText}}
         <p class="text">发票类型：{{typeText}}</p>
+        {{/if}}
+        {{#if title}}
         <p class="text">发票抬头：{{title}}</p>
+        {{/if}}
+        {{#if contentValue}}
         <p class="text">发票内容：{{contentValue}}</p>
+        {{/if}}
     {{^}}
         <p class="text">暂不需要发票</p>
     {{/ invoice}}

@@ -282,7 +282,7 @@ const helpers = {
                 });
 
                 _.forEach(s.sub, ss => {
-                    if (q.misort && q.misort === ss.categoryId) {
+                    if ((q.misort && q.misort === ss.categoryId) || (q.sort === ss.relationParameter.sort)) {
                         ss.checked = true;
                         s.checked = true;
                     }

@@ -23,6 +23,8 @@
         }
 
         .thumb-show {
+            width: 482px;
+            height: 643px;
             position: relative;
         }