Merge branch 'feature/admin_optimize' into release

Application/Admin/View/Member/edit.html

@@ -24,12 +24,12 @@
                         <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" name="account" value="{$data['account']}"disabled="disabled">
                                     <else />
                                     <input type="text" class="txt" name="account" value="{$data['account']|encryptStr}"disabled="disabled">
-                                </if>-->
-                                <input type="text" class="txt" name="account" value="{$data['account']}"disabled="disabled">
+                                </if>
+                                <!--<input type="text" class="txt" name="account" value="{$data['account']}"disabled="disabled">-->
 
                                 <span class="notice-text">玩家登录账号，一经注册，全平台通用</span>
                             </td>