合并

Application/Admin/Common/function.php

@@ -923,3 +923,44 @@ function getGameTypeName($id,$chinese=true)
     }
 }
 
+
+/**
+ * 权限检测
+ * @param string  $rule    检测的规则
+ * @param string  $mode    check模式
+ * @return boolean
+ * @author 朱亚杰  <xcoolcc@gmail.com>
+ */
+use Admin\Model\AuthRuleModel;
+function checkRule($rule, $type=AuthRuleModel::RULE_URL, $mode='url'){
+    static $Auth    =   null;
+    if (!$Auth) {
+        $Auth       =   new \Think\Auth();
+    }
+
+    if(!$Auth->check($rule,is_login(),$type,$mode)){
+        return false;
+    }
+
+    return true;
+}
+/**
+ * 验证导出账号权限是否加密
+ * @param [type] $type 0:"_list_check",1:"_count_check"
+ * @return void
+ */
+function checkEncryptionAuth(&$value,$string){
+    //验证count
+    if(is_administrator()){
+        return true;
+    }else{
+        $exportRule  = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.$string."_encryption_check");
+
+        if (!checkRule($exportRule,array('in','1,2'))) {
+//            dump(1);die();
+            $value = encryption($value);
+        }
+
+    }
+}
+

Application/Admin/Controller/ActionController.class.php

@@ -28,6 +28,9 @@ class ActionController extends AdminController {
             $model_id                  =   get_document_field($value['model'],"name","id");
             $list[$key]['model_id']    =   $model_id ? $model_id : 0;
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('_list', $list);
         $this->meta_title = '行为日志';
 				

Application/Admin/Controller/AdminController.class.php

@@ -639,9 +639,16 @@ class AdminController extends Controller {
      */
     public function checkListOrCountAuthRestMap(&$map,$checkarr = false,$countfield = "rule_count_check"){
         //验证count
-        if(IS_ROOT){ 
+        if(IS_ROOT){
+            $this->assign('role_export_check',true);
             $this->assign($countfield,true); 
         }else{
+            $exportRule  = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME."_export_check");
+
+//            var_dump($this->checkRule($exportRule,array('in','1,2')));die();
+
+            $this->assign('role_export_check',$this->checkRule($exportRule,array('in','1,2')));
+
             $countRule  = strtolower(MODULE_NAME.'/'.CONTROLLER_NAME.'/'.ACTION_NAME."_count_check");  
             $this->assign($countfield,$this->checkRule($countRule,array('in','1,2')));
             //验证list

Application/Admin/Controller/AmericaIpForbitController.class.php

@@ -43,6 +43,7 @@ class AmericaIpForbitController extends ThinkController
 
         $setAppleInteriorBuyStatus = $appleInteriorBuyStatus?1:0;
 
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         $page = set_pagination($count, $row);
 

Application/Admin/Controller/ApplyController.class.php

@@ -94,6 +94,9 @@ class ApplyController extends ThinkController
         if ($page) {
             $this -> assign('_page', $page);
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this -> assign('list_data', $data);
         $this -> meta_title = 'APP分包';
         $this -> m_title = '游戏盒子APP分包';
@@ -176,6 +179,9 @@ class ApplyController extends ThinkController
             $listdata[$k]['launch_count'] = $launchmodel -> where(['apply_id' => $v['id']]) -> count();
 
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this -> assign('list_data', $listdata);
         $this -> m_title = '游戏分包';
         $this -> assign('commonset', M('Kuaijieicon') -> where(['url' => 'Apply/and_lists', 'status' => 1]) -> find());

Application/Admin/Controller/AuthManagerController.class.php

@@ -95,7 +95,8 @@ class AuthManagerController extends AdminController{
         $this->assign( '_list', $list );
         $this->assign( '_use_tip', true );
         $this->meta_title = '权限管理';
-				
+
+        $this->checkListOrCountAuthRestMap($map,[]);
 				
 				$this->m_title = '角色权限';
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'AuthManager/index','status'=>1])->find());

Application/Admin/Controller/BehaviorLogController.class.php

@@ -77,6 +77,7 @@ class BehaviorLogController extends ThinkController
                 
             }
         }
+        $this->checkListOrCountAuthRestMap($map,[]);
         $count = M('pay_info', 'tab_')->where($map)->count();
         $page  = set_pagination($count, $row);
         if ($page) {
@@ -159,6 +160,7 @@ class BehaviorLogController extends ThinkController
         } else {
             $count = M('repair_pay', 'tab_')->where($map)->count();
         }
+        $this->checkListOrCountAuthRestMap($map,[]);
         $page  = set_pagination($count, $row);
         if ($page) {
             $this->assign('_page', $page);

Application/Admin/Controller/BindRechargeRecordController.class.php

@@ -47,6 +47,7 @@ class BindRechargeRecordController extends ThinkController{
 //            $map['id'] = array('lt',1);
 //        }
         setPowerPromoteIds($map,'promote_id');
+        $this->checkListOrCountAuthRestMap($map,[]);
 
 		empty(I('pay_order_number')) || $map['pay_order_number'] = I('pay_order_number','');
 		$data = $model->getLists($map,"create_time desc",$p);

Application/Admin/Controller/BusinessAffairsController.class.php

@@ -25,6 +25,7 @@ class  BusinessAffairsController extends ThinkController
 				
         $this->m_title = '商务专员';
         $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'BusinessAffairs/lists','status'=>1])->find());
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         unset($_REQUEST['phone']);
         parent::order_lists("BusinessAffairs", $_GET["p"], $map);
@@ -258,7 +259,7 @@ class  BusinessAffairsController extends ThinkController
 				$this->m_title = '商务专员汇总查询';
 				$this->meta_title = '汇总查询';
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'BusinessAffairs/summaryQuery','status'=>1])->find());
-				
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         $this->display();
     }

Application/Admin/Controller/DeductBindRecordController.class.php

