|
|
@@ -106,8 +106,9 @@ class Activity extends BaseController
|
|
|
$page = $page >= $total ? $total : $page;
|
|
|
$list = Db::name('activity_info')->alias("a")
|
|
|
->join("good_activity b","b.activity_code=b.activity_code","left")
|
|
|
- ->join("platform c","c.platform_code=b.platform_code","left")
|
|
|
- ->where($where)->page($page,$size)->order("a.addtime desc")->field("a.*,b.activity_name,c.platform_name")->select();
|
|
|
+ ->join("platform c","c.id=b.platform_code","left")
|
|
|
+ ->where($where)->page($page,$size)->order("a.addtime desc")->field("a.*,b.activity_name,c.platform_name,c.platform_code
|
|
|
+ ")->select();
|
|
|
return app_show(0,"获取成功",['list'=>$list,'count'=>$count]);
|
|
|
}
|
|
|
public function zilist(){
|
