fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 99a11690825dcfb79834ba4f9a8591959cf688ef 1 parent 93271746

order status string

Inline Side-by-side
Showing 2 changed files with 8 additions and 7 deletions
@@ -81,16 +81,16 @@ @@ -81,16 +81,16 @@
81 </div> 81 </div>
82 <div class="order-status"> 82 <div class="order-status">
83 {{#if noPay}} 83 {{#if noPay}}
84 - <span class="no-pay">等待付款</span> 84 + <span class="no-pay">{{statusStr}}</span>
85 {{/if}} 85 {{/if}}
86 86
87 {{#if paid}} 87 {{#if paid}}
88 - <span class="paid">待发货</span> 88 + <span class="paid">{{statusStr}}</span>
89 {{/if}} 89 {{/if}}
90 90
91 {{#if shipped}} 91 {{#if shipped}}
92 <span class="shipped"> 92 <span class="shipped">
93 - 待收货 93 + {{statusStr}}
94 {{#if virtualGoods}} 94 {{#if virtualGoods}}
95 <!--虚拟商品--> 95 <!--虚拟商品-->
96 {{else}} 96 {{else}}
@@ -112,15 +112,15 @@ @@ -112,15 +112,15 @@
112 {{/if}} 112 {{/if}}
113 113
114 {{#if complete}} 114 {{#if complete}}
115 - <span class="complete">待发货</span> 115 + <span class="complete">{{statusStr}}</span>
116 {{/if}} 116 {{/if}}
117 117
118 {{#if cancel}} 118 {{#if cancel}}
119 - <span class="cancel">已取消</span> 119 + <span class="cancel">{{statusStr}}</span>
120 {{/if}} 120 {{/if}}
121 121
122 {{#if reback}} 122 {{#if reback}}
123 - <span class="reback">交易完成</span> 123 + <span class="reback">{{statusStr}}</span>
124 {{/if}} 124 {{/if}}
125 </div> 125 </div>
126 <div class="operation"> 126 <div class="operation">
@@ -50,6 +50,7 @@ class OrderModel @@ -50,6 +50,7 @@ class OrderModel
50 } 50 }
51 } 51 }
52 } 52 }
  53 + $orders[$orderK]['statusStr'] = $statusInfo['statusStr'];
53 //订单商品相关信息 54 //订单商品相关信息
54 $opRefundStatus = true; //订单不可操作退换货 55 $opRefundStatus = true; //订单不可操作退换货
55 if (isset($orderV['order_goods']) && $orderV['order_goods']) { 56 if (isset($orderV['order_goods']) && $orderV['order_goods']) {
@@ -166,7 +167,7 @@ class OrderModel @@ -166,7 +167,7 @@ class OrderModel
166 $orderDetail = $orderInfo['data']; 167 $orderDetail = $orderInfo['data'];
167 $detail['orderNum'] = $orderDetail['order_code']; 168 $detail['orderNum'] = $orderDetail['order_code'];
168 //订单状态 169 //订单状态
169 - $statusInfo = self::getOrderStatus($orderDetail['is_cancel'], $orderDetail['status'], $orderDetail['payment_type'], $orderDetail['payment_status']); 170 + $statusInfo = self::getOrderStatus($orderDetail['is_cancel'], $orderDetail['status'], $orderDetail['payment_type'], $orderDetail['payment_status'], $orderDetail['status_str']);
170 $detail['statusStr'] = $statusInfo['statusStr']; 171 $detail['statusStr'] = $statusInfo['statusStr'];
171 //订单是否已完成 172 //订单是否已完成
172 $detail['complete'] = false; 173 $detail['complete'] = false;