| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -142,9 +142,7 @@ class AgentProductController extends Controller | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							//如果是新入驻代理商没有数据,且没有删除过的数据,则显示最早的几条
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							if ($list->isEmpty()) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								if (AgentProduct::list($this->agent_id)->withTrashed()->count() === 0 && request('page', 1) <= 2) { //只获取2页数据
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									$list = AgentProduct::list($this->agent_id)->orWhere(function ($query) { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
										$query->where('status', ProductStatus::ON_SALE); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									})->orderBy('id')->simplePaginate(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									$list = AgentProduct::list($this->agent_id)->orWhere('status', ProductStatus::ON_SALE)->orderBy('id')->simplePaginate(); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								} else { | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
									return $list; //因为只获取2页数据,不return可能会导入下面的代码出错
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
								} | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |