fe / YOHOBUYPC · Commits

Go to a project

Authored by cailing
Commit 2b2398d07c11565655d56eebba01562f229f9ba7 1 parent 49428717

修改

Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
@@ -232,7 +232,9 @@ class OrderModel @@ -232,7 +232,9 @@ class OrderModel
232 $detail['operation'] = self::getOrderDetailOp($orderDetail['order_code'], $orderDetail['payment'], $orderDetail['status'], $orderDetail['is_cancel'], $orderDetail['payment_status'], $orderDetail['payment_type'], $orderDetail['order_type'], $orderDetail['attribute'], $orderDetail['refund_status']); //,$orderDetail['order_type_value'] 232 $detail['operation'] = self::getOrderDetailOp($orderDetail['order_code'], $orderDetail['payment'], $orderDetail['status'], $orderDetail['is_cancel'], $orderDetail['payment_status'], $orderDetail['payment_type'], $orderDetail['order_type'], $orderDetail['attribute'], $orderDetail['refund_status']); //,$orderDetail['order_type_value']
233 $detail['packages'] = CartModel::getPackageInfo($orderDetail); 233 $detail['packages'] = CartModel::getPackageInfo($orderDetail);
234 //判断是否可以修改地址 234 //判断是否可以修改地址
235 -// $detail['changeable'] = $orderDetail['can_update_delivery_address'] == 'Y' ? 'true' : 'false'; 235 +// if($orderDetail['can_update_delivery_address'] == 'Y'){
  236 +// $detail['changeable'] = 'true';
  237 +// }
236 $detail['changeable'] = 'true'; 238 $detail['changeable'] = 'true';
237 } 239 }
238 return $detail; 240 return $detail;
@@ -121,6 +121,7 @@ class OrdersController extends WebAction @@ -121,6 +121,7 @@ class OrdersController extends WebAction
121 'orderBalance' => isset($detail['orderBalance']) ? $detail['orderBalance'] : array(), 121 'orderBalance' => isset($detail['orderBalance']) ? $detail['orderBalance'] : array(),
122 'operation' => $detail['operation'], 122 'operation' => $detail['operation'],
123 'totalYoho' => $detail['yoho_give_coin'], 123 'totalYoho' => $detail['yoho_give_coin'],
  124 + 'editInfo' => $detail['editInfo'],
124 ); 125 );
125 if (isset($detail['noramlPayMode'])) { 126 if (isset($detail['noramlPayMode'])) {
126 $data['orderInfo'] = $detail['orderInfo']; 127 $data['orderInfo'] = $detail['orderInfo'];