Merge branch 'release' of http://8.136.139.249:3000/wmtx/platform into feature/LY0309

Addons/SiteStat/info.html

@@ -221,7 +221,7 @@ $(document).ready(function () {
 					<volist name="fl_set" id="vo">
 					<tr>
 						<td>【返利设置】</td>
-						<td><a href="/admin.php?s=/Rebate/lists.html"><span>【{$vo.game_name}】充值返利已到期</span></a></td>
+						<td><a href="/{$Think.SUBSITE_INDEX}?s=/Rebate/lists.html"><span>【{$vo.game_name}】充值返利已到期</span></a></td>
 					</tr>
 					</volist>
 

Application/Admin/Controller/CompanyStatementController.class.php

@@ -370,13 +370,24 @@ class CompanyStatementController extends ThinkController
                     if ($value['game_name'] == "罚款" || $value['game_name'] == "奖励") {
                         $dbres['statement_info'][$key]['pay_amount'] = "-";
                     }
+
+
+                    $real_statement_amount
+                        = number_format($value['platform_money']*(1-$value['promote_ratio']/100)*($value['ratio']/100)*(1-$value["fax_ratio"]/100),2,'.','');;
+                    if (!$dbres['statement_info'][$key]['other_amount']) {
+                        $dbres['statement_info'][$key]['other_amount'] = number_format($value["sum_money"] - $real_statement_amount,2,'.','');
+                    }
                 }
             }
 
             $this->assign("data", $dbres);
             if ($dbres["company_belong"] == 9) {
                 //上游
-                $this->display("editCpStatement");
+                if (IS_SUBSITE) {
+                    $this->display("editWmCpStatement");
+                } else {
+                    $this->display("editCpStatement");
+                }
             } else {
                 if ($dbres["withdraw_type"] == 3) {
                     if($dbres["company_type"] == 1){
@@ -472,15 +483,24 @@ class CompanyStatementController extends ThinkController
             $promote_ids = array_column($promote_data,"id");
 
             $statement_info = json_decode($value['statement_info'],true);
-//            dump($statement_info);
+
+            $statement_begin_time = $value['statement_begin_time'];
+            $statement_end_time = $value['statement_end_time'];
+
+            $user_data = SM("user", "tab_")
+                ->field("id")
+                ->where([
+                    'promote_id' => ['in', $promote_ids],
+                    "register_time" => ['between', [$statement_begin_time, $statement_end_time]]
+                ])->select();
+
+            $amount_data['user_newcount'] += count($user_data);
+
             if ($value['company_type'] == 1) {
 
                 $list = array_merge($list,$statement_info);
                 foreach ($statement_info as $k => $v) {
 
-                    $statement_begin_time = strtotime(str_replace(".", "-", $v['statement_begin_time']));
-                    $statement_end_time = strtotime(str_replace(".", "-", $v['statement_end_time'])) + 86399;
-
                     if (!$amount_data['statement_begin_time'] || $amount_data['statement_begin_time'] > $v['statement_begin_time']) {
                         $amount_data['statement_begin_time'] = $v['statement_begin_time'];
                     }
@@ -489,13 +509,7 @@ class CompanyStatementController extends ThinkController
                         $amount_data['statement_end_time'] = $v['statement_end_time'];
                     }
 
-                    $user_data = SM("user", "tab_")
-                        ->field("id")
-                        ->where([
-                            'promote_id' => ['in', $promote_ids],
-                            'fgame_name' => ['like', "%{$v['game_name']}%"],
-                            "register_time" => ['between', [$statement_begin_time, $statement_end_time]]
-                        ])->select();
+
                     if ($v['game_name'] != '罚款' && $v['game_name'] != '奖励') {
                         $amount_data['pay_amount'] += $v["pay_amount"];
                     }
@@ -504,7 +518,6 @@ class CompanyStatementController extends ThinkController
                     } else {
                         $amount_data['sum_money'] += $v["sum_money"];
                     }
-                    $amount_data['user_newcount'] += count($user_data);
 
                 }
             } elseif($value['company_type'] == 2) {
@@ -516,8 +529,6 @@ class CompanyStatementController extends ThinkController
                     $list = array_merge($list,$game_list);
 
                     foreach ($game_list as $gk=>$gv) {
-                        $statement_begin_time = strtotime(str_replace(".", "-", $gv['statement_begin_time']));
-                        $statement_end_time = strtotime(str_replace(".", "-", $gv['statement_end_time'])) + 86399;
 
                         if (!$amount_data['statement_begin_time'] || $amount_data['statement_begin_time'] > $gv['statement_begin_time']) {
                             $amount_data['statement_begin_time'] = $gv['statement_begin_time'];
@@ -527,13 +538,6 @@ class CompanyStatementController extends ThinkController
                             $amount_data['statement_end_time'] = $gv['statement_end_time'];
                         }
 
-                        $user_data = SM("user", "tab_")
-                            ->field("id")
-                            ->where([
-                                'promote_id' => ['in', $promote_ids],
-                                'fgame_name' => ['like', "%{$gv['game_name']}%"],
-                                "register_time" => ['between', [$statement_begin_time, $statement_end_time]]
-                            ])->select();
                         if ($gv['game_name'] != '罚款' && $gv['game_name'] != '奖励') {
                             $amount_data['pay_amount'] += $gv["pay_amount"];
                         }
@@ -543,7 +547,7 @@ class CompanyStatementController extends ThinkController
                         } else {
                             $amount_data['sum_money'] += $gv["sum_money"];
                         }
-                        $amount_data['user_newcount'] += count($user_data);
+
                     }
 
                 }
@@ -573,6 +577,10 @@ class CompanyStatementController extends ThinkController
 
         $map['company_belong'] = 9;
 