@@ -29,7 +29,7 @@ class DeductBindRecordController extends ThinkController {
         $sum['yst_day'] = D($model_name)->where($map)->sum('quantity');
 
         $sum['all_num'] = D($model_name)->where($extend)->sum('quantity');
-
+        $this->checkListOrCountAuthRestMap($map,[]);
         $this->assign('sum',$sum);
 
 			$this->m_title = '绑币收回';

Application/Admin/Controller/DepositController.class.php

@@ -128,7 +128,7 @@ class DepositController extends ThinkController {
 //            $this->meta_title = '平台币充值列表';
 //            $this->display('lists');die();
 //        }
-
+        $this->checkListOrCountAuthRestMap($map,[]);
         $total=null_to_0(D(self::model_name)->where($map1)->sum('pay_amount'));
         $ttotal=null_to_0(D(self::model_name)->where('create_time'.total(1))->where(array('pay_status'=>1))->sum('pay_amount'));
         $ytotal=null_to_0(D(self::model_name)->where('create_time'.total(5))->where(array('pay_status'=>1))->sum('pay_amount'));
@@ -245,6 +245,8 @@ class DepositController extends ThinkController {
             /* 执行查询 */
             ->select();
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         /* 查询记录总数 */
         $count = D('coin_pay_order')->where($map)->count();
 

Application/Admin/Controller/DevelopersController.class.php

@@ -40,7 +40,7 @@ class DevelopersController extends ThinkController {
             'template_list' =>'lists',
             'order'=>'id desc',
         );
-
+        $this->checkListOrCountAuthRestMap($map,[]);
 				$this->m_title = '开发者列表';
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Developers/lists','status'=>1])->find());
 				

Application/Admin/Controller/ExportController.class.php

@@ -1219,6 +1219,9 @@ class ExportController extends Controller
                         }else {
                             $value['payed_time'] = "------";
                         }
+                        checkEncryptionAuth($value['user_account'],'spend_lists');
+//                        $value['user_account'] = encryption($value['user_account']);
+
                         $value['extend'] = $value['extend'].'`';
                         $value['pay_way'] = get_pay_way($value['pay_way']);
                         $value['pay_status'] = get_info_status($value['pay_status'],9);
@@ -1340,6 +1343,9 @@ class ExportController extends Controller
                         ->order('id DESC')
                         ->select();
                     foreach ($xlsData as $key => $value) {
+
+                        checkEncryptionAuth($xlsData[$key]['user_account'],'deposit_lists');
+
                         $xlsData[$key]['create_time'] = date('Y-m-d H:i:s', $value['create_time']);
                         if ($value['pay_status'] == 1){
                             $xlsData[$key]['payed_time'] = date('Y-m-d H:i:s', $value['payed_time']);
@@ -1398,6 +1404,11 @@ class ExportController extends Controller
                     ->where($map)
                     ->order('id DESC')
                     ->select();
+                foreach ($xlsData as $key => $value) {
+                    checkEncryptionAuth($xlsData[$key]['user_account'],'provide_list');
+                }
+
+
                 $xlsCell = array(
                     array('pay_order_number', "订单号"),
                     array('user_account', "玩家账号"),
@@ -2253,9 +2264,9 @@ class ExportController extends Controller
 
                             if(!empty(I('get.extend'))) {                                       
                                 $map['tab_spend.extend'] = I('get.extend');
-                                $data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->page($p, $row)->order('tab_repair_pay.id DESC')->select();
+                                $data = M('repair_pay', 'tab_')->join('tab_spend on tab_spend.pay_order_number = tab_repair_pay.pay_order_number')->where($map)->order('tab_repair_pay.id DESC')->select();
                             } else {
-                                $data = M('repair_pay', 'tab_')->where($map)->page($p, $row)->order('id DESC')->select();
+                                $data = M('repair_pay', 'tab_')->where($map)->order('id DESC')->select();
                             }
 
                             $xlsData = [];
@@ -2466,6 +2477,9 @@ class ExportController extends Controller
                         $order_list['pay_amount'] = $v['pay_amount'];
                         $order_list['pay_way'] = get_pay_way($v['pay_way']);
                         $order_list['add_time'] = date('Y-m-d H:i:s', $v['add_time']);
+
+                        checkEncryptionAuth($order_list['user_account'],'TestOrder_lists');
+
                         $xlsData[] = $order_list;
                     }
                      $sumData = [['server_type'=>'总计',
@@ -2636,6 +2650,7 @@ class ExportController extends Controller
                                     $allDatas['spend_amount'] = $spend;
                                     $allDatas['deposit_amount'] = $deposit;
                                     $allDatas['coin_amount'] = $promoteCoin;
+                                    checkEncryptionAuth($allDatas['user_account'],'valueDetail');
                                     mb_convert_variables('GBK', 'UTF-8', $allDatas);
                                     fputcsv($fp, $allDatas);
                                 }  
@@ -4142,6 +4157,7 @@ class ExportController extends Controller
         $xlsName = $_REQUEST['xlsname'];
         $data = $data['data'];
         foreach ($data as $key => $value) {
+            checkEncryptionAuth($data[$key]['user_account'],'BindRechargeRecordExport');
             $data[$key]['pay_way'] = get_pay_way($value['pay_way']);
             $data[$key]['create_time'] = date('Y-m-d H:i:s',$value['create_time']);
             if ($value['pay_status'] == 1) {
@@ -8043,6 +8059,7 @@ class ExportController extends Controller
             array('balance_coin_count','平台币直充支出'),
             array('inside_cash_count','内充支出'),
             array('all_cash_count','游戏内充值合计'),
+            array('notice_fail_count','通知失败合计'),
         );
 
         $map = [];
@@ -8088,13 +8105,15 @@ class ExportController extends Controller
         $sumCash = $totalData['cash_count'];
         $sumBalance = $totalData['balance_coin_count'];
         $sumInside = $totalData['inside_cash_count'];
+        $sumNoticeFail = $totalData['notice_fail_count']? $totalData['notice_fail_count']:0;
         $sumAll = $sumCash + $sumBalance + $sumInside;
 
         $sumData = [['game_name'=>'总计',
             'cash_count'=>$sumCash,
             'balance_coin_count'=>$sumBalance,
             'inside_cash_count'=>$sumInside,
-            'all_cash_count'=>$sumAll]];
+            'all_cash_count'=>$sumAll,
+            'notice_fail_count'=>$sumNoticeFail]];
         $xlsData = array_merge($xlsData,$sumData);
         $this->exportAddOperationLog("Finance/gameStatistics","充值-财务管理-游戏统计-导出");
         $this->exportExcel($xlsName, $xlsCell, $xlsData);

Application/Admin/Controller/FinanceCompareController.class.php

@@ -70,6 +70,9 @@ class FinanceCompareController extends ThinkController
                 "create_time"=>"校验时间"
             ));
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $page = set_pagination($count,$row);
         if($page) {$this->assign('_page', $page);}
         $this->assign('list_data',$listdata);

Application/Admin/Controller/FinanceController.class.php

@@ -749,12 +749,15 @@ class FinanceController extends ThinkController
             $this->assign('_page', $page);//分页
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         //统计合计
         $totalData = D("spend")->totalGameStatistics($map);
 
         $sumCash = $totalData['cash_count'];
         $sumBalance = $totalData['balance_coin_count'];
         $sumInside = $totalData['inside_cash_count'];
+        $sumNoticeFail = $totalData['notice_fail_count']? $totalData['notice_fail_count']:0;
         $sumAll = $sumCash + $sumBalance + $sumInside;
 
         $game_types = M("game_type", 'tab_')->field('id, type_name')->select();
@@ -762,6 +765,7 @@ class FinanceController extends ThinkController
         $this->assign('sumCash', $sumCash);
         $this->assign('sumBalance', $sumBalance);
         $this->assign('sumInside', $sumInside);
+        $this->assign('sumNoticeFail', $sumNoticeFail);
         $this->assign('sumAll', $sumAll);
         $this->assign('data',$data);
 
@@ -850,6 +854,11 @@ class FinanceController extends ThinkController
             $data[$key]['pay_way'] = getPayType($value['pay_way']);
             $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']);
             $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
+
+            if (isset($_REQUEST['export'])) {
+                checkEncryptionAuth($data[$key]['user_account'],'gameStatisticsDetail');
+            }
+
         }
         if(isset($_REQUEST['export'])){
             //操作日志
@@ -873,7 +882,13 @@ class FinanceController extends ThinkController
             data2csv($data,"游戏统计订单查看",$dcop);
         }
 
-        $totalData = D('spend')->totalGameStatistics($map, false);
+        $totalMap = $map;
+        if ($map['game_id']) {
+            $totalMap['s.game_id'] = $map['game_id'];
+            unset($totalMap['game_id']);
+        }
+
+        $totalData = D('spend')->totalGameStatistics($totalMap, false);
 
         $sumCash = $totalData['cash_count'] ?? 0;
         $sumBalance = $totalData['balance_coin_count'] ?? 0;
@@ -886,6 +901,7 @@ class FinanceController extends ThinkController
         $this->assign('sumAll', null_to_0($sumAll));
 
         $count = D("spend")->getSpendData($map,'count(*) as count',$group,$order);
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         $count = $count[0]['count'];
         $page = set_pagination($count,$row);
@@ -1020,6 +1036,7 @@ class FinanceController extends ThinkController
         $count = count($count);
         $page = set_pagination($count,$row);
 
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         $total_cost = D('spend')->sumSpend($map, 'cost');//订单金额合计
         $total_pay_amount = D('spend')->sumSpend($map, 'pay_amount');//实付金额合计
@@ -1226,6 +1243,8 @@ class FinanceController extends ThinkController
             ,['支付方式','现金充值','平台币充值','合计']);
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('all_pay_amount', $all_pay_amount);
         $this->assign('all_balance', $all_balance);
         $this->assign('all_total', $all_total);
@@ -1453,6 +1472,9 @@ class FinanceController extends ThinkController
     //         }
 
     //     }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $page = set_pagination($count,$row);
         if($page) {$this->assign('_page', $page);}
         if(empty($_REQUEST['timestart']) && empty($_REQUEST['timeend']) && empty(I('user_account'))) {
@@ -1534,6 +1556,9 @@ class FinanceController extends ThinkController
         }else {
             $fuhao = '';
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $page = set_pagination($counts,$row);
         if($page) {$this->assign('_page', $page);}
         $this->assign('fuhao', $fuhao);

Application/Admin/Controller/FinancePromoteController.class.php

@@ -172,6 +172,7 @@ class FinancePromoteController extends AdminController
         $count['inside_cash_count'] =  number_format($count['inside_cash_count'],2,'.','');
         $count['all_count'] =  number_format($count['all_count'],2,'.','');
 
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         //外团占比
         $this->assign('outBelong',number_format($outBelong/$count['all_count']*100,2,'.',''));
@@ -361,6 +362,9 @@ class FinancePromoteController extends AdminController
                 "allcount"=>"渠道游戏内充值合计"
             ));
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $size = $row;
         $data = array_slice($data, ($arraypage - 1) * $size, $size);
         $this->assign('all_count', $allcount);
@@ -485,6 +489,8 @@ class FinancePromoteController extends AdminController
             ));
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $allData = self::gameStatisticsData($map);//列表总数
         $count = count($allData);
         $page = set_pagination($count, $row);
@@ -583,6 +589,11 @@ class FinancePromoteController extends AdminController
             $data[$key]['pay_way'] = getPayType($value['pay_way']);
             $data[$key]['game_name'] =clearGameNameType($data[$key]['game_name']);
             $data[$key]['sdk_version'] =getGameTypeName($data[$key]['sdk_version']);
+
+            if (isset($_REQUEST['export'])) {
+                checkEncryptionAuth($data[$key]['user_account'],'gameStatisticsDetail');
+            }
+
         }
         if (isset($_REQUEST['export'])) {
 
@@ -611,6 +622,8 @@ class FinancePromoteController extends AdminController
         $sumInside = $totalData['inside_cash_count'] ?? 0;
         $sumAll = $sumCash + $sumBalance + $sumInside;
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('sumCash', $sumCash);
         $this->assign('sumBalance', $sumBalance);
         $this->assign('sumInside', $sumInside);
@@ -752,6 +765,9 @@ class FinancePromoteController extends AdminController
             $data[$key]['cost'] = number_format($value['cost'],2,'.','');
             $data[$key]['pay_amount'] = number_format($value['pay_amount'],2,'.','');
 
+            if (isset($_REQUEST['export'])) {
+                checkEncryptionAuth($data[$key]['user_account'],'gameCoinDetail');
+            }
         }
 
         if (isset($_REQUEST['export'])) {
@@ -783,6 +799,9 @@ class FinancePromoteController extends AdminController
 
             data2csv($data,$title,$field);
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $count = D("spend")->getSpendData($map,$field,$group,$order);
         $count = count($count);
         $page = set_pagination($count,$row);
@@ -936,6 +955,7 @@ class FinancePromoteController extends AdminController
 
             data2csv($senddata,"平台币内充明细",$field);
         }
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         $this->assign('total_cost', $total_cost);
         $page = set_pagination($count,$row);

Application/Admin/Controller/GameController.class.php

@@ -71,6 +71,8 @@ class GameController extends ThinkController
             $this->assign('show_status', 1);
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $extend['order'] = 'sort desc, id desc';
         //$extend['for_show_pic_list']='icon';//列表显示图片
         $this->m_title = '游戏列表';

Application/Admin/Controller/GameSourceController.class.php

@@ -33,6 +33,9 @@ class GameSourceController extends ThinkController
                 $extend['develop_id'] = array('NEQ', 0);
                 break;
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this -> m_title = '原包管理';
         $this -> assign('commonset', M('Kuaijieicon') -> where(['url' => 'GameSource/lists', 'status' => 1]) -> find());
         parent ::lists(self::model_name, $_GET["p"], $extend);

