Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods

mobile/control/member_address.php

@@ -23,7 +23,7 @@ class member_addressControl extends mobileMemberControl {
     public function address_listOp() {
 		$model_address = Model('address');
         $address_list = $model_address->getAddressList(array('member_id'=>$this->member_info['member_id']));
-        output_data(array('address_list' => $address_list));
+        joutput_data(array('address_list' => $address_list));
     }
 
     /**
@@ -38,9 +38,9 @@ class member_addressControl extends mobileMemberControl {
         $condition['address_id'] = $address_id;
         $address_info = $model_address->getAddressInfo($condition);
         if(!empty($address_id) && $address_info['member_id'] == $this->member_info['member_id']) {
-            output_data(array('address_info' => $address_info));
+            joutput_data(array('address_info' => $address_info));
         } else {
-            output_error('地址不存在');
+            joutput_error(errcode::ErrAddress, '地址不存在');
         }
     }
 
@@ -56,7 +56,7 @@ class member_addressControl extends mobileMemberControl {
         $condition['address_id'] = $address_id;
         $condition['member_id'] = $this->member_info['member_id'];
         $model_address->delAddress($condition);
-        output_data('1');
+        joutput_data(array('result'=>'1'));
     }
 
     /**
@@ -69,9 +69,9 @@ class member_addressControl extends mobileMemberControl {
 
         $result = $model_address->addAddress($address_info);
         if($result) {
-            output_data(array('address_id' => $result));
+            joutput_data(array('address_id' => $result));
         } else {
-            output_error('保存失败');
+            joutput_error(errcode::ErrAddress,'保存失败');
         }
     }
 
@@ -86,16 +86,16 @@ class member_addressControl extends mobileMemberControl {
         //验证地址是否为本人
         $address_info = $model_address->getOneAddress($address_id);
         if ($address_info['member_id'] != $this->member_info['member_id']) {
-            output_error('参数错误');
+            joutput_error(errcode::ErrAddress, '参数错误');
         }
 
         $address_info = $this->_address_valid();
 
         $result = $model_address->editAddress($address_info, array('address_id' => $address_id));
         if($result) {
-            output_data('1');
+            joutput_data(array('result'=>'1'));
         } else {
-            output_error('保存失败');
+            joutput_error(errcode::ErrAddress, '保存失败');
         }
     }
 
@@ -112,7 +112,7 @@ class member_addressControl extends mobileMemberControl {
         );
         $error = $obj_validate->validate();
         if ($error != ''){
-            output_error($error);
+            joutput_error(errcode::ErrAddress, $error);
         }
 
         $data = array();
@@ -132,7 +132,24 @@ class member_addressControl extends mobileMemberControl {
      */
     public function area_listOp() {
         $area_id = intval($_POST['area_id']);
+        $from = $_POST['from'];
+        if($from === 'app'){
+            $area_list = $this->_get_area_list($area_id);
+        }else{
+            $model_area = Model('area');
+
+            $condition = array();
+            if($area_id > 0) {
+                $condition['area_parent_id'] = $area_id;
+            } else {
+                $condition['area_deep'] = 1;
+            }
+            $area_list = $model_area->getAreaList($condition, 'area_id,area_name');
+        }
+        joutput_data(array('area_list' => $area_list));
+    }
 
+    private function _get_area_list($area_id){
         $model_area = Model('area');
 
         $condition = array();
@@ -142,7 +159,13 @@ class member_addressControl extends mobileMemberControl {
             $condition['area_deep'] = 1;
         }
         $area_list = $model_area->getAreaList($condition, 'area_id,area_name');
-        output_data(array('area_list' => $area_list));
+        foreach($area_list as $k => $area){
+            $area_list_by_id = $this->_get_area_list($area['area_id']);
+            if(count($area_list_by_id) > 0){
+                $area_list[$k]['area_list'] = $area_list_by_id;
+            }
+        }
+        return $area_list;
     }
 
 }

mobile/control/member_invoice.php

@@ -29,7 +29,7 @@ class member_invoiceControl extends mobileMemberControl {
 
 	    $invoice_list = $model_invoice->getInvList($condition, 10, 'inv_id,inv_title,inv_content');
 
-        output_data(array('invoice_list' => $invoice_list));
+        joutput_data(array('invoice_list' => $invoice_list));
     }
 
     /**
@@ -38,16 +38,16 @@ class member_invoiceControl extends mobileMemberControl {
     public function invoice_delOp() {
         $inv_id = intval($_POST['inv_id']);
         if($inv_id <= 0) {
-            output_error('参数错误');
+            joutput_error(errcode::ErrInvoice, '参数错误');
         }
 
         $model_invoice = Model('invoice');
 
         $result = $model_invoice->delInv(array('inv_id'=>$inv_id, 'member_id'=>$this->member_info['member_id']));
         if($result) {
-            output_data('1');
+            joutput_data(array('result' => '1'));
         } else {
-            output_error('删除失败');
+            joutput_error(errcode::ErrInvoice, '删除失败');
         }
     }
 
@@ -64,9 +64,9 @@ class member_invoiceControl extends mobileMemberControl {
         $data['member_id'] = $this->member_info['member_id'];
         $result = $model_invoice->addInv($data);
         if($result) {
-            output_data(array('inv_id' => $result));
+            joutput_data(array('inv_id' => $result));
         } else {
-            output_error('添加失败');
+            joutput_error(errcode::ErrInvoice, '添加失败');
         }
     }
 
@@ -95,7 +95,7 @@ class member_invoiceControl extends mobileMemberControl {
             '耗材',
             '电脑配件'
         );
-        output_data(array('invoice_content_list' => $invoice_content_list));
+        joutput_data(array('invoice_content_list' => $invoice_content_list));
     }
 
 }

mobile/util/errcode.php

@@ -19,6 +19,8 @@ class errcode extends SplEnum
     const ErrSpecial  = 10100;
     const ErrCart  = 10200;
     const ErrOrder  = 10300;
+    const ErrAddress  = 10400;
+    const ErrInvoice  = 10400;
 
     const ErrDB      = 11000;
     const ErrSms 	 = 12000;