| 
					
				 | 
			
			
				@@ -131,7 +131,7 @@ Class User extends Core 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $data['list'][$k]['mobile'] = $active['mobile'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $data['list'][$k]['time'] = '';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if ($v['status'] == 1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (time() < =$v['cdate'] + 300 ){
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if (time() <= $v['cdate'] + 300 ){
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $data['list'][$k]['time'] = date('H`i',time()-$v['cdate'] + 300);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -212,15 +212,15 @@ Class User extends Core 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				if ($code) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					foreach ($code as $k => $v) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						if ($v['status'] == 1) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							$status = '待核销';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							$data['info']['code'][$k]['status'] = '待核销';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						} elseif ($v['status'] == 2) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-							$status = '已核销';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							$data['info']['code'][$k]['status'] = '已核销';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						} else {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                            $status = '已作废';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            $data['info']['code'][$k]['status'] = '已作废';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						$user = Dever::db('active/user')->find($v['join_uid']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						$data['info']['code'][$k]['name'] = $user['name'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						$data['info']['code'][$k]['mobile'] = '手机尾号'.substr($user['mobile'],-4).','.$status;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						$data['info']['code'][$k]['mobile'] = substr($user['mobile'], 0, 3).'****'.substr($user['mobile'], 7);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				}
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			} else {
 
			 |