Application/Admin/Controller/GameTypeController.class.php

@@ -10,6 +10,9 @@ class GameTypeController extends ThinkController {
     const model_name = 'GameType';
 
     public function lists($p=1){
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         switch ($_GET['type']) {
             case '':
             case 1:

Application/Admin/Controller/GiftbagController.class.php

@@ -63,7 +63,9 @@ class GiftbagController extends ThinkController {
             $this->assign('show_status',1);
         }
         $extend['for_show_pic_list']='novice';
-				
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
 				$this->m_title = '礼包列表';
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Giftbag/lists','status'=>1])->find());
 				
@@ -92,7 +94,9 @@ class GiftbagController extends ThinkController {
                 unset($_REQUEST['sdk_version']);
             }
         }
-				
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
 				$this->m_title = '礼包领取记录';
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Giftbag/record','status'=>1])->find());
 				

Application/Admin/Controller/LaunchController.class.php

@@ -32,6 +32,8 @@ class LaunchController extends ThinkController {
         $this->m_url = 'Launch/platform';
         $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Merchandise/lists','status'=>1])->find());
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $data = D(self::model_name)->lists($_GET['p'],$extend);
 
         $this->assign('list_data',$data['data']);
@@ -173,6 +175,8 @@ class LaunchController extends ThinkController {
 
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->meta_title = "投放数据列表";
 
         $this->m_title = '投放数据';

Application/Admin/Controller/MemberController.class.php

@@ -1119,6 +1119,7 @@ class MemberController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
+
         $this->meta_title = '黑名单列表';
         $this->display();
     }

Application/Admin/Controller/MendController.class.php

@@ -11,6 +11,9 @@ use Base\Service\PromoteService as PromoteService;
 class MendController extends ThinkController {
     public $tempid = 0;
     public function lists($p=1){
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
 			$this->m_title = '推广补链';
             $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Mend/lists','status'=>1])->find());
             $this->mendList();
@@ -90,7 +93,9 @@ class MendController extends ThinkController {
             ));
             die();
         }
-        
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $count = M("Mend","tab_")->where($map)->count();
         $this->assign('row_count',$count);
         $this->assign('list_data', $data);

Application/Admin/Controller/MerchandiseController.class.php

@@ -32,7 +32,8 @@ class MerchandiseController extends ThinkController {
 				$this->m_title = '商品列表';
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Merchandise/lists','status'=>1])->find());
 
-
+        $this->checkListOrCountAuthRestMap($map,[]);
+        
         parent::lists(self::model_name,$_GET['p'],$extend);
 
     }

Application/Admin/Controller/MsgController.class.php

@@ -28,7 +28,8 @@ class MsgController extends ThinkController{
 				
 				$this->m_title = '站内通知';
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Msg/lists','status'=>1])->find());
-				
+
+        $this->checkListOrCountAuthRestMap($map,[]);
 				
         $this->display();
     }

Application/Admin/Controller/OrderController.class.php

@@ -49,6 +49,9 @@ class OrderController extends ThinkController
         if (!empty($_REQUEST['keyword'])) {
             $extend['game_name|title|server_name|small_account'] = array('like', '%' . $_REQUEST['keyword'] . '%');
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $extend['admin_status'] = 0;
         $this -> m_title = '订单列表';
         $this -> meta_title = '订单列表';

Application/Admin/Controller/PartnerController.class.php

@@ -187,6 +187,7 @@ class PartnerController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
+        $this->checkListOrCountAuthRestMap($map,[]);
 //        dd($parseData[0]);
         $this->assign('listData', $parseData[0]);
         $this->assign('count', $count);

Application/Admin/Controller/PayChannelController.class.php

@@ -358,6 +358,7 @@ class PayChannelController extends ThinkController
                 "game_name"=>"产品名称","sdk_version"=>"设备名称","pay_amount"=>"游戏现金金额","platform_coin"=>"平台币直冲金额","test_coin"=>"测试金额","sum"=>"支付渠道内合计"));
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         $sumData['pay_amount'] = number_format($sumData['pay_amount'],2,'.','');
         $sumData['platform_coin'] = number_format($sumData['platform_coin'],2,'.','');
@@ -720,6 +721,9 @@ class PayChannelController extends ThinkController
         $this->meta_title = "游戏订单查看";
         $sumAllData['sum'] = number_format($sumAllData['bind_amount']+$sumAllData['platform_amount']+$sumAllData['pay_amount'],2,'.','');
 //        var_dump($sumAllData);die();
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('sumAllData',$sumAllData);
         $this->assign('data',$data);
         $this->display();
@@ -883,6 +887,10 @@ class PayChannelController extends ThinkController
                 $v['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']);
                 $v['pay_way'] = get_pay_way($v['pay_way']);
 
+                if ($v['user_account']) {
+                    checkEncryptionAuth($v['user_account'],'gameDetail');
+                }
+
                 $xlsData[] = $v;
 
                 mb_convert_variables('GBK', 'UTF-8', $v);
@@ -1289,6 +1297,8 @@ class PayChannelController extends ThinkController
             }
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $page = set_pagination($count, $row);
         if ($page) {
             $this->assign('_page', $page);
@@ -1430,6 +1440,8 @@ class PayChannelController extends ThinkController
 
                 foreach ($data as $key => $value) {
 
+                    checkEncryptionAuth($value['user_account'],'testDetail');
+
                     $value['pay_order_number'] = "'".$value['pay_order_number'];
                     $value['order_number'] = "'".$value['order_number'];
                     $value['game_name'] =clearGameNameType($value['game_name']);

Application/Admin/Controller/PayChannelIntentionController.class.php

@@ -165,6 +165,8 @@ class PayChannelIntentionController extends AdminController
            }
        }
 
+       $this->checkListOrCountAuthRestMap($map,[]);
+
        $this->assign('data',$data);
 
        $this->display();
@@ -492,6 +494,8 @@ class PayChannelIntentionController extends AdminController
 
        }
 
+       $this->checkListOrCountAuthRestMap($map,[]);
+
        $this->assign('data',$data);
        $this->assign('sum',$sum);
 

Application/Admin/Controller/PlatformController.class.php

@@ -101,6 +101,9 @@ class PlatformController extends ThinkController
         $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
         //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度)
         $data = array_slice($data, ($arraypage - 1) * $size, $size);
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->meta_title = '游戏注册统计列表';
         $this->assign('list_data', $data);
         $this->assign("is_admin",is_administrator());
@@ -192,6 +195,8 @@ class PlatformController extends ThinkController
             $this->assign('_page', $page);
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $data = my_sort($data, $data_order_type, (int)$data_order);
         $size = $row;//每页显示的记录数
         $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
@@ -292,6 +297,9 @@ class PlatformController extends ThinkController
         $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
         //用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度)
         $data = array_slice($data, ($arraypage - 1) * $size, $size);
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->meta_title = '注册方式统计列表';
         $this->assign('list_data', $data);
         $this->assign('total', $total);
@@ -386,6 +394,8 @@ class PlatformController extends ThinkController
             $this->assign('_page', $page);
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $data = my_sort($data, $data_order_type, (int)$data_order);
         $size = $row;//每页显示的记录数
         $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
@@ -578,6 +588,8 @@ class PlatformController extends ThinkController
             $this->assign('_page', $page);
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $data = my_sort($data, $data_order_type, (int)$data_order);
         $size = $row;//每页显示的记录数
         $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
@@ -783,6 +795,9 @@ class PlatformController extends ThinkController
                 "mounth"=>"本月充值",
             ));
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $data = array_slice($data, ($arraypage - 1) * $size, $size);
         $this->meta_title = '渠道充值统计列表';
         $this->assign('list_data', $data);

Application/Admin/Controller/PresidentDepositController.class.php

@@ -147,6 +147,8 @@ class PresidentDepositController extends ThinkController
             }
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $page = set_pagination($count, $row);
         if($page) {
             $this->assign('_page', $page);

Application/Admin/Controller/PromoteCoinController.class.php

@@ -50,6 +50,7 @@ class PromoteCoinController extends ThinkController
 
         $sum['all_num'] = D(self::model_name)->where($extend)->sum('num');
         // echo  D(self::model_name)->getLastSql();exit;
+        $this->checkListOrCountAuthRestMap($map,[]);
         $this->assign('sum', $sum);
 
         $this->m_title = '平台币发放(推广员)';
@@ -91,7 +92,7 @@ class PromoteCoinController extends ThinkController
 //            $map['id'] = array('lt',1);
 //        }
         setPowerPromoteIds($map,'promote_id');
-
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         $map['create_time'] = total(1, false);
         $sum['to_day'] = D(self::model_name)->where($map)->sum('num');
@@ -294,6 +295,8 @@ class PromoteCoinController extends ThinkController
 
         $count = $pc->where($extend)->count();
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $page = set_pagination($count, $row);
         if ($page) {
             $this->assign('_page', $page);

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -2,6 +2,7 @@
 
 namespace Admin\Controller;
 
+use mysql_xdevapi\Exception;
 use User\Api\UserApi as UserApi;
 use OSS\OssClient;
 use OSS\Core\OSsException;
@@ -472,4 +473,80 @@ class PromoteCompanyController extends ThinkController
         }
         # code...
     }
