From 1ca183b5470f63237054903a3ffc3b5489ca1fe8 Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Sat, 21 Dec 2019 14:41:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E5=AF=86=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BehaviorLogController.class.php           |   1 +
 Application/Admin/View/BehaviorLog/index.html | 154 ++++++++++--------
 2 files changed, 84 insertions(+), 71 deletions(-)

diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php
index 01a43b416..79fc6c29e 100644
--- a/Application/Admin/Controller/BehaviorLogController.class.php
+++ b/Application/Admin/Controller/BehaviorLogController.class.php
@@ -78,6 +78,7 @@ class BehaviorLogController extends ThinkController
         $this->assign('startDate', $startDate);
         $this->assign('endDate', $endDate);
         $this->assign('data', $data);
+        $this->assign("is_admin",is_administrator());
         $this->display('index');
     }
 
diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html
index e97c61afd..39a87c998 100644
--- a/Application/Admin/View/BehaviorLog/index.html
+++ b/Application/Admin/View/BehaviorLog/index.html
@@ -7,24 +7,24 @@
     <style>
         .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;}
+            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>
     <!-- 标题栏 -->
 
@@ -37,7 +37,7 @@
         <!-- 高级搜索 -->
         <div class="jssearch fl cf search_list">
             <div class="input-list search-title-box">
-              <label>搜索：</label>
+                <label>搜索：</label>
             </div>
 
             <div class="input-list">
@@ -63,14 +63,14 @@
                     <volist name=":getAllGame()" id="vo">
                         <option value="{$vo.game_name}" <?php echo $vo.relation_game_name == I('game_name') ? 'selected':''; ?>  >{$vo.game_name}</option>
                     </volist>
-                </select>   
+                </select>
             </div>
             <div class="input-list input-list-game search_label_rehab">
                 <select id="sdk_version" name="sdk_version" class="select_gallery" >
                     <option value="">设备类型</option>
                     <option value="1" <?php echo I('game_type') == 1 ? "selected" : ''?>>安卓</option>
                     <option value="2" <?php echo I('game_type') == 2 ? "selected" : ''?>>苹果</option>
-                </select>   
+                </select>
             </div>
             <div class="input-list input-list-server search_label_rehab">
                 <select id="server_name" name="server_name" class="select_gallery"  style="width:120px;">
@@ -139,48 +139,60 @@
                         <tr>
                             <td>{$vo.extend}</td>
                             <td>{:set_show_time($vo['create_time'])}</td>
-                            <td>{$vo.user_account}</td>
+                            <td>
+                                <if condition="$is_admin eq true ">
+                                    {$vo.user_account}
+                                    <else />
+                                    {$vo.user_account|encryptStr}
+                                </if>
+                            </td>
                             <td>{$vo.game_name}</td>
                             <td>{$vo.server_name}</td>
-                            <td>{$vo.promote_account}</td>
+                            <td>
+                                <if condition="$is_admin eq true ">
+                                    {$vo.promote_account}
+                                    <else />
+                                    {$vo.promote_account|encryptStr}
+                                </if>
+                            </td>
                             <td>{$vo.game_player_id}</td>
                             <td>{$vo.game_player_name}</td>
                             <td>{$vo.price}</td>
                         </tr>
                     </volist>
                 </empty>
-               <!--  <tr class="data_summary">
-
-
-                    <td>汇总</td>
-                    <td colspan="6">
-                        当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
-                        今日充值：{$ttotal}
-                        昨日充值：{$ytotal}
-                        累计充值：{$total}（此处只汇总充值成功的订单）
-                    </td>
-                    <td colspan="99" style="color: #a9a9a9;">
-                        今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
-                        昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
-                    </td>
-                </tr> -->
+                <!--  <tr class="data_summary">
+
+
+                     <td>汇总</td>
+                     <td colspan="6">
+                         当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
+                         今日充值：{$ttotal}
+                         昨日充值：{$ytotal}
+                         累计充值：{$total}（此处只汇总充值成功的订单）
+                     </td>
+                     <td colspan="99" style="color: #a9a9a9;">
+                         今日充值：今日平台所有推广员的累计充值（包括官方渠道）/
+                         昨日充值：昨日平台所有推广员的累计充值（包括官方渠道）
+                     </td>
+                 </tr> -->
                 </tbody>
             </table>
         </div>
     </div>
     <div class="page">
-				<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>21,'xlsname'=>'游戏充值预下单'),I('get.')))}">导出</a>
+        <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>21,'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="Spend/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="Spend/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>
 
@@ -197,7 +209,7 @@
     <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
     <script>
         <volist  name = ":I('get.')" id = "vo">
-                Think.setValue('{$key}', "{$vo}");
+            Think.setValue('{$key}', "{$vo}");
         </volist>
         $(".select_gallery").select2();
     </script>
@@ -418,8 +430,8 @@
                 dataType:'json',
                 success:function(response){
                     str = '<option value="">请选择推广员</option>' +
-                      // '<option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>' +
-                      '';
+                        // '<option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>' +
+                        '';
                     data = response.data;
                     for (var i in data){
                         str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"
@@ -432,29 +444,29 @@
         });
         $("#promote_level").change();
 
-            var game_server = "{:I('server_name')}";
-            $("#sdk_version").change(function(){
-                $.ajax({
-                    url:"{:U('Ajax/getGmeServer')}",
-                    type:"post",
-                    data:{sdk_version:$("#sdk_version option:selected").val(), game_name:$("#game_name option:selected").val()},
-                    dataType:'json',
-                    success:function(data){
-                        str = "<option value=''>请选择区服</option>";
-                        for (var i in data){
-                            str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"
-                        }
-                        $("#server_name").empty();
-                        $("#server_name").append(str);
-                        $("#server_name").select2();
+        var game_server = "{:I('server_name')}";
+        $("#sdk_version").change(function(){
+            $.ajax({
+                url:"{:U('Ajax/getGmeServer')}",
+                type:"post",
+                data:{sdk_version:$("#sdk_version option:selected").val(), game_name:$("#game_name option:selected").val()},
+                dataType:'json',
+                success:function(data){
+                    str = "<option value=''>请选择区服</option>";
+                    for (var i in data){
+                        str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"
                     }
-                })
-            });
+                    $("#server_name").empty();
+                    $("#server_name").append(str);
+                    $("#server_name").select2();
+                }
+            })
+        });
 
-            $("#game_name").change(function(){
-                $("#sdk_version").change();
-            });
-            $("#game_name").change();
+        $("#game_name").change(function(){
+            $("#sdk_version").change();
+        });
+        $("#game_name").change();
 
         /**
          * 初始化select2单选，默认带搜索功能。