+        if(!$_REQUEST["year"]) {
+            $_REQUEST["year"] = date("Y");
+        }
+
         if ($_REQUEST["year"]) {
             $start = strtotime($_REQUEST["year"]."-01-01");
             $end = strtotime(date("Y-m-t",strtotime($_REQUEST["year"]."-12"))) + 86399;
@@ -625,29 +633,29 @@ class CompanyStatementController extends ThinkController
 
         foreach ($company_id as $ckey => $cvalue) {
 
-            $use_data = [
-                "01"=>["time"=>"01"],
-                "02"=>["time"=>"02"],
-                "03"=>["time"=>"03"],
-                "04"=>["time"=>"04"],
-                "05"=>["time"=>"05"],
-                "06"=>["time"=>"06"],
-                "07"=>["time"=>"07"],
-                "08"=>["time"=>"08"],
-                "09"=>["time"=>"09"],
-                "10"=>["time"=>"10"],
-                "11"=>["time"=>"11"],
-                "12"=>["time"=>"12"],
-            ];
-
             $map["company_id"] = $cvalue;
             $map['company_belong'] = 9;
 
             $data = SM("company_statement","tab_")
-                ->field("id,company_id,company_name,FROM_UNIXTIME(statement_begin_time,'%m') time,statement_money,platform_amount,statement_info")
+                ->field("id,company_id,company_name,FROM_UNIXTIME(statement_begin_time,'%m') time,statement_money,platform_amount,statement_info,withdraw_type")
                 ->where($map)
                 ->select();
 
+            $use_data = [
+                "01"=>["time"=>"01","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "02"=>["time"=>"02","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "03"=>["time"=>"03","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "04"=>["time"=>"04","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "05"=>["time"=>"05","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "06"=>["time"=>"06","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "07"=>["time"=>"07","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "08"=>["time"=>"08","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "09"=>["time"=>"09","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "10"=>["time"=>"10","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "11"=>["time"=>"11","show_company_name"=>$data[0]["company_name"],"row"=>1],
+                "12"=>["time"=>"12","show_company_name"=>$data[0]["company_name"],"row"=>1],
+            ];
+
             $row = 0;
 
             foreach($data as $key => $value) {
@@ -657,7 +665,7 @@ class CompanyStatementController extends ThinkController
                 $statement_info = $data[$key]['statement_info'];
 
                 $data[$key]['row'] = count($data[$key]['statement_info']);
-
+                $data[$key]['show_company_name'] = $value["company_name"];
                 $row += $data[$key]['row'];
 
                 foreach ($statement_info as $k => $v) {
@@ -691,7 +699,16 @@ class CompanyStatementController extends ThinkController
                 }
 
                 $data[$key]["statement_info"] = $statement_info;
-                $use_data[$value['time']] = $data[$key];
+                if (!$use_data[$value['time']]["statement_info"]) {
+                    $use_data[$value['time']] = $data[$key];
+                }
+                else {
+                    foreach ($statement_info as $sk => $sv) {
+                        array_push($use_data[$value['time']]["statement_info"], $sv);
+                    }
+                }
+
+
             }
 
             $sum[$ckey]["ratio"] = number_format($sum[$ckey]["ratio"]/$row,2,'.','')."%";
@@ -702,6 +719,13 @@ class CompanyStatementController extends ThinkController
 
         }
 
+        foreach ($assign_data as $key => $value) {
+            foreach ($value as $k => $v) {
+                $assign_data[$key][$k]["row"] = count($v["statement_info"])?count($v["statement_info"]):1;
+            }
+        }
+
+//        dump($assign_data);
         $is_export= false;
         if (isset($_REQUEST['is_export']) && $_REQUEST['is_export']==1){
             $is_export = true;
@@ -725,8 +749,6 @@ class CompanyStatementController extends ThinkController
 
         $check_list = array_column(json_decode($_POST["list"],true),"game_name");
 
-//        dump($check_list);die();
-
         if (!$company_id) {
             $data = [];
         } else {
@@ -746,6 +768,22 @@ class CompanyStatementController extends ThinkController
 
             $statement_info = json_decode($value['statement_info'], true);
 
+            $statement_begin_time = $value['statement_begin_time'];
+            $statement_end_time = $value['statement_end_time'];
+
+            $user_data = [];
+            if ($promote_ids) {
+                $user_data = SM("user", "tab_")
+                    ->field("id")
+                    ->where([
+                        'promote_id' => ['in', $promote_ids?$promote_ids:0],
+                        "register_time" => ['between', [$statement_begin_time, $statement_end_time]]
+                    ])->select();
+            }
+
+
+            $amount_data['user_newcount'] += count($user_data);
+
 
             if ($value['company_type'] == 1) {
 //                $list = array_merge(, $statement_info);
@@ -753,16 +791,7 @@ class CompanyStatementController extends ThinkController
                     if (!in_array($v["game_name"],$check_list)) {
                         array_push($list,$v);
                     }
-                    $statement_begin_time = strtotime(str_replace(".", "-", $v['statement_begin_time']));
-                    $statement_end_time = strtotime(str_replace(".", "-", $v['statement_end_time'])) + 86399;
-
-                    $user_data = SM("user", "tab_")
-                        ->field("id")
-                        ->where([
-                            'promote_id' => ['in', $promote_ids?$promote_ids:0],
-                            'fgame_name' => ['like', "%{$v['game_name']}%"],
-                            "register_time" => ['between', [$statement_begin_time, $statement_end_time]]
-                        ])->select();
+
                     if ($v['game_name'] != '罚款' && $v['game_name'] != '奖励') {
                         $amount_data['pay_amount'] += $v["pay_amount"];
                     }
@@ -773,8 +802,6 @@ class CompanyStatementController extends ThinkController
                         $amount_data['sum_money'] += $v["sum_money"];
                     }
 
-                    $amount_data['user_newcount'] += count($user_data);
-
                 }
             } elseif($value['company_type'] == 2) {
                 foreach ($statement_info as $k => $v) {
@@ -786,9 +813,6 @@ class CompanyStatementController extends ThinkController
                             array_push($list,$gv);
                         }
 
-                        $statement_begin_time = strtotime(str_replace(".", "-", $gv['statement_begin_time']));
-                        $statement_end_time = strtotime(str_replace(".", "-", $gv['statement_end_time'])) + 86399;
-
                         if (!$amount_data['statement_begin_time'] || $amount_data['statement_begin_time'] > $gv['statement_begin_time']) {
                             $amount_data['statement_begin_time'] = $gv['statement_begin_time'];
                         }
@@ -797,14 +821,6 @@ class CompanyStatementController extends ThinkController
                             $amount_data['statement_end_time'] = $gv['statement_end_time'];
                         }
 
-                        $user_data = SM("user", "tab_")
-                            ->field("id")
-                            ->where([
-                                'promote_id' => ['in', $promote_ids?$promote_ids:0],
-                                'fgame_name' => ['like', "%{$gv['game_name']}%"],
-                                "register_time" => ['between', [$statement_begin_time, $statement_end_time]]
-                            ])->select();
-
                         if ($gv['game_name'] != '罚款' && $gv['game_name'] != '奖励') {
                             $amount_data['pay_amount'] += floatval($gv["pay_amount"]);
                         }
@@ -814,8 +830,7 @@ class CompanyStatementController extends ThinkController
                         } else {
                             $amount_data['sum_money'] += floatval($gv["sum_money"]);
                         }
-
-                        $amount_data['user_newcount'] += count($user_data);
+                        
                     }
                 }
             }
@@ -899,7 +914,7 @@ class CompanyStatementController extends ThinkController
         $save['statement_begin_time'] = strtotime(str_replace(".", "-", $amount_data['statement_begin_time']));
         $save['statement_end_time'] = strtotime(str_replace(".", "-", $amount_data['statement_end_time'])) + 86399;
         $save['pay_amount'] = $amount_data['pay_amount'];
-        $save['sum_money'] = $amount_data['sum_money']-($amount_data['sum_money']*$_POST['fax_ratio']/100);
+        $save['sum_money'] = $amount_data['sum_money'];
         $save['user_newcount'] = $amount_data['user_newcount'];
         $save['fax_ratio'] = $_POST['fax_ratio'];
         $save['statement_ids'] = $_POST['id'].','.$_POST['other_id'];
@@ -942,6 +957,26 @@ class CompanyStatementController extends ThinkController
     public function adminRefuse(){
         $this->setVerifyStatus(0,-1,"admin");
     }
+    public function adminCancel(){
+        $canCancel = [1,-1,-2];
+        if(!isset($_REQUEST['ids'])) $this->error("参数错误");
+        $ids = $_REQUEST['ids'];
+        $dbres = $this->DBModel->field("id,verify_status,verify_log")->where("id in ({$ids})")->select();
+        foreach($dbres as $k=>&$v){
+            if(!in_array($v['verify_status'],$canCancel)) continue;
+            $v['verify_log'] = json_decode($v['verify_log'],true);
+            unset($v['verify_log']['admin_user'],$v['verify_log']['admin_time'],$v['verify_log']['pool_user'],$v['verify_log']['pool_time'],$v['verify_log']['pool_num']);
+            $v['verify_log'] = json_encode($v['verify_log']);
+            $v['verify_status'] = 0;
+            $v['confirm_log'] = '';
+            $v['confirm_status']=0;
+            $this->DBModel->save($v);
+        }
+        $this->ajaxReturn(array(
+            'status' => 1,
+            "info"=>"审核撤回成功"
+        ));
+    }
 
     public function launch(){
         if(!isset($_REQUEST['ids'])) $this->error("参数错误");
@@ -1008,7 +1043,11 @@ class CompanyStatementController extends ThinkController
             // if(in_array($v['verify_status'],[3,4])) continue; //合作方确认后不进行重算
             //重算
             if ($v['withdraw_type']!=3) {
-                $res =  A("CompanyStatementSet")->updateCompanyStatementData($v['id'],$this->admininfo["username"]);
+                if(IS_SUBSITE){
+                    $res =  A("SubCompanyStatementSet")->updateCompanyStatementData($v['id'],$this->admininfo["username"]);
+                }else{
+                    $res =  A("CompanyStatementSet")->updateCompanyStatementData($v['id'],$this->admininfo["username"]);
+                }
                 if($res === false){
                     $this->ajaxReturn(array(
                         'status' => 0,
@@ -2427,6 +2466,7 @@ class CompanyStatementController extends ThinkController
         $mentBtn = [
             "adminAgree"=>"<a class='butn' id='adminAgree'>管理员审核通过</a>",
             "adminRefuse"=>"<a class='butn' id='adminRefuse' style='background-color: red;'>管理员审核拒绝</a>",
+            "adminCancel"=>"<a class='butn' id='adminCancel'>管理员审核撤回</a>",
             "pool"=>"<a class='butn' id='pool'>发起汇总</a>",
             "updateStatement"=>"<a class='butn' id='updateStatement' style='background-color: green;'>重算金额</a>",
             "export"=>"<a class='butn' id='export'>批量导出</a>",

Application/Admin/Controller/FinanceController.class.php

@@ -705,7 +705,9 @@ class FinanceController extends ThinkController
         $page = $page ? $page : 1; //默认显示第一页数据
         $row = $_REQUEST['row'] ?? 10;
 
-        $map = [];
+        $map = [
+            "_string" => "1 = 1"
+        ];
 
         $searchGameIds = null;
         $game_ids = array_column(getGameByName(I("game_name"), I("sdk_type")), 'id');
@@ -822,14 +824,24 @@ class FinanceController extends ThinkController
                 if (isset($aggData[$value['unique_code']]) && isset($aggData[$value['unique_code']][$deviceType])) {
                     $aggAmount = number_format($aggData[$value['unique_code']][$deviceType], 2, '.', '');
                 }
-                if (isset($aggWmData[$value['unique_code']]) && isset($aggWmData[$value['unique_code']][$deviceType])) {
-                    $aggWmAmount = number_format($aggWmData[$value['unique_code']][$deviceType], 2, '.', '');
-                }
                 if (isset($aggFailData[$value['unique_code']]) && isset($aggFailData[$value['unique_code']][$deviceType])) {
                     $aggFailAmount = number_format($aggFailData[$value['unique_code']][$deviceType], 2, '.', '');
                 }
+                if (isset($aggWmData[$value['unique_code']]) && isset($aggWmData[$value['unique_code']][$deviceType])) {
+                    $aggWmAmount = number_format($aggWmData[$value['unique_code']][$deviceType], 2, '.', '');
+                    if(IS_SUBSITE){
+                        $aggWmAmount =  $data[$key]['cash_count']-0+$data[$key]['balance_coin_count']-0+$data[$key]['inside_cash_count'];
+                        $aggWmTotal = $aggWmTotal -$aggWmData[$value['unique_code']][$deviceType] + $aggWmAmount;
+                        $aggWmAmount = number_format($aggWmAmount, 2, '.', '');
+                    }
+                }
                 if (isset($aggWmFailData[$value['unique_code']]) && isset($aggWmFailData[$value['unique_code']][$deviceType])) {
                     $aggWmFailAmount = number_format($aggWmFailData[$value['unique_code']][$deviceType], 2, '.', '');
+                    if(IS_SUBSITE){
+                        $aggWmFailAmount =  $data[$key]['notice_fail_count'];
+                        $aggWmFailTotal = $aggWmFailTotal -$aggWmFailData[$value['unique_code']][$deviceType] + $aggWmFailAmount;
+                        $aggWmFailAmount = number_format($aggWmFailAmount, 2, '.', '');
+                    }
                 }
             }
             if (isset($gameSets[$value['game_id']]) && isAggGame($gameSets[$value['game_id']]['pay_notify_url'])) {
@@ -886,14 +898,18 @@ class FinanceController extends ThinkController
 
         //统计合计
         if (count($exceptIds) > 0) {
-            if (isset($map['_string'])) {
-                $map['_string'] .= " and s.game_id not in (" . implode(',', $exceptIds) . ")";
-            } else {
-                $map['_string'] = " s.game_id not in (" . implode(',', $exceptIds) . ")";
+            if(IS_SUBSITE){
+                $wmtotalMap = $map;
+                $wmtotalMap['_string'] .= " and s.game_id in (" . implode(',', $exceptIds) . ")";
             }
+            $map['_string'] .= " and s.game_id not in (" . implode(',', $exceptIds) . ")";
         }
         $totalData = D("spend")->totalGameStatistics($map,$searchGameIds);
-
+        if(IS_SUBSITE){
+            $wmTotalData =  D("spend")->totalWmGameStatistics($wmtotalMap,$searchGameIds);
+            $aggWmTotal = $wmTotalData['aggwmtotal']??0;
+            $aggWmFailTotal = $wmTotalData['aggwmfailtotal']??0;
+        }
         $sumCash = $totalData['cash_count'];
         $sumBalance = $totalData['balance_coin_count'];
         $sumInside = $totalData['inside_cash_count'];

Application/Admin/Controller/MarketPercentageController.class.php

@@ -828,6 +828,9 @@ class MarketPercentageController extends ThinkController
                 $value['company_profit'] = "0.00";
             }
 //
+            $data[$key]['should_performance_commission'] = substr(number_format($value["performance_commission"] * ($market_percentage["performance_monthly_ratio"]/100), 4, '.', ''),0,-2)+$this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['performance_commission'];
+            $data[$key]['should_month_bonus_ratio'] = substr(number_format($value["achievement_bonus"] * ($market_percentage["month_bonus_ratio"]/100), 4, '.', ''),0,-2) + $this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['achievement_bonus'];
+
             $data[$key]['extend_commission'] += $this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['performance_commission']+$this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['achievement_bonus'];
 
 //            dump($this->returnMarketPercentageArray[$value['admin_id'].$value['pay_time']]['performance_commission']);
@@ -848,6 +851,11 @@ class MarketPercentageController extends ThinkController
             $sum['extend_commission'] += $data[$key]['extend_commission'];
             $sum['company_profit'] += $data[$key]['company_profit'];
 
+            $sum['should_performance_commission'] += $data[$key]['should_performance_commission'];
+            $sum['should_month_bonus_ratio'] += $data[$key]['should_month_bonus_ratio'];
+
+//            $sum['wait_performance_commission'] += $data[$key]['wait_performance_commission'];
+//            $sum['wait_achievement_commission'] += $data[$key]['wait_achievement_commission'];
 
         }
 //        die();
@@ -871,8 +879,14 @@ class MarketPercentageController extends ThinkController
                 'achievement_bonus' => '绩效考核奖金',
                 'coefficient' => '绩效系数',
                 'commission' => '当月合计',
-                'extend_commission' => '应发金额',
-                'wait_commission' => '待发金额',
+//                'extend_commission' => '应发金额',
+//                'wait_commission' => '待发金额',
+                'should_performance_commission'=>'本月应发业绩提成',
+                'should_month_bonus_ratio'=>'本月应发绩效考核奖金',
+                'extend_commission' => '本月应发金额合计',
+                'wait_performance_commission'=>'本月待发业绩提成',
+                'wait_achievement_commission'=>'本月待发绩效考核奖金',
+                'wait_commission' => '本月待发金额合计',
                 'coefficient_check_detail' => '绩效确认',
                 'market_check_detail' => '市场部确认',
                 'finance_check_detail' => '财务部审批'];

Application/Admin/Controller/SubCompanyStatementSetController.class.php

@@ -277,7 +277,6 @@ class SubCompanyStatementSetController extends Controller {
 			$add_data['verify_log'] = $verify_log;
 			$add_data['op_time'] =time();
 			$add_data['statement_info'] = json_encode($add_data['statement_info'],JSON_UNESCAPED_UNICODE);
-
 			//添加
 			if($recount && $company_id !== false){
 				//非重算
@@ -324,13 +323,17 @@ class SubCompanyStatementSetController extends Controller {
 		$cplList = [];
 		foreach ($gameList as $k => $v) {
 			if($v['pay_money'] <= 0) continue; //0值不发送
+			//兼容旧数据的上游结算
+			$hasOtherName = false;
 			if(empty($v['original_package_name'])){
 				$game_name = $v['game_name'];
 			}else{
                 if($v['select_package_name'] == 0){
                     $game_name = $v['original_package_name'];
+					$hasOtherName = $v['game_name'];
                 }else{
                     $game_name = $v['game_name'];
+                    $hasOtherName = $v['original_package_name'];
                 }
 			}
 			$cp_id = $v['cp_id'];
@@ -339,6 +342,12 @@ class SubCompanyStatementSetController extends Controller {
 			$cplList[$cp_id]['list'][$game_name]["pay_money"] =$ymoney+$v["pay_money"];
 			$cplList[$cp_id]['list'][$game_name]["platform_money"] = $cplList[$cp_id]['list'][$game_name]["pay_money"];
 			$cplList[$cp_id]['list'][$game_name]["aggregate_money"] = 0;
+			//兼容旧数据结算，旧数据有可能不使用原包名结算
+			if($hasOtherName !== false){
+				$cplList[$cp_id]['list'][$hasOtherName]["pay_money"] = $cplList[$cp_id]['list'][$game_name]["pay_money"];
+				$cplList[$cp_id]['list'][$hasOtherName]["platform_money"] = $cplList[$cp_id]['list'][$game_name]["platform_money"];
+				$cplList[$cp_id]['list'][$hasOtherName]["aggregate_money"] = $cplList[$cp_id]['list'][$game_name]["aggregate_money"];
+			}
 		}
 		return $cplList;
 	}

Application/Admin/Model/SpendModel.class.php

@@ -947,5 +947,25 @@ class SpendModel extends Model
         return $data;
     }
 
+    /**
+     *获取聚合万盟数据
+     */
+    public function totalWmGameStatistics($map,$gameIds)
+    {
+        if($gameIds){
+            $map['s.game_id'] = ['in', $gameIds];
+        }
+        $data = M("Spend","tab_")
+            ->alias('s')
+            ->index('game_time')
+            ->field("
+                SUM(CASE WHEN pay_game_status = 1 THEN pay_amount ELSE 0 END) as aggwmtotal,
+                SUM(CASE WHEN pay_game_status = 0 THEN pay_amount ELSE 0 END) as aggwmfailtotal")
+            ->where(['s.pay_status' => 1])
+            ->where($map)
+            ->find();
+        return $data;
+    }
+
 
 }

Application/Admin/View/AggregateFinanceStatement/lists.html

@@ -496,7 +496,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content:'/admin.php?s=/AggregateFinanceStatement/viewStatement/id/'+id
+                    content:'/{$Think.SUBSITE_INDEX}?s=/AggregateFinanceStatement/viewStatement/id/'+id
                 });
             });
             //申请开票
@@ -508,7 +508,7 @@
                     shadeClose: false,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content:'/admin.php?s=/AggregateFinanceStatement/createStatement/id/'+id
+                    content:'/{$Think.SUBSITE_INDEX}?s=/AggregateFinanceStatement/createStatement/id/'+id
                 });
             });
             //开票编辑
@@ -520,7 +520,7 @@
                     shadeClose: false,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content:'/admin.php?s=/AggregateFinanceStatement/editStatement/id/'+id
+                    content:'/{$Think.SUBSITE_INDEX}?s=/AggregateFinanceStatement/editStatement/id/'+id
                 });
             });
             //上传凭证
@@ -532,7 +532,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['60%', '60%'],
-                    content:'/admin.php?s=/AggregateFinanceStatement/uploadVoucher/id/'+id,
+                    content:'/{$Think.SUBSITE_INDEX}?s=/AggregateFinanceStatement/uploadVoucher/id/'+id,
                     end:function(){
                         reload();
                     }
@@ -556,7 +556,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['60%', '60%'],
-                    content:'/admin.php?s=/AggregateFinanceStatement/editVoucher/id/'+id,
+                    content:'/{$Think.SUBSITE_INDEX}?s=/AggregateFinanceStatement/editVoucher/id/'+id,
                     end:function(){
                         reload();
                     }
@@ -686,9 +686,9 @@
                     title:false
                 }, function(){
                     if(del.type == 0){
-                        var url = "/admin.php?s=/Statement/delCpStatement/id/"+del.id;
+                        var url = "/{$Think.SUBSITE_INDEX}?s=/Statement/delCpStatement/id/"+del.id;
                     }else{
-                        var url = "/admin.php?s=/StatementMangement/delStatementData/id/"+del.id;
+                        var url = "/{$Think.SUBSITE_INDEX}?s=/StatementMangement/delStatementData/id/"+del.id;
                     }
                     layer.load(2);
                     $.ajax({

Application/Admin/View/AggregateStatementPool/lists.html

@@ -540,7 +540,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['60%', '60%'],
-                    content:'/admin.php?s=/CompanyStatementPool/uploadVoucher/id/'+id,
+                    content:'/{$Think.SUBSITE_INDEX}?s=/CompanyStatementPool/uploadVoucher/id/'+id,
                     end:function(){
                         reload();
                     }
@@ -564,7 +564,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['60%', '60%'],
-                    content:'/admin.php?s=/CompanyStatementPool/editVoucher/id/'+id,
+                    content:'/{$Think.SUBSITE_INDEX}?s=/CompanyStatementPool/editVoucher/id/'+id,
                     end:function(){
                         reload();
                     }

Application/Admin/View/BusinessAffairs/summaryQuery.html

@@ -191,7 +191,7 @@ $(function(){
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: urlr+'/admin.php?s=/Platform/zhuce_detail/promote_id/'+id+''//iframe的url
+          content: urlr+'/{$Think.SUBSITE_INDEX}?s=/Platform/zhuce_detail/promote_id/'+id+''//iframe的url
     });
     });
     $(".paixu").click(function(){

Application/Admin/View/CompanyStatement/editWmCpStatement.html

@@ -0,0 +1,676 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="UTF-8">
+    <title></title>
+    <link rel="stylesheet" type="text/css" href="__CSS__/base.css" media="all">
+    <link rel="stylesheet" type="text/css" href="__CSS__/common.css" media="all">
+    <link rel="stylesheet" type="text/css" href="__CSS__/style.css" media="all">
+    <link rel="stylesheet" type="text/css" href="__CSS__/default_color.css" media="all">
+    <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+    <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+    <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
+
+    <script type="text/javascript" src="__STATIC__/jquery-2.0.3.min.js"></script>
+    <script type="text/javascript" src="__JS__/select2.min.js"></script>
+    <script type="text/javascript" src="__STATIC__/layer3/layer.js"></script>
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
+        charset="UTF-8"></script>
+    <script src="__STATIC__/juicer-min.js" type="text/javascript"></script>
+</head>
+<style>
+    html {
+        min-width: 100%;
+    }
+
+    body {
+        padding: 0px 0px 150px;
+        width: 960px;
+        margin: auto;
+
+    }
+
+    .tabcon1711 table {
+        width: 480px;
+    }
+
+    table {
+
+        margin: auto;
+    }
+
+    .hidebox {
+        display: none;
+    }
+
+    .r {
+        width: 300px;
+    }
+
+    .l {
+        width: 180px;
+    }
+
+    .select2-container--default .select2-selection--single {
+        color: #000;
+        resize: none;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
+        box-shadow: 0px 3px 3px #F7F8F9 inset;
+        height: 35px;
+        height: 28px;
+        border-radius: 3px;
+        font-size: 12px;
+    }
+
+    .select2-container--default .select2-selection--single .select2-selection__rendered {
+        line-height: 35px;
+        line-height: 28px;
+    }
+
+    .select2-container--default .select2-selection--single .select2-selection__arrow {
+        height: 26px;
+    }
+
+    .select2-container--default .select2-search--dropdown .select2-search__field {
+        height: 26px;
+        line-height: 26px;
+        font-size: 12px;
+    }
+
+    .select2-results__option[aria-selected] {
+        font-size: 12px;
+    }
+
+    .input-list,
+    .i_list {
+        float: left;
+        margin: 0;
+    }
+</style>
+
+<body>
+    <!-- <div style="width: 100%;line-height: 100px;font-size: 25px;font-weight: 600;text-align: center;">
+        海南万盟天下科技有限公司
+    </div> -->
+    <div style="display: flex;margin: auto;">
+        <div class="tab-content tabcon1711" id="firstPartBaseInfo">
+            <table border="0" cellspacing="0" cellpadding="0">
+                <tbody>
+                    <tr>
+                        <td class="l">甲方:</td>
+                        <td class="r">
+                            <div class="input-list input-list-game search_label_rehab">
+                                <select id="first_partner_id" name="partner_id" class="select_gallery">
+                                    <option value="{$data['first_party_info']['id']}" selected>{$data['first_party_info']['partner']}</option>
+                                </select>
+                            </div>
+                        </td>
+                    </tr>
+                <tbody id="first_part_bser_info_show">
+                    <tr>
+                        <td class="l">联系人：</td>
+                        <td class="r">
+                            <input type="text" class="txt" name="link_man" value="" placeholder="请输入联系人">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="l">联系电话：</td>
+                        <td class="r">
+                            <input type="text" class="txt" name="link_phone" value="" placeholder="请输入联系电话">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="l">邮寄地址：</td>
+                        <td class="r">
+                            <input type="text" class="txt" name="address" value="" placeholder="请输入地址">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="l">公司税号：</td>
+                        <td class="r">
+                            <input type="text" class="txt" name="company_tax_no" value="" placeholder="请输入公司税号">
+                        </td>
+                    </tr>
+                </tbody>
+                </tbody>
+            </table>
+        </div>
+        <div class="tab-content tabcon1711" id="secondPartBaseInfo">
+            <table border="0" cellspacing="0" cellpadding="0">
+                <tbody>
+                    <tr>
+                        <td class="l">乙方:</td>
+                        <td class="r">
+                            <div class="input-list input-list-game search_label_rehab">
+                                <select id="second_partner_id" name="partner_id" class="select_gallery">
+                                    <option value="{$data['second_party_info']['id']}" selected>{$data['second_party_info']['partner']}</option>
+                                </select>
+                            </div>
+                        </td>
+                    </tr>
+                <tbody id="second_part_bser_info_show">
+                    <tr>
+                        <td class="l">联系人：</td>
+                        <td class="r">
+                            <input type="text" class="txt" name="link_man" value="" disabled="disabled"
+                                placeholder="请先选择合作公司">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="l">联系电话：</td>
+                        <td class="r">
+                            <input type="text" class="txt" name="link_phone" value="" disabled="disabled"
+                                placeholder="请先选择合作公司">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="l">邮寄地址：</td>
+                        <td class="r">
+                            <input type="text" class="txt" name="address" value="" disabled="disabled"
+                                placeholder="请先选择合作公司">
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="l">公司税号：</td>
+                        <td class="r">
+                            <input type="text" class="txt" name="company_tax_no" value="" disabled="disabled"
+                                placeholder="请先选择合作公司">
+                        </td>
+                    </tr>
+                </tbody>
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div style="padding: 30px 0px 10px;display: block;height:30px;">
+        <div class="input-list input-list-server search_label_rehab">
+            <p style="font-size: 20px;font-weight: 600;">支付给:<spen style="margin-left: 15px;font-size: 16px;">{$data.company_name}
+                </spen>
+            </p>
+        </div>
+
+    </div>
+    <div class="data_list box_mt" style="margin-top: 40px;">
+        <div class="">
+            <table>
+                <!-- 表头 -->
+                <thead>
+                    <tr>
+                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">结算时间</th>
+                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">产品</th>
+                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">平台总额</th>
+                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">聚合流水</th>
+                        <th rowspan=2 style="border-right: solid 1px #b6cad2;">分成比例</th>
+
+                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">渠道费率</th>
+                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">税费费率</th>
+                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">其他</th>
+                        <th>结算金额</th>
+                    </tr>
+                    <tr>
+                        <th style="font-size: 10px;font-weight: 400;max-width: 100px;line-height: 1.2;">
+                            结算金额=平台总额*（1-渠道费）*分成比例*(1-税费费率)</th>
+                    </tr>
+                </thead>
+
+                <!-- 列表 -->
+                <tbody id="statementInit" class="">
+                    <tr style="height: 100px;">
+                        <td colspan=8>
+                            请先选择生成条件后点击生成对账数据
+                        </td>
+                    </tr>
+                </tbody>
+
+                <tbody id="statementShow">
+
+                </tbody>
+            </table>
+        </div>
+    </div>
+    <div id="partpatinfo" style="display: flex;margin: auto;">
+        <div class="tab-content tabcon1711" id="skf_payinfo">
+            <div class="tab-content tabcon1711" id="skf_payinfo">
+                <table  border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                        <tr>
+                            <td class="l">收款方名称:</td>
+                            <td class="r">
+                                <input type="text" class="txt" name=""  disabled="disabled" placeholder="" value="{$data.payinfo.payee_name}">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="l">银行账号：</td>
+                            <td class="r">
+                                <input type="text" class="txt" name="" value="{$data.payinfo.bank_account}" disabled="disabled" placeholder="">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="l">开户行：</td>
+                            <td class="r">
+                            <input type="text" class="txt" name="password" value="{$data.payinfo.opening_bank}" disabled="disabled" placeholder="请先选择支付给谁">
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="tab-content tabcon1711" id="fkf_payinfo">
+                <table  border="0" cellspacing="0" cellpadding="0">
+                    <tbody>
+                        <tr>
+                            <td class="l">开票项目:</td>
+                            <td class="r">
+                                <input type="text" class="txt" disabled="disabled" placeholder=""  name="invoice_item" value="{$data.payinfo.invoice_content}">
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="l">发票类型:</td>
+                            <td class="r">
+                                <div class="input-list input-list-game search_label_rehab">
+                                    <select id="invoice_type" name="invoice_type" class="select_gallery" disabled>
+                                        <option value="0" <if condition="$data['payinfo']['invoice_type'] eq 0">selected</if>>无</option>
+                                        <option value="1" <if condition="$data['payinfo']['invoice_type'] eq 1">selected</if>>专票</option>
+                                        <option value="2" <if condition="$data['payinfo']['invoice_type'] eq 2">selected</if>>普票</option>
+                                    </select>
+                                </div>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>   
+    </div>
+    <div class="search_list" style="display:flex;justify-content:flex-end;width:960px;">
+        <div class="input-list" style="margin-left: 30px;float: right;">
+            <a class="sch-btn" href="javascript:;" id="createStatement" style="width: 150px;">确认修改</a>
+        </div>
+    </div>
+
+    <script type="text/html" id="partbasetpl">
+    <tr>
+        <td class="l">联系人：</td>
+        <td class="r">
+            <input type="text" class="txt normalchange" data-change="${type}.link_man" name="link_man"  value="${link_man|nonull}" placeholder="请输入联系人">
+        </td>
+    </tr>
+    <tr>
+        <td class="l">联系电话：</td>
+        <td class="r">
+        <input type="text" class="txt normalchange" name="link_phone" data-change="${type}.link_phone" value="${link_phone|nonull}" placeholder="请输入联系电话">
+        </td>
+    </tr>
+    <tr>
+        <td class="l">邮寄地址：</td>
+        <td class="r">
+            <input type="text" class="txt normalchange" name="address" data-change="${type}.address" value="${address|nonull}" placeholder="请输入地址">
+        </td>
+    </tr>
+    <tr>
+        <td class="l">公司税号：</td>
+        <td class="r">
+            <input type="text" class="txt normalchange" name="company_tax_no" data-change="${type}.company_tax_no" value="${company_tax_no|nonull}" placeholder="请输入公司税号">
+        </td>
+    </tr>
+</script>
+<script type="text/html" id="partpaytpl">
+    <div class="tab-content tabcon1711" id="skf_payinfo">
+        <table  border="0" cellspacing="0" cellpadding="0">
+            <tbody>
+                <tr>
+                    <td class="l">收款方名称:</td>
+                    <td class="r">
+                        <input type="text" class="txt normalchange" data-change="${skf_type}.payee_name" name="payee_name" placeholder="" value="${skf_party_info.payee_name}">
+                    </td>
+                </tr>
+                <tr>
+                    <td class="l">银行账号：</td>
+                    <td class="r">
+                        <input type="text" class="txt normalchange" data-change="${skf_type}.bank_account" name="bank_account" value="${skf_party_info.bank_account}" placeholder="">
+                    </td>
+                </tr>
+                <tr>
+                    <td class="l">开户行：</td>
+                    <td class="r">
+                    <input type="text" class="txt normalchange" data-change="${skf_type}.opening_bank" name="opening_bank" value="${skf_party_info.opening_bank}" placeholder="请先选择支付给谁">
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <div class="tab-content tabcon1711" id="fkf_payinfo">
+        <table  border="0" cellspacing="0" cellpadding="0">
+            <tbody>
+                <tr>
+                    <td class="l">付款方名称:</td>
+                    <td class="r">
+                        <input type="text" class="txt normalchange" data-change="${fkf_type}.payee_name" name="payee_name" placeholder="" value="${fkf_party_info.payee_name}">
+                    </td>
+                </tr>
+                <tr>
+                    <td class="l">银行账号：</td>
+                    <td class="r">
+                        <input type="text" class="txt normalchange" data-change="${fkf_type}.bank_account" name="bank_account" value="${fkf_party_info.bank_account}" placeholder="">
+                    </td>
+                </tr>
+                <tr>
+                    <td class="l">开户行：</td>
+                    <td class="r">
+                    <input type="text" class="txt normalchange" data-change="${fkf_type}.opening_bank" name="opening_bank" value="${fkf_party_info.opening_bank}" placeholder="请先选择支付给谁">
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+</script>
+<script type="text/html" id="statementTpl">
+    {@each statement_info as it,index}
+        <tr>
+            <td>${it.statement_begin_time}~${it.statement_end_time}</td>
+            <td>${it.game_name}</td>
+            {@if it.statement_type==1}
+                <td>-${it.pay_amount}元</td>
+            {@else}
+                <td>${it.pay_amount}元</td>
+            {@/if}
+            <td>${it.aggregate_money}</td>
+            
+            {@if it.statement_type==0}
+                <td><input type="text" class="txt statementchange" name="first_ratio" data-index ="${index}" data-change="statement_info[${index}]['first_ratio']" value="${it.first_ratio}" style="width: 40px;">%</td>
+                <td><input type="text" class="txt statementchange" name="promote_ratio" data-index ="${index}" data-change="statement_info[${index}]['promote_ratio']" value="${it.promote_ratio}" style="width: 40px;">%</td>
+                <td><input type="text" class="txt statementchange" name="fax_ratio" data-index ="${index}" data-change="statement_info[${index}]['fax_ratio']" value="${it.fax_ratio}" style="width: 40px;">%</td>
+                <td><input type="text" class="txt statementchange other_amount" name="other_amount" data-index ="${index}" data-change="statement_info[${index}]['other_amount']" value="${it.other_amount?it.other_amount:0}" style="width: 60px;"></td>
+            {@else}
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+            {@/if}
+            {@if it.statement_type==1}
+                <td>-<input type="text" class="txt statementchange sum_money" name="sum_money" data-index ="${index}" data-change="statement_info[${index}]['sum_money']" value="${it.sum_money}" style="width: 40px;">元
+                    <input type="text" class="txt statementchange old_sum_money" name="old_sum_money" data-index ="${index}" data-change="statement_info[${index}]['sum_money']" value="${it.sum_money}" style="width: 40px;display: none">
+                </td>
+            {@else}
+                <td><input type="text" class="txt statementchange sum_money" name="sum_money" data-index ="${index}" data-change="statement_info[${index}]['sum_money']" value="${it.sum_money}" style="width: 40px;">元
+                    <input type="text" class="txt statementchange old_sum_money" name="old_sum_money" data-index ="${index}" data-change="statement_info[${index}]['sum_money']" value="${it.sum_money}" style="width: 40px;display: none"></td>
+            {@/if}
+        </tr>
+    {@/each}
+
+    <tr>
+        <td>合计</td>
+        <td></td>
+        <td>${pay_amount}元</td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td>${statement_money}元</td>
+    </tr>
+    <tr>
+        <td colspan=8>本月分成总金额(人民币大写):</td>
+        <td>${statement_money|number_chinese}</td>
+    </tr>
+</script>
+    <script>
+        $(function () {
+            TPLSHOW.juicerInit();
+            $(".select_gallery").select2();
+            $('#time_start').datetimepicker({
+                format: 'yyyy-mm-dd',
+                language: "zh-CN",
+                minView: 2,
+                autoclose: true
+            });
+
+            $('#datetimepicker').datetimepicker({
+                format: 'yyyy-mm-dd',
+                language: "zh-CN",
+                minView: 2,
+                autoclose: true,
+                pickerPosition: 'bottom-left'
+            })
+            EVENT.changeCompany();
+            EVENT.createStatement();
+            $("#first_partner_id").change();
+            // $("#second_partner_id").change();
+
+        });
+        //基础类
+        var PUBLIC = {
+            postData(url, data, callback) {
+                $.ajax({
+                    url: url,
+                    data: data,
+                    type: "post",
+                    dataType: "json",
+                    success: function (data) {
+                        callback(data)
+                    }
+                })
+            },
+            floatAdd(a,b){
+                return Math.round(a*100+b*100)/100;
+            },
+            floatCut(a,b){
+                return Math.round(a*100-b*100)/100;
+            },
+            CompanyKeyName:{
+                id:"公司表id",
+                partner:"公司名称",
+                link_man:'联系人',
+                link_phone:"联系电话",
+                address:'邮寄地址',
+                company_tax_no:'公司税号',
+                payee_name:'名称',
+                bank_account:"银行账号",
+                opening_bank:"开户行"
+            }
+        }
+        //数据类
+        
+        var DATAOBJ = {$data|json_encode=###,JSON_UNESCAPED_UNICODE};        
+        var YDATAOBJ = {$data|json_encode=###,JSON_UNESCAPED_UNICODE};        
+        //事件类
+        var EVENT = {
+            changeCompany() {
+                $("#first_partner_id").on("change", function () {
+                    TPLSHOW.firstPartInfo(DATAOBJ.first_party_info);
+                    TPLSHOW.secondPartInfo(DATAOBJ.second_party_info);
+                    TPLSHOW.showPartPayInfo();
+                    TPLSHOW.showStatementList(true);
+                })
+                $("#first_partner_id").on("change", function () {
+                    TPLSHOW.secondPartInfo(DATAOBJ.second_party_info);
+                })
+            },
+            createStatement() {
+                $("#createStatement").on("click", function () {
+                    //TODO:验证信息
+                    layer.load(2);
+                    PUBLIC.postData("{:U('editStatement')}",DATAOBJ,function(data){
+                        if(data.code == 0){
+                            layer.closeAll('loading');
+                            layer.msg('修改成功');
+                            setTimeout(function(){
+                              window.parent.reload();
+                            },350);
+                        }else{
+                            alert("修改失败，请联系管理员")
+                        }
+                    });
+                    //发送添加请求
+                })
+            },
+            normalchange() {
+                $(".normalchange").off("blur");
+                $(".normalchange").on("blur", function () {
+                    var val = $(this).val();
+                    var index = $(this).data("change");
+                    var str = "DATAOBJ." + index + "='" + val + "';";
+                    eval(str);
+                    if (val !== eval("YDATAOBJ." + index)) {
+                        isedit = true;
+                    }
+                })
+            },
+            statementchange() {
+                $(".statementchange").off("blur");
+                $(".statementchange").on("blur",function(){
+                    var sort = $(this).data("change");
+                    var val = $(this).val();
+                    var vdata = eval("DATAOBJ."+sort);//原先值
+                    var dom = $(this);
+
+                    var type = $(this).attr("name");
+
+                    if(!CHECK.number.test(val)){
+                        layer.msg('结算单中的罚款和税率必须是数字,且不能为空');
+                        dom.val(vdata);
+                        return false;
+                    }
+                
+                    var str = "DATAOBJ."+sort+"='"+val+"';";
+
+                    if((val > 100 || val < 0)&&type!='other_amount'&&type!="sum_money"){
+                        layer.msg('结算单中的税率不允许大于100和小于0');
+                        dom.val(vdata);
+                        return false;
+                    }
+                    eval(str);
+                    var index = $(this).data("index");
+                    var td = DATAOBJ.statement_info[index];
+
+                    if( $(this).attr("name") == "first_ratio"){
+                        td['second_ratio'] = 100-val;
+                    }
+                    if( $(this).attr("name") == "second_ratio"){
+                        td['first_ratio'] = 100-val;
+                    }
+
+                    if(DATAOBJ.pay_type == 1){
+                        //甲方收款
+                        var ratio = td['first_ratio']/100;
+                    }else{
+                        //乙方
+                        var ratio = td['second_ratio']/100;
+                    }
+
+                    var old_sum_money = parseFloat($(this).parent().parent().find(".old_sum_money").val());
+
+                    DATAOBJ.statement_money = PUBLIC.floatCut(DATAOBJ.statement_money,old_sum_money);
+                    if (type!="sum_money") {
+                        td['sum_money'] = Math.round((td['pay_amount']*(100-td['promote_ratio'])/100*ratio*(100-td['fax_ratio'])/100)* 100) / 100 ;
+                    } else {
+                        td['sum_money'] = $(this).parent().parent().find(".sum_money").val();
+                    }
+                    // DATAOBJ.statement_money = 0;
+                    td['other_amount'] = $(this).parent().parent().find(".other_amount").val();
+                    DATAOBJ.statement_money=PUBLIC.floatAdd(DATAOBJ.statement_money,td['sum_money']);
+                    $(this).parent().parent().find(".old_sum_money").val(td['sum_money'])
+                    
+                    TPLSHOW.showStatementList(true);
+                })
+            }
+        }
+        var CHECK = {
+            number: /^\d+(\.{1}\d+)?$/,
+            mobile: /^1[3456789]\d{9}$/,
+            BankNo: /^([1-9]{1})\d{10,19}$/,
+            money: /((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/
+        }
+        // 
+        var TPLSHOW = {
+            juicerInit() {
+                var nonull = function (data) {
+                    if (!data) {
+                        return '';
+                    }
+                    return data;
+                };
+                var number_chinese = function (str) {
+                    var num = parseFloat(str);
+                    var strOutput = "",
+                        strUnit = '仟佰拾亿仟佰拾万仟佰拾元角分';
+                    num += "00";
+                    var intPos = num.indexOf('.');
+                    if (intPos >= 0) {
+                        num = num.substring(0, intPos) + num.substr(intPos + 1, 2);
+                    }
+                    strUnit = strUnit.substr(strUnit.length - num.length);
+                    for (var i = 0; i < num.length; i++) {
+                        strOutput += '零壹贰叁肆伍陆柒捌玖'.substr(num.substr(i, 1), 1) + strUnit.substr(i, 1);
+                    }
+                    return strOutput.replace(/零角零分$/, '整').replace(/零[仟佰拾]/g, '零').replace(/零{2,}/g, '零').replace(/零([亿|万])/g, '$1').replace(/零+元/, '元').replace(/亿零{0,3}万/, '亿').replace(/^元/, "零元")
+
+                }
+                juicer.register('nonull', nonull);
+                juicer.register('number_chinese', number_chinese);
+            },
+            //
+            firstPartInfo(data) {
+                var tpl = $("#partbasetpl").html();
+                data.type = "first_party_info";
+                var html = juicer(tpl, data);
+                $("#first_part_bser_info_show").html(html);
+                TPLSHOW.pushStatementTypeOption();
+            },
+            secondPartInfo(data) {
+                var tpl = $("#partbasetpl").html();
+                data.type ="second_party_info";
+                var html = juicer(tpl, data);
+                $("#second_part_bser_info_show").html(html);
+                TPLSHOW.pushStatementTypeOption();
+            },
+            //支付给公司
+            pushStatementTypeOption() {
+
+                EVENT.normalchange();
+            },
+            //支付信息显示
+            showPartPayInfo() {
+                var data = {};
+                if (DATAOBJ.pay_type == 1) {
+                    data.skf_party_info = DATAOBJ.first_party_info;
+                    data.skf_type ="first_party_info";
+
+                    data.fkf_party_info = DATAOBJ.second_party_info;
+                    data.fkf_type ="second_party_info";
+                } else {
+                    data.skf_party_info = DATAOBJ.second_party_info;
+                    data.skf_type ="second_party_info";
+
+                    data.fkf_party_info = DATAOBJ.first_party_info;
+                    data.fkf_type ="first_party_info";
+                }
+
+                var tpl = $("#partpaytpl").html();
+                var html = juicer(tpl, data);
+                $("#partpatinfo").html(html);
+                EVENT.normalchange();
+
+            },
+            //订单信息显示
+            showStatementList(flag) {
+                if (flag) {
+                    var data = DATAOBJ;
+                    console.log(data);
+                    $("#statementInit").addClass("hidebox");
+                    var tpl = $("#statementTpl").html();
+                    var html = juicer(tpl, data);
+                    $("#statementShow").html(html);
+                    EVENT.statementchange();
+                }
+
+            }
+        }
+    </script>
+
+</body>
+
+</html>

Application/Admin/View/CompanyStatement/lists.html

@@ -411,7 +411,7 @@
             $("#company_type").change();
 
             //设置对账网址
-            var order_url = window.location.protocol+"//"+window.location.host+"/admin.php?s=/Public/cp_login.html";
+            var order_url = window.location.protocol+"//"+window.location.host+"/{$Think.SUBSITE_INDEX}?s=/Public/cp_login.html";
             $("#order_url").html("流程说明：结算自动生成对账单--->管理员审核--->财务审核对账单--->发起汇总  / 确认流程: 发起对外对账--->合作方进行确认【合作方确认地址:"+order_url+"】");
 
             $("#updateNewStatement").on("click",function(){
@@ -468,7 +468,7 @@
                 });
             });
 
-            $("#adminAgree,#adminRefuse,#verifyAgree,#verifyRefuse,#pool,#updateStatement,#delStatement").on("click",function(){
+            $("#adminAgree,#adminRefuse,#adminCancel,#verifyAgree,#verifyRefuse,#pool,#updateStatement,#delStatement").on("click",function(){
                 var id = $(this).attr("id");
                 if(id == "adminAgree"){
                     var opname = "管理员审批通过";
@@ -480,6 +480,11 @@
                     var opurl = "{:U('adminRefuse')}";
                     var opst ="[未进行审批]";
                     var status = [0];
+                }else if(id=="adminCancel"){
+                    var opname = "管理员审批撤回";
+                    var opurl = "{:U('adminCancel')}";
+                    var opst ="[管理员审批通过,管理员审批拒绝,汇总撤销]";
+                    var status = [1,-1,-2];
                 }else if(id=="pool"){
                     var opname = "发起汇总";
                     var opurl = "{:U('pool_splice')}";

Application/Admin/View/CompanyStatement/poolWmStatement.html

@@ -118,8 +118,8 @@
                         <td>{$data[0]['game_name']}</td>
                         <td rowspan="{$row}" class="pay_amount">{$amount_data['pay_amount']}</td>
                         <td rowspan="{$row}" class="user_newcount">{$amount_data['user_newcount']}</td>
-                        <td rowspan="{$row}" class="parent_fax_ratio"><input class="fax_ratio" type="text" class="txt" name="fax_ratio" value="0" placeholder="" style="width: 25px">%</td>
-                        <td rowspan="{$row}" class="sum_money">{$amount_data['sum_money']}</td>
+                        <td rowspan="{$row}" class="parent_fax_ratio"><input class="fax_ratio txt" type="text" name="fax_ratio" value="0" placeholder="" style="width: 25px">%</td>
+                        <td rowspan="{$row}" class = "parent_sum_money"><input class="sum_money txt" type="text" name="sum_money" value="{$amount_data['sum_money']}" placeholder="" style="width: 88px;text-align: right;"></td>
                     </tr>
                     <foreach name="data" item="it" key="key">
 
@@ -153,16 +153,23 @@
 
     $(function () {
 
-        var sum_amount = parseFloat($(".sum_money").text());
+        var sum_amount = parseFloat($(".sum_money").val());
         var row = 0;
         var amount_datas;
         var other_list;
         var list = '{$js_data}';
         var company_id;
         var other_id;
+        var submit = 0;
 
         $(".submit_btn").click(function () {
 
+            if (submit == 0) {
+                submit++;
+            } else {
+                return;
+            }
+
             var id = "{$_GET['id']}";
 
             if (!company_id) {
@@ -195,6 +202,21 @@
 
         });
 
+        $(".sum_money").blur(function() {
+
+            var pay_amount = parseFloat($(".pay_amount").text());
+            sum_amount = parseFloat($(this).val());
+
+            if (sum_amount > pay_amount) {
+                sum_amount = pay_amount;
+                $(this).val(sum_amount)
+            }
+            var jsonObj = JSON.parse(amount_datas);
+            jsonObj["sum_money"] = sum_amount;
+            amount_datas = JSON.stringify(jsonObj);
+
+        });
+
         $("#promote_company").change(function () {
             var begin = $(".time").data("begin");
             var end = $(".time").data("end");
@@ -212,7 +234,7 @@
             $(".pay_amount").attr("rowspan",parseInt($(".pay_amount").attr('rowspan'))-row);
             $(".user_newcount").attr("rowspan",parseInt($(".user_newcount").attr('rowspan'))-row);
             $(".parent_fax_ratio").attr("rowspan",parseInt($(".parent_fax_ratio").attr('rowspan'))-row);
-            $(".sum_money").attr("rowspan",parseInt($(".sum_money").attr('rowspan'))-row);
+            $(".parent_sum_money").attr("rowspan",parseInt($(".parent_sum_money").attr('rowspan'))-row);
             layer.load(2);
 
             $.ajax({
@@ -237,12 +259,12 @@
                         $(".pay_amount").text(data.amount_data['pay_amount']);
                         $(".user_newcount").text(data.amount_data['user_newcount']);
                         // $(".fax_ratio").text(data.amount_data['pay_amount']);
-                        $(".sum_money").text(data.amount_data['sum_money']);
+                        $(".sum_money").val(data.amount_data['sum_money']);
 
                         $(".pay_amount").attr("rowspan",parseInt($(".pay_amount").attr('rowspan'))+row);
                         $(".user_newcount").attr("rowspan",parseInt($(".user_newcount").attr('rowspan'))+row);
                         $(".parent_fax_ratio").attr("rowspan",parseInt($(".parent_fax_ratio").attr('rowspan'))+row);
-                        $(".sum_money").attr("rowspan",parseInt($(".sum_money").attr('rowspan'))+row);
+                        $(".parent_sum_money").attr("rowspan",parseInt($(".parent_sum_money").attr('rowspan'))+row);
                         sum_amount = data.amount_data['sum_money'];
                         amount_datas = JSON.stringify(data.amount_data);
                         other_list = JSON.stringify(data.list);
@@ -269,7 +291,7 @@
 
             sum_money = sum_amount-fax_amount;
 
-            $(".sum_money").text(sum_money.toFixed(2));
+            $(".sum_money").val(sum_money.toFixed(2));
 
         });
 

Application/Admin/View/CompanyStatement/showCpStatementList.html

@@ -122,6 +122,7 @@
     <div class="butnbox" >
         <div class="butnlist jscheckbutn" style="margin-left: 2px">
             <a class='butn' id='export'>批量导出</a>
+            <a class='butn' id='view_show'>查看</a>
         </div>
     </div>
 
@@ -310,6 +311,36 @@
                 $("body").append(iframeExcel)
             });
 
+            $("#view_show").click(function () {
+
+                var time = $("#year").val();
+                var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
+                    return $(elem).val();
+                }).get();
+
+                if(text.length > 20){
+                    layer.msg("<font style='color:white'>" + '暂不支持超过20条的批量导出' + "</font>");
+                    return;
+                }
+                if(text.length < 1){
+                    layer.msg("<font style='color:white'>" + '请先选择要查看的公司' + "</font>");
+                    return;
+                }
+
+                var url ="{:U('showCpStatementView')}"+"&company_id="+text.join(",")+"&time="+time;
+
+                layer.open({
+                    type: 2,
+                    title: "详情",
+                    shadeClose: true,
+                    shade: 0.8,
+                    area: ['100%', '100%'],
+                    content: url
+                });
+            });
+
+
+
             $(".view").click(function () {
                 var company_id = $(this).data("company_id");
                 var time = $("#year").val();

Application/Admin/View/CompanyStatement/showCpStatementView.html

@@ -99,6 +99,7 @@
                 <!-- 表头 -->
                 <thead>
                     <tr>
+                        <th>公司名称</th>
                         <th>结算时间</th>
                         <th>产品</th>
                         <th>联运流水</th>
@@ -122,11 +123,12 @@
                     </if>
 
                     <foreach name="data" item="first_data" key="index" >
-                        <foreach name="first_data" item="data">
+                        <foreach name="first_data" item="datas">
                             <tr>
-                                <td rowspan="{$data['row']}">{$time}年{$data["time"]}月</td>
-                                <if condition="$data['statement_info'][0]['statement_type'] gt 0">
-                                    <td>{$data['statement_info'][0]['game_name']|default="--"}</td>
+                                <td rowspan="{$datas['row']}">{$datas['show_company_name']}</td>
+                                <td rowspan="{$datas['row']}">{$time}年{$datas["time"]}月</td>
+                                <if condition="$datas['statement_info'][0]['statement_type'] gt 0">
+                                    <td>{$datas['statement_info'][0]['game_name']|default="--"}<if condition="$datas['statement_info'][0]['withdraw_type'] eq 0 and $datas['statement_info'][0]['statement_begin_time']">({$datas['statement_info'][0]['statement_begin_time']}-{$datas['statement_info'][0]['statement_end_time']})</if></td>
                                     <td>--</td>
                                     <td>--</td>
                                     <td>--</td>
@@ -134,25 +136,25 @@
                                     <td>--</td>
                                     <td>--</td>
                                     <td>--</td>
-                                    <td><if condition="$data['statement_info'][0]['statement_type'] eq 2">-</if>{$data['statement_info'][0]['sum_money']|default="--"}</td>
+                                    <td><if condition="$datas['statement_info'][0]['statement_type'] eq 2">-</if>{$datas['statement_info'][0]['sum_money']|default="--"}</td>
                                     <else/>
-                                    <td>{$data['statement_info'][0]['game_name']|default="--"}</td>
-                                    <td>{$data['statement_info'][0]['platform_money']|default="--"}</td>
-                                    <td>{$data['statement_info'][0]['aggregate_money']|default="--"}</td>
-                                    <td>{$data['statement_info'][0]['sum_amount']|default="--"}</td>
-                                    <td>{$data['statement_info'][0]['ratio']|default="--"}</td>
-                                    <td>{$data['statement_info'][0]['promote_ratio']|default="--"}</td>
-                                    <td>{$data['statement_info'][0]['fax_ratio']|default="--"}</td>
-                                    <td>{$data['statement_info'][0]['other_amount']|default="--"}</td>
-                                    <td>{$data['statement_info'][0]['sum_money']|default="--"}</td>
+                                    <td>{$datas['statement_info'][0]['game_name']|default="--"}<if condition="$datas['statement_info'][0]['withdraw_type'] eq 0 and $datas['statement_info'][0]['statement_begin_time']">({$datas['statement_info'][0]['statement_begin_time']}-{$datas['statement_info'][0]['statement_end_time']})</if></td>
+                                    <td>{$datas['statement_info'][0]['platform_money']|default="--"}</td>
+                                    <td>{$datas['statement_info'][0]['aggregate_money']|default="--"}</td>
+                                    <td>{$datas['statement_info'][0]['sum_amount']|default="--"}</td>
+                                    <td>{$datas['statement_info'][0]['ratio']|default="--"}</td>
+                                    <td>{$datas['statement_info'][0]['promote_ratio']|default="--"}</td>
+                                    <td>{$datas['statement_info'][0]['fax_ratio']|default="--"}</td>
+                                    <td>{$datas['statement_info'][0]['other_amount']|default="--"}</td>
+                                    <td>{$datas['statement_info'][0]['sum_money']|default="--"}</td>
 
                                 </if>
 
                             </tr>
-                            <foreach name="data['statement_info']" item="statement_info" key="skey">
+                            <foreach name="datas['statement_info']" item="statement_info" key="skey">
                                 <if condition="$skey gt 0">
                                     <if condition="$statement_info['statement_type'] gt 0">
-                                        <td>{$statement_info['game_name']|default="--"}</td>
+                                        <td>{$statement_info['game_name']|default="--"}<if condition="$datas['statement_info'][0]['withdraw_type'] eq 0 and $statement_info['statement_begin_time']">({$statement_info['statement_begin_time']}-{$statement_info['statement_end_time']})</if></td>
                                         <td>--</td>
                                         <td>--</td>
                                         <td>--</td>
@@ -163,7 +165,7 @@
                                         <td><if condition="$statement_info['statement_type'] eq 2">-</if>{$statement_info['sum_money']|default="--"}</td>
                                         <else/>
                                         <tr>
-                                            <td>{$statement_info['game_name']|default="--"}</td>
+                                            <td>{$statement_info['game_name']|default="--"}<if condition="$datas['statement_info'][0]['withdraw_type'] eq 0 and $statement_info['statement_begin_time']">({$statement_info['statement_begin_time']}-{$statement_info['statement_end_time']})</if></td>
                                             <td>{$statement_info['platform_money']|default="--"}</td>
                                             <td>{$statement_info['aggregate_money']|default="--"}</td>
                                             <td>{$statement_info['sum_amount']|default="--"}</td>
@@ -180,6 +182,7 @@
                         <tr>
                             <td>小计</td>
                             <td>--</td>
+                            <td>--</td>
                             <td>{$sum[$index]['platform_money']}</td>
                             <td>{$sum[$index]['aggregate_money']}</td>
                             <td>{$sum[$index]['sum_amount']}</td>

Application/Admin/View/CompanyStatementPool/editPuPool.html

@@ -168,7 +168,7 @@
                                     <td><span class="pay_amount">{$com['statement_info'][0]['game_list'][0]['pay_amount']}</span></td>
                                     <td>
                                         <if condition="($com.is_reward_fine_split eq 0)">
-                                            <input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$com['statement_info'][0]['game_list'][0]['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$com['statement_info'][0]['game_list'][0]['game_name']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['account']}]">
+                                            <input class="refund" value="{$com['statement_info'][0]['game_list'][0]['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$com['statement_info'][0]['game_list'][0]['game_name']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['account']}]">
                                             <else/>
                                             0
                                         </if>
@@ -259,7 +259,7 @@
                                             <td><span class="pay_amount">{$game['pay_amount']}</span></td>
                                             <td>
                                                 <if condition="($com.is_reward_fine_split eq 0)">
-                                                    <input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$game['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$game['game_name']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['account']}]">
+                                                    <input class="refund" value="{$game['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$game['game_name']}{$com['statement_info'][0]['time']}{$com['statement_info'][0]['account']}]">
                                                     <else/>
                                                     0
                                                 </if>
@@ -310,7 +310,7 @@
     <!--                                            <td>{$account['game_list'][0]['increment_ratio']|showNumPercent}</td>-->
                                                 <td>
                                                     <if condition="($com.is_reward_fine_split eq 0)">
-                                                        <input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$account['game_list'][0]['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]">
+                                                        <input class="refund" value="{$account['game_list'][0]['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$account['game_list'][0]['game_name']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]">
                                                         <else/>
                                                         0
                                                     </if>
@@ -377,7 +377,7 @@
     <!--                                                    <td>{$game['increment_ratio']|showNumPercent}</td>-->
                                                         <td>
                                                             <if condition="($com.is_reward_fine_split eq 0)">
-                                                                <input class="refund" onkeyup ="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" value="{$game['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$game['game_name']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]">
+                                                                <input class="refund" value="{$game['refund']|default=0}" style="width: 40px;" name="refund[{$com['id']}][{$game['game_name']}{$account['time']?$account['time']:$com['statement_info'][0]['time']}{$account['account']}]">
                                                                 <else/>
                                                                 0
                                                             </if>
@@ -464,6 +464,13 @@
         saveForm(id);
 
     });
+   $(".refund").keyup(function() {
+        var val = $(this).val();
+        var reg = /^(\-|\+)?\d+(\.\d+)?$/g;
+        if( !reg.test(val)){
+            $(this).val(0)
+        }
+   });
 
     var pool_ids = "{$_GET['id']}";
     $(".split_RewardOrFail").on("click",function() {
@@ -641,8 +648,8 @@
         }
         //退款
         var refund = $(_this).parent().parent().find(".refund").val();
-        if (!refund  || refund < 0) {
-            refund = 0;
+        if (!refund) {
+            // refund = 0;
             $(_this).parent().parent().find(".refund").val(refund);
         } else if(parseFloat(refund) > parseFloat(pay_money)) {
           refund = pay_money;

Application/Admin/View/CompanyStatementPool/lists.html

@@ -693,7 +693,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['60%', '60%'],
-                    content:'/admin.php?s=/CompanyStatementPool/uploadVoucher/id/'+id,
+                    content:'/{$Think.SUBSITE_INDEX}?s=/CompanyStatementPool/uploadVoucher/id/'+id,
                     end:function(){
                         reload();
                     }
@@ -717,7 +717,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['60%', '60%'],
-                    content:'/admin.php?s=/CompanyStatementPool/editVoucher/id/'+id,
+                    content:'/{$Think.SUBSITE_INDEX}?s=/CompanyStatementPool/editVoucher/id/'+id,
                     end:function(){
                         reload();
                     }

Application/Admin/View/CpJuheCompany/export.html

@@ -249,7 +249,7 @@
         shadeClose: true,
         shade: 0.8,
         area: ['70%', '80%'],
-        content: ['admin.php?s=/Member/denglu/id/', 'no']
+        content: ['{$Think.SUBSITE_INDEX}?s=/Member/denglu/id/', 'no']
       });
     }
 

Application/Admin/View/CpJuheCompany/index.html

@@ -272,7 +272,7 @@
         shadeClose: true,
         shade: 0.8,
         area: ['70%', '80%'],
-        content: ['admin.php?s=/Member/denglu/id/', 'no']
+        content: ['{$Think.SUBSITE_INDEX}?s=/Member/denglu/id/', 'no']
       });
     }
 

Application/Admin/View/Developers/gameEdit.html

@@ -581,7 +581,7 @@ $("#add_another").click(function() {
   shadeClose: true,
   shade: 0.8,
   area: ['70%', '80%'],
-  content: url+'admin.php?s=/Game/add_another/id/1111'//iframe的url
+  content: url+'{$Think.SUBSITE_INDEX}?s=/Game/add_another/id/1111'//iframe的url
 }); 
 });
 /*获取游戏类型名称*/

Application/Admin/View/Developers/relation.html

@@ -315,7 +315,7 @@ $("#add_another").click(function() {
   shadeClose: true,
   shade: 0.8,
   area: ['70%', '80%'],
-  content: url+'admin.php?s=/Game/add_another/id/1111'//iframe的url
+  content: url+'{$Think.SUBSITE_INDEX}?s=/Game/add_another/id/1111'//iframe的url
 }); 
 });
 /*获取游戏类型名称*/

Application/Admin/View/Finance/aggDetail.html

@@ -240,7 +240,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/Finance/gameFinance.html

@@ -262,7 +262,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/Finance/gameFinanceDetail.html

@@ -203,7 +203,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/Finance/gameStatistics.html

@@ -237,15 +237,21 @@
                 false))}"><if condition="$data.inside_cash_count neq ''">{$data.inside_cash_count}<else/>0</if></td>
               <td ><if condition="$data.all_cash_count neq ''">{$data.all_cash_count}<else/>0</if></td>
               <td ><span style="color:red;"><if condition="$data.notice_fail_count neq ''">{$data.notice_fail_count}<else/>0</if></span></td>
-              <td ><a href="{:U('Finance/aggDetail', [
-                'timestart'=>$_GET['timestart'],
-                'timeend'=>$_GET['timeend'],
-                'sdk_type'=>$_GET['sdk_type'],
-                'game_id'=>$data['game_id'],
-                'game_name'=>$data['game_name'],
-                'partner_id'=>$_REQUEST['partner_id'],
-                'channel_type'=>1,
-              ])}">{$data.agg_wm_amount}</a></td>
+              <td > 
+                <if condition="!IS_SUBSITE"> 
+                  <a href="{:U('Finance/aggDetail', [
+                  'timestart'=>$_GET['timestart'],
+                  'timeend'=>$_GET['timeend'],
+                  'sdk_type'=>$_GET['sdk_type'],
+                  'game_id'=>$data['game_id'],
+                  'game_name'=>$data['game_name'],
+                  'partner_id'=>$_REQUEST['partner_id'],
+                  'channel_type'=>1,
+                ])}">{$data.agg_wm_amount}</a>
+                <else />
+                  {$data.agg_wm_amount}
+                </if>
+              </td>
               <td ><span style="color:red;"><if condition="$data.agg_wm_failed_amount neq ''">{$data.agg_wm_failed_amount}<else/>0</if></span></td>
               <td ><span style="color:red;">
                 <a href="{:U('TestOrder/lists', [

