| 
					
				 | 
			
			
				@@ -168,13 +168,13 @@ class GoodsController extends Base 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$data['quantity_unit'] = '分钟'; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		/*if ($data['cat_id']) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		if ($data['cat_id']) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$cat = Category::find($data['cat_id']); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			if (!empty($cat)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				$cat = $cat->toArray(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$data['ptype'] = $cat['ptype']; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		}*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		if (!empty($data['videourl'])) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			$data['videotype'] = 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		} elseif (!empty($data['videoid'])) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -418,8 +418,7 @@ class GoodsController extends Base 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	function getField() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//		$ptype = input('post.ptype', '', 'serach_in'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		$ptype = 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		$ptype = input('post.ptype', '', 'serach_in'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$data['cidarray'] = _generateSelectTree(Category::getpcarray($ptype)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$data['mgidarray'] = \app\model\MemberAuthGroup::getpcarray(1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		$data['unitarray'] = \app\model\GoodsQuantityUnit::getpcarray($ptype); 
			 |