用户

application/admin/controller/user/User.php

@@ -3,7 +3,6 @@
 namespace app\admin\controller\user;
 
 use app\common\controller\Backend;
-use app\common\library\Auth;
 
 /**
  * 会员管理
@@ -25,16 +24,12 @@ class User extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\User;
-        $this->view->assign("realStatusList", $this->model->getRealStatusList());
         $this->view->assign("genderList", $this->model->getGenderList());
         $this->view->assign("idcardStatusList", $this->model->getIdcardStatusList());
         $this->view->assign("statusList", $this->model->getStatusList());
-        $this->view->assign("openMatchVideoList", $this->model->getOpenMatchVideoList());
-        $this->view->assign("openMatchAudioList", $this->model->getOpenMatchAudioList());
-        $this->view->assign("openMatchTypingList", $this->model->getOpenMatchTypingList());
-        $this->view->assign("freeVideoList", $this->model->getFreeVideoList());
-        $this->view->assign("freeAudioList", $this->model->getFreeAudioList());
-        $this->view->assign("freeTypingList", $this->model->getFreeTypingList());
+        $this->view->assign("hideIsFinishinfoList", $this->model->getHideIsFinishinfoList());
+        $this->view->assign("isActiveList", $this->model->getIsActiveList());
+        $this->view->assign("isTuijianList", $this->model->getIsTuijianList());
     }
 
     public function import()
@@ -49,38 +44,4 @@ class User extends Backend
      */
     
 
-    /**
-     * 查看
-     */
-    public function index()
-    {
-        //当前是否为关联查询
-        $this->relationSearch = true;
-        //设置过滤方法
-        $this->request->filter(['strip_tags', 'trim']);
-        if ($this->request->isAjax()) {
-            //如果发送的来源是Selectpage，则转发到Selectpage
-            if ($this->request->request('keyField')) {
-                return $this->selectpage();
-            }
-            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
-            $list = $this->model
-                    ->with(['gonghui'])
-                    ->where($where)
-                    ->order($sort, $order)
-                    ->paginate($limit);
-
-            foreach ($list as $row) {
-                
-                $row->getRelation('gonghui')->visible(['id','name']);
-            }
-
-            $result = array("total" => $list->total(), "rows" => $list->items());
-
-            return json($result);
-        }
-        return $this->view->fetch();
-    }
-
 }

application/admin/lang/zh-cn/user/user.php