+
+    public function promoteDataConfigIndex() {
+
+        if (IS_POST) {
+
+            $changeData = I('post.','');
+
+            $promoteData = M("promote","tab_")
+                ->field("id")
+                ->where(['company_belong'=>2])
+                ->select();
+
+            $promoteData = implode(',',array_column($promoteData,'id'));
+
+            if ($changeData['admin_type'] == 1) {
+
+
+                $num_pend = 0;
+                $num_deposit = 0;
+                if ($promoteData) {
+
+                    $sql_spend = "UPDATE `tab_spend` SET `old_change_promote_id`=`promote_id`,`old_change_promote_account`=`promote_account`,`promote_id`=0,`promote_account`='无' WHERE promote_id in({$promoteData})";
+                    $sql_deposit = "UPDATE `tab_deposit` SET `old_change_promote_id`=`promote_id`,`old_change_promote_account`=`promote_account`,`promote_id`=0,`promote_account`='无' WHERE promote_id in({$promoteData})";
+
+                    $model = new \Think\Model();
+                    $num_pend = $model->execute($sql_spend,true);
+                    $num_deposit = $model->execute($sql_deposit,true);
+
+                    $this->ajaxReturn(['info'=>"处理订单数据".($num_pend+$num_deposit).'条']);
+
+                }
+
+            } else if ($changeData['admin_type'] == 2){
+                $num_pend = 0;
+                $num_deposit = 0;
+
+                if ($promoteData) {
+
+                    $sql_spend = "UPDATE `tab_spend` SET `promote_id`=`old_change_promote_id`,`promote_account`=`old_change_promote_account`,`old_change_promote_id`=0,`old_change_promote_account`='' 
+WHERE old_change_promote_id in ({$promoteData})";
+                    $sql_deposit = "UPDATE `tab_deposit` SET `promote_id`=`old_change_promote_id`,`promote_account`=`old_change_promote_account`,`old_change_promote_id`=0,`old_change_promote_account`='' 
+WHERE old_change_promote_id in ({$promoteData})";
+
+                    $model = new \Think\Model();
+                    $num_pend = $model->execute($sql_spend,true);
+                    $num_deposit = $model->execute($sql_deposit,true);
+
+                    $this->ajaxReturn(['info'=>"将数据还原,处理订单数据".($num_pend+$num_deposit).'条']);
+
+                }
+
+            }
+
+        } else {
+
+            $promoteData = M("promote","tab_")
+                ->field("id")
+                ->where(['company_belong'=>2])
+                ->select();
+
+            $promoteData = implode(',',array_column($promoteData,'id'));
+
+            $spendData = M('spend','tab_')->field("old_change_promote_account")->where(['old_change_promote_id'=>['in',$promoteData]])->find();
+
+//            var_dump($spendData);die();
+
+            if ($spendData['old_change_promote_account']) {
+                $this->assign('old_change_promote_account',1);
+            }
+
+            $this->display('promotedataconfigindex');
+
+        }
+
+    }
+
 }

Application/Admin/Controller/PromoteController.class.php