Application/Admin/View/Finance/gameStatisticsDetail.html

@@ -288,7 +288,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/Finance/getMiniterUser.html

@@ -239,7 +239,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/Finance/getParentUser.html

@@ -240,7 +240,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/Finance/getPromoteUser.html

@@ -225,7 +225,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/Finance/getRootUser.html

@@ -242,7 +242,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/Finance/index.html

@@ -261,7 +261,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/FinancePromote/gameStatisticsDetail.html

@@ -328,7 +328,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/Game/edit.html

@@ -1339,7 +1339,7 @@
                 shadeClose: true,
                 shade: 0.8,
                 area: ['70%', '80%'],
-                content: url+'admin.php?s=/Game/add_another/id/1111'//iframe的url
+                content: url+'{$Think.SUBSITE_INDEX}?s=/Game/add_another/id/1111'//iframe的url
             });
         });
         /*获取游戏类型名称*/

Application/Admin/View/Game/relation.html

@@ -513,7 +513,7 @@ $("#add_another").click(function() {
   shadeClose: true,
   shade: 0.8,
   area: ['70%', '80%'],
-  content: url+'admin.php?s=/Game/add_another/id/1111'//iframe的url
+  content: url+'{$Think.SUBSITE_INDEX}?s=/Game/add_another/id/1111'//iframe的url
 }); 
 });
 /*获取游戏类型名称*/

