diff --git a/Application/Admin/Controller/AuthManagerController.class.php b/Application/Admin/Controller/AuthManagerController.class.php index 9f91399d0..c72fca0cf 100644 --- a/Application/Admin/Controller/AuthManagerController.class.php +++ b/Application/Admin/Controller/AuthManagerController.class.php @@ -624,7 +624,7 @@ class AuthManagerController extends AdminController{ $this->assign('data',$data['market_percentage']); $this->assign('auth_group', $auth_group); - $this->display(); + $this->display("authmarketmember"); } diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index 0487e691f..c3f143269 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -833,7 +833,9 @@ class MarketPercentageController extends ThinkController // $pay_time = date("Y-m",strtotime('-1 month')); } - exec("php cli.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &"); +// var_dump("php cli.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");die(); + + exec("php admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &"); $this->success('操作成功,后台正在计算中,请稍后再打开......'); } @@ -1040,7 +1042,7 @@ class MarketPercentageController extends ThinkController // var_dump($data['config']);die(); $this->assign('data',$data['config']); - $this->display(); + $this->display("marketstaffsettle"); } diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index acbdffd88..98bad980c 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -789,7 +789,7 @@ class TimingController extends AdminController { ->where($spend_map) ->group("tab_spend.id") ->select(false); - +// var_dump($spend);die(); $payway_spend = M()->table("({$spend}) spend") ->field("sum(pay_amount) as pay_amount,pay_time,promote_id,game_name,game_id,relation_game_id,pay_way,sdk_version") ->where($map) diff --git a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html index 628cc3cf0..fce25c938 100644 --- a/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/personmarketstaffsettle.html @@ -121,7 +121,7 @@ - +