修改地址

@@ -192,6 +192,13 @@ class OrderModel
                 $detail['orderInfo']['receiver'] = $orderDetail['user_name'];
                 $detail['orderInfo']['receiver'] = $orderDetail['user_name'];
                 $detail['orderInfo']['address'] = $orderDetail['area'] . $orderDetail['address'];
                 $detail['orderInfo']['address'] = $orderDetail['area'] . $orderDetail['address'];
                 $detail['orderInfo']['phone'] = substr_replace($orderDetail['mobile'], '****', 3, 4) . (!empty($orderDetail['phone']) ? ',' . substr_replace($orderDetail['phone'], '****', 3, 5) : '');
                 $detail['orderInfo']['phone'] = substr_replace($orderDetail['mobile'], '****', 3, 4) . (!empty($orderDetail['phone']) ? ',' . substr_replace($orderDetail['phone'], '****', 3, 5) : '');
+                $detail['editInfo']['userName'] = $orderDetail['user_name'];//收货人
+                $detail['editInfo']['address'] = $orderDetail['address'];//地址
+                $detail['editInfo']['areaCode'] = $orderDetail['area_code'];//地址编号
+                $detail['editInfo']['mobile'] = $orderDetail['mobile'];//手机号码
+                $phone = explode('-', strtr($value['phone'], array('null' => '')));//固定电话
+                $detail['editInfo']['phoneNum'] = isset($phone[1]) ? $phone[0] : '';//电话区号
+                $detail['editInfo']['phoneCode'] =isset($phone[1]) ? $phone[1] : '';//电话号码
             }
             }
             //商品信息
             //商品信息
             if ($orderDetail['order_goods']) {
             if ($orderDetail['order_goods']) {
@@ -225,7 +232,8 @@ 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['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['packages'] = CartModel::getPackageInfo($orderDetail);
             //判断是否可以修改地址
             //判断是否可以修改地址
-            $detail['changeable'] = $orderDetail['can_update_delivery_address'] == 'Y' ? 'true' : 'false';
+//            $detail['changeable'] = $orderDetail['can_update_delivery_address'] == 'Y' ? 'true' : 'false';
+            $detail['changeable'] = 'true';
         }
         }
         return $detail;
         return $detail;
     }
     }

@@ -267,7 +267,7 @@ class OrdersController extends WebAction
             $address = $this->get('address', ''); //地址
             $address = $this->get('address', ''); //地址
             $mobile = $this->get('mobile', ''); //手机号码
             $mobile = $this->get('mobile', ''); //手机号码
             $phoneNum = $this->get('phoneNum', ''); //固定电话
             $phoneNum = $this->get('phoneNum', ''); //固定电话
-            $phoneCode = $this->get('phoneCode', ''); //固定电话
+            $phoneCode = $this->get('phoneCode', ''); //电话编号
             if(!empty($phoneNum) && !empty($phoneCode)){
             if(!empty($phoneNum) && !empty($phoneCode)){
                $phone = $phoneCode.'-'.$phoneNum;
                $phone = $phoneCode.'-'.$phoneNum;
             }          
             }