@@ -1,80 +1,59 @@
 <?php
 
 return [
-    'Id'                  => 'ID',
-    'Gh_id'               => '公会ID',
-    'Username'            => '用户名',
-    'Nickname'            => '昵称',
-    'Password'            => '密码',
-    'Salt'                => '密码盐',
-    'Email'               => '电子邮箱',
-    'Mobile'              => '手机号',
-    'Avatar'              => '头像',
-    'Real_status'         => '真人认证',
-    'Real_status -1'      => '未申请',
-    'Real_status 0'       => '待审核',
-    'Real_status 1'       => '审核通过',
-    'Real_status 2'       => '审核驳回',
-    'Gender'              => '性别',
-    'Gender 1'            => '男',
-    'Gender 0'            => '女',
-    'Height'              => '身高',
-    'Weight'              => '体重',
-    'Birthday'            => '生日',
-    'Bio'                 => '个性签名',
-    'Audio_bio'           => '语音签名',
-    'Idcard_status'       => '实名认证',
-    'Idcard_status -1'    => '未申请',
-    'Idcard_status 0'     => '待审核',
-    'Idcard_status 1'     => '审核通过',
-    'Idcard_status 2'     => '审核驳回',
-    'Successions'         => '连续登录天数',
-    'Maxsuccessions'      => '最大连续登录天数',
-    'Prevtime'            => '上次登录时间',
-    'Logintime'           => '登录时间',
-    'Loginip'             => '登录IP',
-    'Loginfailure'        => '失败次数',
-    'Joinip'              => '加入IP',
-    'Jointime'            => '加入时间',
-    'Createtime'          => '创建时间',
-    'Updatetime'          => '更新时间',
-    'Token'               => 'Token',
-    'Status'              => '状态',
-    'Status 1'            => '正常',
-    'Status 0'            => '禁用',
-    'Status -1'           => '注销',
-    'Verification'        => '验证',
-    'Longitude'           => '经度',
-    'Latitude'            => '纬度',
-    'Cityname'            => '即时城市名',
-    'Photo_images'        => '相册',
-    'Education_id'        => '学历id',
-    'Hobby_ids'           => '爱好ids',
-    'Job_id'              => '职业id',
-    'Marital_id'          => '婚恋id',
-    'Tag_ids'             => '标签ids',
-    'Wages_id'            => '收入id',
-    'Hometown_cityid'     => '家乡城市id',
-    'Open_match_video'    => '匹配视频开关',
-    'Open_match_video 1'  => '开',
-    'Open_match_video 0'  => '关',
-    'Open_match_audio'    => '匹配语音开关',
-    'Open_match_audio 1'  => '开',
-    'Open_match_audio 0'  => '关',
-    'Open_match_typing'   => '匹配聊天开关',
-    'Open_match_typing 1' => '开',
-    'Open_match_typing 0' => '关',
-    'Free_video'          => '免费视频开关',
-    'Free_video 1'        => '开',
-    'Free_video 0'        => '关',
-    'Free_audio'          => '免费语音开关',
-    'Free_audio 1'        => '开',
-    'Free_audio 0'        => '关',
-    'Free_typing'         => '免费聊天开关',
-    'Free_typing 1'       => '开',
-    'Free_typing 0'       => '关',
-    'Gonghui.id'          => '公会ID',
-    'Gonghui.name'        => '公会名称',
-    'Leave password blank if dont want to change' => '不修改密码请留空',
-    'Register_from' => '注册来源',
+    'Id'                   => 'ID',
+    'Intro_uid'            => '推荐人UID',
+    'Username'             => '用户名',
+    'Nickname'             => '昵称',
+    'Introcode'            => '邀请码',
+    'Password'             => '密码',
+    'Salt'                 => '密码盐',
+    'Mobile'               => '手机号',
+    'Avatar'               => '头像',
+    'Gender'               => '性别',
+    'Gender 1'             => '男',
+    'Gender 0'             => '女',
+    'Height'               => '身高',
+    'Weight'               => '体重',
+    'Birthday'             => '生日',
+    'Bio'                  => '个性签名',
+    'Audio_bio'            => '语音签名',
+    'Idcard_status'        => '实名认证',
+    'Idcard_status -1'     => '未申请',
+    'Idcard_status 0'      => '待审核',
+    'Idcard_status 1'      => '审核通过',
+    'Idcard_status 2'      => '审核驳回',
+    'Successions'          => '连续登录天数',
+    'Maxsuccessions'       => '最大连续登录天数',
+    'Prevtime'             => '上次登录时间',
+    'Logintime'            => '登录时间',
+    'Loginip'              => '登录IP',
+    'Loginfailure'         => '失败次数',
+    'Joinip'               => '加入IP',
+    'Jointime'             => '加入时间',
+    'Createtime'           => '创建时间',
+    'Updatetime'           => '更新时间',
+    'Token'                => 'Token',
+    'Status'               => '状态',
+    'Status 1'             => '正常',
+    'Status 0'             => '禁用',
+    'Status -1'            => '注销',
+    'Verification'         => '验证',
+    'Longitude'            => '经度',
+    'Latitude'             => '纬度',
+    'Cityname'             => '即时城市名',
+    'Photo_images'         => '相册',
+    'Tag_ids'              => '标签ids',
+    'Hide_is_finishinfo'   => '是否完善资料',
+    'Hide_is_finishinfo 1' => '是',
+    'Hide_is_finishinfo 0' => '否',
+    'Wechat_openid'        => '微信openid',
+    'Is_active'            => '是否活跃',
+    'Is_active 1'          => '是',
+    'Is_active 0'          => '否',
+    'Attribute'            => '属性',
+    'Shoesize'             => '鞋码',
+    'Is_tuijian'           => '首页推荐',
+    'Is_tuijian 1'         => '是',
+    'Is_tuijian 0'         => '否'
 ];

application/admin/model/User.php

