diff --git a/market/controllers/api/sylive/GroupsStatistics.php b/market/controllers/api/sylive/GroupsStatistics.php index b3bbd34d..5d500f6e 100644 --- a/market/controllers/api/sylive/GroupsStatistics.php +++ b/market/controllers/api/sylive/GroupsStatistics.php @@ -637,12 +637,20 @@ class GroupsStatistics extends BaseController $left_order = $this->mdSyliveActivityKpidata->count(['activityId' => $activityId, 'kpi' => 'order', $left_browse_where => null]); } $left_subscribe_per = number_format_com($left_subscribe / $left_browse * 100, 1, ''); - $left_watch_per = number_format_com($left_watch / $left_subscribe * 100, 1, ''); - $left_order_per = number_format_com($left_order / $left_watch * 100, 1, ''); - $left_expected_data = [['name' => "浏览人数100%", 'value' => 100], ['name' => "预约人数({$left_subscribe_per}%)", 'value' => 75] - , ['name' => "观看人数({$left_watch_per}%)", 'value' => 50], ['name' => "订单数({$left_order_per}%)", 'value' => 25]]; - $left_actual_data = [['name' => '浏览人数', 'value' => $left_browse], ['name' => '预约人数', 'value' => $left_subscribe] - , ['name' => '观看人数', 'value' => $left_watch], ['name' => '订单数', 'value' => $left_order]]; + if ($left_watch) { + $left_watch_per = number_format_com($left_watch / $left_subscribe * 100, 1, ''); + $left_order_per = number_format_com($left_order / $left_watch * 100, 1, ''); + $left_expected_data = [['name' => "浏览人数100%", 'value' => 100], ['name' => "预约人数({$left_subscribe_per}%)", 'value' => 75] + , ['name' => "观看人数({$left_watch_per}%)", 'value' => 50], ['name' => "订单数({$left_order_per}%)", 'value' => 25]]; + $left_actual_data = [['name' => '浏览人数', 'value' => $left_browse], ['name' => '预约人数', 'value' => $left_subscribe] + , ['name' => '观看人数', 'value' => $left_watch], ['name' => '订单数', 'value' => $left_order]]; + } else { + $left_order_per = number_format_com($left_order / $left_subscribe * 100, 1, ''); + $left_expected_data = [['name' => "浏览人数100%", 'value' => 100], ['name' => "预约人数({$left_subscribe_per}%)", 'value' => 66.7] + , ['name' => "订单数({$left_order_per}%)", 'value' => 33.3]]; + $left_actual_data = [['name' => '浏览人数', 'value' => $left_browse], ['name' => '预约人数', 'value' => $left_subscribe] + , ['name' => '订单数', 'value' => $left_order]]; + } $funnel_preheating = ['title' => '浏览转化漏斗((预热阶段)', 'expectedData' => $left_expected_data, 'actualData' => $left_actual_data]; } if ($show == 'right' || !$show) {//直播阶段 diff --git a/market/controllers/api/system/RoleMenu.php b/market/controllers/api/system/RoleMenu.php index b5c45447..2bb9a32d 100644 --- a/market/controllers/api/system/RoleMenu.php +++ b/market/controllers/api/system/RoleMenu.php @@ -28,11 +28,12 @@ class RoleMenu extends BaseController $this->return_json('参数错误'); } $re_ro = $this->mdSysRole->get(['roleId' => $roleId, 'status' => 0]); - $menuIds = $re_ro ? $re_ro['menuIds'] . ',' : ''; + $menuIds = $re_ro['menuIds'] ? explode(',', $re_ro['menuIds']) : []; $where['status>='] = 0; $res = $this->mdSysMenu->select($where, 'sortNumber asc,menuId desc'); foreach ($res as $k => $v) { - $res[$k]['menuId'] = intval($v['menuId']); + $menuId = intval($v['menuId']); + $res[$k]['menuId'] = $menuId; $res[$k]['parentId'] = intval($v['parentId']); $res[$k]['menuType'] = intval($v['menuType']); $res[$k]['openType'] = intval($v['openType']); @@ -40,7 +41,7 @@ class RoleMenu extends BaseController $res[$k]['hide'] = intval($v['hide']); $res[$k]['meta'] = json_decode($v['meta'], true); $res[$k]['children'] = ''; - $res[$k]['checked'] = strstr($menuIds, "{$v['menuId']},") ? true : false; + $res[$k]['checked'] = in_array($menuId, $menuIds) ? true : false; } $this->return_response_list($res); }