@ -35,11 +35,7 @@ class SquirrelModel extends Orm_Base{
//获取仓鼠信息
$data['slist']=$this->field('id,number,sex,birthday,father,mother,strains_id as strains,gene,hair_color,cage,remark')->where("is_delete=0 and is_kill=0 {$params['where']}")->fList();
foreach($data['slist'] as $key => & $val){
// $father = $this->getOneInfo($val['father']);
// $mother = $this->getOneInfo($val['mother']);
$val['sex'] = $val['sex']=1?'公':'母';
// $val['father'] = empty($father)?$val['father']:$father['number'];
// $val['mother'] = empty($mother)?$val['mother']:$mother['number'];
//获取笼位号
$val['cage'] =$cageModel->getOneInfo($val['cage'])['number'];
}
@ -85,9 +81,9 @@ class SquirrelModel extends Orm_Base{
$date = strtotime(date('Y-m-d',time()));
$info = $this->field('nusring_time')->where("id={$squirrel}")->fRow();
if(strotime($info['nusring_time'])>$date){
$data['icon'] = Yaf_Registry::get("config")->cangshu->url->small;
$data['icon'] = $_SERVER['HTTP_HOST']. Yaf_Registry::get("config")->cangshu->url->small;
}else{
$data['icon'] = Yaf_Registry::get("config")->cangshu->url->big;
$data['icon'] =$_SERVER['HTTP_HOST']. Yaf_Registry::get("config")->cangshu->url->big;
}
return $data;
}