@@ -25,20 +25,17 @@ class User extends Model
 
     // 追加属性
     protected $append = [
-        'real_status_text',
         'gender_text',
         'idcard_status_text',
         'prevtime_text',
         'logintime_text',
         'jointime_text',
         'status_text',
-        'open_match_video_text',
-        'open_match_audio_text',
-        'open_match_typing_text',
-        'free_video_text',
-        'free_audio_text',
-        'free_typing_text'
+        'hide_is_finishinfo_text',
+        'is_active_text',
+        'is_tuijian_text'
     ];
+    
 
     protected static function init()
     {
@@ -105,11 +102,6 @@ class User extends Model
         });
     }
     
-    public function getRealStatusList()
-    {
-        return ['-1' => __('Real_status -1'), '0' => __('Real_status 0'), '1' => __('Real_status 1'), '2' => __('Real_status 2')];
-    }
-
     public function getGenderList()
     {
         return ['1' => __('Gender 1'), '0' => __('Gender 0')];
@@ -125,42 +117,19 @@ class User extends Model
         return ['1' => __('Status 1'), '0' => __('Status 0'), '-1' => __('Status -1')];
     }
 
-    public function getOpenMatchVideoList()
-    {
-        return ['1' => __('Open_match_video 1'), '0' => __('Open_match_video 0')];
-    }
-
-    public function getOpenMatchAudioList()
-    {
-        return ['1' => __('Open_match_audio 1'), '0' => __('Open_match_audio 0')];
-    }
-
-    public function getOpenMatchTypingList()
+    public function getHideIsFinishinfoList()
     {
-        return ['1' => __('Open_match_typing 1'), '0' => __('Open_match_typing 0')];
+        return ['1' => __('Hide_is_finishinfo 1'), '0' => __('Hide_is_finishinfo 0')];
     }
 
-    public function getFreeVideoList()
+    public function getIsActiveList()
     {
-        return ['1' => __('Free_video 1'), '0' => __('Free_video 0')];
+        return ['1' => __('Is_active 1'), '0' => __('Is_active 0')];
     }
 
-    public function getFreeAudioList()
+    public function getIsTuijianList()
     {
-        return ['1' => __('Free_audio 1'), '0' => __('Free_audio 0')];
-    }
-
-    public function getFreeTypingList()
-    {
-        return ['1' => __('Free_typing 1'), '0' => __('Free_typing 0')];
-    }
-
-
-    public function getRealStatusTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['real_status']) ? $data['real_status'] : '');
-        $list = $this->getRealStatusList();
-        return isset($list[$value]) ? $list[$value] : '';
+        return ['1' => __('Is_tuijian 1'), '0' => __('Is_tuijian 0')];
     }
 
 
@@ -209,50 +178,26 @@ class User extends Model
     }
 
 
-    public function getOpenMatchVideoTextAttr($value, $data)
+    public function getHideIsFinishinfoTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['open_match_video']) ? $data['open_match_video'] : '');
-        $list = $this->getOpenMatchVideoList();
+        $value = $value ? $value : (isset($data['hide_is_finishinfo']) ? $data['hide_is_finishinfo'] : '');
+        $list = $this->getHideIsFinishinfoList();
         return isset($list[$value]) ? $list[$value] : '';
     }
 
 
-    public function getOpenMatchAudioTextAttr($value, $data)
+    public function getIsActiveTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['open_match_audio']) ? $data['open_match_audio'] : '');
-        $list = $this->getOpenMatchAudioList();
+        $value = $value ? $value : (isset($data['is_active']) ? $data['is_active'] : '');
+        $list = $this->getIsActiveList();
         return isset($list[$value]) ? $list[$value] : '';
     }
 
 
-    public function getOpenMatchTypingTextAttr($value, $data)
+    public function getIsTuijianTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['open_match_typing']) ? $data['open_match_typing'] : '');
-        $list = $this->getOpenMatchTypingList();
-        return isset($list[$value]) ? $list[$value] : '';
-    }
-
-
-    public function getFreeVideoTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['free_video']) ? $data['free_video'] : '');
-        $list = $this->getFreeVideoList();
-        return isset($list[$value]) ? $list[$value] : '';
-    }
-
-
-    public function getFreeAudioTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['free_audio']) ? $data['free_audio'] : '');
-        $list = $this->getFreeAudioList();
-        return isset($list[$value]) ? $list[$value] : '';
-    }
-
-
-    public function getFreeTypingTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['free_typing']) ? $data['free_typing'] : '');
-        $list = $this->getFreeTypingList();
+        $value = $value ? $value : (isset($data['is_tuijian']) ? $data['is_tuijian'] : '');
+        $list = $this->getIsTuijianList();
         return isset($list[$value]) ? $list[$value] : '';
     }
 
