Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Home/Conf/config.php

@@ -64,6 +64,8 @@ return array(
         '__IMG__'    => __ROOT__ . '/Public/' . MODULE_NAME . '/images',
         '__CSS__'    => __ROOT__ . '/Public/' . MODULE_NAME . '/css',
         '__JS__'     => __ROOT__ . '/Public/' . MODULE_NAME . '/js',
+        '__LAY__'    => __ROOT__ . '/Public/' . MODULE_NAME . '/layui',
+        
     ),
 
     /* SESSION 和 COOKIE 配置 */

Application/Home/Controller/ArticleController.class.php

@@ -9,6 +9,8 @@
 
 namespace Home\Controller;
 
+use mysql_xdevapi\Exception;
+
 /**
  * 文档模型控制器
  * 文档模型列表和详情
@@ -77,6 +79,24 @@ class ArticleController extends HomeController {
 			$this->error('文档ID错误！');
 		}
 
+		$field = 'id as document_id,category_id';
+		$decumentData = M('document')->field($field)->where("id={$id}")->find();
+		$promote_id = get_pid();
+		foreach ($decumentData as $key => $value) {
+            $decumentData['promote_id'] = $promote_id;
+            $decumentData['create_time'] = time();
+        }
+        M('document_read')->startTrans();  //事物
+        try {
+            $haveRead = M('document_read')->where("document_id={$id} and promote_id={$promote_id}")->find();
+            if (!$haveRead) {
+                M('document_read')->add($decumentData);
+            }
+        } catch (Exception $e) {
+            M('document_read')->rollback();//回滚
+        }
+        M('document_read')->commit();    //提交事物
+
 		/* 页码检测 */
 		$p = intval($p);
 		$p = empty($p) ? 1 : $p;

Application/Home/Controller/PromoteController.class.php

@@ -56,6 +56,20 @@ class PromoteController extends BaseController
         $game_list = M("game", "tab_")->field("id,game_name")->order("id desc")->select();
         $gg_list = M("document", "sys_")->limit('0,5')->where("category_id=56 and status=1")->order("update_time desc")->select(); //游戏公告
         $zx_list = M("document", "sys_")->limit('0,5')->where("category_id=51 and status=1")->order("update_time desc")->select(); //游戏咨询
+
+        $field = 'id,game_name,server_name,user_account,nickname,promote_account,detail,create_time as update_time';
+        $rz_list = M("protect_log","tab_")->field($field)->limit('0,5')->order("create_time desc")->select(); //日志管理
+
+        $promote_id = get_pid();
+        $logCount = M('protect_log','tab_')->count();
+        $readLogCount = M('protect_log_read','tab_')->where("promote_id = {$promote_id}")->count();
+
+        $gg_Count = M("document", "sys_")->where("category_id=56 and status=1")->count();
+        $gg_ReadDocument = M("document_read", "sys_")->where("promote_id = {$promote_id} and category_id=56")->count();
+
+        $zx_Count = M("document", "sys_")->where("category_id=51 and status=1")->count();
+        $zx_ReadDocument = M("document_read", "sys_")->where("promote_id = {$promote_id} and category_id=51")->count();
+
         $xx_list = null;
 
         $today_start = mktime(0, 0, 0, date('m'), date('d'), date('Y'));
@@ -107,8 +121,12 @@ class PromoteController extends BaseController
 
         $this->assign("menu_list", $quick_menu_list);
         $this->assign("gg_list", $gg_list);
+        $this->assign("gg_count", $gg_Count-$gg_ReadDocument);
         $this->assign("zx_list", $zx_list);
+        $this->assign("zx_count", $zx_Count-$zx_ReadDocument);
         $this->assign("xx_list", $xx_list);
+        $this->assign('rz_list', $rz_list);
+        $this->assign("rz_count", $logCount-$readLogCount);
         $this->assign("today_open_server_list", $today_open_server_list);
         $this->assign("game_list", $game_list);
         $this->meta_title = "首页";
@@ -317,10 +335,29 @@ class PromoteController extends BaseController
         } elseif ($type == 50) {
             $data_list = null;
             $count = 0;
+        } else if($type == 0) {
+            $field = 'id,game_name,server_name,user_account,nickname,promote_account,detail,create_time as update_time';
+            $data_list = M("protect_log","tab_")->field($field)->limit('0,5')->order("create_time desc")->select();
+
+            foreach($data_list as $key => $value) {
+                $data_list[$key]['title'] = '账号：'.$value['user_account'].','.$value['detail'];
+            }
+
+            $count = M("protect_log","tab_")->field($field)->count();
         } else {
             $data_list = M("document", "sys_")->limit('0,50')->where("category_id=56 and status=1")->order("update_time desc")->page($page, $row)->select(); //游戏公告
             $count = M("document", "sys_")->where("category_id=56 and status=1")->count();
         }
+        $promote_id = get_pid();
+        $logCount = M('protect_log','tab_')->count();
+        $readLogCount = M('protect_log_read','tab_')->where("promote_id = {$promote_id}")->count();
+
+        $gg_Count = M("document", "sys_")->where("category_id=56 and status=1")->count();
+        $gg_ReadDocument = M("document_read", "sys_")->where("promote_id = {$promote_id} and category_id=56")->count();
+
+        $zx_Count = M("document", "sys_")->where("category_id=51 and status=1")->count();
+        $zx_ReadDocument = M("document_read", "sys_")->where("promote_id = {$promote_id} and category_id=51")->count();
+
         $parameter['p'] = I('get.p', 1);
         $parameter['row'] = I('get.row');
         $page = set_pagination($count, $row, $parameter);
@@ -331,6 +368,9 @@ class PromoteController extends BaseController
         $this->meta_title = "公告列表";
         $this->assign("type", $type);
         $this->assign("data_list", $data_list);
+        $this->assign("gg_count", $gg_Count-$gg_ReadDocument);
+        $this->assign("zx_count", $zx_Count-$zx_ReadDocument);
+        $this->assign("rz_count", $logCount-$readLogCount);
         $this->display();
     }
 

Application/Home/Controller/QueryController.class.php

@@ -84,11 +84,15 @@ class QueryController extends BaseController
             $map['tab_spend.pay_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
         }
 
