Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize

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

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>

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 锁定">