@@ -272,8 +217,4 @@ class User extends Model
     }
 
 
-    public function gonghui()
-    {
-        return $this->belongsTo('Gonghui', 'gh_id', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
 }

application/admin/view/user/user/add.html

@@ -1,18 +1,17 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gh_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Intro_uid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-gh_id" data-rule="required" data-source="gonghui/index" class="form-control selectpage" name="row[gh_id]" type="text" value="">
+            <input id="c-intro_uid" class="form-control" name="row[intro_uid]" type="number" value="0">
         </div>
     </div>
-   <!-- <div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-username" class="form-control" name="row[username]" type="text" value="">
         </div>
-    </div>-->
-   -->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -20,27 +19,27 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Introcode')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-introcode" class="form-control" name="row[introcode]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-password" class="form-control" name="row[password]" type="text" value="">
         </div>
     </div>
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Salt')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-salt" class="form-control" name="row[salt]" type="text" value="">
         </div>
-    </div>-->
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-email" class="form-control" name="row[email]" type="text" value="">
-        </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-mobile" class="form-control" name="row[mobile]" maxlength="11" type="text" value="">
+            <input id="c-mobile" data-rule="required" class="form-control" name="row[mobile]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -58,18 +57,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Real_status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="realStatusList" item="vo"}
-            <label for="row[real_status]-{$key}"><input id="row[real_status]-{$key}" name="row[real_status]" type="radio" value="{$key}" {in name="key" value="-1"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
@@ -84,19 +71,19 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Height')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-height" class="form-control" name="row[height]" type="text">
+            <input id="c-height" class="form-control" name="row[height]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Weight')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-weight" class="form-control" name="row[weight]" type="text">
+            <input id="c-weight" class="form-control" name="row[weight]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-birthday" class="form-control" name="row[birthday]" type="number">
+            <input id="c-birthday" class="form-control" name="row[birthday]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
@@ -108,10 +95,9 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Audio_bio')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-audio_bio" class="form-control" name="row[audio_bio]" type="text">
+            <input id="c-audio_bio" class="form-control" name="row[audio_bio]" type="text" value="">
         </div>
     </div>
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -199,13 +185,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Longitude')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-longitude" class="form-control" name="row[longitude]" type="text" value="">
+            <input id="c-longitude" class="form-control" name="row[longitude]" type="text" value="116.403909">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-latitude" class="form-control" name="row[latitude]" type="text" value="">
+            <input id="c-latitude" class="form-control" name="row[latitude]" type="text" value="39.914133">
         </div>
     </div>
     <div class="form-group">
@@ -218,7 +204,7 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Photo_images')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-photo_images" class="form-control" size="50" name="row[photo_images]" type="text">
+                <input id="c-photo_images" class="form-control" size="50" name="row[photo_images]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-photo_images" class="btn btn-danger faupload" data-input-id="c-photo_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-photo_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-photo_images" class="btn btn-primary fachoose" data-input-id="c-photo_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -229,53 +215,17 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Education_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-education_id" data-rule="required" data-source="education/index" class="form-control selectpage" name="row[education_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Hobby_ids')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-hobby_ids" data-rule="required" data-source="hobby/index" data-multiple="true" class="form-control selectpage" name="row[hobby_ids]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Job_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-job_id" data-rule="required" data-source="job/index" class="form-control selectpage" name="row[job_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Marital_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-marital_id" data-rule="required" data-source="marital/index" class="form-control selectpage" name="row[marital_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Tag_ids')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-tag_ids" data-rule="required" data-source="tag/index" data-multiple="true" class="form-control selectpage" name="row[tag_ids]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Wages_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-wages_id" data-rule="required" data-source="wages/index" class="form-control selectpage" name="row[wages_id]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Hometown_cityid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-hometown_cityid" class="form-control" name="row[hometown_cityid]" type="number">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Open_match_video')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Hide_is_finishinfo')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-open_match_video" data-rule="required" class="form-control selectpicker" name="row[open_match_video]">
-                {foreach name="openMatchVideoList" item="vo"}
+            <select  id="c-hide_is_finishinfo" data-rule="required" class="form-control selectpicker" name="row[hide_is_finishinfo]">
+                {foreach name="hideIsFinishinfoList" item="vo"}
                     <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
@@ -283,23 +233,17 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Open_match_audio')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Wechat_openid')}:</label>
         <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-open_match_audio" data-rule="required" class="form-control selectpicker" name="row[open_match_audio]">