-        if (I('pay_way') !== null && I('pay_way') !== '') {
-            if (I('pay_way') == 2) {
-                $map['tab_spend.pay_way'] = ['in', '2,3,4'];
-            } else {
-                $map['tab_spend.pay_way'] = I('pay_way');
+        if (isset($_REQUEST['pay_way']) && $_REQUEST['pay_way'] !== '') {
+            $payWay = intval(I('pay_way'));
+
+            if (in_array($payWay, array_keys(QueryController::$payWay))) {
+                if ($payWay == 2) {
+                    $map['tab_spend.pay_way'] = ['in', '2,3,4'];
+                } else {
+                    $map['tab_spend.pay_way'] = $payWay;
+                }
             }
         }
 
@@ -222,6 +226,7 @@ class QueryController extends BaseController
         }
 
         empty(I('account')) || $map['tab_user.account'] = ['like', '%' . I('account') . '%'];
+        empty(I('id')) || $map['tab_user.id'] = intval(I('id'));
 
         $data = M('User', 'tab_')
             ->field('tab_user.*,tab_promote.real_name as pro_real_name')
@@ -667,7 +672,7 @@ class QueryController extends BaseController
             'grand_id' => $promote['id'],
         ];
         $ids = M('promote', 'tab_')->where($map)->getField('id', true);
-        
+
         $subPromotes = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where(['parent_id' => $promote['id']])->select();
         $games = $this->getGamesByPromote($promote);
 

Application/Home/Controller/TestResourceController.class.php

@@ -5,6 +5,7 @@ namespace Home\Controller;
 
 use Base\Model\PromoteModel;
 use Base\Service\PromoteService;
+use OSS\Core\OssException;
 
 
 class TestResourceController extends BaseController
@@ -150,6 +151,7 @@ class TestResourceController extends BaseController
     }
 
     public function protectLogList($p = 1) {
+        $promote_id = get_pid();
         $page = intval($p);
         $page = $page ? $page : 1; //默认显示第一页数据
         $row=10;
@@ -184,18 +186,47 @@ class TestResourceController extends BaseController
             $map['type']=I('types');
         }
 
-        $field = 'game_name,server_name,user_account,nickname,promote_account,detail';
+        $field = 'id,game_name,server_name,user_account,nickname,promote_account,detail';
         $order = 'id DESC';
 
         $data = D('protect_log')->getProtectLog($field,$map,'',$order,$page,$row);
 
         $count = D('protect_log')->getProtectLog($field,$map,'',$order);
-        $count = count($count);
 
-        $page = set_pagination($count,$row);
+        M('protect_log_read', 'tab_')->startTrans();  //事物
+        try {
+            $arrUserId = array_column($data,'id');
+            $logId = implode(',',$arrUserId);
 
-        $this->meta_title = '日志管理';
+            $logRead = M('protect_log_read','tab_')
+                ->where("log_id IN({$logId}) and promote_id = {$promote_id}")
+                ->select();
+
+            $upsetData = array_column($logRead,'log_id');
+
+            $addData = [];
+            $k = 0;
+            foreach($arrUserId as $key => $value) {
+                if (in_array($value['id'],$upsetData)) {
+                    continue;
+                } else {
+                    $addData[$k]['log_id'] = $value;
+                    $addData[$k]['promote_id'] = $promote_id;
+                    $addData[$k]['create_time'] = time();
+                    $k++;
+                }
+            }
+
+            M('protect_log_read','tab_')->addAll($addData);
+
+        } catch (OssException $e) {
+            M('protect_log_read', 'tab_')->rollback();//回滚
+        }
+        M('protect_log_read', 'tab_')->commit();    //提交事物
 
+        $count = count($count);
+        $page = set_pagination($count,$row);
+        $this->meta_title = '日志管理';
         if($page) {$this->assign('_page', $page);}
 
         $this->assign('data',$data);

Application/Home/View/default/Apply/feature.html

@@ -6,7 +6,7 @@
   <link href="__CSS__/20180207/finance.css" rel="stylesheet">
   <link href="__CSS__/game_detailed.css" rel="stylesheet">
   <link href="__STATIC__/icons_alibaba/iconfont.css" rel="stylesheet">
-
+  <link rel="stylesheet" href="__LAY__/css/layui.css"  media="all">
   <style type="text/css">
     .trunk-list {
       position: relative;
@@ -114,12 +114,9 @@
         display: flex;
         flex-direction: column;
         flex-wrap: wrap;
-        justify-content:center;
         align-items:center;
-        width:50%;
-        margin-left:25%;
         background: white;opacity: 1.0;
-        min-height:900px;
+        min-height:800px;
     }
     .detailindex img {
         width: 100%;
@@ -215,7 +212,12 @@
                         </if>
                       </if>-->
                       <!--<span onclick="commonApply({$vo.id},this,0,0)" style="cursor: pointer;"><u>查看详情</u></span>-->
-                      <span onclick="lookdetail({$vo.id})" style="cursor: pointer;"><u class="lookdetail">查看详情</u></span>
+<!--                      <span onclick="lookdetail({$vo.id})" style="cursor: pointer;"><u class="lookdetail">查看详情</u></span>-->
+                      <div class="site-demo-button" id="layerDemo" style="margin-bottom: 0;">
+<!--                         <button data-method="notice" class="layui-btn">示范一个公告层</button>-->
+                             <span id="detailArr"   onclick="lookdetail({$vo.id})" class="layui-btn" style="cursor: pointer;background:#62A8EA"><u>查看详情</u><u  class="hiddenattr"  style="">{$vo.id}</u></span>
+                          
+                      </div>
                     </div>
                   </div>
                 </li>
@@ -230,17 +232,21 @@
     </div>
   </div>
     
-  <div class="detailback" id="detailback"> 
+<!--  <div class="detailback" id="detailback"> 
       <div class="detailindex" style="">
-         
+          
       </div>
-  </div>
+  </div>-->
 </block>
 
 <block name="script">
   <script src="__STATIC__/zeroclipboard/jquery.zclip.min.js"></script>
   <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
+  <script type="text/javascript" src="__JS__/jquery.min.js"></script>
+   <script src="__LAY__/layui.js" type="text/javascript" ></script>
+
   <script type="text/javascript">
+      
       function lookdetail(id) {
           $.ajax({
               type: "post",
@@ -251,34 +257,47 @@
                   console.log(res)
                   if(res.code == 10000) {
                       content = res.info;
-                      html = '';
-                      html += content;
-                      $('.detailindex').html(html);$('.detailindex').val();
-                      $('.detailback').css('display','block')
                   }else {
                       content = "暂无资料查询";
-                      html = '';
-                      html += content;
-                      $('.detailindex').html(html);$('.detailindex').val();
-                      $('.detailback').css('display','block')
                   }
+                  layer.open({
+                        type: 1
+                        ,title: false //不显示标题栏
+                        ,closeBtn: true
+                        ,area: ["800px","900px"]
+                        ,shade: 0.8
+                        ,id: 'LAY_layuipro' //设定一个id，防止重复弹出
+                        //,btn: ['我已查阅']
+                        ,btnAlign: 'c'
+                        ,moveType: 1 //拖拽模式，0或者1
+                       ,content: '<div style="padding: 50px;line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;" class="detailindex" >'+content+'</div>'
+                       // ,content:content
+                     
+                        ,success: function(layero){
+                         
+                        },
+
+                    fail:function(err) {
+                        console.log('err')
+                    }
+                 }) 
               },
               fail:function(err) {
                   console.log('err')
               }
            })  
       }
