| 
					
				 | 
			
			
				@@ -16,13 +16,18 @@ class Eyemargin extends Model 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 获取携带标签的列表 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public static function getDistanceList($user_lng,$user_lat,$field,$where,$user_id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public static function getDistanceList($user_lng,$user_lat,$field,$where,$user_id,$page=0,$pageNum=10) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $results = \app\common\model\Eyemargin::alias("a") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ->field($field) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ->join("hx_user u","a.user_id = u.id") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ->where($where) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ->order("a.weight desc,a.createtime desc") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ->select(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ->order("a.weight desc,a.createtime desc"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if($page>=0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            $results = $results->page($page,$pageNum); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $results = $results->select(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if($results) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $userinfo = Db::name('user_info'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $public_key = "-----BEGIN PUBLIC KEY-----" .PHP_EOL. 
			 |