Application/Admin/View/MarketPercentage/marketstaffsettle.html

@@ -202,8 +202,14 @@
                         <th ><div class="tooltip">绩效考核奖金<span class="tooltiptext"><span style="margin-left: -10px">当月开发税后毛利奖金与维护税后毛利奖金之和</span></span></div></th>
                         <th >绩效系数</th>
                         <th>当月合计</th>
-                        <th>本月应发金额</th>
-                        <th>待发金额</th>
+<!--                        <th>本月应发金额</th>-->
+                        <th>本月应发业绩提成</th>
+                        <th>本月应发绩效考核奖金</th>
+                        <th>本月应发金额合计</th>
+<!--                        <th>待发金额</th>-->
+                        <th>本月待发业绩提成</th>
+                        <th>本月待发绩效考核奖金</th>
+                        <th>本月待发金额合计</th>
                         <th>绩效确认</th>
                         <th>市场部确认</th>
                         <th>财务部审批</th>
@@ -232,7 +238,15 @@
                                 <td>{$data['achievement_bonus']|default='0.00'}</td>
                                 <td>{$data['coefficient']|default='1'}</td>
                                 <td>{$data['commission']|default='0.00'}</td>
+<!--                                <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']|default='0.00'}</a></td>-->
+
+                                <td>{$data['should_performance_commission']|default='0.00'}</td>
+                                <td>{$data['should_month_bonus_ratio']|default='0.00'}</td>
                                 <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'admin_id'=>$data['admin_id']))}" >{$data['extend_commission']|default='0.00'}</a></td>