-      
-      window.onload=function(){
-        var detailback = document.getElementById("detailback");
-        document.addEventListener("click",function(){
-            detailback.style.display="none";
-        });
-        detailback.addEventListener("click",function(event){
-            event=event||window.event;
-            event.stopPropagation();
-        });
-    };
+      //处理空白地方点击关掉事件
+//      window.onload=function(){
+//        var detailback = document.getElementById("detailback");
+//        document.addEventListener("click",function(){
+//            detailback.style.display="none";
+//        });
+//        detailback.addEventListener("click",function(event){          //添加监听事件
+//            event=event||window.event;
+//            event.stopPropagation();
+//        });
+//    };
   </script>
   <script type="text/javascript">
       var gameScreenshotCount = 0;  //游戏截图数量

Application/Home/View/default/Promote/index.html

@@ -42,7 +42,39 @@
             </li>
             <li>
                 <div class="fxui-tab">
-                    <div class="fxui-tab-hand"><span class="fxui-tab-tit"><a href="#;">公告</a></span> <span class="fxui-tab-tit"><a href="#;">消息</a></span> <span class="fxui-tab-tit"><a href="#;">游戏活动</a></span><span class="more"><a href="{:U('msg_list')}">查看更多></a></span></div>
+                    <div class="fxui-tab-hand">
+                        <span class="fxui-tab-tit"><a href="#;">公告</a>
+                            <if condition="$gg_count neq 0">
+                                <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1);border-radius:15px">
+                                    <a style="line-height: 25px;padding: 0px;color: #fff">{$gg_count}</a>
+                                </span>
+                            </if>
+
+                        </span>
+                        <span class="fxui-tab-tit"><a href="#;">消息</a>
+<!--                            <if condition="gg_count neq 0">-->
+<!--                                <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">-->
+<!--                                    <a style="line-height: 25px;padding: 0;color: #fff">0</a>-->
+<!--                                </span>-->
+<!--                            </if>-->
+                        </span>
+                        <span class="fxui-tab-tit"><a href="#;">游戏活动</a>
+                            <if condition="$zx_count neq 0">
+                                <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:83px;text-align: center;background: rgba(255, 0, 0, 1);border-radius:15px">
+                                    <a style="line-height: 25px;padding: 0px;color: #fff">{$zx_count}</a>
+                                </span>
+                            </if>
+                        </span>
+                        <span class="fxui-tab-tit"><a href="#;">资源号异常日志</a>
+                            <if condition="$rz_count neq 0">
+                                <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:125px;text-align: center;background: rgba(255, 0, 0, 1);border-radius:15px">
+                                    <a style="line-height: 25px;padding: 0px;color: #fff">{$rz_count}</a>
+                                </span>
+                            </if>
+                        </span>
+                        <div id="u271_ann" class="annotation"></div>
+                        <span class="more"><a href="{:U('msg_list')}">查看更多></a></span>
+                    </div>
                     <div class="fxui-tab-nav">
                         <empty name="gg_list">
                             暂无公告
@@ -79,6 +111,18 @@
                             </volist>
                         </empty>
                     </div>
+                    <div class="fxui-tab-nav">
+                        <empty name="rz_list">
+                            暂无异常日志
+                            <else/>
+                            <volist name="rz_list" id="zx">
+                                <p>
+                                    <span class="title"><a href="index.php?s=/Home/TestResource/protectLogList/id/{$zx.id}.html">账号:{$zx.user_account},{$zx.detail}</a></span>
+                                    <span class="time">{$zx.update_time|date="Y/m/d",###}</span>
+                                </p>
+                            </volist>
+                        </empty>
+                    </div>
                 </div>
             </li>
         </ul>
@@ -202,5 +246,4 @@
             });
         }
     </script>
-</block>
-  
+</block>

Application/Home/View/default/Promote/msg_list.html

@@ -13,9 +13,27 @@
         <div class="trunk-list list_normal">
             <div class="fxui-tab">
                 <div class="fxui-tab-hand" style="border-bottom: none">
-                    <span class="fxui-tab-tit <if condition="$type==56">curr</if>"><a href="{:U('msg_list')}&type=56">公告</a></span>
-                    <span class="fxui-tab-tit <if condition="$type==50">curr</if>"><a href="{:U('msg_list')}&type=50">消息</a></span>
-                    <span class="fxui-tab-tit <if condition="$type==51">curr</if>"><a href="{:U('msg_list')}&type=51">游戏活动</a></span></div>
+                    <span class="fxui-tab-tit <if condition="$type==56">curr</if>"><a href="{:U('msg_list')}&type=56">公告</a>
+                        <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">
+                            <a style="line-height: 25px;padding: 0px;color: #fff">{$gg_count}</a>
+                        </span>
+                    </span>
+                    <span class="fxui-tab-tit <if condition="$type==50">curr</if>"><a href="{:U('msg_list')}&type=50">消息</a>
+                        <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">
+                            <a style="line-height: 25px;padding: 0px;color: #fff">0</a>
+                        </span>
+                    </span>
+                    <span class="fxui-tab-tit <if condition="$type==51">curr</if>"><a href="{:U('msg_list')}&type=51">游戏活动</a>
+                        <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:83px;text-align: center;background: rgba(255, 0, 0, 1)">
+                            <a style="line-height: 25px;padding: 0px;color: #fff">{$zx_count}</a>
+                        </span>
+                    </span>
+                    <span class="fxui-tab-tit <if condition="$type==0">curr</if>"><a href="{:U('msg_list')}&type=0">资源号异常日志</a>
+                        <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:125px;text-align: center;background: rgba(255, 0, 0, 1)">
+                            <a style="line-height: 25px;padding: 0px;color: #fff">{$rz_count}</a>
+                        </span>
+                    </span>
+                </div>
                 <div class="fxui-tab-nav">
                     <empty name="data_list">
                         暂无信息

