diff --git a/Application/Admin/Conf/config.php b/Application/Admin/Conf/config.php index 90f82c3c5..2b3384f87 100644 --- a/Application/Admin/Conf/config.php +++ b/Application/Admin/Conf/config.php @@ -127,6 +127,7 @@ return array( "tab_settleup_marketorder", "tab_market_altogether", "tab_cmd_tasks", - "tab_operation_log" + "tab_operation_log", + "sys_action_log" ] ); \ No newline at end of file diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 87a6f0520..b3c5ed1d1 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -84,9 +84,11 @@ class CompanyStatementSetController extends Controller { $this->promoteCompanyStatement(0,$stime); echo "∟----推广公司周结统计ok".PHP_EOL; - - $this->promoteUserPool(0,$stime); - echo "∟----推广个人周结ok".PHP_EOL; + if(!IS_SUBSITE){ + $this->promoteUserPool(0,$stime); + echo "∟----推广个人周结ok".PHP_EOL; + } + } if($company == "cp"){ $this->cpStatement(0,$stime); @@ -115,10 +117,11 @@ class CompanyStatementSetController extends Controller { $this->promoteCompanyStatement(2,$stime); $this->officeCompanyStatement($stime); //官方结算 echo "∟----官方/推广公司月结&补点统计ok".PHP_EOL; - - $this->promoteUserPool(1,$stime); - $this->promoteUserPool(2,$stime); - echo "∟----推广个人月结&补点统计ok".PHP_EOL; + if(!IS_SUBSITE){ + $this->promoteUserPool(1,$stime); + $this->promoteUserPool(2,$stime); + echo "∟----推广个人月结&补点统计ok".PHP_EOL; + } } if($company == "cp"){ $this->cpStatement(1,$stime); diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php index 6866af2b7..2bbcbd793 100644 --- a/Application/Admin/Controller/PartnerController.class.php +++ b/Application/Admin/Controller/PartnerController.class.php @@ -280,6 +280,8 @@ class PartnerController extends ThinkController // $count = $model // ->where($map) // ->count(); + $arraypage = $page; + //分页 $parameter['p'] = $page; $parameter['row'] = $row; @@ -288,7 +290,7 @@ class PartnerController extends ThinkController $this->assign('_page', $page); } - $arraypage = $page; +// $arraypage = $page; $size = $row;//每页显示的记录数 $parseData = array_slice($parseData, ($arraypage - 1) * $size, $size); // $page = set_pagination($count, $row, $parameter); @@ -473,7 +475,12 @@ class PartnerController extends ThinkController if ($_POST) { $save = I("post."); $this->checkData($save); - $save['relation']['collaborate_way'] = $save['part_a_type']; + if ($save['part_a_type'] == 1) { // 1己方公司的时候 合作类型是2 + $save['relation']['collaborate_way'] = 2; + } + if ($save['part_a_type'] == 2) { // 2下游推广公司的时候 合作类型是1 + $save['relation']['collaborate_way'] = 1; + } if ($save['part_a_type'] == 1) { $save['relation']['self_company_id'] = $save['part_a']; } diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 87bb0b6ae..0ab31c840 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -732,11 +732,16 @@ class PromoteCompanyController extends ThinkController if ($_POST) { $save = I('post.');//前端已经验证 - $save['relation']['collaborate_way'] = $save['part_a_type']; - if ($save['part_a_type'] == 1) { + if ($save['part_a_type'] == 1) { // 1己方公司的时候 合作类型是2 + $save['relation']['collaborate_way'] = 2; + } + if ($save['part_a_type'] == 2) { // 2下游推广公司的时候 合作类型是1 + $save['relation']['collaborate_way'] = 1; + } + if ($save['part_a_type'] == 1) { // 1己方公司的时候 $save['relation']['self_company_id'] = $save['part_a']; } - if ($save['part_a_type'] == 2) { + if ($save['part_a_type'] == 2) { // 2下游推广公司的时候 $save['relation']['self_company_id'] = $save['part_b']; } diff --git a/Application/Admin/Controller/PublicController.class.php b/Application/Admin/Controller/PublicController.class.php index 7273be80b..9b31d6136 100644 --- a/Application/Admin/Controller/PublicController.class.php +++ b/Application/Admin/Controller/PublicController.class.php @@ -24,6 +24,10 @@ class PublicController extends \Think\Controller if (!check_verify($verify)) { $this->error('验证码输入错误！'); } + /* 财务账号只能登陆子系统*/ + if(!IS_SUBSITE && $username == "cw"){ + $this->error('账户或密码错误！'); + } /* 调用UC登录接口登录 */ $User = new UserApi; @@ -101,7 +105,10 @@ class PublicController extends \Think\Controller 'last_login_time' => NOW_TIME, 'last_login_ip' => get_client_ip(1), ); - $Member->save($data); + if(!IS_SUBSITE){ + $Member->save($data); + } + $adminData = getAdminData($member['uid']); $groupId = getGameGroup($member['uid']); diff --git a/Application/Admin/Model/MemberModel.class.php b/Application/Admin/Model/MemberModel.class.php index cc4181628..d81965260 100644 --- a/Application/Admin/Model/MemberModel.class.php +++ b/Application/Admin/Model/MemberModel.class.php @@ -69,7 +69,9 @@ class MemberModel extends Model { 'last_login_time' => NOW_TIME, 'last_login_ip' => get_client_ip(1), ); - $this->save($data); + if(!IS_SUBSITE){ + $this->save($data); + } $adminData = getAdminData($user['uid']); $groupId = getGameGroup($user['uid']); diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html index e268f6b63..5ce0ad3b6 100644 --- a/Application/Admin/View/Deposit/lists.html +++ b/Application/Admin/View/Deposit/lists.html @@ -83,14 +83,16 @@ -
- -
+ +
+ +
+ diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html index aba96572e..cc36739df 100644 --- a/Application/Admin/View/Partner/edit.html +++ b/Application/Admin/View/Partner/edit.html @@ -152,16 +152,16 @@ *甲方公司类型: *乙方公司类型: @@ -179,7 +179,7 @@ --> - + *甲方公司: @@ -200,7 +200,7 @@ - + *甲方公司: diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html index 5e6445583..df69e3536 100644 --- a/Application/Admin/View/Partner/show.html +++ b/Application/Admin/View/Partner/show.html @@ -149,16 +149,16 @@ *甲方公司类型: *乙方公司类型: @@ -176,7 +176,7 @@ --> - + *甲方公司: @@ -196,7 +196,7 @@ - + *甲方公司: diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index d98f280f8..b11946ec2 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -500,16 +500,16 @@ *甲方公司类型: *乙方公司类型: @@ -528,7 +528,7 @@ --> - + *甲方公司: @@ -549,7 +549,7 @@ - + *甲方公司: diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html index 3dc1981c7..cb02e93d1 100644 --- a/Application/Admin/View/PromoteCompany/view.html +++ b/Application/Admin/View/PromoteCompany/view.html @@ -486,16 +486,16 @@ *甲方公司类型: *乙方公司类型: @@ -513,7 +513,7 @@ --> - + *甲方公司: @@ -533,7 +533,7 @@ - + *甲方公司: diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 55caeff52..fb8bf063a 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -178,14 +178,17 @@ -
- -
+ +
+ +
+ +
-
- -
+ +
+ +
+