@@ -18,6 +18,9 @@ class PromoteController extends ThinkController
 
     public function lists($p=1)
     {
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
         $this->assign('show_data_power', $show_data_power);
         switch ($_GET['type']) {
@@ -738,6 +741,8 @@ class PromoteController extends ThinkController
         $this->assign('ytotal', $ytotal);
         $user = A('User', 'Event');
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->m_title = '实时注册';
         $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/ch_reg_list','status'=>1])->find());
         $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
@@ -883,6 +888,8 @@ class PromoteController extends ThinkController
         $this->assign('ytotal', $ytotal);
         $user = A('Spend', 'Event');
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->m_title = '实时充值';
         $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/spend_list','status'=>1])->find());
         $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
@@ -960,6 +967,8 @@ class PromoteController extends ThinkController
         $this->assign('ttotal', $ttotal);
         $this->assign('ytotal', $ytotal);
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->m_title = '会长代充记录';
         $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/agent_list','status'=>1])->find());
         $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
@@ -1286,7 +1295,7 @@ class PromoteController extends ThinkController
 
     public function linkInfo() {
         $link = $_REQUEST['link'];
-        
+
         $applyServe = new ApplyService();
         $identifier = $applyServe->getPageIdentifier($link);
         if (!$identifier) {

Application/Admin/Controller/PromoteGameRatioController.class.php

@@ -219,6 +219,9 @@ class PromoteGameRatioController extends ThinkController
         if($page) {
             $this->assign('_page', $page);
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('companys', $companys);
         $this->assign('gameTypeList', $gameTypelist);
         $this->assign('group', $group);

Application/Admin/Controller/PromoteWelfareController.class.php

@@ -43,6 +43,7 @@ class PromoteWelfareController extends ThinkController {
 
                 break;
         }
+        $this->checkListOrCountAuthRestMap($map,[]);
         $this->assign("show_status",$show_status);
                 
                 $this->m_title = '折扣设置';

Application/Admin/Controller/ProvideController.class.php

@@ -62,6 +62,7 @@ class ProvideController extends ThinkController {
         $ttotal=null_to_0(D(self::model_name)->where('create_time'.total(1))->where(array('status'=>1))->sum('amount'));
         $ytotal=null_to_0(D(self::model_name)->where('create_time'.total(5))->where(array('status'=>1))->sum('amount'));
         // $this->assign('dtotal',$dtotal);
+        $this->checkListOrCountAuthRestMap($map,[]);
         $this->assign('total',$total);
         $this->assign('ttotal',$ttotal);
         $this->assign('ytotal',$ytotal);

Application/Admin/Controller/QueryController.class.php

@@ -57,6 +57,8 @@ class QueryController extends ThinkController
         $this->assign('show_data_power', $show_data_power);
         $promoteId = I('promote_id', 0);
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         if ($group == 1) {
             unset($settlementTypeList[WithdrawModel::SETTLEMENT_TYPE_OTHER]);
             $time = I('time', '');
@@ -568,6 +570,8 @@ class QueryController extends ThinkController
         $this->m_title = '开发者结算';
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Query/cpsettlement', 'status' => 1])->find());
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         if (isset($_REQUEST['timestart']) && $_REQUEST['timestart'] != '' && $_REQUEST['group'] == 1) {
             $starttime = strtotime($_REQUEST['timestart']);
             $endtime = strtotime($_REQUEST['timeend']) + 24 * 3600 - 1;
@@ -1015,6 +1019,9 @@ class QueryController extends ThinkController
             $ttotal = null_to_0(D('withdraw')->where('audit_time' . total(1))->where($map1)->sum('sum_money'));
             $ytotal = null_to_0(D('withdraw')->where('audit_time' . total(5))->where($map1)->sum('sum_money'));
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('stotal', $total);
         $this->assign('ttotal', $ttotal);
         $this->assign('ytotal', $ytotal);
@@ -1161,6 +1168,8 @@ class QueryController extends ThinkController
             }
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $map1 = array('status' => ['neq', -1]);
         //为数据权限添加
         setPowerPromoteIds($map1);

Application/Admin/Controller/RebateController.class.php

@@ -13,7 +13,7 @@ class RebateController extends ThinkController {
     *返利设置列表
     */
     public function lists(){
-
+        $this->checkListOrCountAuthRestMap($map,[]);
         switch ($_REQUEST['type']) {
             case '':
             case 1 :

Application/Admin/Controller/RechargeSumController.class.php

@@ -149,6 +149,9 @@ class RechargeSumController extends ThinkController
 
             $this->exportSum($export_data);
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('meta_title', "充值汇总");
         $this->assign('list_data', $data);
         $this->assign('total', $total);

Application/Admin/Controller/SelfbuiltController.class.php

@@ -24,7 +24,8 @@ class SelfbuiltController extends ThinkController {
 		
 		$this->m_title = '自建官网';
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Selfbuilt/index','status'=>1])->find());
-				
+
+        $this->checkListOrCountAuthRestMap($map,[]);
 		
 		parent::lists($this->model_name,$_GET["p"]);
 	}

Application/Admin/Controller/ServerController.class.php

@@ -54,7 +54,9 @@ class ServerController extends ThinkController {
             $extend['developers'] = array('NEQ',0);
             $this->assign('show_status',1);
         }
-				
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->m_title = '区服列表';
         $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Server/lists','status'=>1])->find());
 				

Application/Admin/Controller/ServerNoticeController.class.php

@@ -49,7 +49,9 @@ class ServerNoticeController extends ThinkController {
             $extend['developers'] = array('NEQ',0);
             $this->assign('show_status',1);
         }
-				
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
 				$this->m_title = '区服预告';
 				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'ServerNotice/lists','status'=>1])->find());
 				

Application/Admin/Controller/StatController.class.php

@@ -49,6 +49,8 @@ class StatController extends ThinkController
 			$page = set_pagination($count,$row);
 			if($page) {$this->assign('_page', $page);}
 
+            $this->checkListOrCountAuthRestMap($map,[]);
+
 			$this->meta_title = '用户统计';
 
 			$this->assign('data',$data);
@@ -216,6 +218,8 @@ class StatController extends ThinkController
             $this->assign('error', $error);
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('data', $data);
         $this->assign('order_type', $orderType);
         $this->assign('order_column', $orderColumn);
@@ -813,6 +817,9 @@ AND UNIX_TIMESTAMP(
             $this->assign('userarpu_order',$data_order);
             $this->assign('userarpu_order_type',$data_order_type);
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $data=my_sort($data,$data_order_type,(int)$data_order,SORT_STRING);
         $size=$row;//每页显示的记录数
         $pnum = ceil(count($data) / $size); //总页数，ceil()函数用于求大于数字的最小整数
@@ -1519,6 +1526,8 @@ AND UNIX_TIMESTAMP(
 			// 折线图
 			$this->foldLineDiagram($_REQUEST['start'],$_REQUEST['end'],$_REQUEST['num']);
 
+            $this->checkListOrCountAuthRestMap($map,[]);
+
 			$this->display();
 
 		}

Application/Admin/Controller/StatementMangementController.class.php

@@ -76,6 +76,7 @@ class StatementMangementController extends ThinkController
             $handleSumData[0] = 0;
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
 
         $this->assign('sum',$handleSumData);
 //        dump($sumData);die();

Application/Admin/Controller/StatisticsController.class.php

@@ -73,8 +73,8 @@ class StatisticsController extends ThinkController {
 			$this->assign('promotepay',$promote_data['pay']);
 			$this->assign('promote_chart', $promote_data['chart']);
 			$this->assign('promote_date_info',"统计[ ".date("Y/m/d",$promotedateinfo[2])." -- ".date("Y/m/d",$promoteyesterdaydate)." ]之间数据");
-			
 
+        $this->checkListOrCountAuthRestMap($map,[]);
 			// 日历
 			R('Index/calendar');
 			
@@ -1128,6 +1128,9 @@ class StatisticsController extends ThinkController {
 				];
 			}
 		}
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
 		$count = ($end-$start)/86400;
 		$page = set_pagination($count,$row);
 		if($page) {$this->assign('_page', $page);}

Application/Admin/Controller/SuperStatisticalController.class.php

@@ -36,6 +36,9 @@ class SuperStatisticalController extends ThinkController
         foreach($supersign_token as $k => $v) {
             $authorization_all_num += count($this->game_supersign_num($v));
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $where['pay_status'] = 1;
         $data['buy_num'] = M('game_supersign', 'tab_')->where($where)->count();
         $pay_price = M('game_supersign', 'tab_')->field('sum(pay_price) as pay_price')->where($where)->select();

Application/Admin/Controller/SupportController.class.php

@@ -40,6 +40,8 @@ class SupportController extends ThinkController {
         //分页
         $page = set_pagination($count,$row);
         if($page) {$this->assign('_page', $page);}
+
+        $this->checkListOrCountAuthRestMap($map,[]);
         
         $this->assign('list_data', $list);
         $show_data_power = (is_administrator()|| session('user_auth')['show_data']);

Application/Admin/Controller/TestOrderController.class.php

@@ -64,6 +64,8 @@ class TestOrderController extends ThinkController
             $this->assign('_page', $page);//分页
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('datas', $order_list);
         $this->assign('sum_order_amount', $sum_order_amount);
         $this->assign('sum_pay_amount', $sum_pay_amount);

Application/Admin/Controller/TestResourceController.class.php

@@ -46,6 +46,9 @@ class TestResourceController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
         $this->assign('show_data_power', $show_data_power);
         $this->assign('list_data', $list);
@@ -101,7 +104,7 @@ class TestResourceController extends ThinkController
 
       $page = set_pagination($count,$row);
       if($page) {$this->assign('_page', $page);}
-      $this->meta_title = '扶持号管理';
+      $this->meta_title = '资源管理';
       $this->assign('data',$data);
       $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
       $this->assign('show_data_power', $show_data_power);
@@ -109,6 +112,69 @@ class TestResourceController extends ThinkController
 
   }
 
+  public function batchFreeze() {
+
+        if (I('id','')) {
+            $id =I('id','');
+        } else {
+            $this->error('请选择资源后再进行操作');
+            $this->ajaxReturn(['status'=>0, 'msg'=> '请选择资源后再进行操作']);
+        }
+
+        if (!I('status','')&&I('status','')!='0') {
+            $this->ajaxReturn(['status'=>0, 'msg'=> '请选择状态后在进行操作']);
+//            $this->error('请选择状态后在进行操作');
+        }
+
+//        $resourceData = M('test_resource','tab_')
+//            ->field("promote_id")
+//            ->where(['id'=>['in',$id]])
+//            ->select();
+//
+//        $resourceData = array_column($resourceData,'promote_id');
+
+//        $promoteId = [];
+//
+//        foreach ($resourceData as $key => $value) {
+//
+//            $promoteData = M('promote','tab_')
+//                ->field('id')
+//                ->where("chain like '%/{$value}/%' or id = {$value}")
+//                ->select();
+//            $promoteId = array_merge($promoteData, $promoteId);
+//        }
+
+//        $promoteId = array_unique($resourceData);
+//        var_dump($promoteId);die();
+
+        $testResource = M('test_resource','tab_')
+            ->field("user_id")
+            ->where(['id'=>['in',$id]])
+            ->group('user_id')
+            ->select();
+
+        $data = [
+            'lock_status' => I('status','')
+        ];
+
+        $user_id = implode(',',array_column($testResource,'user_id'));
+
+        $isFreeze = M('user','tab_')->where(['id'=>['in',$user_id]])->save($data);
+
+        if ($isFreeze) {
+
+//            $this->success('操作成功',U('supportNumberList'));
+            $this->ajaxReturn(['status'=>1, 'msg'=> '操作成功']);
+
+        } else {
+
+            $this->ajaxReturn(['status'=>0, 'msg'=> '操作失败']);
+//            $this->error('操作失败',U('supportNumberList'));
+
+        }
+
+  }
+
   public function freezeSupport() {
       $supportId = I('support_id', 0);
       if ($supportId == 0) {
@@ -339,6 +405,9 @@ class TestResourceController extends ThinkController
             $map['create_time']  =  array('BETWEEN',array(strtotime($_REQUEST['start']),strtotime($_REQUEST['end'])+24*60*60-1));
             unset($_REQUEST['start']);unset($_REQUEST['end']);
         }
+        if(!empty($_REQUEST['promote_id'])||$_REQUEST['promote_id']=='0') {
+            $map['tab_test_resource.promote_id']=I('promote_id');
+        }
         //
         $res = D("test_resource")->getResourceCout($map,$page,$row);
         // dump($res);

Application/Admin/Controller/TimingController.class.php

@@ -325,4 +325,22 @@ class TimingController extends AdminController {
 
     }
 
+    public function getTogetherUserAccount() {
+
+        if (I('user_id','')) {
+            $user_id = I('user_id','');
+        } else {
+            return false;
+        }
+
+        $data = M('user','tab_')->field('account')->where(['id'=>$user_id])->find();
+//        var_dump($data);
+        if (!$data) {
+            return false;
+        }
+
+        $this->ajaxReturn($data);
+
+    }
+
 }

Application/Admin/Controller/UserActionLogController.class.php

@@ -59,25 +59,45 @@ class UserActionLogController extends AdminController
 
        foreach($data as $key=>$value) {
            $remarks = json_decode($value['remarks'],true);
-//           dump($data);
+
+           $action = json_decode($value['action'],true);
 
            if ($value['type'] == 3) {
-                $data[$key]['action'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+                $data[$key]['action_title'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
             } else if ($value['type'] == 4) {
-                $data[$key]['action'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+                $data[$key]['action_title'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
             } else if ($value['type'] == 0) {
-               $data[$key]['action'] = '修改密码';
+               $data[$key]['action_title'] = '修改密码';
+               if (!$action['old_data']) {
+                   $data[$key]['action_content'] = "-------------------";
+               } else {
+                   $data[$key]['action_content'] = "旧值：{$action['old_data']}<br>新值：{$action['new_data']}";
+               }
+
            } else if ($value['type'] == 1) {
-               $data[$key]['action'] = '修改/绑定手机号';
+               $data[$key]['action_title'] = '修改/绑定手机号';
+               $data[$key]['action_content'] = "手机号：{$action['phone']}";
            } else if ($value['type'] == 2) {
-               $data[$key]['action'] = '修改身份信息';
+               $data[$key]['action_title'] = '修改身份信息';
+               $data[$key]['action_content'] = $action['old_data']?"旧姓名：{$action['old_data']['real_name']} - 新姓名：{$action['new_data']['real_name']}<br>旧身份证：{$action['old_data']['idcard']} - 新身份证：{$action['new_data']['idcard']}":"无历史记录";
            } else if ($value['type'] == 5) {
-               $data[$key]['action'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
-           } else if ($value['type'] == 11) {
-               $data[$key]['action'] = '修改绑定上级推广员';
+               $data[$key]['action_title'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+           } else if ($value['type'] == 6) {
+               $data[$key]['action_title'] = '点击推广链接下载';
+               $data[$key]['action_content'] = "下载地址：".$value['action'];;
+           } else if ($value['type'] == 7){
+               $data[$key]['action_title'] = '修改角色名';
+               $data[$key]['action_content'] = "旧值：{$action['old_data']}<br>新值：{$action['new_data']}";
+           } else if ($value['type'] == 8){
+               $data[$key]['action_title'] = '解绑手机号';
+               $data[$key]['action_content'] = "手机号：{$action['phone']}";
+           }
+           else if ($value['type'] == 11) {
+               $data[$key]['action_title'] = '修改绑定上级推广员';
            } else {
-               $data[$key]['action'] = '未知';
+               $data[$key]['action_title'] = '未知';
            }
+
        }
 //       die();
 
@@ -88,6 +108,8 @@ class UserActionLogController extends AdminController
            $this->assign('_page', $page);//分页
        }
 
+       $this->checkListOrCountAuthRestMap($map,[]);
+
        $this->assign('data',$data);
 
        $this->display();
@@ -117,7 +139,7 @@ class UserActionLogController extends AdminController
         $xlsName = $_REQUEST['xlsname'];
 
         $xlsCell = array(
-            '编号','行为','游戏','玩家','操作时间','操作IP地址'
+            '编号','行为','内容','游戏','玩家','操作时间','操作IP地址'
         );
 
         $map = [];
@@ -165,7 +187,7 @@ class UserActionLogController extends AdminController
             /* 获取频道列表 */
 
             $xlsData = M('user_action_log','tab_')
-                ->field("id,action,game_name,account,create_time,ip,type,remarks")
+                ->field("id,'' as action_title,'' as action_content,game_name,account,create_time,ip,type,remarks,action")
                 ->where($map)
                 ->limit(($i-1)*$perSize  ,$perSize)
                 ->order('create_time DESC')->select();
@@ -174,28 +196,70 @@ class UserActionLogController extends AdminController
 
                 $value['create_time'] = date("Y-m-d H:i:s", $value['create_time']);
 
+//                $remarks = json_decode($value['remarks'],true);
+////           dump($data);
+//
+//                if ($value['type'] == 3) {
+//                    $value['action'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+//                } else if ($value['type'] == 4) {
+//                    $value['action'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+//                } else if ($value['type'] == 0) {
+//                    $value['action'] = '修改密码';
+//                } else if ($value['type'] == 1) {
+//                    $value['action'] = '修改/绑定手机号';
+//                } else if ($value['type'] == 2) {
+//                    $value['action'] = '修改身份信息';
+//                } else if ($value['type'] == 5) {
+//                    $value['action'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+//                } else if ($value['type'] == 11) {
+//                    $value['action'] = '修改绑定上级推广员';
+//                } else {
+//                    $value['action'] = '未知';
+//                }
+
                 $remarks = json_decode($value['remarks'],true);
-//           dump($data);
+
+                $action = json_decode($value['action'],true);
 
                 if ($value['type'] == 3) {
-                    $value['action'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+                    $value['action_title'] = '登录 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
                 } else if ($value['type'] == 4) {
-                    $value['action'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+                    $value['action_title'] = '退出 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
                 } else if ($value['type'] == 0) {
-                    $value['action'] = '修改密码';
+                    $value['action_title'] = '修改密码';
+                    if ($action['account']) {
+                        $value['action_content'] = "-------------------";
+                    } else {
+                        $value['action_content'] = "旧值：{$action['old_data']}<br>新值：{$action['new_data']}";
+                    }
+
                 } else if ($value['type'] == 1) {
-                    $value['action'] = '修改/绑定手机号';
+                    $value['action_title'] = '修改/绑定手机号';
+                    $value['action_content'] = "手机号：{$action['phone']}";
                 } else if ($value['type'] == 2) {
-                    $value['action'] = '修改身份信息';
+                    $value['action_title'] = '修改身份信息';
+                    $value['action_content'] = $action['old_data']?"旧姓名：{$action['old_data']['real_name']} - 新姓名：{$action['new_data']['real_name']}<br>旧身份证：{$action['old_data']['idcard']} - 新身份证：{$action['new_data']['idcard']}":"无历史记录";
                 } else if ($value['type'] == 5) {
-                    $value['action'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
-                } else if ($value['type'] == 11) {
-                    $value['action'] = '修改绑定上级推广员';
+                    $value['action_title'] = '上报角色 '.($remarks['server_name']?$remarks['server_name']:'无').'-'.($remarks['role_name']?$remarks['role_name']:'无').'-'.($remarks['role_level']?$remarks['role_level']:'无');
+                } else if ($value['type'] == 6) {
+                    $value['action_title'] = '点击推广链接下载';
+                    $value['action_content'] = "下载地址：".$value['action'];;
+                } else if ($value['type'] == 7){
+                    $value['action_title'] = '修改角色名';
+                    $value['action_content'] = "旧值：{$action['old_data']}<br>新值：{$action['new_data']}";
+                } else if ($value['type'] == 8){
+                    $value['action_title'] = '解绑手机号';
+                    $value['action_content'] = "手机号：{$action['phone']}";
+                }
+                else if ($value['type'] == 11) {
+                    $value['action_title'] = '修改绑定上级推广员';
                 } else {
-                    $value['action'] = '未知';
+                    $value['action_title'] = '未知';
                 }
+
                 unset($value['type']);
                 unset($value['remarks']);
+                unset($value['action']);
 
                 mb_convert_variables('GBK', 'UTF-8', $value);
                 fputcsv($fp, $value);
@@ -266,6 +330,8 @@ class UserActionLogController extends AdminController
             $this->assign('_page', $page);//分页
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('data',$data);
 
         $this->display();

Application/Admin/Controller/UserController.class.php

@@ -39,6 +39,8 @@ class UserController extends AdminController
         $list = $this->lists('Member', $map);
         int_to_string($list);
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('_list', $list);
         $this->meta_title = '管理员列表';
 
@@ -507,6 +509,8 @@ class UserController extends AdminController
             $this->assign('_page', $page);
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('list', $list);
         $this->meta_title = '修改记录';
 

Application/Admin/Controller/UserPayWhiteListController.class.php

@@ -57,6 +57,8 @@ class UserPayWhiteListController extends ThinkController
             if($page) {$this->assign('_page', $page);}
         }
 
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('data',$data);
         $this->meta_title = '玩家支付限制白名单';
 

Application/Admin/Controller/UserWithdrawController.class.php

@@ -44,6 +44,9 @@ class UserWithdrawController extends ThinkController {
         $ttotal = null_to_0($wgc->where('create_time' . total(1))->where($map)->sum('coin'));
         $mtotal = null_to_0($wgc->where('create_time' . total(3))->where($map)->sum('coin'));
         $poundage = null_to_0($wgc->where($map)->sum('poundage'));
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $this->assign('total', $total);
         $this->assign('ttotal', $ttotal);
         $this->assign('mtotal', $mtotal);

Application/Admin/Controller/WorkOrderController.class.php

@@ -58,6 +58,9 @@ class WorkOrderController extends ThinkController
                 $item['status_desc'] = $this->getOrderStatus($item['status']);
             }
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $page = set_pagination($count, $row);
         if ($page) {
             $this->assign('_page', $page);
@@ -427,6 +430,9 @@ class WorkOrderController extends ThinkController
             $order
             limit {$limit}");
         }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
         $page = set_pagination($count, $row);
         if ($page) {
             $this->assign('_page', $page);

Application/Admin/Model/SpendModel.class.php

@@ -840,20 +840,33 @@ class SpendModel extends Model
      */
     public function gameStatistics($map, $row = 0, $page = 1)
     {
+
+        $noticeFailData = M("Spend s use index(game_time)","tab_")
+            ->field("SUM(pay_amount) as notice_fail_count,game_id")
+            ->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
+            ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id')
+            ->where(['s.pay_status' => 1, 'pay_game_status' => 0])
+            ->where($map)
+            ->group('s.game_id')
+            ->select(false);
+
         $query = M("Spend s use index(game_time)","tab_")
             ->field("s.game_id,g.relation_game_name game_name,p.partner as partner_name, g.game_type_name,
-            SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
-SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
-SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sdk_version")
+            SUM(CASE WHEN pay_way > 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as cash_count,
+SUM(CASE WHEN pay_way = 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as balance_coin_count,
+SUM(CASE WHEN pay_way = -1 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sdk_version,notice_fail_count")
             ->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
             ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id')
-            ->where(['s.pay_status' => 1, 'pay_game_status' => 1])
+            ->join("LEFT JOIN ({$noticeFailData})a ON s.game_id = a.game_id")
+            ->where(['s.pay_status' => 1])
+//            ->where("(s.pay_status = 1 and pay_game_status = 1) or (s.pay_status = 1 and pay_game_status = 0)")
             ->where($map)
             ->group('s.game_id');
         if ($row) {
             $query = $query->page($page,$row);
         }
         $data = $query->select();
+//        var_dump($data);die();
         return $data;
     }
     public function gameStatisticsCount($map)
@@ -863,7 +876,7 @@ SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sd
             ->field("game_id")
             ->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
             ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id')
-            ->where(['s.pay_status' => 1, 'pay_game_status' => 1])
+            ->where(['s.pay_status' => 1])
             ->where($map)
             ->group('s.game_id');
         $data = $query->select();
@@ -876,17 +889,39 @@ SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count,g.sd
      */
     public function totalGameStatistics($map, $join = true)
     {
+
+
+        $noticeFailData = M("Spend s use index(game_time)","tab_")
+            ->field("SUM(pay_amount) as notice_fail_count,game_id")
+            ->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
+            ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id')
+            ->where(['s.pay_status' => 1, 'pay_game_status' => 0])
+            ->where($map)
+            ->find();
+//        var_dump($noticeFailData);die();
+
+
         $query = M("Spend s use index(game_time)","tab_")
-            ->field("SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
-SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,
-SUM(CASE WHEN pay_way = -1 THEN pay_amount ELSE 0 END) as inside_cash_count");
+            ->field("SUM(CASE WHEN pay_way > 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as cash_count,
+SUM(CASE WHEN pay_way = 0 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as balance_coin_count,
+SUM(CASE WHEN pay_way = -1 and s.pay_status = 1 and pay_game_status = 1 THEN pay_amount ELSE 0 END) as inside_cash_count");
         if ($join) {
             $query = $query->join('LEFT JOIN tab_game as g ON s.game_id=g.id')
                 ->join('LEFT JOIN tab_partner as p ON g.partner_id=p.id');
         }
-        $data = $query->where(['s.pay_status' => 1, 'pay_game_status' => 1])
+        $data = $query->where(['s.pay_status' => 1])
             ->where($map)
             ->find();
+
+//        $gc_game_id = array_unique(explode(',',$data['gc_game_id']));
+
+//        $noticeFailData = M("Spend s use index(game_time)","tab_")
+//            ->field("SUM(pay_amount) as notice_fail_count,game_id")
+//            ->where(['s.pay_status' => 1, 'pay_game_status' => 0])
+//            ->where($noticeMap)
+//            ->find();
+
+        $data['notice_fail_count'] = $noticeFailData['notice_fail_count'];
 //        dd($query->_sql());
         return $data;
     }

Application/Admin/Model/TestResourceModel.class.php

@@ -33,9 +33,9 @@ class TestResourceModel extends Model{
         $promote_id=session("promote_auth.pid");
         //获取基本信息
         $res =  $this
-                ->table("tab_test_resource as test")
-                ->field("test.*,user.check_status")
-                ->join('tab_user user on test.user_id=user.id','left')
+                ->table("tab_test_resource")
+                ->field("tab_test_resource.*,user.check_status")
+                ->join('tab_user user on tab_test_resource.user_id=user.id','left')
                 ->page($page,$row)
                 ->order("create_time desc")
                 ->where($map)

Application/Admin/Model/UserModel.class.php

@@ -831,15 +831,6 @@ class UserModel extends Model{
 					if( C('UC_OPEN')==1 ){
 						$res = uc_user_edit($user['account'],'',$data['password'],'',1);
 						if($res != 1) {return false;}
-                        /**
-                         * 同步修改其他站点用户密码
-                         */
-                        $domain = C('UC_OTHER_WEB_URL');
-                        $username = get_user_account($data['id']);
-                        if(!empty($domain)){
-                            $url = "http://{$domain}/Api/user/editPassword?account={$username}&type=1&newpsw={$data['password']}";
-                            $aa = json_decode(file_get_contents($url),true);
-                        }
 					}
 
 					$u_map['uid']=$data['id'];

Application/Admin/View/Action/actionlog.html

@@ -50,7 +50,9 @@
 	</div>
 	<!-- 分页 -->
 	<div class="page">
-		<a class="sch-btn" href="{:U('Export/actionlog',array_merge(array('xlsname'=>'管理_行为日志'),I('get.')))}">导出</a>
+		<if condition="$role_export_check eq true ">
+			<a class="sch-btn" href="{:U('Export/actionlog',array_merge(array('xlsname'=>'管理_行为日志'),I('get.')))}">导出</a>
+		</if>
     {$_page}
 	</div>
 	<!-- /分页 -->

Application/Admin/View/AmericaIpForbit/index.html

@@ -310,7 +310,7 @@
     </empty>
   </div>
   <div class="page">
-    <if condition="$is_admin eq true ">
+    <if condition="$role_export_check eq true ">
       <a class="sch-btn export-btn"
          href="{:U('AmericaIpForbit/export',array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
       <!-- <a class="sch-btn" href="{:U('Export/expUser',array_merge(['id'=>3,'xlsname'=>'玩家_玩家列表_'.(I('get.type')==2?'第三方玩家':'本站玩家')],I('get.')))}">导出</a> -->

Application/Admin/View/Apply/and_lists.html

@@ -349,7 +349,7 @@
         </empty>
     </div>
     <div class="page">
-        <if condition="$is_admin eq true ">
+        <if condition="$role_export_check eq true ">
             <a class="sch-btn" href="{:U('Export/game_subpackage_list',array_merge(['xlsname'=>'推广员管理_游戏分包'.((I('type',1)==2)?'_IOS分包':'_安卓分包')],I('get.')))}">导出</a>
         </if>
         {$_page|default=''}

Application/Admin/View/Apply/app_lists.html

@@ -145,7 +145,7 @@
         </div>
     </div>
     <div class="page">
-        <if condition="$is_admin eq true ">
+        <if condition="$role_export_check eq true">
             <a class="sch-btn" href="{:U('Export/app_subpackage_list',array_merge(['xlsname'=>'推广员管理_游戏盒子APP分包'.((I('type',1)==2)?'_IOSAPP':'_安卓APP')],I('get.')))}">导出</a>
         </if>
         {$_page|default=''}

Application/Admin/View/AuthManager/index.html

@@ -69,7 +69,9 @@
 
 	</div>
     <div class="page">
+			<if condition="$role_export_check eq true ">
         <a class="sch-btn" href="{:U('Export/auth_manager',array_merge(array('xlsname'=>'管理_角色权限'),I('get.')))}">导出</a>
+			</if>
         {$_page}
     </div>
 		

Application/Admin/View/BehaviorLog/index.html

@@ -187,7 +187,9 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>21,'xlsname'=>'游戏充值预下单'),I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>21,'xlsname'=>'游戏充值预下单'),I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/BehaviorLog/singleSupplement.html

@@ -158,7 +158,9 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>25,'xlsname'=>'补单记录'),I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>25,'xlsname'=>'补单记录'),I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/BindRechargeRecord/lists.html

@@ -184,7 +184,9 @@
         </div>
     </div>
     <div class="page">
-		<a class="sch-btn" href="{:U('Export/BindRechargeRecordExport',array_merge(I('get.'),['xlsname'=>'绑币订单_绑币充值']))}">导出</a>
+        <if condition="$role_export_check eq true ">
+		        <a class="sch-btn" href="{:U('Export/BindRechargeRecordExport',array_merge(I('get.'),['xlsname'=>'绑币订单_绑币充值']))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 		

Application/Admin/View/BusinessAffairs/lists.html

@@ -128,7 +128,9 @@
         </div>
     </div>
     <div class="page">
+      <if condition="$role_export_check eq true ">
         <a class="sch-btn" href="{:U('Export/business_affairs_list',array_merge(['xlsname'=>'商务专员_商务专员'],I('get.')))}">导出</a>
+      </if>
         {$_page|default=''}
     </div>
 		

Application/Admin/View/DeductBindRecord/recordLists.html

@@ -84,7 +84,9 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/deduct_bind_list',array_merge(['xlsname'=>'绑币订单_绑币收回'],I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/deduct_bind_list',array_merge(['xlsname'=>'绑币订单_绑币收回'],I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/Deposit/lists.html

@@ -217,7 +217,9 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>8,'xlsname'=>'平台币订单_平台币充值'),I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>8,'xlsname'=>'平台币订单_平台币充值'),I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/Deposit/lists_secord.html

@@ -189,7 +189,9 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>26,'xlsname'=>'平台币订单_推广员充值'),I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>26,'xlsname'=>'平台币订单_推广员充值'),I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/Developers/lists.html

@@ -153,7 +153,9 @@
         </div>
     </div>
     <div class="page">
-				<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>17,'xlsname'=>'开发者_开发者列表'),I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+				    <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>17,'xlsname'=>'开发者_开发者列表'),I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 		

Application/Admin/View/Finance/coinDetail.html

@@ -52,8 +52,10 @@
             <div class="input-list">
                 <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/coinDetail','model='.$model['name'].'&row='.I('row'),false)}"
                    style="">搜索</a>
-                <if condition="$_GET['all'] neq 1">
-                    <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出</a>
+                <if condition="$role_export_check eq true ">
+                    <if condition="$_GET['all'] neq 1">
+                        <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出</a>
+                    </if>
                 </if>
             </div>
         </div>

Application/Admin/View/Finance/definiteDetaile.html

@@ -114,7 +114,9 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>29,'xlsname'=>'平台币明细','timestart'=>$starttime,'timeend'=>$endtime),I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>29,'xlsname'=>'平台币明细','timestart'=>$starttime,'timeend'=>$endtime),I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/Finance/gameStatistics.html

@@ -74,7 +74,7 @@
   <div class="cf main-place top_nav_list navtab_list">
 
     <h3 class="page_title">{$_REQUEST['count_date']}游戏统计</h3>
-    <p class="description_text">说明：仅统计通知成功</p>
+    <p class="description_text">说明：仅统计通知成功,结算给上游的是支付成功通知成功，就算给公会的是支付成功</p>
   </div>
 
   <div class="cf top_nav_list">
@@ -132,17 +132,19 @@
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/gameStatistics','model='.$model['name'].'&row='.I('row'),false)}"
            style="width: 100px;border: #3C95C8 solid 1px;">搜索</a>
 <!--        <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>-->
-        <a class="sch-btn" href="{:U('Export/exportGameStatistics',
-                array(
-                 'timestart'=>$_GET['timestart'],
-                  'timeend'=>$_GET['timeend'],
-                'sdk_type'=>$_GET['sdk_type'],
-                'game_name'=>$_GET['game_name'],
-                'game_type_id'=>$_GET['game_type_id'],
-                'game_id'=>$_REQUEST['game_id'],
-                'partner_id'=>$_REQUEST['partner_id'],
-                false))}"
-           style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+        <if condition="$role_export_check eq true ">
+          <a class="sch-btn" href="{:U('Export/exportGameStatistics',
+                  array(
+                   'timestart'=>$_GET['timestart'],
+                    'timeend'=>$_GET['timeend'],
+                  'sdk_type'=>$_GET['sdk_type'],
+                  'game_name'=>$_GET['game_name'],
+                  'game_type_id'=>$_GET['game_type_id'],
+                  'game_id'=>$_REQUEST['game_id'],
+                  'partner_id'=>$_REQUEST['partner_id'],
+                  false))}"
+             style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+        </if>
       </div>
 
 
@@ -174,6 +176,8 @@
 
           <th ><div class="tooltip">游戏内充值合计<span class="tooltiptext"><span style="margin-left: -10px">游戏现金金额+平台币直充支出+平台币内充支出</span></span></div></th>
 
+          <th ><div class="tooltip"><span style="color: red">通知失败合计</span><span class="tooltiptext"><span style="margin-left: -10px">所有通知失败的合计金额</span></span></div></th>
+
           <th >操作</th>
         </tr>
         </thead>
@@ -218,6 +222,7 @@
                 'pay_way'=>-1,
                 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/gameStatisticsDetail',array(
                 'timestart'=>$_GET['timestart'],
@@ -236,6 +241,7 @@
             <td><if condition="$sumBalance neq ''">{$sumBalance}<else/>0</if></td>
             <td><if condition="$sumInside neq ''">{$sumInside}<else/>0</if></td>
             <td><if condition="$sumAll neq ''">{$sumAll}<else/>0</if></td>
+            <td><span style="color: red"><if condition="$sumNoticeFail neq ''">{$sumNoticeFail}<else/>0</if></span></td>
             <td>
               <a href="{:U('Finance/gameStatisticsDetail',
                 array(

Application/Admin/View/Finance/gameStatisticsDetail.html

@@ -92,8 +92,10 @@
 
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/gameStatisticsDetail','model='.$model['name'].'&row='.I('row'),false)}"
            style="">搜索</a>
-        <if condition="$_GET['all'] neq 1">
-          <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+          <if condition="$_GET['all'] neq 1">
+            <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出</a>
+          </if>
         </if>
       </div>
     </div>

Application/Admin/View/Finance/payTypeStatistics.html

@@ -100,9 +100,11 @@
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/payTypeStatistics','model='.$model['name'].'&row='.I('row'),false)}"
            style="width: 100px;border: #3C95C8 solid 1px;">搜索</a>
 <!--        <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>-->
-        <a class="sch-btn" href="{:U('Finance/payTypeStatistics',
-                  array_merge(array('export'=>'1'),I('get.')))}"
-           style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+        <if condition="$role_export_check eq true ">
+          <a class="sch-btn" href="{:U('Finance/payTypeStatistics',
+                    array_merge(array('export'=>'1'),I('get.')))}"
+             style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+        </if>
       </div>
 
 

Application/Admin/View/Finance/valueDetail.html

@@ -191,8 +191,10 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>28,'xlsname'=>'平台币统计','timestart'=>$starttime,'timeend'=>$endtime),I('get.')))}">导出</a>
-        {$_page|default=''}
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>28,'xlsname'=>'平台币统计','timestart'=>$starttime,'timeend'=>$endtime),I('get.')))}">导出</a>
+        </if>
+            {$_page|default=''}
     </div>
 
     <div class="common_settings">