Application/Home/View/default/Public/promote_base.html

@@ -1,22 +1,22 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>{$meta_title}-个人中心</title>
-    <link href="__CSS__/20170831/iconfont.css" rel="stylesheet" type="text/css">
-    <link href="__CSS__/20170831/select2.min.css" rel="stylesheet" type="text/css" />
-    <!--<link href="__CSS__/20170831/common.css" rel="stylesheet" type="text/css">-->
-    <link href="__CSS__/20180207/common.css" rel="stylesheet" type="text/css">
-    <link href="{:get_cover(C('CH_SET_ICO'),'path')}" type="image/x-icon" rel="shortcut icon">
-    <script type="text/javascript" src="__JS__/jquery-1.11.1.min.js"></script>
-    
-     <!--[if lt IE 9]>
-    <script type="text/javascript" src="__STATIC__/jquery-1.10.2.min.js"></script>
-    <![endif]-->
-    {:hook('pageHeader')}
-    <script type="text/javascript" src="__STATIC__/layer/layer.js" ></script>
-    <block name="css"></block>
-    <script type="text/javascript" src="__JS__/20170831/common.js"></script>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>{$meta_title}-个人中心</title>
+	<link href="__CSS__/20170831/iconfont.css" rel="stylesheet" type="text/css">
+	<link href="__CSS__/20170831/select2.min.css" rel="stylesheet" type="text/css" />
+	<!--<link href="__CSS__/20170831/common.css" rel="stylesheet" type="text/css">-->
+	<link href="__CSS__/20180207/common.css" rel="stylesheet" type="text/css">
+	<link href="{:get_cover(C('CH_SET_ICO'),'path')}" type="image/x-icon" rel="shortcut icon">
+	<script type="text/javascript" src="__JS__/jquery-1.11.1.min.js"></script>
+
+	<!--[if lt IE 9]>
+	<script type="text/javascript" src="__STATIC__/jquery-1.10.2.min.js"></script>
+	<![endif]-->
+	{:hook('pageHeader')}
+	<script type="text/javascript" src="__STATIC__/layer/layer.js" ></script>
+	<block name="css"></block>
+	<script type="text/javascript" src="__JS__/20170831/common.js"></script>
 	<style>
 		.subNavBox a.subNav {
 			display: block;
@@ -25,132 +25,132 @@
 			padding-left: 50px;
 		}
 	</style>
-  </head>
+</head>
 
   <body>
-  	
-  	<!--左侧导航栏 开始-->
-		<div class="nav_new fl">
-			<div class="logo_picture">
-				<img src="{:check_logo_is_exist(C('CH_LOGO_BACKSTAGE'),'logo_default.png')}" style="height:40px;margin:0px;">
+
+	<!--左侧导航栏 开始-->
+	<div class="nav_new fl">
+		<div class="logo_picture">
+			<img src="{:check_logo_is_exist(C('CH_LOGO_BACKSTAGE'),'logo_default.png')}" style="height:40px;margin:0px;">
+		</div>
+		<div class="subNavBox">
+			<a href="{:U('Promote/index')}" class="subNav <if condition='CONTROLLER_NAME eq Promote and ACTION_NAME eq index '>active</if>"> 后台首页 </a>
+			<div class="subNav jssubNav"><i class="prev_icon icon_guanli"></i><span>管理中心</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<a href="{:U('Promote/base_info')}" class="<if condition='CONTROLLER_NAME eq Promote and ACTION_NAME eq base_info '>active</if> ">账户信息</a>
+				<!-- <a href="{:U('Promote/balance')}" class="<if condition='(CONTROLLER_NAME eq Promote and ACTION_NAME eq balance) or(CONTROLLER_NAME eq PromoteCoin and ACTION_NAME eq lists) '>active</if> ">账户余额</a> -->
+				<if condition="($parent_id eq 0) and ($grand_id eq 0)">
+					<a href="{:U('Promote/mychlid')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq mychlid or ACTION_NAME eq add_chlid or ACTION_NAME eq edit_chlid) '>active</if> ">组长管理</a>
+					<a href="{:U('Promote/mygrand')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq mygrand or ACTION_NAME eq add_chlid or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
+					<elseif condition="($parent_id gt 0) and ($grand_id eq 0)"/>
+					<a href="{:U('Promote/mygrand')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq mygrand or ACTION_NAME eq add_chlid or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
+				</if>
+			</div>
+			<div class="subNav jssubNav"><i class="prev_icon icon_shujvi"></i><span>数据管理</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<a href="{:U('Query/dailySummary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq dailySummary '>active</if> ">每日概况</a>
+				<a href="{:U('Query/summary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq summary '>active</if> ">数据汇总</a>
+				<a href="{:U('Query/recharge')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq recharge or ACTION_NAME eq viewSpendDetailed) '>active</if> ">订单查询</a>
+				<a href="{:U('Query/register')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq register or ACTION_NAME eq viewRole) '>active</if> ">注册明细</a>
+				<a href="{:U('Query/arpu')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq arpu '>active</if> ">ARPU统计</a>
+				<!-- <a href="{:U('Query/retention_analysis')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq retention_analysis '>active</if> ">留存统计</a> -->
+				<a href="{:U('Query/userRoles')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRoles '>active</if> ">角色查询</a>
+				<a href="{:U('Query/userRecharges')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRecharges '>active</if> ">充值玩家</a>
+				<a href="{:U('Query/achievement')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq achievement '>active</if> ">团队/推广员业绩</a>
+			</div>
+			<!-- <div class="subNav jssubNav"><i class="prev_icon icon_caiwu"></i><span>财务管理</span><i class="arrow_icon"></i></div> -->
+			<!-- <div class="navContent jsnavContent"> -->
+
+			<!-- <a href="{:U('Query/my_earning')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq my_earning '>active</if> ">我的结算</a> -->
+
+			<!-- <lt name="Think.const.PRO_GRADE" value="3"> -->
+			<!-- <a href="{:U('Query/son_earning')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq son_earning or ACTION_NAME eq son_list)'>active</if> ">子渠道结算</a> -->
+			<!-- </lt> -->
+			<!-- </div> -->
+			<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>游戏管理</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<!--							<a href="{:U('Apply/app_index')}" class="<if condition='CONTROLLER_NAME eq Apply and ACTION_NAME eq app_index '>active</if> ">APP列表</a>-->
+				<a href="{:U('Apply/index')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq index or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">专服管理</a>
+				<a href="{:U('Apply/feature')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq feature or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">资料专区</a>
 			</div>
