diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 5af746288..072918190 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -139,7 +139,7 @@ class MemberController extends ThinkController
         $this->checkListOrCountAuthRestMap($map,["tab_user.id","tab_user.account","tab_user.device_number"]);
         //计算用户列表
         $data =  M("user","tab_")
-        ->field("tab_user.id,`device_number`,`age_status`,tab_user.account,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,lock_remark,
+        ->field("tab_user.id,`device_number`,`device_type`,`age_status`,tab_user.account,`balance`,`gold_coin`,`alipay`,tab_user.promote_id,`register_type`,tab_user.promote_account,`register_time`,`lock_status`,lock_remark,
                 `register_way`,`register_ip`,`login_time`,`check_status`,IFNULL(ss.pay_amount,0) AS recharge_total,tab_user.is_repeat,promote.admin_id")
         ->where($map)
         ->group("tab_user.id")
@@ -214,13 +214,14 @@ class MemberController extends ThinkController
                 $v['lock_status'] = get_info_status($v['lock_status'],4);
                 $v['check_status'] = $v['check_status']==1 ? "正常" :"拉黑";
                 $v['is_repeat'] = $v['is_repeat']==1 ? "是" :"否";
+                $v['device_type'] = $v['device_type'] == 1 ? "安卓" :($v['device_type'] == 2 ? "IOS" :"未知");
                 $v['market_admin_username'] = isset($adminList[$v['promote_id']]) && $adminList[$v['promote_id']]['admin'] ? $adminList[$v['promote_id']]['admin']['username'] : '无';
             }
             
             $field = array(
                 "id"=>"账号ID","account"=>"玩家账号","promote_account"=>"所属推广员","market_admin_username"=>"所属市场专员","balance"=>"账户平台币","recharge_total"=>"累计充值","gold_coin"=>"金币",
                 "small_count"=>"小号","vip_level"=>"VIP等级","register_type"=>"注册方式","register_time"=>"注册时间","register_ip"=>"注册IP","login_time"=>"最后登录时间",
-                "device_number"=>"设备号","is_repeat"=>"去重数据","lock_remark"=>"锁定备注","lock_status"=>"账号状态","check_status"=>"拉黑状态"
+                "device_number"=>"设备号","device_type"=>"设备类型","is_repeat"=>"去重数据","lock_remark"=>"锁定备注","lock_status"=>"账号状态","check_status"=>"拉黑状态"
             );
             if ($showMarketAdmin == 0) {
                 unset($field['market_admin_username']);
@@ -739,7 +740,12 @@ class MemberController extends ThinkController
                 ->where($map)
                 ->setField('phone', $_POST['phone']);
             if ($pro !== false) {
-                $this->userEditOperationLog($_POST['id']);
+                // $this->userEditOperationLog($_POST['id']);
+                addOperationLog(array(
+                    "op_type"=>1,
+                    "key"=>get_user_account($_POST['id']).'的手机号修改为：'.$_POST['phone'],
+                    "url"=>U("Member/edit",array("id"=>$_POST['id'])),
+                ));
                 $this->ajaxReturn(array("status" => 1, "msg" => "手机修改成功"));
             } else {
                 $this->ajaxReturn(array("status" => 0, "msg" => "手机修改失败"));
@@ -761,7 +767,7 @@ class MemberController extends ThinkController
             if ($pro !== false) {
                 addOperationLog(array(
                     "op_type"=>1,
-                    "key"=>get_user_account($_POST['id']),
+                    "key"=>get_user_account($_POST['id']).'的真实姓名修改为：'.$_POST['real_name'],
                     "url"=>U("Member/edit",array("id"=>$_POST['id'])),
                     "menu"=>"用户-玩家组-玩家列表-编辑-真实姓名修改",
                 ));
@@ -790,7 +796,11 @@ class MemberController extends ThinkController
                 ->where($map)
                 ->setField('idcard', $_POST['idcard']);
             if ($pro !== false) {
-                $this->userEditOperationLog($_POST['id']);
+                addOperationLog(array(
+                    "op_type"=>1,
+                    "key"=>get_user_account($_POST['id']).'的身份证号码修改为：'.$_POST['idcard'],
+                    "url"=>U("Member/edit",array("id"=>$_POST['id'])),   
+                ));
                 $this->ajaxReturn(array("status" => 1, "msg" => "身份证号码修改成功"));
             } else {
                 $this->ajaxReturn(array("status" => 0, "msg" => "身份证号码修改失败"));
diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html
index cba880772..2c2cddab2 100644
--- a/Application/Admin/View/Member/user_info.html
+++ b/Application/Admin/View/Member/user_info.html
@@ -254,6 +254,7 @@
                     <th  >注册IP</th>
                     <th  >最后登录时间</th>
                     <th  >设备号</th>
+                    <th  >设备类型</th>
                     <th  >去重数据</th>
                     <th  >锁定备注</th>
                     <th  >账号状态</th>
@@ -348,6 +349,16 @@
                                 </if>
                                 <!--{$data.device_number}-->
                             </td>
+                            <td>
+                                <if condition="$data['device_type'] eq 1 ">
+                                    安卓
+                                    <elseif condition="$data['device_type'] eq 2 "/>
+                                    IOS
+                                    <else />
+                                    未知
+                                </if>
+
+                            </td>
                             <eq name="data.is_repeat" value="1">
                                 <td>是</td>
                                 <else/>