diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php index 586701fd3..82a121138 100644 --- a/Application/Admin/Controller/AuthManagerController.class.php +++ b/Application/Admin/Controller/AuthManagerController.class.php @@ -536,7 +536,7 @@ class AuthManagerController extends AdminController{ $auth_group = M('AuthGroup')->where( array('status'=>array('egt','0'),'module'=>'admin','type'=>AuthGroupModel::TYPE_ADMIN) ) ->getfield('id,id,title,rules'); // var_dump($auth_group);die(); - $empower_type = M('AuthGroup')->field('data_empower_type,show_data,show_market_admin,show_promote,allow_over_week')->where(array('id'=>$_GET['group_id']))->find(); + $empower_type = M('AuthGroup')->field('data_empower_type,show_data,show_merchant,show_market_admin,show_promote,allow_over_week')->where(array('id'=>$_GET['group_id']))->find(); // var_dump($empower_type);die(); $this->assign('data_empower_type', $empower_type['data_empower_type']); @@ -544,6 +544,7 @@ class AuthManagerController extends AdminController{ $this->assign('auth_group', $auth_group); $this->assign('show_market_admin', $empower_type['show_market_admin']); $this->assign('show_promote', $empower_type['show_promote']); + $this->assign('show_merchant', $empower_type['show_merchant']); $this->assign('allow_over_week', $empower_type['allow_over_week']); $this->display(); @@ -558,6 +559,7 @@ class AuthManagerController extends AdminController{ $allow_over_week = I('allow_over_week'); $show_promote = I('show_promote'); $promoteData = I('promote_data'); + $show_merchant = I('show_merchant'); // dump(json_decode($promoteData,true)); // var_dump($promoteData);die(); @@ -588,6 +590,7 @@ class AuthManagerController extends AdminController{ 'show_market_admin' => $show_market_admin, 'allow_over_week' => $allow_over_week, 'show_promote' => $show_promote, + 'show_merchant'=>$show_merchant ))) { resetUserAuth(); diff --git a/Application/Admin/View/AuthManager/dataempower.html b/Application/Admin/View/AuthManager/dataempower.html index 5ee3d36fe..f058f2092 100644 --- a/Application/Admin/View/AuthManager/dataempower.html +++ b/Application/Admin/View/AuthManager/dataempower.html @@ -130,6 +130,25 @@ + + 是否展示商户: + + + + + + 游戏充值,公会统计中订单统计商户列展示 + + + + +