Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0

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');
     }
 

Application/Admin/View/BehaviorLog/index.html

@@ -139,10 +139,22 @@
                         <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>