Application/Admin/View/FinanceCompare/index.html

@@ -153,7 +153,9 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 </block>

Application/Admin/View/FinancePromote/gameCoinDetail.html

@@ -149,8 +149,10 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn"
-            href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn"
+                href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        </if>
         {$_page}
     </div>
     

Application/Admin/View/FinancePromote/gameStatistics.html

@@ -241,7 +241,9 @@
     </div>
   </div>
   <div class="page">
-    <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+    <if condition="$role_export_check eq true ">
+      <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+    </if>
     {$_page|default=''}
   </div>
 </block>

Application/Admin/View/FinancePromote/gameStatisticsDetail.html

@@ -223,7 +223,9 @@
     </div>
   </div>
   <div class="page">
-    <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+    <if condition="$role_export_check eq true ">
+      <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+    </if>
     {$_page|default=''}
   </div>
 </block>

Application/Admin/View/FinancePromote/index.html

@@ -269,8 +269,10 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn"
-            href="{:U('FinancePromote/index',array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn"
+                href="{:U('FinancePromote/index',array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/FinancePromote/insideCoinDetail.html

@@ -91,8 +91,10 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn"
-            href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn"
+                href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        </if>
         {$_page}
     </div>
     

Application/Admin/View/FinancePromote/promoteUser.html

