Authored by cailing

修改

... ... @@ -232,7 +232,9 @@ class OrderModel
$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']
$detail['packages'] = CartModel::getPackageInfo($orderDetail);
//判断是否可以修改地址
// $detail['changeable'] = $orderDetail['can_update_delivery_address'] == 'Y' ? 'true' : 'false';
// if($orderDetail['can_update_delivery_address'] == 'Y'){
// $detail['changeable'] = 'true';
// }
$detail['changeable'] = 'true';
}
return $detail;
... ...
... ... @@ -121,6 +121,7 @@ class OrdersController extends WebAction
'orderBalance' => isset($detail['orderBalance']) ? $detail['orderBalance'] : array(),
'operation' => $detail['operation'],
'totalYoho' => $detail['yoho_give_coin'],
'editInfo' => $detail['editInfo'],
);
if (isset($detail['noramlPayMode'])) {
$data['orderInfo'] = $detail['orderInfo'];
... ...