-			<div class="subNavBox">
-						<a href="{:U('Promote/index')}" class="subNav <if condition='CONTROLLER_NAME eq Promote and ACTION_NAME eq index '>active</if>"> 后台首页 </a>
-						<div class="subNav jssubNav"><i class="prev_icon icon_guanli"></i><span>管理中心</span><i class="arrow_icon"></i></div>
-						<div class="navContent jsnavContent">
-							<a href="{:U('Promote/base_info')}" class="<if condition='CONTROLLER_NAME eq Promote and ACTION_NAME eq base_info '>active</if> ">账户信息</a>
-							<!-- <a href="{:U('Promote/balance')}" class="<if condition='(CONTROLLER_NAME eq Promote and ACTION_NAME eq balance) or(CONTROLLER_NAME eq PromoteCoin and ACTION_NAME eq lists) '>active</if> ">账户余额</a> -->
-							<if condition="($parent_id eq 0) and ($grand_id eq 0)">
-							<a href="{:U('Promote/mychlid')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq mychlid or ACTION_NAME eq add_chlid or ACTION_NAME eq edit_chlid) '>active</if> ">组长管理</a>
-							<a href="{:U('Promote/mygrand')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq mygrand or ACTION_NAME eq add_chlid or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
-							<elseif condition="($parent_id gt 0) and ($grand_id eq 0)"/>
-                            <a href="{:U('Promote/mygrand')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq mygrand or ACTION_NAME eq add_chlid or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
-							</if>
-						</div>
-						<div class="subNav jssubNav"><i class="prev_icon icon_shujvi"></i><span>数据管理</span><i class="arrow_icon"></i></div>
-						<div class="navContent jsnavContent">
-							<a href="{:U('Query/dailySummary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq dailySummary '>active</if> ">每日概况</a>
-							<a href="{:U('Query/summary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq summary '>active</if> ">数据汇总</a>
-							<a href="{:U('Query/recharge')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq recharge or ACTION_NAME eq viewSpendDetailed) '>active</if> ">充值明细</a>
-							<a href="{:U('Query/register')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq register or ACTION_NAME eq viewRole) '>active</if> ">注册明细</a>
-							<a href="{:U('Query/arpu')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq arpu '>active</if> ">ARPU统计</a>
-							<!-- <a href="{:U('Query/retention_analysis')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq retention_analysis '>active</if> ">留存统计</a> -->
-							<a href="{:U('Query/userRoles')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRoles '>active</if> ">角色查询</a>
-							<a href="{:U('Query/userRecharges')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRecharges '>active</if> ">充值玩家</a>
-							<a href="{:U('Query/achievement')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq achievement '>active</if> ">团队/推广员业绩</a>
-						</div>
-						<!-- <div class="subNav jssubNav"><i class="prev_icon icon_caiwu"></i><span>财务管理</span><i class="arrow_icon"></i></div> -->
-						<!-- <div class="navContent jsnavContent"> -->
-							
-							<!-- <a href="{:U('Query/my_earning')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq my_earning '>active</if> ">我的结算</a> -->
-							
-							<!-- <lt name="Think.const.PRO_GRADE" value="3"> -->
-								<!-- <a href="{:U('Query/son_earning')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq son_earning or ACTION_NAME eq son_list)'>active</if> ">子渠道结算</a> -->
-							<!-- </lt> -->
-						 <!-- </div> -->
-						<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>游戏管理</span><i class="arrow_icon"></i></div>
-						<div class="navContent jsnavContent">
-<!--							<a href="{:U('Apply/app_index')}" class="<if condition='CONTROLLER_NAME eq Apply and ACTION_NAME eq app_index '>active</if> ">APP列表</a>-->
-							<a href="{:U('Apply/index')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq index or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">专服管理</a>
-                                                        <a href="{:U('Apply/feature')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq feature or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">资料专区</a>
-						</div>
-						
-						<eq name="parent_id" value="0">
-						<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>测试资源</span><i class="arrow_icon"></i></div>
-						<div class="navContent jsnavContent">
-							<a href="{:U('TestResource/index')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">测试资源申请</a>
-							<a href="{:U('TestResource/lists')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq lists '>active</if> ">测试资源申请记录</a>
-							<a href="{:U('TestResource/supportNumberList')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq supportNumberList or ACTION_NAME eq freezeSupport or ACTION_NAME eq unfreezeSupport or ACTION_NAME eq rechangePassward ) '>active</if> ">扶持号管理</a>
-							<a href="{:U('TestResource/protectLogList')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq protectLogList '>active</if> ">日志管理</a>
-						</div>
-						</eq>
-						<!--<eq name="parent_id" value="0">
-						<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>扶持管理</span><i class="arrow_icon"></i></div>
-						<div class="navContent jsnavContent">
-							<a href="{:U('Support/index')}" class="<if condition='CONTROLLER_NAME eq Support and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">扶持申请</a>
-							<a href="{:U('Support/lists')}" class="<if condition='CONTROLLER_NAME eq Support and ACTION_NAME eq lists '>active</if> ">扶持记录</a>
-							<a href="{:U('Support/quota')}" class="<if condition='CONTROLLER_NAME eq Support and ACTION_NAME eq quota '>active</if> ">扶持额度</a>
-						</div>
-						</eq>-->
 
