|
|
@@ -114,7 +114,7 @@ class Activity extends Base{
|
|
|
if($param['roundId']!==""){
|
|
|
$where[]=["roundId","=",$param['roundId']];
|
|
|
}
|
|
|
- $list= $this->model->with(["act","platformYz"=>["platform","good"],"promocode"])->where($where)->order("id desc")->paginate(["list_rows"=>$param['size'],"page"=>$param['page']]);
|
|
|
+ $list= $this->model->with(["act","platformYz"=>["platform","good"=>['unit','brand','category']],"promocode"])->where($where)->order("id desc")->paginate(["list_rows"=>$param['size'],"page"=>$param['page']]);
|
|
|
$list->each(function($item,$key){
|
|
|
$item['status_cn']=ActGood::$statusCn[$item['status']]??"";
|
|
|
$item['act_status_cn']=\app\txx\model\Act::$statusCn[$item['act_status']]??"";
|
|
|
@@ -124,7 +124,7 @@ class Activity extends Base{
|
|
|
}
|
|
|
public function info(){
|
|
|
$param=$this->request->param(["id"=>""],"post","trim");
|
|
|
- $info= $this->model->with(["act","platformYz"=>["platform","good"],"promocode"])->findOrEmpty($param['id']);
|
|
|
+ $info= $this->model->with(["act","platformYz"=>["platform","good"=>['unit','brand','category']],"promocode"])->findOrEmpty($param['id']);
|
|
|
if($info->isEmpty()){
|
|
|
$this->error("信息有误");
|
|
|
}
|
