Merge branch 'master_zcl' into release-1.0.0

# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Admin/Controller/MemberController.class.php

Application/Admin/Common/function.php

@@ -586,7 +586,6 @@ function getAllGame()
     return $list;
 }
 
-
 /**
  * 中间加密 替换字符串的子串
  */

Application/Admin/Controller/MemberController.class.php

@@ -282,7 +282,7 @@ class MemberController extends ThinkController
 
         $this->m_title = '玩家列表';
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/user_info', 'status' => 1])->find());
-
+        
         $this->display();
     }
 
@@ -487,7 +487,6 @@ class MemberController extends ThinkController
         if (IS_POST) {
             $member = new MemberApi();
             $data = $_REQUEST;
-            unset($data['']);
             if (empty($data['password'])) {
                 unset($data['password']);
             }
@@ -495,7 +494,7 @@ class MemberController extends ThinkController
                 $this->error('请填写正确的名字');
             }
 
-            /*if (!empty($data['idcard']) && !preg_match('/^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/', $data['idcard'])) {
+           /* if (!empty($data['idcard']) && !preg_match('/^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/', $data['idcard'])) {
                 $this->error('请输入正确的身份证号码');
             }*/
 
@@ -813,20 +812,13 @@ class MemberController extends ThinkController
             $map['server_name'] = $_REQUEST['server_name'];
             unset($_REQUEST['server_name']);
         }
-        if (isset($_REQUEST['promote_id'])) {
-            $map['promote_id'] = $_REQUEST['promote_id'];
-            unset($_REQUEST['promote_id']);
-        }
         // $map['type'] = 1;
         // $map['login_time'] = ['exp', 'login_time<>0'];
         $extend = array();
         $extend['map'] = $map;
-        $count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false);
+
-        $sql = "select count(user_id) as count from ({$count})t";
-        $count = M('UserLoginRecord','tab_')->query($sql);
 
         $this->m_title = '登录记录';
-        $this->assign('user_count',$count[0]['count']);
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find());
 
         parent::lists("UserLoginRecord", $p, $extend['map']);