-                {foreach name="openMatchAudioList" item="vo"}
-                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
+            <input id="c-wechat_openid" data-rule="required" class="form-control" name="row[wechat_openid]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Open_match_typing')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_active')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-open_match_typing" data-rule="required" class="form-control selectpicker" name="row[open_match_typing]">
-                {foreach name="openMatchTypingList" item="vo"}
+            <select  id="c-is_active" data-rule="required" class="form-control selectpicker" name="row[is_active]">
+                {foreach name="isActiveList" item="vo"}
                     <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
@@ -307,36 +251,24 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Free_video')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Attribute')}:</label>
         <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-free_video" data-rule="required" class="form-control selectpicker" name="row[free_video]">
-                {foreach name="freeVideoList" item="vo"}
-                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
+            <input id="c-attribute" class="form-control" name="row[attribute]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Free_audio')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Shoesize')}:</label>
         <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-free_audio" data-rule="required" class="form-control selectpicker" name="row[free_audio]">
-                {foreach name="freeAudioList" item="vo"}
-                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
+            <input id="c-shoesize" class="form-control" name="row[shoesize]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Free_typing')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_tuijian')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-free_typing" data-rule="required" class="form-control selectpicker" name="row[free_typing]">
-                {foreach name="freeTypingList" item="vo"}
-                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+            <select  id="c-is_tuijian" data-rule="required" class="form-control selectpicker" name="row[is_tuijian]">
+                {foreach name="isTuijianList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 

application/admin/view/user/user/edit.html

@@ -1,18 +1,17 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gh_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Intro_uid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-gh_id" data-rule="required" data-source="gonghui/index" class="form-control selectpage" name="row[gh_id]" type="text" value="{$row.gh_id|htmlentities}">
+            <input id="c-intro_uid" class="form-control" name="row[intro_uid]" type="number" value="{$row.intro_uid|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-username" disabled class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
+            <input id="c-username" class="form-control" name="row[username]" type="text" value="{$row.username|htmlentities}">
         </div>
     </div>
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -20,27 +19,27 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Introcode')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-password" class="form-control" name="row[password]" type="text" placeholder="{:__('Leave password blank if dont want to change')}" value="">
+            <input id="c-introcode" class="form-control" name="row[introcode]" type="text" value="{$row.introcode|htmlentities}">
         </div>
     </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Salt')}:</label>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-salt" class="form-control" name="row[salt]" type="text" value="{$row.salt|htmlentities}">
+            <input id="c-password" class="form-control" name="row[password]" type="text" value="{$row.password|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Salt')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-email" class="form-control" name="row[email]" type="text" value="{$row.email|htmlentities}">
+            <input id="c-salt" class="form-control" name="row[salt]" type="text" value="{$row.salt|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-mobile" class="form-control" name="row[mobile]" type="text" maxlength="11"  value="{$row.mobile|htmlentities}">
+            <input id="c-mobile" data-rule="required" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -57,18 +56,6 @@
             <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
         </div>
     </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Real_status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="realStatusList" item="vo"}