-						<!--<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>会长福利</span><i class="arrow_icon"></i></div>-->
-						<if condition="get_promote_levels(session('promote_auth.pid')) neq '三级推广员'">
-							<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>平台币管理</span><i class="arrow_icon"></i></div>
-							<div class="navContent jsnavContent">
-								<a href="{:U('PromoteCoin/myCoin')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq myCoin or ACTION_NAME eq coinRecord or ACTION_NAME eq coinRecordDesc) '>active</if> ">我的平台币</a>
-								<a href="{:U('PromoteCoin/record')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq shift or ACTION_NAME eq record) '>active</if> ">平台币转移</a>
-								<if condition="($parent_id eq 0) and ($grand_id eq 0)">
-									<a href="{:U('CoinOrder/order_list')}" class="<if condition='CONTROLLER_NAME eq CoinOrder and (ACTION_NAME eq order_list or ACTION_NAME eq order_add or ACTION_NAME eq order_detail) '>active</if> ">平台币充值</a>
-								</if>
-							</div>
-						</if>
-						<!--<div class="subNav jssubNav"><i class="prev_icon icon_zhandian"></i><span>联盟站点</span><i class="arrow_icon"></i></div>-->
-						<!--<div class="navContent jsnavContent">-->
-							<!--<a href="{:U('SiteApply/index')}" class="<if condition='CONTROLLER_NAME eq SiteApply and ACTION_NAME eq index '>active</if> ">站点申请</a>-->
-							<!--<notempty name="noapplysite">-->
-							<!--<a href="{:U('SiteBase/index')}" class="<if condition='CONTROLLER_NAME eq SiteBase and ACTION_NAME eq index '>active</if> ">基本信息</a>-->
-							<!--<a href="{:U('SiteGame/index')}" class="<if condition='CONTROLLER_NAME eq SiteGame and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq edit) '>active</if> ">游戏列表</a>-->
-							<!--<a href="{:U('SiteServer/index')}" class="<if condition='CONTROLLER_NAME eq SiteServer and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq edit)'>active</if> ">区服列表</a>-->
-							<!--<a href="{:U('SiteGift/index')}" class="<if condition='CONTROLLER_NAME eq SiteGift and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq edit)'>active</if> ">礼包列表</a>-->
-							<!--<a href="{:U('SiteAdv/index')}" class="<if condition='CONTROLLER_NAME eq SiteAdv and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq edit)'>active</if> ">广告列表</a>-->
-							<!--</notempty>-->
-						<!--</ul>-->
-					<!--</div>-->
+			<eq name="parent_id" value="0">
+				<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>测试资源</span><i class="arrow_icon"></i></div>
+				<div class="navContent jsnavContent">
+					<a href="{:U('TestResource/index')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">测试资源申请</a>
+					<a href="{:U('TestResource/lists')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq lists '>active</if> ">测试资源申请记录</a>
+					<a href="{:U('TestResource/supportNumberList')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq supportNumberList or ACTION_NAME eq freezeSupport or ACTION_NAME eq unfreezeSupport or ACTION_NAME eq rechangePassward ) '>active</if> ">扶持号管理</a>
+					<a href="{:U('TestResource/protectLogList')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq protectLogList '>active</if> ">日志管理</a>
+				</div>
+			</eq>
+			<!--<eq name="parent_id" value="0">
+      <div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>扶持管理</span><i class="arrow_icon"></i></div>
+      <div class="navContent jsnavContent">
+        <a href="{:U('Support/index')}" class="<if condition='CONTROLLER_NAME eq Support and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">扶持申请</a>
+        <a href="{:U('Support/lists')}" class="<if condition='CONTROLLER_NAME eq Support and ACTION_NAME eq lists '>active</if> ">扶持记录</a>
+        <a href="{:U('Support/quota')}" class="<if condition='CONTROLLER_NAME eq Support and ACTION_NAME eq quota '>active</if> ">扶持额度</a>
+      </div>
+      </eq>-->
+
+			<!--<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>会长福利</span><i class="arrow_icon"></i></div>-->
+			<if condition="get_promote_levels(session('promote_auth.pid')) neq '三级推广员'">
+				<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>平台币管理</span><i class="arrow_icon"></i></div>
+				<div class="navContent jsnavContent">
+					<a href="{:U('PromoteCoin/myCoin')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq myCoin or ACTION_NAME eq coinRecord or ACTION_NAME eq coinRecordDesc) '>active</if> ">我的平台币</a>
+					<a href="{:U('PromoteCoin/record')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq shift or ACTION_NAME eq record) '>active</if> ">平台币转移</a>
+					<if condition="($parent_id eq 0) and ($grand_id eq 0)">
+						<a href="{:U('CoinOrder/order_list')}" class="<if condition='CONTROLLER_NAME eq CoinOrder and (ACTION_NAME eq order_list or ACTION_NAME eq order_add or ACTION_NAME eq order_detail) '>active</if> ">平台币充值</a>
+					</if>
+				</div>
+			</if>
+			<!--<div class="subNav jssubNav"><i class="prev_icon icon_zhandian"></i><span>联盟站点</span><i class="arrow_icon"></i></div>-->
+			<!--<div class="navContent jsnavContent">-->
+			<!--<a href="{:U('SiteApply/index')}" class="<if condition='CONTROLLER_NAME eq SiteApply and ACTION_NAME eq index '>active</if> ">站点申请</a>-->
+			<!--<notempty name="noapplysite">-->
+			<!--<a href="{:U('SiteBase/index')}" class="<if condition='CONTROLLER_NAME eq SiteBase and ACTION_NAME eq index '>active</if> ">基本信息</a>-->
+			<!--<a href="{:U('SiteGame/index')}" class="<if condition='CONTROLLER_NAME eq SiteGame and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq edit) '>active</if> ">游戏列表</a>-->
+			<!--<a href="{:U('SiteServer/index')}" class="<if condition='CONTROLLER_NAME eq SiteServer and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq edit)'>active</if> ">区服列表</a>-->
+			<!--<a href="{:U('SiteGift/index')}" class="<if condition='CONTROLLER_NAME eq SiteGift and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq edit)'>active</if> ">礼包列表</a>-->
+			<!--<a href="{:U('SiteAdv/index')}" class="<if condition='CONTROLLER_NAME eq SiteAdv and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq edit)'>active</if> ">广告列表</a>-->
+			<!--</notempty>-->
+			<!--</ul>-->
+			<!--</div>-->
 		</div>