@@ -238,8 +238,10 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn"
-            href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn"
+                href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/Game/edit.html

@@ -718,6 +718,7 @@
                                     <select name="pay_config[zfb]">
                                             <option value="gf" <?php echo $data['pay_config']['zfb'] == 'gf' ? "selected" : ''; ?>>官方</option>
                                         <option value="sq" <?php echo $data['pay_config']['zfb'] == 'sq' ? "selected" : ''; ?>>双乾</option>
+                                        <option value="heepay" <?php echo $data['pay_config']['zfb'] == 'heepay' ? "selected" : ''; ?>>汇付宝</option>
 
                                     </select>
                                 </span>

Application/Admin/View/Game/lists.html

@@ -355,7 +355,9 @@ text-indent:0;
     </if>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/game_list',array_merge(['xlsname'=>'游戏管理_游戏列表'.((I('type',1)==2)?'_开发者游戏':'_官方游戏')],I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/game_list',array_merge(['xlsname'=>'游戏管理_游戏列表'.((I('type',1)==2)?'_开发者游戏':'_官方游戏')],I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 		

Application/Admin/View/GameSource/lists.html

@@ -160,7 +160,9 @@
     </empty>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/game_source_list',array_merge(['xlsname'=>'游戏管理_原包管理'.((I('type',1)==2)?'_开发者原包':'_官方原包')],I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/game_source_list',array_merge(['xlsname'=>'游戏管理_原包管理'.((I('type',1)==2)?'_开发者原包':'_官方原包')],I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 		

Application/Admin/View/GameType/lists.html

@@ -155,7 +155,9 @@
     </empty>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/game_type_list',array_merge(['xlsname'=>'游戏管理_游戏类型'.((I('type',1)==2)?'_运营状态':'_游戏类型')],I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/game_type_list',array_merge(['xlsname'=>'游戏管理_游戏类型'.((I('type',1)==2)?'_运营状态':'_游戏类型')],I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 		

Application/Admin/View/Giftbag/lists.html

@@ -244,7 +244,9 @@
     </empty>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/giftbag_list',array_merge(['xlsname'=>'礼包管理_礼包列表'.((I('type',1)==2)?'_开发者礼包':'_官方礼包')],I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/giftbag_list',array_merge(['xlsname'=>'礼包管理_礼包列表'.((I('type',1)==2)?'_开发者礼包':'_官方礼包')],I('get.')))}">导出</a>
+        </if>
         {$_page|default=''}
     </div>
 		

Application/Admin/View/Giftbag/record.html

@@ -98,7 +98,9 @@
         </div>
     </div>
     <div class="page">
-		<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>11,'xlsname'=>'礼包管理_领取记录',),I('get.')))}">导出</a>
+      <if condition="$role_export_check eq true ">
+		    <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>11,'xlsname'=>'礼包管理_领取记录',),I('get.')))}">导出</a>
+      </if>
         {$_page|default=''}
     </div>
 

