| 
					
				 | 
			
			
				@@ -154,15 +154,16 @@ class Journal_v1 extends Core 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $where['publish'] = 2;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         # 获取最新的小刊
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //$this->data['push'] = Dever::db('journal/info')->getNew($where);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $this->data['push'] = Dever::db('journal/info')->getNew($where);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //$this->data['push'] = $this->ding($this->data['push']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $this->data['push'] = $this->ding($this->data['push']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $this->data['button'] = array();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ////$this->data['push'] = $this->getButton($this->data['push']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         ////$this->data['push'] = $this->getAppSet($this->data['push']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         # 热门电子刊
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        /*
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $this->data['push'] = Dever::db('journal/info')->getHot($where);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if ($this->data['push']) {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -171,6 +172,7 @@ class Journal_v1 extends Core 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $this->data['push'][$k] = $this->getButton($this->data['push'][$k]);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        */
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $data = Dever::db('journal/info')->getAllByPage($where);
 
			 |