+<!--                                <td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_commission']|default='0.00'}</a></td>-->
+
+                                <td>{$data['wait_performance_commission']|default='0.00'}</td>
+                                <td>{$data['wait_achievement_commission']|default='0.00'}</td>
                                 <td><a href="{:U('MarketPercentage/showBonusList',array('time_start'=>$data['start_time'],'time_end'=>$data['end_time'],'real_name'=>$data['real_name'],'level'=>$data['group_id']))}" >{$data['wait_commission']|default='0.00'}</a></td>
                                 <td><if condition="$data.coefficient_check eq 0"><span ></if>{$data['coefficient_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
                                 <td><if condition="$data.market_check eq 0"><span ></if>{$data['market_check_detail']|default=''}<if condition="$data.market_check eq 1"></span></if></td>
@@ -254,11 +268,15 @@
                         <td>{$sum['achievement_bonus']|default='0.00'}</td>
                         <td></td>
                         <td>{$sum['commission']|default='0.00'}</td>
+                        <td>{$sum['should_performance_commission']|default='0.00'}</td>
+                        <td>{$sum['should_month_bonus_ratio']|default='0.00'}</td>
                         <td><a href="{:U('MarketPercentage/personMarketStaffSettle',array('time_start'=>$start_time,'time_end'=>$end_time))}" >{$sum['extend_commission']|default='0.00'}</a></td>
                         <td></td>
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td></td>
+                        <td></td>
                     </notemtpy>
                     </tbody>
                 </table>

Application/Admin/View/Member/balance.html

@@ -29,7 +29,7 @@ body{ padding: 0px; }
     (function(){
         var ThinkPHP = window.Think = {
             "ROOT"   : "", //当前网站地址
-            "APP"    : "/admin.php?s=", //当前项目地址
+            "APP"    : "/{$Think.SUBSITE_INDEX}?s=", //当前项目地址
             "PUBLIC" : "/Public", //项目公共目录地址
             "DEEP"   : "/", //PATHINFO分割符
             "MODEL"  : ["3", "", "html"],

Application/Admin/View/Member/bind_balance1.html

@@ -64,7 +64,7 @@ body{ padding: 0px; }
     (function(){
         var ThinkPHP = window.Think = {
             "ROOT"   : "", //当前网站地址
-            "APP"    : "/admin.php?s=", //当前项目地址
+            "APP"    : "/{$Think.SUBSITE_INDEX}?s=", //当前项目地址
             "PUBLIC" : "/Public", //项目公共目录地址
             "DEEP"   : "/", //PATHINFO分割符
             "MODEL"  : ["3", "", "html"],

Application/Admin/View/Member/edit.html

@@ -313,7 +313,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: [url + 'admin.php?s=/Member/chax/id/' + id + '' , 'no']
+                    content: [url + '{$Think.SUBSITE_INDEX}?s=/Member/chax/id/' + id + '' , 'no']
                 });
             });
 
@@ -324,7 +324,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: [url + 'admin.php?s=/Member/role_list/user_id/' + id + '' , 'no']
+                    content: [url + '{$Think.SUBSITE_INDEX}?s=/Member/role_list/user_id/' + id + '' , 'no']
                 });
             });
 
