diff --git a/market/controllers/api/sylive/Activity.php b/market/controllers/api/sylive/Activity.php index ed6897f9..202da80d 100644 --- a/market/controllers/api/sylive/Activity.php +++ b/market/controllers/api/sylive/Activity.php @@ -56,7 +56,8 @@ class Activity extends BaseController $item['title'] = $getItem['title']; $item['introduction'] = $getItem['introduction']; $item['price'] = $getItem['price']; - $item['dateRange'] = [$getItem['timeStart'], $getItem['timeEnd']]; + $item['dateRange'] = $getItem['timeStart'] ? [$getItem['timeStart'], $getItem['timeEnd']] : []; + $item['dateUseRange'] = $getItem['useTimeStart'] ? [$getItem['useTimeStart'], $getItem['useTimeEnd']] : []; if ($getItem['itemImg']) { $itemImg = []; foreach ($getItem['itemImg'] as $k2 => $v2) { @@ -273,6 +274,7 @@ class Activity extends BaseController $price = $this->input_param('price'); $itemImg = $this->input_param('itemImg'); $dateRange = $this->input_param('dateRange'); + $dateUseRange = $this->input_param('dateUseRange'); $introduction = $this->input_param('introduction'); if (!$activityId) { $this->return_json('参数错误'); @@ -282,7 +284,8 @@ class Activity extends BaseController $this->return_json('活动不存在'); } $jsondata = $re['jsondata'] ? json_decode($re['jsondata'], true) : []; - $item = ['title' => $title, 'price' => $price, 'timeStart' => $dateRange[0], 'timeEnd' => $dateRange[1], 'introduction' => $introduction]; + $item = ['title' => $title, 'price' => $price, 'timeStart' => $dateRange[0], 'timeEnd' => $dateRange[1] + , 'useTimeStart' => $dateUseRange[0], 'useTimeEnd' => $dateUseRange[1], 'introduction' => $introduction]; if ($itemImg) { $setItemImg = []; foreach ($itemImg as $v) { @@ -490,10 +493,14 @@ class Activity extends BaseController } $activityData1 = [['name' => '参与区域数', 'value' => count($areaData)], ['name' => '参与门店数', 'value' => count($bizData)] , ['name' => '参与顾问数', 'value' => count($res_user)]]; - $url = '/sylive/activity/statistics/piechart?'; - $activityData2 = [['name' => '浏览人数', 'value' => $browse, 'url' => "{$url}activityId=$activityId&type=browse"], ['name' => '预约人数', 'value' => $subscribe, 'url' => "{$url}activityId=$activityId&type=subscribe"] - , ['name' => '观看人数', 'value' => $watch, 'url' => "{$url}activityId=$activityId&type=watch"], ['name' => '订单数', 'value' => $order, 'url' => "{$url}activityId=$activityId&type=order"] - , ['name' => '直播时长', 'value' => $duration, 'url' => ''], ['name' => '观看次数', 'value' => $livePV, 'url' => ''], ['name' => '人均观看', 'value' => $watchDuration, 'url' => '']]; + $url = "/sylive/activity/statistics/piechart?activityId={$activityId}&"; + $activityData2 = [['name' => '浏览人数', 'value' => $browse, 'url' => ''], ['name' => '预约人数', 'value' => $subscribe, 'url' => ''] + , ['name' => '观看人数', 'value' => $watch, 'url' => ''], ['name' => '订单数', 'value' => $order, 'url' => ''] + , ['name' => '直播时长', 'value' => $duration, 'url' => ''], ['name' => '观看次数', 'value' => $livePV, 'url' => ''] + , ['name' => '人均观看', 'value' => $watchDuration, 'url' => '']]; +// $activityData2 = [['name' => '浏览人数', 'value' => $browse, 'url' => "{$url}type=browse"], ['name' => '预约人数', 'value' => $subscribe, 'url' => "{$url}type=subscribe"] +// , ['name' => '观看人数', 'value' => $watch, 'url' => "{$url}type=watch"], ['name' => '订单数', 'value' => $order, 'url' => "{$url}type=order"] +// , ['name' => '直播时长', 'value' => $duration, 'url' => ''], ['name' => '观看次数', 'value' => $livePV, 'url' => ''], ['name' => '人均观看', 'value' => $watchDuration, 'url' => '']]; } $watch_per = number_format_com($watch / $browse * 100, 1, ''); $order_per = number_format_com($order / $browse * 100, 1, '');