| 
					
				 | 
			
			
				@@ -16,6 +16,20 @@ class Address  extends Base 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return $data;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    # 获取某个收货地址
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public function getOne($uid, $id)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $where['uid'] = $uid;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $where['id'] = $id;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $data = Dever::db('passport/address')->find($where);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if ($data && Dever::project('area')) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            $data = $this->getInfo($data);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return $data;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     # 获取地址列表
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public function getAddress($uid)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -24,20 +38,29 @@ class Address  extends Base 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ($data && Dever::project('area')) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             foreach ($data as $k => $v) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $info = Dever::db('area/province')->find($v['province']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $data[$k]['province_name'] = $info['name'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $info = Dever::db('area/city')->find($v['city']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $data[$k]['city_name'] = $info['name'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $info = Dever::db('area/county')->find($v['county']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                $data[$k]['county_name'] = $info['name'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                $data[$k] = $this->getInfo($v);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return $data;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private function getInfo($data)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $info = Dever::db('area/province')->find($data['province']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $data['province_name'] = $info['name'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $info = Dever::db('area/city')->find($data['city']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $data['city_name'] = $info['name'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $info = Dever::db('area/county')->find($data['county']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $data['county_name'] = $info['name'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $data['add_string'] = $data['province_name'] . $data['city_name'] . $data['county_name'] .','. $data['address'] .','. $data['house_number'] .','. $data['contact'] .','. $data['mobile'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return $data;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     # 添加或者更新地址接口
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public function up()
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     {
 
			 |