Merge branch 'tuancan' into test

application/modules/Marketing/controllers/Marketing.php

@@ -212,7 +212,7 @@ class MarketingController extends Base
         $this->params['sort_field'] = 'end_time';
         $this->params['sort_type'] = 'desc';
         $this->params['need_buy_num'] = false;
-        $this->params['online_status'] = [Marketing::ONLINE_STATUS_QIDONG,Marketing::ONLINE_STATUS_GUANBI];//状态 ， 1启用，2关闭，3 到期
+        $this->params['online_status'] = [Marketing::ONLINE_STATUS_QIDONG, Marketing::ONLINE_STATUS_GUANBI, Marketing::ONLINE_STATUS_DAOQI];//状态 ， 1启用，2关闭，3 到期
         $this->params['activity_status'] = MarketingPindan::ACTIVITY_STATUS_FINISHED;//1 未开始，2进行中，3已结束, 4当日上新（即将开始）
         $list['end'] = MarketingService::marketingList($this->params)['result'];
         $list['end'] = $list['end'] ? array_column($list['end'], null, 'marketing_id') : [];