-            <label for="row[real_status]-{$key}"><input id="row[real_status]-{$key}" name="row[real_status]" type="radio" value="{$key}" {in name="key" value="$row.real_status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
-        </div>
-    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -81,7 +68,7 @@
 
         </div>
     </div>
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Height')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-height" class="form-control" name="row[height]" type="text" value="{$row.height|htmlentities}">
@@ -96,7 +83,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-birthday" data-rule="" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{$row.birthday}">
+            <input id="c-birthday" class="form-control" name="row[birthday]" type="number" value="{$row.birthday|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -111,7 +98,6 @@
             <input id="c-audio_bio" class="form-control" name="row[audio_bio]" type="text" value="{$row.audio_bio|htmlentities}">
         </div>
     </div>
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -123,8 +109,8 @@
             </div>
 
         </div>
-    </div>-->
-    <!--<div class="form-group">
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Successions')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-successions" min="0" class="form-control" name="row[successions]" type="number" value="{$row.successions|htmlentities}">
@@ -177,7 +163,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-token" class="form-control" name="row[token]" type="text" value="{$row.token|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -190,7 +176,7 @@
 
         </div>
     </div>
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Verification')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-verification" class="form-control" name="row[verification]" type="text" value="{$row.verification|htmlentities}">
@@ -213,7 +199,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-cityname" class="form-control" name="row[cityname]" type="text" value="{$row.cityname|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Photo_images')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -228,30 +214,6 @@
             <ul class="row list-inline faupload-preview" id="p-photo_images"></ul>
         </div>
     </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Education_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-education_id" data-rule="required" data-source="education/index" class="form-control selectpage" name="row[education_id]" type="text" value="{$row.education_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Hobby_ids')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-hobby_ids" data-rule="required" data-source="hobby/index" data-multiple="true" class="form-control selectpage" name="row[hobby_ids]" type="text" value="{$row.hobby_ids|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Job_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-job_id" data-rule="required" data-source="job/index" class="form-control selectpage" name="row[job_id]" type="text" value="{$row.job_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Marital_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-marital_id" data-rule="required" data-source="marital/index" class="form-control selectpage" name="row[marital_id]" type="text" value="{$row.marital_id|htmlentities}">
-        </div>
-    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Tag_ids')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -259,89 +221,59 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Wages_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-wages_id" data-rule="required" data-source="wages/index" class="form-control selectpage" name="row[wages_id]" type="text" value="{$row.wages_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Hometown_cityid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-hometown_cityid" class="form-control" name="row[hometown_cityid]" type="number" value="{$row.hometown_cityid|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Open_match_video')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Hide_is_finishinfo')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-open_match_video" data-rule="required" class="form-control selectpicker" name="row[open_match_video]">
-                {foreach name="openMatchVideoList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.open_match_video"}selected{/in}>{$vo}</option>
+            <select  id="c-hide_is_finishinfo" data-rule="required" class="form-control selectpicker" name="row[hide_is_finishinfo]">
+                {foreach name="hideIsFinishinfoList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.hide_is_finishinfo"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Open_match_audio')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Wechat_openid')}:</label>
         <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-open_match_audio" data-rule="required" class="form-control selectpicker" name="row[open_match_audio]">
-                {foreach name="openMatchAudioList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.open_match_audio"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
+            <input id="c-wechat_openid" data-rule="required" class="form-control" name="row[wechat_openid]" type="text" value="{$row.wechat_openid|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Open_match_typing')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_active')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-open_match_typing" data-rule="required" class="form-control selectpicker" name="row[open_match_typing]">
-                {foreach name="openMatchTypingList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.open_match_typing"}selected{/in}>{$vo}</option>
+            <select  id="c-is_active" data-rule="required" class="form-control selectpicker" name="row[is_active]">
+                {foreach name="isActiveList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_active"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Free_video')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Attribute')}:</label>
         <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-free_video" data-rule="required" class="form-control selectpicker" name="row[free_video]">
-                {foreach name="freeVideoList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.free_video"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
+            <input id="c-attribute" class="form-control" name="row[attribute]" type="text" value="{$row.attribute|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Free_audio')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Shoesize')}:</label>
         <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-free_audio" data-rule="required" class="form-control selectpicker" name="row[free_audio]">
-                {foreach name="freeAudioList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.free_audio"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
+            <input id="c-shoesize" class="form-control" name="row[shoesize]" type="text" value="{$row.shoesize|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Free_typing')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_tuijian')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-free_typing" data-rule="required" class="form-control selectpicker" name="row[free_typing]">
-                {foreach name="freeTypingList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.free_typing"}selected{/in}>{$vo}</option>
+            <select  id="c-is_tuijian" data-rule="required" class="form-control selectpicker" name="row[is_tuijian]">
+                {foreach name="isTuijianList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_tuijian"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
         </div>
-    </div>-->
+    </div>
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/user/user/index.html

@@ -21,14 +21,14 @@
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('user/user/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
-
+-->
                         <div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_tuijian=1"><i class="fa fa-eye"></i>首页推荐</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_tuijian=0"><i class="fa fa-eye-slash"></i>首页不推荐</a></li>
                             </ul>
-                        </div>-->
+                        </div>
 
                         
                     </div>

application/api/controller/User.php

@@ -331,7 +331,7 @@ class User extends Api
      */
     public function profile()
     {
-        $field_array = ['nickname','introcode','gender','birthday','attribute','shoesize','height','weight','bio','avatar','photo_images','tag_ids','hide_is_finishinfo'/*,'wechat_account'*/];
+        $field_array = ['nickname','introcode','gender','birthday','attribute','shoesize','height','weight','bio','avatar','photo_images','tag_ids','hide_is_finishinfo'];
 
         $data = [];
         foreach($field_array as $key => $field){

application/api/controller/Usercenter.php

@@ -38,7 +38,6 @@ class Usercenter extends Api
         'tag_ids',
         'attribute',
         'shoesize',
-        'wechat_account',
     ];
 
     //获取他人用户信息，留下足迹

application/common/library/Auth.php

@@ -52,11 +52,9 @@ class Auth
 
         'tag_ids',
 
-        'hometown_cityid',
         'hide_is_finishinfo',
 
         'wechat_openid',
-        'wechat_account',
 
         'attribute',
         'shoesize',

public/assets/js/backend/user/user.js

@@ -17,14 +17,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
             var table = $("#table");
 
-            //在普通搜索渲染后
-            table.on('post-common-search.bs.table', function (event, table) {
-                var form = $("form", table.$commonsearch);
-                $("input[name='gh_id']", form).addClass("selectpage").data("source", "gonghui/index").data("primaryKey", "id").data("field", "name").data("orderBy", "id asc");
-                Form.events.cxselect(form);
-                Form.events.selectpage(form);
-            });
-
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
@@ -34,56 +26,45 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'gh_id', title: __('Gh_id')},
-                        {field: 'gonghui.name', title: __('Gonghui.name'), operate: false},
+//                        {field: 'intro_uid', title: __('Intro_uid')},
                         {field: 'username', title: __('Username'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
-                        //{field: 'password', title: __('Password'), operate: 'LIKE'},
-                        //{field: 'salt', title: __('Salt'), operate: 'LIKE'},
-                        //{field: 'email', title: __('Email'), operate: 'LIKE'},
+                        {field: 'introcode', title: __('Introcode'), operate: 'LIKE'},
+//                        {field: 'password', title: __('Password'), operate: 'LIKE'},
+//                        {field: 'salt', title: __('Salt'), operate: 'LIKE'},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
                         {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'real_status', title: __('Real_status'), searchList: {"-1":__('Real_status -1'),"0":__('Real_status 0'),"1":__('Real_status 1'),"2":__('Real_status 2')}, formatter: Table.api.formatter.status},
                         {field: 'gender', title: __('Gender'), searchList: {"1":__('Gender 1'),"0":__('Gender 0')}, formatter: Table.api.formatter.normal},
-                        //{field: 'height', title: __('Height'), operate: 'LIKE'},
-                        //{field: 'weight', title: __('Weight'), operate: 'LIKE'},
-                        //{field: 'birthday', title: __('Birthday')},
-                        //{field: 'bio', title: __('Bio'), operate: 'LIKE'},
-                        //{field: 'audio_bio', title: __('Audio_bio'), operate: 'LIKE'},
+//                        {field: 'height', title: __('Height'), operate: 'LIKE'},
+//                        {field: 'weight', title: __('Weight'), operate: 'LIKE'},
+//                        {field: 'birthday', title: __('Birthday')},
+//                        {field: 'bio', title: __('Bio'), operate: 'LIKE'},
+//                        {field: 'audio_bio', title: __('Audio_bio'), operate: 'LIKE'},
                         {field: 'idcard_status', title: __('Idcard_status'), searchList: {"-1":__('Idcard_status -1'),"0":__('Idcard_status 0'),"1":__('Idcard_status 1'),"2":__('Idcard_status 2')}, formatter: Table.api.formatter.status},
-                        //{field: 'successions', title: __('Successions')},
-                        //{field: 'maxsuccessions', title: __('Maxsuccessions')},
-                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        //{field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        //{field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
-                        //{field: 'loginfailure', title: __('Loginfailure')},
-                        //{field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
-                        //{field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        //{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        //{field: 'token', title: __('Token'), operate: 'LIKE'},
+//                        {field: 'successions', title: __('Successions')},
+//                        {field: 'maxsuccessions', title: __('Maxsuccessions')},
+//                        {field: 'prevtime', title: __('Prevtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
+//                        {field: 'loginfailure', title: __('Loginfailure')},
+//                        {field: 'joinip', title: __('Joinip'), operate: 'LIKE'},
+//                        {field: 'jointime', title: __('Jointime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'token', title: __('Token'), operate: 'LIKE'},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0'),"-1":__('Status -1')}, formatter: Table.api.formatter.status},
-                        //{field: 'verification', title: __('Verification'), operate: 'LIKE'},
-                        //{field: 'longitude', title: __('Longitude'), operate: 'LIKE'},
-                        //{field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
-                        {field: 'register_from', title: __('Register_from'), operate: 'LIKE'},
-                        {field: 'cityname', title: __('Cityname'), operate: 'LIKE'},
-                        //{field: 'photo_images', title: __('Photo_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
-                        //{field: 'education_id', title: __('Education_id')},
-                        //{field: 'hobby_ids', title: __('Hobby_ids'), operate: 'LIKE'},
-                        //{field: 'job_id', title: __('Job_id')},
-                        //{field: 'marital_id', title: __('Marital_id')},
-                        //{field: 'tag_ids', title: __('Tag_ids'), operate: 'LIKE'},
-                        //{field: 'wages_id', title: __('Wages_id')},
-                        //{field: 'hometown_cityid', title: __('Hometown_cityid')},
-                        //{field: 'open_match_video', title: __('Open_match_video'), searchList: {"1":__('Open_match_video 1'),"0":__('Open_match_video 0')}, formatter: Table.api.formatter.normal},
-                        //{field: 'open_match_audio', title: __('Open_match_audio'), searchList: {"1":__('Open_match_audio 1'),"0":__('Open_match_audio 0')}, formatter: Table.api.formatter.normal},
-                        //{field: 'open_match_typing', title: __('Open_match_typing'), searchList: {"1":__('Open_match_typing 1'),"0":__('Open_match_typing 0')}, formatter: Table.api.formatter.normal},
-                        //{field: 'free_video', title: __('Free_video'), searchList: {"1":__('Free_video 1'),"0":__('Free_video 0')}, formatter: Table.api.formatter.normal},
-                        //{field: 'free_audio', title: __('Free_audio'), searchList: {"1":__('Free_audio 1'),"0":__('Free_audio 0')}, formatter: Table.api.formatter.normal},
-                        //{field: 'free_typing', title: __('Free_typing'), searchList: {"1":__('Free_typing 1'),"0":__('Free_typing 0')}, formatter: Table.api.formatter.normal},
-                        //{field: 'gonghui.id', title: __('Gonghui.id')},
-
+//                        {field: 'verification', title: __('Verification'), operate: 'LIKE'},
+//                        {field: 'longitude', title: __('Longitude'), operate: 'LIKE'},
+//                        {field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
+//                        {field: 'cityname', title: __('Cityname'), operate: 'LIKE'},
+//                        {field: 'photo_images', title: __('Photo_images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
+//                        {field: 'tag_ids', title: __('Tag_ids'), operate: 'LIKE'},
+//                        {field: 'hide_is_finishinfo', title: __('Hide_is_finishinfo'), searchList: {"1":__('Hide_is_finishinfo 1'),"0":__('Hide_is_finishinfo 0')}, formatter: Table.api.formatter.normal},
+//                        {field: 'wechat_openid', title: __('Wechat_openid'), operate: 'LIKE'},
+//                        {field: 'is_active', title: __('Is_active'), searchList: {"1":__('Is_active 1'),"0":__('Is_active 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'attribute', title: __('Attribute'), operate: 'LIKE'},
+                        {field: 'shoesize', title: __('Shoesize'), operate: 'LIKE'},
+                        {field: 'is_tuijian', title: __('Is_tuijian'), searchList: {"1":__('Is_tuijian 1'),"0":__('Is_tuijian 0')}, formatter: Table.api.formatter.normal},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]