Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

master
tpingzhang 5 years ago
commit ff71880645

@ -1052,6 +1052,14 @@ class QueryController extends BaseController
$summaryData['spend_all_amount'][] = $list['spend_all_amount'];
}
$summaryData['date'] = array_reverse($summaryData['date']);
$summaryData['role_num'] = array_reverse($summaryData['role_num']);
$summaryData['user_num'] = array_reverse($summaryData['user_num']);
$summaryData['new_user_num'] = array_reverse($summaryData['new_user_num']);
$summaryData['new_device_num'] = array_reverse($summaryData['new_device_num']);
$summaryData['spend_user_num'] = array_reverse($summaryData['spend_user_num']);
$summaryData['spend_all_amount'] = array_reverse($summaryData['spend_all_amount']);
$serverData = $this->getServer(I('relation_game_id'), I('sdk_version'));
$thisParentPromoteId = getParentPromoteId(PID);//本账号上级渠道ID

@ -374,7 +374,7 @@
color: "#999"
},
alignWithLabel: true,
interval: 0,
interval: 1,
},
axisLine: {
lineStyle: {

Loading…
Cancel
Save