-    </div>
+	</div>
 
-    <div class="trunk">
-    	<div class="trunk_con">
-	    	<!--头部个人信息-->
-		    <div class="header">
-	        
-	        <div class="header-right">
-	          <span class="pinfo jstime">今天是：<span></span></span>
-	          <span class="pinfo">您好！{:session('promote_auth.account')}</span>
-	          <a class="pinfo" href="{:U('Public/logout')}" ><img src="__IMG__/20180207/icon_normal_tuichu.png"><!--{:L('Quit')}--></a>
-	        </div>
-		    </div>
-		    <!--结束 头部个人信息-->
-	      <div class="trunk-container">
-		        <!--右侧内容 开始-->
-			    	<div class="right_container">
-			    		<div class="location">
-					      <block name="location"></block>
-					    </div>
-			    		<block name="body"> </block>
-			    	</div>
-	      </div>
-	      <!--底部信息-->
-		  <!--  <div class="footer">
-		      <div class="inner" >
-		        <p class="customerService" style="margin-top:.8%;">
-		          <span>客服电话：{:C("CH_SET_SERVER_TEL")}</span>
-		          <span>客服邮箱：{:C("CH_SET_SERVER_EMAIL")}</span>
-		          <span>服务时间：{:C("CH_TIME")}</span>
-		        </p>
-		        <p class="copyright"><span>网络备案：{:C('CH_SET_FOR_THE_RECORD')}</span><span>网络文化经营许可证编号：{:C(CH_SET_LICENSE)}</span><span>版权所有：{:C('CH_SET_COPYRIGHT')}</span></p>
-		      </div>
-		    </div>--><!--  <div class="footer">
+<div class="trunk">
+	<div class="trunk_con">
+		<!--头部个人信息-->
+		<div class="header">
+
+			<div class="header-right">
+				<span class="pinfo jstime">今天是：<span></span></span>
+				<span class="pinfo">您好！{:session('promote_auth.account')}</span>
+				<a class="pinfo" href="{:U('Public/logout')}" ><img src="__IMG__/20180207/icon_normal_tuichu.png"><!--{:L('Quit')}--></a>
+			</div>
+		</div>
+		<!--结束 头部个人信息-->
+		<div class="trunk-container">
+			<!--右侧内容 开始-->
+			<div class="right_container">
+				<div class="location">
+					<block name="location"></block>
+				</div>
+				<block name="body"> </block>
+			</div>
+		</div>
+		<!--底部信息-->
+		<!--  <div class="footer">
+        <div class="inner" >
+          <p class="customerService" style="margin-top:.8%;">
+            <span>客服电话：{:C("CH_SET_SERVER_TEL")}</span>
+            <span>客服邮箱：{:C("CH_SET_SERVER_EMAIL")}</span>
+            <span>服务时间：{:C("CH_TIME")}</span>
+          </p>
+          <p class="copyright"><span>网络备案：{:C('CH_SET_FOR_THE_RECORD')}</span><span>网络文化经营许可证编号：{:C(CH_SET_LICENSE)}</span><span>版权所有：{:C('CH_SET_COPYRIGHT')}</span></p>
+        </div>
+      </div>--><!--  <div class="footer">
 		      <div class="inner" >
 		        <p class="customerService" style="margin-top:.8%;">
 		          <span>客服电话：{:C("CH_SET_SERVER_TEL")}</span>
@@ -160,24 +160,24 @@
 		        <p class="copyright"><span>网络备案：{:C('CH_SET_FOR_THE_RECORD')}</span><span>网络文化经营许可证编号：{:C(CH_SET_LICENSE)}</span><span>版权所有：{:C('CH_SET_COPYRIGHT')}</span></p>
 		      </div>
 		    </div>-->
-		    <!--结束 底部信息-->
-	    </div>
-    </div>
-    
-    <script>
-        var url = window.location.pathname+"?s=/Home/" + "{$Think.CONTROLLER_NAME}"+ "/" + "{$Think.ACTION_NAME}"+".html";
-        url = url.replace(/(\/(p)\/\d+)|(&p=\d+)|(\/(id)\/\d+)|(&id=\d+)|(\/(group)\/\d+)|(&group=\d+)/, "");
-        $('.nav .menu').find("a[href='" + url + "']").addClass("active").closest('.wrap').addClass('active');
-        
-        $(function() {
-        	$('.jsnavContent').find('.active').closest('.jsnavContent').css('display','block');
-        	$('.jsnavContent').find('.active').closest('.jsnavContent').prev('.jssubNav').addClass('currentDd');
-					$(".jssubNav").click(function() {
-						$(this).toggleClass("currentDd").siblings(".jssubNav").removeClass("currentDd");
-						$(this).next(".jsnavContent").slideToggle(300).siblings(".jsnavContent").slideUp(500); 
-					});
-				});
-    </script>
-    <block name="script"></block>
-  </body>
+		<!--结束 底部信息-->
+	</div>
+</div>
+
+<script>
+	var url = window.location.pathname+"?s=/Home/" + "{$Think.CONTROLLER_NAME}"+ "/" + "{$Think.ACTION_NAME}"+".html";
+	url = url.replace(/(\/(p)\/\d+)|(&p=\d+)|(\/(id)\/\d+)|(&id=\d+)|(\/(group)\/\d+)|(&group=\d+)/, "");
+	$('.nav .menu').find("a[href='" + url + "']").addClass("active").closest('.wrap').addClass('active');
+
+	$(function() {
+		$('.jsnavContent').find('.active').closest('.jsnavContent').css('display','block');
+		$('.jsnavContent').find('.active').closest('.jsnavContent').prev('.jssubNav').addClass('currentDd');
+		$(".jssubNav").click(function() {
+			$(this).toggleClass("currentDd").siblings(".jssubNav").removeClass("currentDd");
+			$(this).next(".jsnavContent").slideToggle(300).siblings(".jsnavContent").slideUp(500);
+		});
+	});
+</script>
+<block name="script"></block>
+</body>
 </html>

