|
|
@@ -67,21 +67,17 @@ class CollectController extends CommonController {
|
|
|
->limit($offset,$listRows)
|
|
|
->select();
|
|
|
$activitys = M('activity_v2')->where(['id'=>$act_id])->find();
|
|
|
- foreach($activitys as $row){
|
|
|
- $activity_info[$row['id']] = ['activity_name'=>$row['activity_name']];
|
|
|
- }
|
|
|
if($activitys['collect_list']){
|
|
|
$collects = json_decode($activitys['collect_list'],true);
|
|
|
$collects = array_column($collects, null,'collect_id');
|
|
|
}
|
|
|
|
|
|
foreach ($List as $key=>$row) {
|
|
|
- $List[$key]['activity_name'] = $activity_info[$row['act_id']]['activity_name'];
|
|
|
+ $List[$key]['activity_name'] = $activitys['activity_name'];
|
|
|
if($collects){
|
|
|
$List[$key]['collect_name'] = $collects[$row['collect_id']]['collect_name'];
|
|
|
}
|
|
|
}
|
|
|
-// var_dump($List);die;
|
|
|
$count = $this->table->where($where)->count();
|
|
|
$Page = new \Think\Page($count, $listRows);
|
|
|
$Page->parameter .= "&p=[PAGE]";
|
