diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php index 655740236..4799d652b 100644 --- a/Application/Admin/Controller/AuthManagerController.class.php +++ b/Application/Admin/Controller/AuthManagerController.class.php @@ -539,7 +539,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')->where(array('id'=>$_GET['group_id']))->find(); + $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(); // var_dump($empower_type);die(); $this->assign('data_empower_type', $empower_type['data_empower_type']); @@ -547,6 +547,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('allow_over_week', $empower_type['allow_over_week']); $this->display(); } @@ -557,6 +558,7 @@ class AuthManagerController extends AdminController{ $data_empower_type = I('data_empower_type'); $show_data = I('show_data'); $show_market_admin = I('show_market_admin'); + $allow_over_week = I('allow_over_week'); $show_promote = I('show_promote'); $promoteData = I('promote_data'); @@ -587,6 +589,7 @@ class AuthManagerController extends AdminController{ 'data_president' => $promoteData, 'show_data' => $show_data, 'show_market_admin' => $show_market_admin, + 'allow_over_week' => $allow_over_week, 'show_promote' => $show_promote, ))) { diff --git a/Application/Admin/Model/MemberModel.class.php b/Application/Admin/Model/MemberModel.class.php index d81965260..d945bd9f0 100644 --- a/Application/Admin/Model/MemberModel.class.php +++ b/Application/Admin/Model/MemberModel.class.php @@ -86,6 +86,7 @@ class MemberModel extends Model { 'show_data'=>$adminData['show_data'], 'show_market_admin'=>$adminData['show_market_admin'], 'show_promote'=>$adminData['show_promote'], + 'allow_over_week' => $adminData['allow_over_week'], ); session('user_group_id',$groupId); session('user_auth', $auth); diff --git a/Application/Admin/View/AuthManager/dataempower.html b/Application/Admin/View/AuthManager/dataempower.html index b15a6447e..732e2948b 100644 --- a/Application/Admin/View/AuthManager/dataempower.html +++ b/Application/Admin/View/AuthManager/dataempower.html @@ -112,6 +112,23 @@ + + + 是否允许跨周补链: + + + + + + + + diff --git a/Application/Home/Controller/BaseController.class.php b/Application/Home/Controller/BaseController.class.php index 4817777a8..95a882ac3 100644 --- a/Application/Home/Controller/BaseController.class.php +++ b/Application/Home/Controller/BaseController.class.php @@ -11,7 +11,7 @@ class BaseController extends HomeController protected $promotePermissions; protected $loginPromote = null; protected $canViewUserRecharge = true; - + protected $canViewMend = true; protected $permControlUrls = [ 'Home/Query/recharge', @@ -58,6 +58,7 @@ class BaseController extends HomeController $this->assign("parent_id", $loginer['parent_id']); $this->assign("grand_id", $loginer['grand_id']); $this->assign('canViewUserRecharge', $this->canViewUserRecharge); + $this->assign('canViewMend', $this->canViewMend); $result = M('site_apply', 'tab_')->where("promote_id=$pid")->getField('status'); if ($result['status'] == 1) {