From 7456c891a8e794c9e64795601319afd5a95780d6 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 15 Oct 2019 14:14:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E6=9C=8DID=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../View/default/Public/promote_base.html     | 314 +++++++++---------
 .../Home/View/default/Query/dailySummary.html |   2 +-
 .../Home/View/default/Query/recharge.html     |   4 +-
 .../Home/View/default/Query/summary.html      |   2 +-
 .../Home/View/default/Query/view_role.html    |   4 +-
 Data/update.sql                               |   2 +-
 6 files changed, 164 insertions(+), 164 deletions(-)
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index c96dc462d..fb5093735 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/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>
diff --git a/Application/Home/View/default/Query/dailySummary.html b/Application/Home/View/default/Query/dailySummary.html
index 0f2fc4022..035a716d2 100644
--- a/Application/Home/View/default/Query/dailySummary.html
+++ b/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>";
                               }
                           }
                       }
diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html
index e1a7d65dc..a8f1c62d1 100644
--- a/Application/Home/View/default/Query/recharge.html
+++ b/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>
@@ -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>";
                               }
                           }
                       }
diff --git a/Application/Home/View/default/Query/summary.html b/Application/Home/View/default/Query/summary.html
index 7932c5592..15c191cf8 100644
--- a/Application/Home/View/default/Query/summary.html
+++ b/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>";
                               }
                           }
                       }
diff --git a/Application/Home/View/default/Query/view_role.html b/Application/Home/View/default/Query/view_role.html
index ab9184279..2f7ed5939 100644
--- a/Application/Home/View/default/Query/view_role.html
+++ b/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>";
                               }
                           }
                       }
diff --git a/Data/update.sql b/Data/update.sql
index 8e20756cd..b1cab2369 100644
--- a/Data/update.sql
+++ b/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` (