@@ -335,7 +335,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: [url + 'admin.php?s=/Member/gold_coin/user_id/' + id + '/account/'+$.trim($('input[name="account"]').val()), 'no']
+                    content: [url + '{$Think.SUBSITE_INDEX}?s=/Member/gold_coin/user_id/' + id + '/account/'+$.trim($('input[name="account"]').val()), 'no']
                 });
             });
 
@@ -358,7 +358,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: [url + 'admin.php?s=/Member/denglu/id/' + id + '', 'no']
+                    content: [url + '{$Think.SUBSITE_INDEX}?s=/Member/denglu/id/' + id + '', 'no']
                 });
             });
             $("#bind_balance").click(function () {
@@ -369,7 +369,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: [url + 'admin.php?s=/Member/bind_balance/id/' + id + '', 'no']
+                    content: [url + '{$Think.SUBSITE_INDEX}?s=/Member/bind_balance/id/' + id + '', 'no']
                 });
             });
 

Application/Admin/View/PayChannel/gameDetail.html

@@ -286,7 +286,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/PayChannel/index.html

@@ -315,7 +315,7 @@
         shadeClose: true,
         shade: 0.8,
         area: ['70%', '80%'],
-        content: ['admin.php?s=/Member/denglu/id/', 'no']
+        content: ['{$Think.SUBSITE_INDEX}?s=/Member/denglu/id/', 'no']
       });
     }
 
@@ -395,7 +395,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/PayChannel/testDetail.html

@@ -312,7 +312,7 @@
           shadeClose: true,
           shade: 0.8,
           area: ['70%', '80%'],
-          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+          content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
         });
       });
 

Application/Admin/View/PayChannelIntention/index.html

@@ -403,7 +403,7 @@
         pay_status = '';
       }
 
-      var url = "admin.php?s=/PayChannelIntention/detail/"+ pay_ways + pay_way + pay_status + timestart + timeend;
+      var url = "{$Think.SUBSITE_INDEX}?s=/PayChannelIntention/detail/"+ pay_ways + pay_way + pay_status + timestart + timeend;
 
       window.location.href = url;
 

Application/Admin/View/PayMerchant/index.html

@@ -308,7 +308,7 @@
         shadeClose: true,
         shade: 0.8,
         area: ['70%', '80%'],
-        content: ['admin.php?s=/Member/denglu/id/', 'no']
+        content: ['{$Think.SUBSITE_INDEX}?s=/Member/denglu/id/', 'no']
       });
     }
 

Application/Admin/View/PaymentMerchant/list.html

@@ -373,8 +373,8 @@
                         shadeClose: true,
                         shade: 0.8,
                         area: ['500px', '300px'],
-                        // content:'/admin.php?s=/AggregateFinanceStatement/viewStatement/id/'+1
-                        content: '/admin.php?s=/PaymentMerchant/editDefault'
+                        // content:'/{$Think.SUBSITE_INDEX}?s=/AggregateFinanceStatement/viewStatement/id/'+1
+                        content: '/{$Think.SUBSITE_INDEX}?s=/PaymentMerchant/editDefault'
                     })
                 }
             })

Application/Admin/View/Platform/promote_statistics.html

@@ -270,7 +270,7 @@
             //       shadeClose: true,
             //       shade: 0.8,
             //       area: ['70%', '80%'],
-            //       content: '/admin.php?s=/Platform/zhuce_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+            //       content: '/{$Think.SUBSITE_INDEX}?s=/Platform/zhuce_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
             //     });
             // });
             $(".paixu").click(function(){

Application/Admin/View/Platform/promotepay_statistics.html

@@ -284,7 +284,7 @@
             //       shadeClose: true,
             //       shade: 0.8,
             //       area: ['70%', '80%'],
-            //       content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+            //       content: '{$Think.SUBSITE_INDEX}?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
             // });
             // });
             $(".paixu").click(function(){

Application/Admin/View/Public/base.html

@@ -160,7 +160,7 @@ $(function(){
      $.ajax({
         type: 'POST',
         type:'json',
-        url: "/admin.php?s=/Public/en_us",
+        url: "/{$Think.SUBSITE_INDEX}?s=/Public/en_us",
         success: function(data) {
             location.reload();
         },

Application/Admin/View/Public/cp_base.html

@@ -164,7 +164,7 @@
             $.ajax({
                 type: 'POST',
                 type: 'json',
-                url: "/admin.php?s=/Public/en_us",
+                url: "/{$Think.SUBSITE_INDEX}?s=/Public/en_us",
                 success: function (data) {
                     location.reload();
                 },
@@ -215,7 +215,7 @@
             <h3 class=""><i class="icon icon-unfold"></i>万盟对账单管理</h3>
             <ul class="side-sub-menu" style="">
                 <li class="current">
-                    <a class="item" href="/admin.php?s=/VerifyBill/index.html">对账单确认</a>
+                    <a class="item" href="/{$Think.SUBSITE_INDEX}?s=/VerifyBill/index.html">对账单确认</a>
                 </li>
             </ul>
         </div>

Application/Admin/View/Query/cpsettlement.html

@@ -509,7 +509,7 @@ function detailsInfo(developers,create_time){
         shadeClose: true,
         shade: 0.8,
         area: ['80%', '70%'],
-        content: '/admin.php?s=/Query/detailscps/developers_id/'+developers+'/create_time/'+ create_time //iframe的url
+        content: '/{$Think.SUBSITE_INDEX}?s=/Query/detailscps/developers_id/'+developers+'/create_time/'+ create_time //iframe的url
     });
 }
 </script>

Application/Admin/View/Query/marketList.html

@@ -263,7 +263,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: ['admin.php?s=/Query/detaillist/my_time/'+my_time+'/game_id/' + game_id + '/promote_id/' + promote_id + '', 'no']
+                    content: ['{$Think.SUBSITE_INDEX}?s=/Query/detaillist/my_time/'+my_time+'/game_id/' + game_id + '/promote_id/' + promote_id + '', 'no']
                 });
         }
     </script>

Application/Admin/View/Query/settlement.html

@@ -419,7 +419,7 @@
                 shadeClose: true,
                 shade: 0.8,
                 area: ['80%', '70%'],
-                content: '/admin.php?s=/Query/details/promote_id/'+promote_id+'/create_time/'+ create_time //iframe的url
+                content: '/{$Think.SUBSITE_INDEX}?s=/Query/details/promote_id/'+promote_id+'/create_time/'+ create_time //iframe的url
             });
         }
 

Application/Admin/View/Query/withdraw.html

@@ -332,7 +332,7 @@
                 shadeClose: true,
                 shade: 0.8,
                 area: ['80%', '70%'],
-                content: '/admin.php?s=/Query/withdrawDetails/id/'+id+'' //iframe的url
+                content: '/{$Think.SUBSITE_INDEX}?s=/Query/withdrawDetails/id/'+id+'' //iframe的url
             });
         }
 

Application/Admin/View/Question/show.html

@@ -71,7 +71,7 @@ $(function(){
   shadeClose: true,
   shade: 0.8,
   area: ['60%', '50%'],
-  content: 'admin.php?s=/Question/reply/id/'+id+''//iframe的url
+  content: '{$Think.SUBSITE_INDEX}?s=/Question/reply/id/'+id+''//iframe的url
 }); 
 });
 })

Application/Admin/View/Settlement/generatesettlementsheet.html

@@ -115,7 +115,7 @@
 
                 <?php if (!$generate) :?>
                 <div class="input-list">
-                    <a class="sch-btn" href="javascript:;" id="search" url="/admin.php?s=/settlement/generateSettlementSheet">生成</a>
+                    <a class="sch-btn" href="javascript:;" id="search" url="/{$Think.SUBSITE_INDEX}?s=/settlement/generateSettlementSheet">生成</a>
                 </div>
                 <?php endif;?>
             </div>

Application/Admin/View/Stat/cha_userarpu.html

@@ -71,7 +71,7 @@ body{ padding: 0px; }
     (function(){
         var ThinkPHP = window.Think = {
             "ROOT"   : "", //当前网站地址
-            "APP"    : "/admin.php?s=", //当前项目地址
+            "APP"    : "/{$Think.SUBSITE_INDEX}?s=", //当前项目地址
             "PUBLIC" : "/Public", //项目公共目录地址
             "DEEP"   : "/", //PATHINFO分割符
             "MODEL"  : ["3", "", "html"],

Application/Admin/View/StatementMangement/PersonOrderEdit.html

@@ -279,7 +279,7 @@
             }).get().join(",");
             var id =$("#withdraw_id").val();
             var withdraw =$("#withdraw").val();
-            var url = "/admin.php?s=/statementMangement/PersonOrderEdit/withdraw/" + text + "/time_start/" + $("#time_start").val() + "/time_end/" + $("#time_end").val() + "/id/" + id;
+            var url = "/{$Think.SUBSITE_INDEX}?s=/statementMangement/PersonOrderEdit/withdraw/" + text + "/time_start/" + $("#time_start").val() + "/time_end/" + $("#time_end").val() + "/id/" + id;
 
             console.log(url)
 
@@ -389,7 +389,7 @@
             );
 
             //设置对账网址
-            var order_url = window.location.protocol+"//"+window.location.host+"/admin.php?s=/Public/cp_login.html";
+            var order_url = window.location.protocol+"//"+window.location.host+"/{$Think.SUBSITE_INDEX}?s=/Public/cp_login.html";
             $("#order_url").html("结算单管理,对账地址:<spen style='margin-left:10px;'>"+order_url+"</spen>");
 
             //全选的实现

Application/Admin/View/StatementMangement/PersonOrderList.html

@@ -277,7 +277,7 @@
                 return $(elem).val();
             }).get().join(",");
 
-            var url = "/admin.php?s=/statementMangement/PersonOrderList/withdraw/" + text + "/time_start/" + $("#time_start").val() + "/time_end/" + $("#time_end").val();
+            var url = "/{$Think.SUBSITE_INDEX}?s=/statementMangement/PersonOrderList/withdraw/" + text + "/time_start/" + $("#time_start").val() + "/time_end/" + $("#time_end").val();
 
             console.log(url)
 
@@ -386,7 +386,7 @@
             );
 
             //设置对账网址
-            var order_url = window.location.protocol+"//"+window.location.host+"/admin.php?s=/Public/cp_login.html";
+            var order_url = window.location.protocol+"//"+window.location.host+"/{$Think.SUBSITE_INDEX}?s=/Public/cp_login.html";
             $("#order_url").html("结算单管理,对账地址:<spen style='margin-left:10px;'>"+order_url+"</spen>");
 
             //全选的实现

Application/Admin/View/StatementMangement/lists.html

@@ -289,7 +289,7 @@
                 }
             }
             //设置对账网址
-            var order_url = window.location.protocol+"//"+window.location.host+"/admin.php?s=/Public/cp_login.html";
+            var order_url = window.location.protocol+"//"+window.location.host+"/{$Think.SUBSITE_INDEX}?s=/Public/cp_login.html";
             $("#order_url").html("结算单管理,对账地址:<spen style='margin-left:10px;'>"+order_url+"</spen>");
 
             $("#upstream").click(function () {
@@ -299,7 +299,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content:'/admin.php?s=/Statement/createCpStatement/'
+                    content:'/{$Think.SUBSITE_INDEX}?s=/Statement/createCpStatement/'
                 });
             });
 
@@ -310,7 +310,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: '/admin.php?s=/statementMangement/createDownstreamOrder/'
+                    content: '/{$Think.SUBSITE_INDEX}?s=/statementMangement/createDownstreamOrder/'
                 });
             });
 
@@ -321,7 +321,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: '/admin.php?s=/statementMangement/PersonOrderList/'
+                    content: '/{$Think.SUBSITE_INDEX}?s=/statementMangement/PersonOrderList/'
                 });
             });
 
