|
@@ -101,6 +101,7 @@ class Index extends Base
|
|
|
->where('is_deleted',0)
|
|
->where('is_deleted',0)
|
|
|
->where('status',1)
|
|
->where('status',1)
|
|
|
->whereIn('type',$in_type)
|
|
->whereIn('type',$in_type)
|
|
|
|
|
+ ->where('sell_time','< time',date("Y-m-d 23:59:59"))
|
|
|
->when($issue_mode,function ($query)use($issue_mode){ if($issue_mode) $query->where('issue_mode',$issue_mode);})
|
|
->when($issue_mode,function ($query)use($issue_mode){ if($issue_mode) $query->where('issue_mode',$issue_mode);})
|
|
|
->field('id,cover,name,type,label,price,inventory,now_inventory,state,sell_time,advance_info,auth_name,auth_img,issue_mode,apply_st,before_time')
|
|
->field('id,cover,name,type,label,price,inventory,now_inventory,state,sell_time,advance_info,auth_name,auth_img,issue_mode,apply_st,before_time')
|
|
|
->order('state asc,sell_time asc')
|
|
->order('state asc,sell_time asc')
|
|
@@ -122,7 +123,7 @@ class Index extends Base
|
|
|
$v['now_inventory'] = $now_inventory<=0 ? 0 : $now_inventory;
|
|
$v['now_inventory'] = $now_inventory<=0 ? 0 : $now_inventory;
|
|
|
$v['is_remind'] = getRemind($this->uid,$v['id']) ? true : false;
|
|
$v['is_remind'] = getRemind($this->uid,$v['id']) ? true : false;
|
|
|
}
|
|
}
|
|
|
- $this->success('成功',$list);
|
|
|
|
|
|
|
+ $this->success('成功',$list);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -155,7 +156,7 @@ class Index extends Base
|
|
|
->where('status',1)
|
|
->where('status',1)
|
|
|
->where('state',2)
|
|
->where('state',2)
|
|
|
->whereIn('type',$in_type)
|
|
->whereIn('type',$in_type)
|
|
|
- ->where('date','>=',date('Y-m-d',time()))
|
|
|
|
|
|
|
+ ->where('date','>=',date('Y-m-d',time()+86400))
|
|
|
->group('date')
|
|
->group('date')
|
|
|
->order('date asc')
|
|
->order('date asc')
|
|
|
->column('date');
|
|
->column('date');
|