Application/Admin/View/Launch/data.html

@@ -250,7 +250,7 @@
 
     </div>
     <div class="page">
-        <if condition="$is_admin eq true ">
+        <if condition="$role_export_check eq true ">
             <a class="sch-btn" href="{:U('Export/launch_data',array(
 					'platform_id'=>I('get.platform_id'),
 					'promote_id'=>I('get.promote_id'),

Application/Admin/View/Launch/platform.html

@@ -138,7 +138,7 @@
 
     </div>
     <div class="page">
-        <if condition="$is_admin eq true ">
+        <if condition="$role_export_check eq true ">
             <a class="sch-btn" href="{:U('Export/platform',array('name'=>I('request.name',''),'group'=>I('request.group',0),'promote_id'=>I('promote_id',''),'xlsname'=>'广告监测管理_投放平台列表_'.(I('request.group','')?'渠道添加':'后台录入')))}">导出</a>
         </if>
         {$_page|default=''}

Application/Admin/View/Member/login_record.html

@@ -172,7 +172,7 @@
         </div>
     </div>
     <div class="page">
-        <if condition="$is_admin eq true ">
+        <if condition="$role_export_check eq true ">
             <a class="sch-btn" href="{:U('Export/login_record',array_merge(['xlsname'=>'玩家_登录记录'],I('get.')))}">导出</a>
         </if>
         {$_page|default=''}

Application/Admin/View/Member/user_info.html

@@ -375,7 +375,7 @@
         </div>
     </div>
     <div class="page">
-        <if condition="$is_admin eq true ">
+        <if condition="$role_export_check eq true ">
             <a class="sch-btn export-btn"
                href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
             <!-- <a class="sch-btn" href="{:U('Export/expUser',array_merge(['id'=>3,'xlsname'=>'玩家_玩家列表_'.(I('get.type')==2?'第三方玩家':'本站玩家')],I('get.')))}">导出</a> -->

Application/Admin/View/Mend/lists.html

@@ -167,7 +167,7 @@
         </empty>
     </div>
     <div class="page">
-        <if condition="$is_admin eq true ">
+        <if condition="$role_export_check eq true ">
             <if condition="$Think.get.type eq 2">
                 <a class="sch-btn" href="{:U('Export/mend_record_list',array_merge(['xlsname'=>'推广员管理_推广补链_补链记录'],I('get.')))}">导出</a>
                 <else />

Application/Admin/View/Mend/recordList.html

@@ -124,7 +124,9 @@
         </div>
     </div>
     <div class="page">
-         <a class="sch-btn" href="{:U('Mend/recordList',array_merge(['export'=>1],I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Mend/recordList',array_merge(['export'=>1],I('get.')))}">导出</a>
+        </if>
          <div id="pagebox">
             {$_page|default=''}
          </div>

Application/Admin/View/Merchandise/lists.html

@@ -181,7 +181,9 @@ text-indent:0;
     
     </div>
     <div class="page">
+      <if condition="$role_export_check eq true ">
 				<a class="sch-btn" href="{:U('Export/merchandise',array('account'=>I('account'),'timestart'=>I('timestart'),'timeend'=>I('timeend'),'game_id'=>I('game_id'),'status'=>I('status'),'keyword'=>I('keyword'),'title'=>I('title'),'xlsname'=>'商品中心_商品列表'))}">导出</a>
+      </if>
         {$_page|default=''}
     </div>
 		

Application/Admin/View/Msg/lists.html

@@ -75,7 +75,9 @@
         </div>
     </div>
     <div class="page">
-        <a class="sch-btn" href="{:U('Export/msg_lists',array_merge(array('xlsname'=>'管理_站内通知'),I('get.')))}">导出</a>
+        <if condition="$role_export_check eq true ">
+            <a class="sch-btn" href="{:U('Export/msg_lists',array_merge(array('xlsname'=>'管理_站内通知'),I('get.')))}">导出</a>
+        </if>
     {$_page|default=''}
     </div>
 		

Application/Admin/View/Order/lists.html

@@ -167,7 +167,9 @@ text-indent:0;
     
     </div>
     <div class="page">
+      <if condition="$role_export_check eq true ">
 				<a class="sch-btn" href="{:U('Export/order_list',array('order_number'=>I('order_number'),'timestart'=>I('timestart'),'timeend'=>I('timeend'),'game_id'=>I('game_id'),'pay_status'=>I('pay_status'),'keyword'=>I('keyword'),'xlsname'=>'商品中心_订单中心'))}">导出</a>
+      </if>
         {$_page|default=''}
     </div>