fix member_address add

mobile/control/member_address.php

@@ -23,19 +23,12 @@ class member_addressControl extends mbMemberControl
         parent::__construct();
     }
 
-    /**
-     * 地址列表
-     */
     public function address_listOp()
     {
         $model_address = Model('address');
         $address_list = $model_address->getAddressList(array('member_id' => $_SESSION['member_id']));
         self::outsuccess(array('address_list' => $address_list), 'shop/choose_address');
     }
-
-    /**
-     * 地址详细信息
-     */
     public function address_infoOp()
     {
         $address_id = intval($_POST['address_id']);
@@ -52,9 +45,6 @@ class member_addressControl extends mbMemberControl
         }
     }
 
-    /**
-     * 删除地址
-     */
     public function address_delOp()
     {
         $address_id = intval($_POST['address_id']);
@@ -77,30 +67,19 @@ class member_addressControl extends mbMemberControl
     public function address_addOp()
     {
         $model_address = Model('address');
-        $err = '';
         $address_info = $this->_address_valid($err, $err_code);
         if ($err != '') {
             return self::outerr($err_code, $err);
         }
 
         $addr_acount = $model_address->getAddressCount(array('member_id' => $_SESSION['member_id']));
-
         if ($addr_acount >= self::MAX_ADDRESS_COUNT) {
             return self::outerr(errcode::ErrAddress, '地址数量已达上限');
         }
 
-        // 格式化区域信息
-
-        if($_SESSION['is_lasted'] == false) {
-            $model_area = Model('area');
-            $address_info['area_info'] = $model_area->formatAddress($address_info['area_info']);
-            if(empty($address_info['area_info'])) {
-                $address_info['area_info'] = '';
-            }
-        }
-
         $result = $model_address->addAddress($address_info);
-        if ($result) {
+        if ($result)
+        {
             $addr_acount = $model_address->getAddressCount(array('member_id' => $_SESSION['member_id']));
             if (intval($addr_acount) === 1) {
                 $this->_set_default($result, 1);
@@ -150,70 +129,39 @@ class member_addressControl extends mbMemberControl
      */
     private function _address_valid(&$err, &$errcode)
     {
-        if($_SESSION['is_lasted'])
-        {
-            $obj_validate = new Validator();
-            $obj_validate->validateparam = array(
-                array("input" => $_POST["true_name"], "require" => "true", "message" => '姓名不能为空'),
-                array("input" => $_POST["address"], "require" => "true", "message" => '地址不能为空'),
-                Validator::verify_mobile($_POST['mob_phone'])
-            );
-
-            $err = $obj_validate->validate();
-            if ($err != '') {
-                $errcode = errcode::ErrAddress;
-                return NULL;
-            }
-
-            $area_id = intval($_POST['area_id']);
-            $area = search\tcp_client::instance()->get_area($area_id);
-            if ($area == false || $area['result'] == false) {
-                $errcode = errcode::ErrAddress;
-                return NULL;
-            }
-
-            $data = array();
-            $data['member_id'] = $_SESSION['member_id'];
-            $data['true_name'] = urldecode($_POST['true_name']);
-
-            $data['area_id'] = intval($area['country']['area_id']);
-            $data['city_id'] = intval($area['city']['area_id']);
-            $data['area_info'] = "{$area['province']['area_name']}\t{$area['city']['area_name']}\t{$area['country']['area_name']}";
-
-            $data['address'] = urldecode($_POST['address']);
-            $data['tel_phone'] = '';
-            $data['mob_phone'] = $_POST['mob_phone'];
+        $obj_validate = new Validator();
+        $obj_validate->validateparam = array(
+            array("input" => $_POST["true_name"], "require" => "true", "message" => '姓名不能为空'),
+            array("input" => $_POST["address"], "require" => "true", "message" => '地址不能为空'),
+            Validator::verify_mobile($_POST['mob_phone'])
+        );
+
+        $err = $obj_validate->validate();
+        if ($err != '') {
+            $errcode = errcode::ErrAddress;
+            return NULL;
+        }
 
-            return $data;
+        $area_id = intval($_POST['area_id']);
+        $area = search\tcp_client::instance()->get_area($area_id);
+        if ($area == false || $area['result'] == false) {
+            $errcode = errcode::ErrAddress;
+            return NULL;
         }
-        else
-        {
-            $obj_validate = new Validator();
-            $obj_validate->validateparam = array(
-                array("input" => $_POST["true_name"], "require" => "true", "message" => '姓名不能为空'),
-                array("input" => $_POST["area_info"], "require" => "true", "message" => '地区不能为空'),
-                array("input" => $_POST["address"], "require" => "true", "message" => '地址不能为空'),
-                Validator::verify_mobile($_POST['mob_phone'])
-            );
-            $err = $obj_validate->validate();
-            if ($err != '') {
-                $errcode = errcode::ErrAddress;
-                return NULL;
-            }
 
-            $data = array();
-            $data['member_id'] = $_SESSION['member_id'];
-            $data['true_name'] = urldecode($_POST['true_name']);
-            $data['area_id'] = intval($_POST['area_id']);
-            $data['city_id'] = intval($_POST['city_id']);
-            $data['area_info'] = urldecode($_POST['area_info']);
-            $data['address'] = urldecode($_POST['address']);
-            $data['tel_phone'] = '';
-            $data['mob_phone'] = $_POST['mob_phone'];
+        $data = array();
+        $data['member_id'] = $_SESSION['member_id'];
+        $data['true_name'] = urldecode($_POST['true_name']);
 
+        $data['area_id'] = intval($area['country']['area_id']);
+        $data['city_id'] = intval($area['city']['area_id']);
+        $data['area_info'] = "{$area['province']['area_name']}\t{$area['city']['area_name']}\t{$area['country']['area_name']}";
 
-            return $data;
-        }
+        $data['address'] = urldecode($_POST['address']);
+        $data['tel_phone'] = '';
+        $data['mob_phone'] = $_POST['mob_phone'];
+
+        return $data;
     }
 
     /**