order status string

@@ -81,16 +81,16 @@
                     </div>
                     <div class="order-status">
                         {{#if noPay}}
-                            <span class="no-pay">等待付款</span>
+                            <span class="no-pay">{{statusStr}}</span>
                         {{/if}}
 
                         {{#if paid}}
-                            <span class="paid">待发货</span>
+                            <span class="paid">{{statusStr}}</span>
                         {{/if}}
 
                         {{#if shipped}}
                             <span class="shipped">
-                                待收货
+                                {{statusStr}}
                                 {{#if virtualGoods}}
                                     <!--虚拟商品-->
                                 {{else}}
@@ -112,15 +112,15 @@
                         {{/if}}
 
                         {{#if complete}}
-                            <span class="complete">待发货</span>
+                            <span class="complete">{{statusStr}}</span>
                         {{/if}}
 
                         {{#if cancel}}
-                            <span class="cancel">已取消</span>
+                            <span class="cancel">{{statusStr}}</span>
                         {{/if}}
 
                         {{#if reback}}
-                            <span class="reback">交易完成</span>
+                            <span class="reback">{{statusStr}}</span>
                         {{/if}}
                     </div>
                     <div class="operation">

@@ -50,6 +50,7 @@ class OrderModel
                         }
                     }
                 }
+                $orders[$orderK]['statusStr'] = $statusInfo['statusStr'];
                 //订单商品相关信息
                 $opRefundStatus = true; //订单不可操作退换货
                 if (isset($orderV['order_goods']) && $orderV['order_goods']) {
@@ -166,7 +167,7 @@ class OrderModel
             $orderDetail = $orderInfo['data'];
             $detail['orderNum'] = $orderDetail['order_code'];
             //订单状态
-            $statusInfo = self::getOrderStatus($orderDetail['is_cancel'], $orderDetail['status'], $orderDetail['payment_type'], $orderDetail['payment_status']);
+            $statusInfo = self::getOrderStatus($orderDetail['is_cancel'], $orderDetail['status'], $orderDetail['payment_type'], $orderDetail['payment_status'], $orderDetail['status_str']);
             $detail['statusStr'] = $statusInfo['statusStr'];
             //订单是否已完成
             $detail['complete'] = false;