From 5f5abce2ec7d65a2aa35a7897f2a5e940d6fbef9 Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Fri, 14 Feb 2020 15:34:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E6=9D=83=E9=99=90BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/MemberController.class.php     |  6 ++++-
 Application/Admin/View/Member/edit.html       |  6 ++---
 Application/Admin/View/Member/user_info.html  | 22 +++++++++----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 1c5a26ada..27bb806c1 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -318,7 +318,9 @@ class MemberController extends ThinkController
             $this->assign('_page', $page);
         }
         $this->assign('list_data', $data);
-        $this->assign("is_admin",is_administrator());
+        //$this->assign("is_admin",is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->display();
     }
 
@@ -841,6 +843,8 @@ class MemberController extends ThinkController
             $this->m_title = '玩家列表';
 
             $this->assign("is_admin",is_administrator());
+            $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+            $this->assign('show_data_power', $show_data_power);
             $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/user_info', 'status' => 1])->find());
             $this->display();
         }
diff --git a/Application/Admin/View/Member/edit.html b/Application/Admin/View/Member/edit.html
index 8d51e0647..b5d962ac5 100644
--- a/Application/Admin/View/Member/edit.html
+++ b/Application/Admin/View/Member/edit.html
@@ -112,7 +112,7 @@
                                 <if condition="$data['real_name'] eq null">
                                     <input type="text" class="txt"  value="" readonly>
                                     <else/>
-                                    <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         <input type="text" class="txt" value="{$data['real_name']}" readonly>
                                         <else />
                                         <input type="text" class="txt" value="{$data['real_name']|encryptRealName}" readonly>
@@ -124,7 +124,7 @@
                         <tr>
                             <td class="l">身份证号</td>
                             <td class="r">
-                                <if condition="$is_admin eq true ">
+                                <if condition="$show_data_power eq true ">
                                     <input type="text" class="txt" value="{$data['idcard']}" readonly>
                                     <else />
                                     <input type="text" class="txt" value="{$data['idcard']|encryptIdCard}" readonly>
@@ -145,7 +145,7 @@
                         <tr>
                             <td class="l noticeinfo">手机号码</td>
                             <td class="r pr">
-                                <if condition="$is_admin eq true ">
+                                <if condition="$show_data_power eq true ">
                                     <input type="text" class="txt " value="{$data['phone']}" placeholder="暂无手机号码" readonly>
                                     <else />
                                     <input type="text" class="txt " value="{$data['phone']|encryptStr}" placeholder="暂无手机号码" readonly>
diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html
index 5353a6e9c..d01a4a2cc 100644
--- a/Application/Admin/View/Member/user_info.html
+++ b/Application/Admin/View/Member/user_info.html
@@ -249,17 +249,17 @@
                                         {$data.account}
                                         <else />
                                         {$data.account|encryptStr}
-                                    </if>-->
-                                    {$data.account}
+                                    </if>
+                                    <!--{$data.account}-->
                                 </td>
                                 <else/>
                                 <td >
-                                   <!-- <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {$data.account}
                                         <else />
                                         {$data.account|encryptStr}
-                                    </if>-->
-                                    {$data.account}
+                                    </if>
+                                    <!--{$data.account}-->
                                 </td>
                             </if>
                             <td >
@@ -267,12 +267,12 @@
                                     官方渠道
                                     <else/>
                                     <empty name='data["promote_account"]'>---<else/>
-                                       <!-- <if condition="$is_admin eq true ">
+                                        <if condition="$show_data_power eq true ">
                                             {$data.promote_account}
                                             <else />
                                             {$data.promote_account|encryptStr}
-                                        </if>-->
-                                        {$data.promote_account}
+                                        </if>
+                                        <!--{$data.promote_account}-->
                                     </empty>
                                 </if>
                             </td>
@@ -307,12 +307,12 @@
                                 </if>
                             </td>
                             <td >
-                               <!-- <if condition="$is_admin eq true ">
+                                <if condition="$show_data_power eq true ">
                                     {$data.device_number}
                                     <else />
                                     {$data.device_number|encryptStr}
