Commit 0448d228 authored by suntengda's avatar suntengda

update 修改即将开始活动排序规则

parent fab60d54
...@@ -166,7 +166,7 @@ class MarketingController extends Base ...@@ -166,7 +166,7 @@ class MarketingController extends Base
$this->params['marketing_type'] = Marketing::MARKETING_TYPE_PINDAN;//1分销 2团购 3秒杀 4团餐 $this->params['marketing_type'] = Marketing::MARKETING_TYPE_PINDAN;//1分销 2团购 3秒杀 4团餐
$this->params['online_status'] = Marketing::ONLINE_STATUS_QIDONG;//状态 , 1启用,2关闭,3 到期 $this->params['online_status'] = Marketing::ONLINE_STATUS_QIDONG;//状态 , 1启用,2关闭,3 到期
$this->params['from'] = 1;//1 小程序前台 默认0 后台 $this->params['from'] = 1;//1 小程序前台 默认0 后台
//正在进行中的 //正在进行中的 按结束时间正序
$this->params['sort_field'] = 'end_time'; $this->params['sort_field'] = 'end_time';
$this->params['sort_type'] = 'asc'; $this->params['sort_type'] = 'asc';
$this->params['need_buy_num'] = false; $this->params['need_buy_num'] = false;
...@@ -175,9 +175,9 @@ class MarketingController extends Base ...@@ -175,9 +175,9 @@ class MarketingController extends Base
$list['doing'] = $list['doing'] ? array_column($list['doing'], null, 'marketing_id') : []; $list['doing'] = $list['doing'] ? array_column($list['doing'], null, 'marketing_id') : [];
$marketingIdsDoing = array_keys($list['doing']); $marketingIdsDoing = array_keys($list['doing']);
//当天即将开始的 //当天即将开始的 按开始时间正序
$this->params['page'] = 1; $this->params['page'] = 1;
$this->params['sort_field'] = 'end_time'; $this->params['sort_field'] = 'start_time';
$this->params['sort_type'] = 'asc'; $this->params['sort_type'] = 'asc';
$this->params['need_buy_num'] = false; $this->params['need_buy_num'] = false;
$this->params['activity_status'] = MarketingPindan::ACTIVITY_STATUS_START_TODAY;//1 未开始,2进行中,3已结束, 4当日上新(即将开始) $this->params['activity_status'] = MarketingPindan::ACTIVITY_STATUS_START_TODAY;//1 未开始,2进行中,3已结束, 4当日上新(即将开始)
...@@ -185,7 +185,7 @@ class MarketingController extends Base ...@@ -185,7 +185,7 @@ class MarketingController extends Base
$list['prepare'] = $list['prepare'] ? array_column((array)$list['prepare'], null, 'marketing_id') : []; $list['prepare'] = $list['prepare'] ? array_column((array)$list['prepare'], null, 'marketing_id') : [];
$marketingIdsPrepare = array_keys($list['prepare']); $marketingIdsPrepare = array_keys($list['prepare']);
//已结束的 //已结束的 按结束时间倒序
$this->params['page'] = 1; $this->params['page'] = 1;
$this->params['page_size'] = 10; $this->params['page_size'] = 10;
$this->params['sort_field'] = 'end_time'; $this->params['sort_field'] = 'end_time';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment