diff --git a/Application/Admin/Controller/DepositController.class.php b/Application/Admin/Controller/DepositController.class.php
index 6378c79a0..b386cddb7 100644
--- a/Application/Admin/Controller/DepositController.class.php
+++ b/Application/Admin/Controller/DepositController.class.php
@@ -8,13 +8,13 @@ use User\Api\UserApi as UserApi;
  * @author 麦当苗儿 <zuojiazi@vip.qq.com>
  */
 class DepositController extends ThinkController {
-	const model_name = 'Deposit';
+    const model_name = 'Deposit';
 
     public function lists(){
-    	if(isset($_REQUEST['user_account'])){
-    		$map['user_account']=array('like','%'.trim($_REQUEST['user_account']).'%');
-    		unset($_REQUEST['user_account']);
-    	}
+        if(isset($_REQUEST['user_account'])){
+            $map['user_account']=array('like','%'.trim($_REQUEST['user_account']).'%');
+            unset($_REQUEST['user_account']);
+        }
         if(isset($_REQUEST['pay_order_number'])){
             $map['pay_order_number']=array('like','%'.trim($_REQUEST['pay_order_number']).'%');
             unset($_REQUEST['pay_order_number']);
@@ -49,7 +49,7 @@ class DepositController extends ThinkController {
             unset($_REQUEST['promote_id']);
             unset($_REQUEST['promote_name']);
         }
-    	if(isset($_REQUEST['time-start'])&&isset($_REQUEST['time-end'])){
+        if(isset($_REQUEST['time-start'])&&isset($_REQUEST['time-end'])){
             $map['create_time'] =array('BETWEEN',array(strtotime($_REQUEST['time-start']),strtotime($_REQUEST['time-end'])+24*60*60-1));
             unset($_REQUEST['time-start']);unset($_REQUEST['time-end']);
         }elseif(isset($_REQUEST['time-start'])){
@@ -101,16 +101,16 @@ class DepositController extends ThinkController {
         $this->assign('ttotal',$ttotal);
         $this->assign('ytotal',$ytotal);
 
-					$this->m_title = '平台币充值';
-				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Deposit/lists','status'=>1])->find());
-
+        $this->m_title = '平台币充值';
+        $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Deposit/lists','status'=>1])->find());
 
-    	parent::lists(self::model_name,$_GET["p"],$map);
+        $this->assign("is_admin",is_administrator());
+        parent::lists(self::model_name,$_GET["p"],$map);
     }
 
 
 
-     public function send_lists(){
+    public function send_lists(){
         if(IS_POST){
             $type = $_REQUEST['type'];
             $firstpay = A('Send','Event');
@@ -131,8 +131,8 @@ class DepositController extends ThinkController {
             $this->meta_title ="后台发放（玩家）";
 
 
-						$this->m_title = '平台币发放(玩家)';
-						$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Deposit/send_lists','status'=>1])->find());
+            $this->m_title = '平台币发放(玩家)';
+            $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Deposit/send_lists','status'=>1])->find());
 
             $this->display();
         }
@@ -183,10 +183,10 @@ class DepositController extends ThinkController {
             unset($_REQUEST['op_id']);
         }
 
-				if(is_numeric($_REQUEST['status']) && ($_REQUEST['status']==0 || $_REQUEST['status']==1)) {
-					$map['status'] = $_REQUEST['status'];
-					unset($_REQUEST['status']);
-				}
+        if(is_numeric($_REQUEST['status']) && ($_REQUEST['status']==0 || $_REQUEST['status']==1)) {
+            $map['status'] = $_REQUEST['status'];
+            unset($_REQUEST['status']);
+        }
 
         $map1=$map;
         $map1['status']=1;
@@ -209,8 +209,8 @@ class DepositController extends ThinkController {
         );
         $user = A('User','Event');
 
-				$this->m_title = '平台币发放(玩家)';
-				$this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Deposit/send_lists','status'=>1])->find());
+        $this->m_title = '平台币发放(玩家)';
+        $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Deposit/send_lists','status'=>1])->find());
 
 
         $user->user_join_($model,$_GET['p']);
@@ -222,7 +222,7 @@ class DepositController extends ThinkController {
      * @param $ids
      */
     public function batch($ids=''){
-				if ( empty($ids) ) {
+        if ( empty($ids) ) {
             $this->error('请选择要操作的数据!');
         }
         $list=M("provide_user","tab_");
@@ -244,7 +244,7 @@ class DepositController extends ThinkController {
     }
 
     public function delprovide($ids=null){
-				if ( empty($ids) ) {
+        if ( empty($ids) ) {
             $this->error('请选择要操作的数据!');
         }
         $list=M("provide_user","tab_");
diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html
index 7fe8954f1..8fc244467 100644
--- a/Application/Admin/View/Deposit/lists.html
+++ b/Application/Admin/View/Deposit/lists.html
@@ -1,43 +1,43 @@
 <extend name="Public/base"/>
 
 <block name="body">
-<link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
-<script type="text/javascript" src="__JS__/bootstrap.min.js"></script>
-<script type="text/javascript" src="__JS__/select2.min.js"></script>
+    <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
+    <script type="text/javascript" src="__JS__/bootstrap.min.js"></script>
+    <script type="text/javascript" src="__JS__/select2.min.js"></script>
     <style>
-    .select2-container--default .select2-selection--single {
+        .select2-container--default .select2-selection--single {
             color: #000;
-        resize: none;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
-        box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
-        height:28px;border-radius:3px;font-size:12px;
-    }
-    .select2-container--default .select2-selection--single .select2-selection__rendered {
-        line-height:35px;
-        line-height:28px;
-    }
-    .select2-container--default .select2-selection--single .select2-selection__arrow {
-        height:26px;
-    }
-    .select2-container--default .select2-search--dropdown .select2-search__field {
-      height:26px;line-height:26px;font-size:12px;
-    }
-    .select2-results__option[aria-selected] {font-size:12px;}
-</style>
-    
+            resize: none;
+            border-width: 1px;
+            border-style: solid;
+            border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
+            box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
+            height:28px;border-radius:3px;font-size:12px;
+        }
+        .select2-container--default .select2-selection--single .select2-selection__rendered {
+            line-height:35px;
+            line-height:28px;
+        }
+        .select2-container--default .select2-selection--single .select2-selection__arrow {
+            height:26px;
+        }
+        .select2-container--default .select2-search--dropdown .select2-search__field {
+            height:26px;line-height:26px;font-size:12px;
+        }
+        .select2-results__option[aria-selected] {font-size:12px;}
+    </style>
+
     <div class="cf main-place top_nav_list navtab_list">
         <h3 class="page_title">平台币充值</h3>
         <p class="description_text">说明：玩家充值平台币到账户的记录，不包含消费平台币的记录，如需查询平台币使用，请到游戏充值中查询</p>
     </div>
-    
-    
+
+
     <div class="cf top_nav_list">
         <!-- 高级搜索 -->
         <div class="jssearch fl cf search_list">
-          <div class="input-list search-title-box">
-              <label>搜索：</label>
+            <div class="input-list search-title-box">
+                <label>搜索：</label>
             </div>
             <div class="input-list">
                 <input type="text" id="search-input" name="user_account" class="" value="{:I('user_account')}"
@@ -77,7 +77,7 @@
                     <option value="0">下单未付款</option>
                 </select>
             </div>
-            
+
 
             <input type="hidden" name="" value="" class="sortBy">
             <div class="input-list">
@@ -96,56 +96,73 @@
                 <!-- 表头 -->
                 <thead>
                 <tr>
-                <th>订单号</th>
-                <th>玩家账号</th>
-                <th>所属推广员</th>
-                <th>
-                    <a class="paixu" data-order='pay_amount'>
-                        充值平台币
-                    </a>
-                </th>
-                <th>充值方式</th>
-                <th>充值ip</th>
-                <th>
-                    <a class="paixu" data-order='create_time'>
-                        充值时间
-                    </a>
-                </th>
-                <th>订单状态</th>
+                    <th>订单号</th>
+                    <th>玩家账号</th>
+                    <th>所属推广员</th>
+                    <th>
+                        <a class="paixu" data-order='pay_amount'>
+                            充值平台币
+                        </a>
+                    </th>
+                    <th>充值方式</th>
+                    <th>充值ip</th>
+                    <th>
+                        <a class="paixu" data-order='create_time'>
+                            充值时间
+                        </a>
+                    </th>
+                    <th>订单状态</th>
                 </tr>
                 </thead>
 
                 <!-- 列表 -->
                 <tbody>
                 <empty name ="list_data">
-                <td colspan="11" class="text-center">aOh! 暂时还没有内容!</td>
-                <else />
-                <volist name="list_data" id="data">
-                    <tr>
-                        <td>{:$data['pay_order_number']}</td>
-                        <td>{$data.user_account}</td>
-                        <td><if condition="$data['promote_account'] eq '自然注册'">官方渠道<else/>{$data.promote_account}</if></td>
-                        <td><span>{$data.pay_amount}</span></td>
-                        <td>{:get_pay_way($data['pay_way'])}</td>
-                        <td>{$data.pay_ip}</td>
-                        <td>{:set_show_time($data['create_time'],'','pay')}</td>
-                        <td>
-                            <if condition="$data['pay_status'] eq 1">
-                                <span class="order_status_color">{:get_info_status($data['pay_status'],9)}</span>
-                            <else/>
-                                {:get_info_status($data['pay_status'],9)}
-                            </if>
-                        </td>
-                    </tr>
-                </volist>
+                    <td colspan="11" class="text-center">aOh! 暂时还没有内容!</td>
+                    <else />
+                    <volist name="list_data" id="data">
+                        <tr>
+                            <td>{:$data['pay_order_number']}</td>
+                            <td>
+                                <if condition="$is_admin eq true ">
+                                    {$data.user_account}
+                                    <else />
+                                    {$data.user_account|encryptStr}
+                                </if>
+                            </td>
+                            <td>
+                                <if condition="$data['promote_account'] eq '自然注册'">
+                                    官方渠道
+                                    <else/>
+                                    <if condition="$is_admin eq true ">
+                                        {$data.promote_account}
+                                        <else />
+                                        {$data.promote_account|encryptStr}
+                                    </if>
+
+                                </if>
+                            </td>
+                            <td><span>{$data.pay_amount}</span></td>
+                            <td>{:get_pay_way($data['pay_way'])}</td>
+                            <td>{$data.pay_ip}</td>
+                            <td>{:set_show_time($data['create_time'],'','pay')}</td>
+                            <td>
+                                <if condition="$data['pay_status'] eq 1">
+                                    <span class="order_status_color">{:get_info_status($data['pay_status'],9)}</span>
+                                    <else/>
+                                    {:get_info_status($data['pay_status'],9)}
+                                </if>
+                            </td>
+                        </tr>
+                    </volist>
                 </empty>
                 <tr class="data_summary">
-                <td>汇总</td>
-                 <td colspan="7">
-                当页充值：{:array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount'))}；
-                今日充值：{$ttotal} ；
-                昨日充值：{$ytotal} ；
-                累计充值：{$total}元（此处只汇总充值成功的订单）
+                    <td>汇总</td>
+                    <td colspan="7">
+                        当页充值：{:array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount'))}；
+                        今日充值：{$ttotal} ；
+                        昨日充值：{$ytotal} ；
+                        累计充值：{$total}元（此处只汇总充值成功的订单）
                     </td>
                 </tr>
                 </tbody>
@@ -153,19 +170,19 @@
         </div>
     </div>
     <div class="page">
-				<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>8,'xlsname'=>'平台币订单_平台币充值'),I('get.')))}">导出</a>
+        <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>8,'xlsname'=>'平台币订单_平台币充值'),I('get.')))}">导出</a>
         {$_page|default=''}
     </div>
 
-		<div class="common_settings">
-			<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
-			<form class="addShortcutIcon">
-				<input type="hidden" name="title" value="{$m_title}">
-				<input type="hidden" name="url" value="Deposit/lists">
-			</form>
-			<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
-		</div>
-		
+    <div class="common_settings">
+        <span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
+        <form class="addShortcutIcon">
+            <input type="hidden" name="title" value="{$m_title}">
+            <input type="hidden" name="url" value="Deposit/lists">
+        </form>
+        <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
+    </div>
+
 </block>
 
 <block name="script">
@@ -180,10 +197,10 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js"
             charset="UTF-8"></script>
     <script>
-    <volist name=":I('get.')" id="vo">
-        Think.setValue('{$key}',"{$vo}");
-    </volist>
-    $(".select_gallery").select2();
+        <volist name=":I('get.')" id="vo">
+            Think.setValue('{$key}',"{$vo}");
+        </volist>
+        $(".select_gallery").select2();
     </script>
     <script type="text/javascript">
         //导航高亮
@@ -312,29 +329,29 @@
                 })
             });
         })
-		
-		
-		
-		/**
- * 初始化select2单选，默认带搜索功能。
- */
- 
- //初始化页面加载
-$(document).ready(function () {
-
-    //初始化select2单选
-    initSelect2WithSearch();
-
-});
- 
- 
-function initSelect2WithSearch() {
-    // $("#sel_order").select2({
-    //     tags: true,
-    //     placeholder: '订单状态',
-    //     allowClear: false,				//清空
-	// 	minimumResultsForSearch: Infinity,  // 永久隐藏搜索框  
-    // });
-}
+
+
+
+        /**
+         * 初始化select2单选，默认带搜索功能。
+         */
+
+        //初始化页面加载
+        $(document).ready(function () {
+
+            //初始化select2单选
+            initSelect2WithSearch();
+
+        });
+
+
+        function initSelect2WithSearch() {
+            // $("#sel_order").select2({
+            //     tags: true,
+            //     placeholder: '订单状态',
+            //     allowClear: false,				//清空
+            // 	minimumResultsForSearch: Infinity,  // 永久隐藏搜索框
+            // });
+        }
     </script>
 </block>
diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html
index d0a2938c4..2fb1f517d 100644
--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@@ -224,7 +224,13 @@
                                 <td>{:set_show_time($data['create_time'])}</td>
                                 <td>{:set_show_time($data['last_login_time'])}</td>
                                 <td>{:get_promote_levels($data['id'])}</td>
-                                <td>{:getTopPromote($data['id'])['account']}</td>
+                                <td>
+                                    <if condition="$is_admin eq true ">
+                                        {:getTopPromote($data['id'])['account']}
+                                        <else />
+                                        {:encryptStr(getTopPromote($data['id'])['account'])}
+                                    </if>
+                                </td>
                                 <td>{:get_business_affairs_account($data['ba_id'])}</td>
                                 <td><if condition="$data['status'] eq 0">
                                     <span class="preview_status">{:get_info_status($data['status'],3)}</span>