-                                </if>-->
-                                {$data.device_number}
+                                </if>
+                                <!--{$data.device_number}-->
                             </td>
                             <td >
                                 <if condition="get_info_status($data['lock_status'],4) eq 锁定">

From 2589a76603c097f1ce200b9179158af3993a5036 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Fri, 14 Feb 2020 15:40:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=B8=8B=E6=B8=B8?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=BB=93=E7=AE=97=E5=8D=95bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/View/StatementMangement/PersonOrderEdit.html        | 4 ++--
 .../Admin/View/StatementMangement/PersonOrderList.html        | 4 ++--
 .../Admin/View/StatementMangement/personOrderDetail.html      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/View/StatementMangement/PersonOrderEdit.html b/Application/Admin/View/StatementMangement/PersonOrderEdit.html
index 7e4d3827b..37b7545eb 100644
--- a/Application/Admin/View/StatementMangement/PersonOrderEdit.html
+++ b/Application/Admin/View/StatementMangement/PersonOrderEdit.html
@@ -194,7 +194,7 @@
                                 <td>无</td>
                                 <td>-</td>
                                 <td>0</td>
-                                <td>0</td>
+                                <td>0%</td>
                                 <td>0</td>
                                 <td>0</td>
                                 <td>0</td>
@@ -216,7 +216,7 @@
                                 <td>{$game_ratio.game_name}</td>
                                 <td>{$game_ratio.begin_time|0}&nbsp;-&nbsp;{$game_ratio.end_time|0}</td>
                                 <td>{$game_ratio.sum_amount|0}</td>
-                                <td>{$game_ratio.selle_ratio|0}</td>
+                                <td>{$game_ratio.selle_ratio|0}%</td>
                                 <td>{$game_ratio.reward|0}</td>
                                 <td>{$game_ratio.forfeit|0}</td>
                                 <td>{$game_ratio.real_amount|0}</td>
diff --git a/Application/Admin/View/StatementMangement/PersonOrderList.html b/Application/Admin/View/StatementMangement/PersonOrderList.html
index a83698ebf..197f800c9 100644
--- a/Application/Admin/View/StatementMangement/PersonOrderList.html
+++ b/Application/Admin/View/StatementMangement/PersonOrderList.html
@@ -194,7 +194,7 @@
                                 <td>无</td>
                                 <td>-</td>
                                 <td>0</td>
-                                <td>0</td>
+                                <td>0%</td>
                                 <td>0</td>
                                 <td>0</td>
                                 <td>0</td>
@@ -216,7 +216,7 @@
                                 <td>{$game_ratio.game_name}</td>
                                 <td>{$game_ratio.begin_time|0}&nbsp;-&nbsp;{$game_ratio.end_time|0}</td>
                                 <td>{$game_ratio.sum_amount|0}</td>
-                                <td>{$game_ratio.selle_ratio|0}</td>
+                                <td>{$game_ratio.selle_ratio|0}%</td>
                                 <td>{$game_ratio.reward|0}</td>
                                 <td>{$game_ratio.forfeit|0}</td>
                                 <td>{$game_ratio.real_amount|0}</td>
diff --git a/Application/Admin/View/StatementMangement/personOrderDetail.html b/Application/Admin/View/StatementMangement/personOrderDetail.html
index bf2f5af3d..f401a0b45 100644
--- a/Application/Admin/View/StatementMangement/personOrderDetail.html
+++ b/Application/Admin/View/StatementMangement/personOrderDetail.html
@@ -162,7 +162,7 @@
                                     <td>{$data.game_name}</td>
                                     <td>{$data.time|0}</td>
                                     <td>{$data.sum_amount|0}</td>
-                                    <td>{$data.selle_ratio|0}</td>
+                                    <td>{$data.selle_ratio|0}%</td>
                                     <td>{$data.reward|0}</td>
                                     <td>{$data.forfeit|0}</td>
                                     <td>{$data.real_amount|0}</td>