| 
					
				 | 
			
			
				@@ -121,7 +121,7 @@ class Api 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @return mixed 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public function string($area, $im = ',', $unset = true, $name = '不限', $check = false) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public function string($area, $im = ',', $name = '不限', $unset = true, $check = false) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ($area) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (is_string($area)) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -133,7 +133,7 @@ class Api 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if ($k == 0) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $result[$k] = $this->getName('province', $v, false, 'id', $name); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } elseif ($k == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    $result[$k] = $this->getName('city', $v); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    $result[$k] = $this->getName('city', $v, false, 'id', $name); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if (isset($result[0]) && $result[0] == $result[1] && $unset) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         unset($result[1]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 |