@@ -330,11 +330,11 @@
                 var edit = $(this).data();
                 var ext_field = $(this).attr('ext_field');
                 if(edit.type == 0){
-                    var url = "/admin.php?s=/Statement/editCpStatement/id/"+edit.id;
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/Statement/editCpStatement/id/"+edit.id;
                 }else if(edit.type == 1){
-                    var url = "/admin.php?s=/StatementMangement/editDownstreamOrder/id/"+edit.id+"/ext_field/"+ext_field;
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/StatementMangement/editDownstreamOrder/id/"+edit.id+"/ext_field/"+ext_field;
                 }else if(edit.type == 2){
-                    var url = "/admin.php?s=/StatementMangement/PersonOrderEdit/id/"+edit.id+"/withdraw/"+ext_field+"/time_start/"+edit.start+"/time_end/"+edit.end;
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/StatementMangement/PersonOrderEdit/id/"+edit.id+"/withdraw/"+ext_field+"/time_start/"+edit.start+"/time_end/"+edit.end;
                 }
 
                 layer.open({
@@ -351,9 +351,9 @@
 
                 var type = $(this).data("type");
                 if (type == 2) {
-                    var url = "/admin.php?s=/StatementMangement/personOrderDetail/id/"+id;
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/StatementMangement/personOrderDetail/id/"+id;
                 } else {
-                    var url = "/admin.php?s=/VerifyBill/show/id/"+id+"/from/pc";
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/VerifyBill/show/id/"+id+"/from/pc";
                 }
 
                 layer.open({
@@ -372,9 +372,9 @@
                     title:false
                 }, function(){
                     if(del.type == 0){
-                        var url = "/admin.php?s=/Statement/delCpStatement/id/"+del.id;
+                        var url = "/{$Think.SUBSITE_INDEX}?s=/Statement/delCpStatement/id/"+del.id;
                     }else{
-                        var url = "/admin.php?s=/StatementMangement/delStatementData/id/"+del.id;
+                        var url = "/{$Think.SUBSITE_INDEX}?s=/StatementMangement/delStatementData/id/"+del.id;
                     }
                     layer.load(2);
                     $.ajax({

Application/Admin/View/StatementMangement/personOrderDetail.html

@@ -209,7 +209,7 @@
                     return $(elem).val();
                 }).get().join(",");
 
-                var url = "/admin.php?s=/statementMangement/PersonOrderList/withdraw/" + text + "/time_start/" + $("#time_start").val() + "/time_end/" + $("#time_end").val();
+                var url = "/{$Think.SUBSITE_INDEX}?s=/statementMangement/PersonOrderList/withdraw/" + text + "/time_start/" + $("#time_start").val() + "/time_end/" + $("#time_end").val();
 
                 console.log(url)
 
@@ -314,7 +314,7 @@
                 );
 
                 //设置对账网址
-                var order_url = window.location.protocol+"//"+window.location.host+"/admin.php?s=/Public/cp_login.html";
+                var order_url = window.location.protocol+"//"+window.location.host+"/{$Think.SUBSITE_INDEX}?s=/Public/cp_login.html";
                 $("#order_url").html("结算单管理,对账地址:<spen style='margin-left:10px;'>"+order_url+"</spen>");
 
                 //全选的实现

Application/Admin/View/SubCompanyStatementPool/lists.html

@@ -589,7 +589,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['60%', '60%'],
-                    content:'/admin.php?s=/CompanyStatementPool/uploadVoucher/id/'+id,
+                    content:'/{$Think.SUBSITE_INDEX}?s=/CompanyStatementPool/uploadVoucher/id/'+id,
                     end:function(){
                         reload();
                     }
@@ -613,7 +613,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['60%', '60%'],
-                    content:'/admin.php?s=/CompanyStatementPool/editVoucher/id/'+id,
+                    content:'/{$Think.SUBSITE_INDEX}?s=/CompanyStatementPool/editVoucher/id/'+id,
                     end:function(){
                         reload();
                     }

Application/Admin/View/SuperStatistical/index.html

@@ -159,7 +159,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: 'admin.php?s=/SuperStatistical/lists' + params
+                    content: '{$Think.SUBSITE_INDEX}?s=/SuperStatistical/lists' + params
                 });
             });
             $("#role1").click(function () {
@@ -169,7 +169,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: 'admin.php?s=/SuperStatistical/lists' + params
+                    content: '{$Think.SUBSITE_INDEX}?s=/SuperStatistical/lists' + params
                 });
             });
             $("#superDetail").click(function () {
@@ -179,7 +179,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: 'admin.php?s=/SuperStatistical/superDetail' + params
+                    content: '{$Think.SUBSITE_INDEX}?s=/SuperStatistical/superDetail' + params
                 });
             });
             //搜索功能

Application/Admin/View/TestOrder/lists.html

@@ -263,7 +263,7 @@
           btn: ['确认','取消'],
           title:false
         }, function(){
-          var url = "/admin.php?s=/TestOrder/del/id/"+del.id;
+          var url = "/{$Think.SUBSITE_INDEX}?s=/TestOrder/del/id/"+del.id;
 
           layer.load(2);
           $.ajax({
@@ -359,7 +359,7 @@
         shadeClose: true,
         shade: 0.8,
         area: ['500px', '600px'],
-        content:'/admin.php?s=/TestOrder/addOrder/'
+        content:'/{$Think.SUBSITE_INDEX}?s=/TestOrder/addOrder/'
       });
     });
   </script>

Application/Admin/View/UserActionLog/index.html

@@ -230,7 +230,7 @@
         btn: ['确认','取消'],
         title:false
       }, function(){
-        var url = "/admin.php?s=/UserActionLog/del/id/"+del.id;
+        var url = "/{$Think.SUBSITE_INDEX}?s=/UserActionLog/del/id/"+del.id;
 
         layer.load(2);
         $.ajax({

Application/Admin/View/UserActionLog/operateLog.html

@@ -237,7 +237,7 @@
         btn: ['确认','取消'],
         title:false
       }, function(){
-        var url = "/admin.php?s=/UserActionLog/operateLogDel/id/"+del.id;
+        var url = "/{$Think.SUBSITE_INDEX}?s=/UserActionLog/operateLogDel/id/"+del.id;
 
         layer.load(2);
         $.ajax({

Application/Admin/View/UserPayWhiteList/add.html

@@ -114,7 +114,7 @@
                 layer.msg("<em style='color:white'>" + data.msg + "</em>")
 
                 setTimeout(function(){
-                  window.location.href = "/admin.php?s=/UserPayWhiteList/index.html";
+                  window.location.href = "/{$Think.SUBSITE_INDEX}?s=/UserPayWhiteList/index.html";
                 },1500);
               }
             }

Application/Admin/View/UserPayWhiteList/index.html

@@ -100,8 +100,8 @@
 
     <div class="butnbox" >
         <div class="butnlist jscheckbutn" style="margin-left: 2px">
-            <a class="butn" style="width:180px" href="/admin.php?s=/UserPayWhiteList/add.html">添加允许支付账号</a>
-            <if condition="$show eq 1"><a class="butn" style="width:180px" href="/admin.php?s=/UserPayWhiteList/index/show/1.html">查看允许支付白名单</a></if>
+            <a class="butn" style="width:180px" href="/{$Think.SUBSITE_INDEX}?s=/UserPayWhiteList/add.html">添加允许支付账号</a>
+            <if condition="$show eq 1"><a class="butn" style="width:180px" href="/{$Think.SUBSITE_INDEX}?s=/UserPayWhiteList/index/show/1.html">查看允许支付白名单</a></if>
         </div>
     </div>
     <if condition = "!empty($data)">
@@ -276,7 +276,7 @@
                 }
             }
             //设置对账网址
-            var order_url = window.location.protocol+"//"+window.location.host+"/admin.php?s=/Public/cp_login.html";
+            var order_url = window.location.protocol+"//"+window.location.host+"/{$Think.SUBSITE_INDEX}?s=/Public/cp_login.html";
             $("#order_url").html("说明：允许玩家正常支付的白名单");
 
             $("#upstream").click(function () {
@@ -286,7 +286,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content:'/admin.php?s=/Statement/createCpStatement/'
+                    content:'/{$Think.SUBSITE_INDEX}?s=/Statement/createCpStatement/'
                 });
             });
 
@@ -297,7 +297,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: '/admin.php?s=/statementMangement/createDownstreamOrder/'
+                    content: '/{$Think.SUBSITE_INDEX}?s=/statementMangement/createDownstreamOrder/'
                 });
             });
 
@@ -308,7 +308,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: '/admin.php?s=/statementMangement/PersonOrderList/'
+                    content: '/{$Think.SUBSITE_INDEX}?s=/statementMangement/PersonOrderList/'
                 });
             });
 
@@ -317,11 +317,11 @@
                 var edit = $(this).data();
                 var ext_field = $(this).attr('ext_field');
                 if(edit.type == 0){
-                    var url = "/admin.php?s=/Statement/editCpStatement/id/"+edit.id;
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/Statement/editCpStatement/id/"+edit.id;
                 }else if(edit.type == 1){
-                    var url = "/admin.php?s=/StatementMangement/editDownstreamOrder/id/"+edit.id+"/ext_field/"+ext_field;
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/StatementMangement/editDownstreamOrder/id/"+edit.id+"/ext_field/"+ext_field;
                 }else if(edit.type == 2){
-                    var url = "/admin.php?s=/StatementMangement/PersonOrderEdit/id/"+edit.id+"/withdraw/"+ext_field+"/time_start/"+edit.start+"/time_end/"+edit.end;
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/StatementMangement/PersonOrderEdit/id/"+edit.id+"/withdraw/"+ext_field+"/time_start/"+edit.start+"/time_end/"+edit.end;
                 }
 
                 layer.open({
@@ -338,9 +338,9 @@
 
                 var type = $(this).data("type");
                 if (type == 2) {
-                    var url = "/admin.php?s=/StatementMangement/personOrderDetail/id/"+id;
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/StatementMangement/personOrderDetail/id/"+id;
                 } else {
-                    var url = "/admin.php?s=/VerifyBill/show/id/"+id+"/from/pc";
+                    var url = "/{$Think.SUBSITE_INDEX}?s=/VerifyBill/show/id/"+id+"/from/pc";
                 }
 
                 layer.open({
@@ -359,9 +359,9 @@
                     title:false
                 }, function(){
                     if(del.type == 0){
-                        var url = "/admin.php?s=/Statement/delCpStatement/id/"+del.id;
+                        var url = "/{$Think.SUBSITE_INDEX}?s=/Statement/delCpStatement/id/"+del.id;
                     }else{
-                        var url = "/admin.php?s=/StatementMangement/delStatementData/id/"+del.id;
+                        var url = "/{$Think.SUBSITE_INDEX}?s=/StatementMangement/delStatementData/id/"+del.id;
                     }
                     layer.load(2);
                     $.ajax({

Application/Home/View/default/Home/landingPage.html

@@ -20,7 +20,8 @@
   <script src="__STATIC__/bg4_4.js"></script>
   <title>{$game['relation_game_name']}</title>
 </head>
-<body class="dialog-open" onclick="checkSafari()">
+<!-- <body class="dialog-open" onclick="checkSafari()"> -->
+<body onclick="checkSafari()">
 <style>
   .layui-layer-btn0 {
     font-size: 18px;

Application/Payment/View/Public/base.html

@@ -158,7 +158,7 @@ $(function(){
      $.ajax({
         type: 'POST',
         type:'json',
-        url: "/admin.php?s=/Public/en_us",
+        url: "/{$Think.SUBSITE_INDEX}?s=/Public/en_us",
         success: function(data) {
             location.reload();
         },

Data/update.sql

@@ -2794,4 +2794,8 @@ ALTER TABLE `tab_company_statement_info`
 ADD COLUMN `is_reward_fine_split` tinyint(255) NULL DEFAULT 0 COMMENT '是否是奖罚分离生成 0 否 1 是' AFTER `pay_check_time`;
 
 ALTER TABLE `platform_wm`.`tab_company_statement_pool`
-ADD COLUMN `wm_statement_ids` int(11) NOT NULL DEFAULT 0 COMMENT '子系统财务结算单id' AFTER `remark`;
+ADD COLUMN `wm_statement_ids` int(11) NOT NULL DEFAULT 0 COMMENT '子系统财务结算单id' AFTER `remark`;
+
+ALTER TABLE `tab_reward_record`
+ADD COLUMN `is_verify` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否审核' AFTER `settlement_time`,
+ADD COLUMN `verify_detail` longtext NULL COMMENT '审核详情' AFTER `is_verify`;

payment.php

@@ -23,6 +23,7 @@ define('FONTS',dirname(__FILE__).'/Public/Admin/fonts/');
  * 安全期间，建议安装调试完成后移动到非WEB目录
  */
 define ( 'APP_PATH', './Application/' );
+define ( 'SUBSITE_INDEX', "payment.php" );//子站点路口，影响session
 
 if(!is_file(APP_PATH . 'User/Conf/config.php')){
 	header('Location: ./install.php');