Application/Home/View/default/Query/dailySummary.html

@@ -582,7 +582,7 @@
 
                           if (serverData.length > 0) {
                               for (var i in serverData) {
-                                  html += "<option value='" + serverData[i]['id'] + "'>" + serverData[i]['server_name'] + "</option>";
+                                  html += "<option value='" + serverData[i]['server_id'] + "'>" + serverData[i]['server_name'] + "</option>";
                               }
                           }
                       }

Application/Home/View/default/Query/recharge.html

@@ -87,7 +87,7 @@
           <select id="server_id" name="server_id" class=" reselect select_gallery">
             <option value="">请选择区服</option>
             <volist name="serverData" id="vo">
-              <option value="{$vo.id}">{$vo.server_name}</option>
+              <option value="{$vo.server_id}">{$vo.server_name}</option>
             </volist>
           </select>
         </div>
@@ -142,14 +142,14 @@
 
         <div class="form-group normal_space fl">
           <select id="pay_way" name="pay_way" class="reselect select_gallery" style="min-width:130px;">
-            <option value="">支付方式</option>
-            <volist name="payWayData" id="vo" key="k">
-              <if condition="$k eq I('pay_way')">
+            <option value="-2">支付方式</option>
+            <foreach name="payWayData" item="vo" key="k">
+              <if condition="$k eq I('pay_way',-2)">
                 <option value="{$k}" selected>{$vo}</option>
                 <else/>
                 <option value="{$k}">{$vo}</option>
               </if>
-            </volist>
+            </foreach>
           </select>
         </div>
 
@@ -320,7 +320,7 @@
 
                           if (serverData.length > 0) {
                               for (var i in serverData) {
-                                  html += "<option value='" + serverData[i]['id'] + "'>" + serverData[i]['server_name'] + "</option>";
+                                  html += "<option value='" + serverData[i]['server_id'] + "'>" + serverData[i]['server_name'] + "</option>";
                               }
                           }
                       }

Application/Home/View/default/Query/register.html

@@ -59,10 +59,15 @@
           </eq>
 
           <div class="form-group fl">
-            <input type="text" name="account" class="txt normal_txt" id="uid" placeholder="请输入玩家账号"
+            <input type="text" name="account" class="txt normal_txt" placeholder="请输入玩家账号"
                    value="{:I('account')}">
           </div>
 
+          <div class="form-group fl">
+            <input type="text" name="id" class="txt normal_txt" placeholder="请输入玩家ID"
+                   value="{:I('id')}">
+          </div>
+
           <div class="form-group normal_space fl">
             <label class="form-title select-title" style="position: relative;">起止时间：</label>
             <div class="select-time">

Application/Home/View/default/Query/summary.html

@@ -350,7 +350,7 @@
 
                           if (serverData.length > 0) {
                               for (var i in serverData) {
-                                  html += "<option value='" + serverData[i]['id'] + "'>" + serverData[i]['server_name'] + "</option>";
+                                  html += "<option value='" + serverData[i]['server_id'] + "'>" + serverData[i]['server_name'] + "</option>";
                               }
                           }
                       }

Application/Home/View/default/Query/view_role.html

@@ -43,7 +43,7 @@
             <select id="server_id" name="server_id" class=" reselect select_gallery">
               <option value="">请选择区服</option>
               <volist name="serverData" id="vo">
-                <option value="{$vo.id}">{$vo.server_name}</option>
+                <option value="{$vo.server_id}">{$vo.server_name}</option>
               </volist>
             </select>
           </div>
@@ -183,7 +183,7 @@
 
                           if (serverData.length > 0) {
                               for (var i in serverData) {
-                                  html += "<option value='" + serverData[i]['id'] + "'>" + serverData[i]['server_name'] + "</option>";
+                                  html += "<option value='" + serverData[i]['server_id'] + "'>" + serverData[i]['server_name'] + "</option>";
                               }
                           }
                       }

Data/update.sql

@@ -80,7 +80,7 @@ ALTER TABLE `tab_apply` ADD COLUMN `bale_sort`  int(5) NOT NULL DEFAULT 0 COMMEN
 -- ----------------------------
 -- 2019-10-11 zyx
 -- ----------------------------
-ALTER TABLE `tab_user` ADD COLUMN `last_device_number`  varchar(50) DEFAULT '' COMMENT '上一次登录设备号' AFTER `device_number`;
+ALTER TABLE `tab_user` ADD COLUMN `last_device_number`  varchar(50) DEFAULT '' COMMENT '上一次登录设备号' AFTER `device_tab_protect_log_readnumber`;
 ALTER TABLE `tab_user` ADD COLUMN `last_login_ip`  varchar(16) DEFAULT '' COMMENT '上一次登录id' AFTER `login_ip`;
 
 CREATE TABLE `tab_protect_log` (
@@ -138,3 +138,23 @@ alter table tab_user_play_info add column `create_time` int(11) NOT NULL DEFAULT
 alter table tab_user_play_info add column `create_ip` varchar(16) NOT NULL DEFAULT '' COMMENT '角色创建IP';
 alter table tab_user_play_info add column `create_device_number` varchar(50) NOT NULL DEFAULT '' COMMENT '角色创建设备号';
 alter table tab_server add column `server_id` varchar(50) not NULL default '' COMMENT '对接区服id';
+
+-- ----------------------------
+-- 2019-10-11 zyx
+-- ----------------------------
+CREATE TABLE `sys_document_read` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `document_id` int(11) NOT NULL DEFAULT '0' COMMENT '文档模型基础表id',
+  `category_id` int(10) NOT NULL DEFAULT '0' COMMENT '所属分类',
+  `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id',
+  `create_time` int(11) DEFAULT '0' COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+
+CREATE TABLE `tab_protect_log_read` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `log_id` int(11) NOT NULL DEFAULT '0' COMMENT '日志id',
+  `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id',
+  `create_time` int(11) DEFAULT '0' COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;

Public/Home/layui/css/modules/code.css

@@ -0,0 +1,2 @@
+/** layui-v2.5.5 MIT License By https://www.layui.com */
+ html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}