后台创建

application/admin/controller/user/User.php

@@ -14,7 +14,6 @@ class User extends Backend
     
     protected $searchFields = 'id,username,nickname';
     protected $selectpageFields = 'id,username,nickname,mobile';
-    protected $multiFields = 'is_tuijian';
     /**
      * User模型对象
      * @var \app\admin\model\User
@@ -27,11 +26,14 @@ class User extends Backend
         $this->model = new \app\admin\model\User;
         $this->view->assign("genderList", $this->model->getGenderList());
         $this->view->assign("idcardStatusList", $this->model->getIdcardStatusList());
+        $this->view->assign("realStatusList", $this->model->getRealStatusList());
         $this->view->assign("statusList", $this->model->getStatusList());
         $this->view->assign("hideIsFinishinfoList", $this->model->getHideIsFinishinfoList());
         $this->view->assign("isActiveList", $this->model->getIsActiveList());
-        $this->view->assign("isTuijianList", $this->model->getIsTuijianList());
+        $this->view->assign("openMatchVideoList", $this->model->getOpenMatchVideoList());
+        $this->view->assign("openMatchAudioList", $this->model->getOpenMatchAudioList());
         $this->view->assign("jinyantypeList", $this->model->getJinyantypeList());
+        $this->view->assign("isShouchongList", $this->model->getIsShouchongList());
     }
 
     public function import()
@@ -63,14 +65,14 @@ class User extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['userwallet'])
+                    ->with(['usergroup'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
             foreach ($list as $row) {
                 
-                $row->getRelation('userwallet')->visible(['money','gold','vip_endtime']);
+                $row->getRelation('usergroup')->visible(['name']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -1,70 +1,79 @@
 <?php
 
 return [
-    'Id'                     => 'ID',
-    'Intro_uid'              => '推荐人UID',
-    'Username'               => 'TK号',
-    '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'        => '审核驳回',
-    'Idcard_status 3'        => '被取消',
-    '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'           => '否',
-    'Ios_user_id'            => '苹果用户ID',
-    'Plat_unique_id'         => '设备唯一ID',
-    'Jinyantime'             => '禁言截止时间',
-    'Jinyantype'             => '禁言状态',
-    'Jinyantype 1'           => '不禁',
-    'Jinyantype 2'           => '限制时间',
-    'Jinyantype 3'           => '永久',
-    'Userwallet.money'       => '余额',
-    'Userwallet.gold'        => '金币',
-    'Userwallet.vip_endtime' => 'vip结束时间'
+    'Id'                   => 'ID',
+    'Group_id'             => '角色',
+    'Intro_uid'            => '超推上级UID',
+    'Agent_id'             => '一级代理ID',
+    'Yaoqingtime'          => '邀请时间',
+    'Invite_uid'           => '直推上级UID',
+    'Username'             => '用户名',
+    'Nickname'             => '昵称',
+    'Agentname'            => '代理名',
+    'Introcode'            => '邀请码',
+    'Mobile'               => '手机号',
+    'Avatar'               => '头像',
+    'Gender'               => '性别',
+    'Gender 1'             => '男',
+    'Gender 0'             => '女',
+    'Height'               => '身高',
+    'Weight'               => '体重',
+    'Birthday'             => '生日',
+    'Bio'                  => '个性签名',
+    'Audio_bio'            => '语音签名',
+    'Video_bio'            => '视频秀',
+    'Idcard_status'        => '实名认证',
+    'Idcard_status -1'     => '未申请',
+    'Idcard_status 0'      => '待审核',
+    'Idcard_status 1'      => '审核通过',
+    'Real_status'          => '真人认证',
+    'Real_status -1'       => '未申请',
+    'Real_status 0'        => '待审核',
+    'Real_status 1'        => '审核通过',
+    'Logintime'            => '登录时间',
+    'Loginip'              => '登录IP',
+    'Joinip'               => '加入IP',
+    'Jointime'             => '加入时间',
+    'Createtime'           => '创建时间',
+    'Token'                => 'Token',
+    'Status'               => '状态',
+    'Status 1'             => '正常',
+    'Status 0'             => '禁用',
+    'Status -1'            => '注销',
+    'Provincename'         => '省名',
+    'Cityname'             => '城市名',
+    'Photo_images'         => '相册',
+    'Hide_is_finishinfo'   => '是否完善资料',
+    'Hide_is_finishinfo 1' => '是',
+    'Hide_is_finishinfo 0' => '否',
+    'Wechat_openid'        => '微信openid',
+    'Is_active'            => '是否活跃',
+    'Is_active 1'          => '是',
+    'Is_active 0'          => '否',
+    'Ios_user_id'          => '苹果用户ID',
+    'Plat_unique_id'       => '设备唯一ID',
+    'Marital_id'           => '情感状况',
+    'Job_id'               => '职业',
+    'Wages_id'             => '收入',
+    'Suqiu_id'             => '交友诉求',
+    'Tag_ids'              => '我的标签',
+    'Hobby_ids'            => '喜欢类型',
+    'Open_match_video'     => '匹配视频开关',
+    'Open_match_video 1'   => '开',
+    'Open_match_video 0'   => '关',
+    'Open_match_audio'     => '匹配语音开关',
+    'Open_match_audio 1'   => '开',
+    'Open_match_audio 0'   => '关',
+    'Match_video_price'    => '视频金币价格',
+    'Match_audio_price'    => '语音金币价格',
+    'Match_typing_price'   => '文字金币价格',
+    'Jinyantime'           => '禁言截止时间',
+    'Jinyantype'           => '禁言状态',
+    'Jinyantype 1'         => '不禁',
+    'Jinyantype 2'         => '限制时间',
+    'Jinyantype 3'         => '永久',
+    'Is_shouchong'         => '完成首充',
+    'Is_shouchong 0'       => '没有',
+    'Is_shouchong 1'       => '完成',
+    'Usergroup.name'       => '角色'
 ];

application/admin/model/User.php

@@ -20,28 +20,31 @@ class User extends Model
 
     // 定义时间戳字段名
     protected $createTime = 'createtime';
-    protected $updateTime = 'updatetime';
+    protected $updateTime = false;
     protected $deleteTime = false;
 
     // 追加属性
     protected $append = [
+        'yaoqingtime_text',
         'gender_text',
         'idcard_status_text',
-        'prevtime_text',
+        'real_status_text',
         'logintime_text',
         'jointime_text',
         'status_text',
         'hide_is_finishinfo_text',
         'is_active_text',
-        'is_tuijian_text',
+        'open_match_video_text',
+        'open_match_audio_text',
         'jinyantime_text',
-        'jinyantype_text'
+        'jinyantype_text',
+        'is_shouchong_text'
     ];
     
 
     protected static function init()
     {
-        self::beforeUpdate(function ($row) {
+        /*self::beforeUpdate(function ($row) {
             $changed = $row->getChangedData();
             //如果有修改密码
             if (isset($changed['password'])) {
@@ -73,7 +76,7 @@ class User extends Model
                 }
             }
         });
-        /*self::beforeInsert(function ($row){
+        self::beforeInsert(function ($row){
             if (isset($row['password'])) {
                 if ($row['password']) {
                     $salt = \fast\Random::alnum();
@@ -117,7 +120,12 @@ class User extends Model
 
     public function getIdcardStatusList()
     {
-        return ['-1' => __('Idcard_status -1'), '0' => __('Idcard_status 0'), '1' => __('Idcard_status 1'), '2' => __('Idcard_status 2'), '3' => __('Idcard_status 3')];
+        return ['-1' => __('Idcard_status -1'), '0' => __('Idcard_status 0'), '1' => __('Idcard_status 1')];
+    }
+
+    public function getRealStatusList()
+    {
+        return ['-1' => __('Real_status -1'), '0' => __('Real_status 0'), '1' => __('Real_status 1')];
     }
 
     public function getStatusList()
@@ -135,9 +143,14 @@ class User extends Model
         return ['1' => __('Is_active 1'), '0' => __('Is_active 0')];
     }
 
-    public function getIsTuijianList()
+    public function getOpenMatchVideoList()
     {
-        return ['1' => __('Is_tuijian 1'), '0' => __('Is_tuijian 0')];
+        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 getJinyantypeList()
@@ -145,6 +158,18 @@ class User extends Model
         return ['1' => __('Jinyantype 1'), '2' => __('Jinyantype 2'), '3' => __('Jinyantype 3')];
     }
 
+    public function getIsShouchongList()
+    {
+        return ['0' => __('Is_shouchong 0'), '1' => __('Is_shouchong 1')];
+    }
+
+
+    public function getYaoqingtimeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['yaoqingtime']) ? $data['yaoqingtime'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
 
     public function getGenderTextAttr($value, $data)
     {
@@ -162,10 +187,11 @@ class User extends Model
     }
 
 
-    public function getPrevtimeTextAttr($value, $data)
+    public function getRealStatusTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['prevtime']) ? $data['prevtime'] : '');
-        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+        $value = $value ? $value : (isset($data['real_status']) ? $data['real_status'] : '');
+        $list = $this->getRealStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
     }
 
 
@@ -207,10 +233,18 @@ class User extends Model
     }
 
 
-    public function getIsTuijianTextAttr($value, $data)
+    public function getOpenMatchVideoTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['open_match_video']) ? $data['open_match_video'] : '');
+        $list = $this->getOpenMatchVideoList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getOpenMatchAudioTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['is_tuijian']) ? $data['is_tuijian'] : '');
-        $list = $this->getIsTuijianList();
+        $value = $value ? $value : (isset($data['open_match_audio']) ? $data['open_match_audio'] : '');
+        $list = $this->getOpenMatchAudioList();
         return isset($list[$value]) ? $list[$value] : '';
     }
 
@@ -229,7 +263,15 @@ class User extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
-    protected function setPrevtimeAttr($value)
+
+    public function getIsShouchongTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['is_shouchong']) ? $data['is_shouchong'] : '');
+        $list = $this->getIsShouchongList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+    protected function setYaoqingtimeAttr($value)
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
     }
@@ -246,12 +288,12 @@ class User extends Model
 
     protected function setJinyantimeAttr($value)
     {
-        return $value === '' ? 0 : ($value && !is_numeric($value) ? strtotime($value) : $value);
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
     }
 
 
-    public function userwallet()
+    public function usergroup()
     {
-        return $this->belongsTo('Userwallet', 'id', 'user_id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('UserGroup', 'group_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }

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

@@ -1,39 +1,57 @@
 <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">{:__('Group_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-group_id" data-rule="required" data-source="group/index" class="form-control selectpage" name="row[group_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Intro_uid')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-intro_uid" class="form-control" name="row[intro_uid]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Agent_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-username" class="form-control" name="row[username]" type="text" value="">
+            <input id="c-agent_id" data-rule="required" data-source="agent/index" class="form-control selectpage" name="row[agent_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Yaoqingtime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-nickname" class="form-control" name="row[nickname]" type="text" value="">
+            <input id="c-yaoqingtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[yaoqingtime]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Introcode')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Invite_uid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-introcode" class="form-control" name="row[introcode]" type="text" value="">
+            <input id="c-invite_uid" class="form-control" name="row[invite_uid]" type="number" value="0">
+        </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" class="form-control" name="row[username]" type="text" value="">
         </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">{:__('Nickname')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-password" class="form-control" name="row[password]" type="text" value="">
+            <input id="c-nickname" class="form-control" name="row[nickname]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Salt')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Agentname')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-salt" class="form-control" name="row[salt]" type="text" value="">
+            <input id="c-agentname" class="form-control" name="row[agentname]" type="text" value="">
+        </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">
@@ -60,9 +78,9 @@
         <label class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-gender" data-rule="required" min="0" class="form-control selectpicker" name="row[gender]">
+            <select  id="c-gender" data-rule="required" class="form-control selectpicker" name="row[gender]">
                 {foreach name="genderList" item="vo"}
-                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                    <option value="{$key}" {in name="key" value="-1"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
@@ -99,6 +117,12 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Video_bio')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-video_bio" class="form-control" name="row[video_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">
             
@@ -111,21 +135,15 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Successions')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_status')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-successions" min="0" class="form-control" name="row[successions]" type="number" value="1">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Maxsuccessions')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-maxsuccessions" min="0" class="form-control" name="row[maxsuccessions]" type="number" value="1">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Prevtime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-prevtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[prevtime]" type="text" value="{:date('Y-m-d H:i:s')}">
+            
+            <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">
@@ -141,12 +159,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Loginfailure')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-loginfailure" min="0" class="form-control" name="row[loginfailure]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Joinip')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-joinip" class="form-control" name="row[joinip]" type="text" value="">
@@ -177,21 +189,9 @@
         </div>
     </div>
     <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="">
-        </div>
-    </div>
-    <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="116.403909">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Provincename')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-latitude" class="form-control" name="row[latitude]" type="text" value="39.914133">
+            <input id="c-provincename" class="form-control" name="row[provincename]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -204,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" value="">
+                <input id="c-photo_images" class="form-control" size="50" name="row[photo_images]" type="textarea">
                 <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>
@@ -215,12 +215,6 @@
         </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">{:__('Hide_is_finishinfo')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
@@ -251,39 +245,93 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Attribute')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ios_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ios_user_id" data-rule="required" data-source="ios/user/index" class="form-control selectpage" name="row[ios_user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_unique_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_unique_id" data-rule="required" data-source="plat/unique/index" class="form-control selectpage" name="row[plat_unique_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">{:__('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">{:__('Wages_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-attribute" class="form-control" name="row[attribute]" type="text" value="">
+            <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">{:__('Shoesize')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Suqiu_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-shoesize" class="form-control" name="row[shoesize]" type="text" value="">
+            <input id="c-suqiu_id" data-rule="required" data-source="suqiu/index" class="form-control selectpage" name="row[suqiu_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_tuijian')}:</label>
+        <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">{:__('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">{:__('Open_match_video')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <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>
+            <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="1"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Ios_user_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Open_match_audio')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-ios_user_id" data-rule="required" data-source="ios/user/index" class="form-control selectpage" name="row[ios_user_id]" type="text" value="">
+                        
+            <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="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_unique_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Match_video_price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-plat_unique_id" data-rule="required" data-source="plat/unique/index" class="form-control selectpage" name="row[plat_unique_id]" type="text" value="">
+            <input id="c-match_video_price" data-rule="required" class="form-control" name="row[match_video_price]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Match_audio_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-match_audio_price" data-rule="required" class="form-control" name="row[match_audio_price]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Match_typing_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-match_typing_price" data-rule="required" class="form-control" name="row[match_typing_price]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
@@ -304,6 +352,18 @@
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_shouchong')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_shouchong" data-rule="required" class="form-control selectpicker" name="row[is_shouchong]">
+                {foreach name="isShouchongList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </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/edit.html

@@ -1,56 +1,66 @@
 <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">{:__('Intro_uid')}:</label>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Group_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-intro_uid" class="form-control" name="row[intro_uid]" type="number" value="{$row.intro_uid|htmlentities}">
+            <input id="c-group_id" data-rule="required" data-source="user/group/index" class="form-control selectpage" name="row[group_id]" type="text" value="{$row.group_id|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</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-username" disabled class="form-control" name="row[username]" type="text" value="{$row.username|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">{:__('Nickname')}:</label>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Agent_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-nickname" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
+            <input id="c-agent_id" class="form-control" name="row[agent_id]" type="number" value="{$row.agent_id|htmlentities}">
         </div>
-    </div>-->
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Introcode')}:</label>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Yaoqingtime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-introcode" class="form-control" name="row[introcode]" type="text" value="{$row.introcode|htmlentities}">
+            <input id="c-yaoqingtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[yaoqingtime]" type="text" value="{:$row.yaoqingtime?datetime($row.yaoqingtime):''}">
         </div>
-    </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">{:__('Invite_uid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-password" class="form-control" name="row[password]" type="text" value="">
-            不需要修改就不填
+            <input id="c-invite_uid" class="form-control" name="row[invite_uid]" type="number" value="{$row.invite_uid|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">{:__('Username')}:</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-username" class="form-control" disabled name="row[username]" type="text" value="{$row.username|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Mobile')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Nickname')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-mobile" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">
+            <input id="c-nickname" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Simplemobile')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Agentname')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-simplemobile" class="form-control" name="row[simplemobile]" type="text" value="{$row.simplemobile|htmlentities}">
-            必须和区号手机号同步,并去掉区号
+            <input id="c-agentname" class="form-control" name="row[agentname]" type="text" value="{$row.agentname|htmlentities}">
         </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="{$row.introcode|htmlentities}">
+        </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" data-rule="required" class="form-control" name="row[mobile]" type="text" value="{$row.mobile|htmlentities}">
+        </div>
+    </div>-->
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
@@ -63,8 +73,19 @@
             </div>
             <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
         </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">
+                        
+            <select  id="c-gender" data-rule="required" class="form-control selectpicker" name="row[gender]">
+                {foreach name="genderList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.gender"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
 
+        </div>
+    </div>
     <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Height')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -80,46 +101,52 @@
     <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 datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{:$row.birthday?datetime($row.birthday):''}">
+            <input id="c-birthday" class="form-control" name="row[birthday]" type="number" value="{$row.birthday|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-bio" class="form-control" name="row[bio]" type="text" value="{$row.bio|htmlentities}">
+        </div>
+    </div>
+    <!--<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" value="{$row.audio_bio|htmlentities}">
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Video_bio')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-video_bio" class="form-control" name="row[video_bio]" type="text" value="{$row.video_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">
             
             <div class="radio">
             {foreach name="idcardStatusList" item="vo"}
-            <label for="row[idcard_status]-{$key}"><input id="row[idcard_status]-{$key}" disabled name="row[idcard_status]" type="radio" value="{$key}" {in name="key" value="$row.idcard_status"}checked{/in} /> {$vo}</label>
+            <label for="row[idcard_status]-{$key}"><input id="row[idcard_status]-{$key}" name="row[idcard_status]" type="radio" value="{$key}" {in name="key" value="$row.idcard_status"}checked{/in} /> {$vo}</label> 
             {/foreach}
             </div>
 
         </div>
-    </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}">
-        </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Maxsuccessions')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Real_status')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-maxsuccessions" min="0" class="form-control" name="row[maxsuccessions]" type="number" value="{$row.maxsuccessions|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Prevtime')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-prevtime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[prevtime]" type="text" value="{:$row.prevtime?datetime($row.prevtime):''}">
+            
+            <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">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Logintime')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-logintime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[logintime]" type="text" value="{:$row.logintime?datetime($row.logintime):''}">
@@ -132,12 +159,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Loginfailure')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-loginfailure" min="0" class="form-control" name="row[loginfailure]" type="number" value="{$row.loginfailure|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Joinip')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-joinip" class="form-control" name="row[joinip]" type="text" value="{$row.joinip|htmlentities}">
@@ -168,21 +189,9 @@
         </div>
     </div>
     <!--<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}">
-        </div>
-    </div>
-    <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="{$row.longitude|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Latitude')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Provincename')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-latitude" class="form-control" name="row[latitude]" type="text" value="{$row.latitude|htmlentities}">
+            <input id="c-provincename" class="form-control" name="row[provincename]" type="text" value="{$row.provincename|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -191,11 +200,18 @@
             <input id="c-cityname" class="form-control" name="row[cityname]" type="text" value="{$row.cityname|htmlentities}">
         </div>
     </div>-->
-    <!--
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Tag_ids')}:</label>
+    <!--<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">
-            <input id="c-tag_ids" data-rule="required" data-source="tag/index" data-multipart="true" data-multiple="true" class="form-control selectpage" name="row[tag_ids]" type="text" value="{$row.tag_ids|htmlentities}">
+            <div class="input-group">
+                <input id="c-photo_images" class="form-control" size="50" name="row[photo_images]" type="textarea" value="{$row.photo_images|htmlentities}">
+                <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>
+                </div>
+                <span class="msg-box n-right" for="c-photo_images"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-photo_images"></ul>
         </div>
     </div>-->
     <!--<div class="form-group">
@@ -209,8 +225,8 @@
             </select>
 
         </div>
-    </div>
-    <div class="form-group">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Wechat_openid')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-wechat_openid" data-rule="required" class="form-control" name="row[wechat_openid]" type="text" value="{$row.wechat_openid|htmlentities}">
@@ -227,99 +243,127 @@
             </select>
 
         </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Ios_user_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-ios_user_id" data-rule="required" data-source="ios/user/index" class="form-control selectpage" name="row[ios_user_id]" type="text" value="{$row.ios_user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_unique_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-plat_unique_id" data-rule="required" data-source="plat/unique/index" class="form-control selectpage" name="row[plat_unique_id]" type="text" value="{$row.plat_unique_id|htmlentities}">
+        </div>
     </div>-->
     <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Attribute')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Marital_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-attribute" class="form-control" name="row[attribute]" type="text" value="{$row.attribute|htmlentities}">
+            <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">{:__('Shoesize')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Job_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-shoesize" class="form-control" name="row[shoesize]" type="text" value="{$row.shoesize|htmlentities}">
+            <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>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_tuijian')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Wages_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-                        
-            <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>
-
+            <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">{:__('Ios_user_id')}:</label>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Suqiu_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-ios_user_id" data-rule="required" data-source="ios/user/index" class="form-control selectpage" name="row[ios_user_id]" type="text" value="{$row.ios_user_id|htmlentities}">
+            <input id="c-suqiu_id" data-rule="required" data-source="suqiu/index" class="form-control selectpage" name="row[suqiu_id]" type="text" value="{$row.suqiu_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Plat_unique_id')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Tag_ids')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-plat_unique_id" data-rule="required" data-source="plat/unique/index" class="form-control selectpage" name="row[plat_unique_id]" type="text" value="{$row.plat_unique_id|htmlentities}">
+            <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="{$row.tag_ids|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jinyantype')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Hobby_ids')}:</label>
         <div class="col-xs-12 col-sm-8">
-
-            <div class="radio">
-                {foreach name="jinyantypeList" item="vo"}
-                <label for="row[jinyantype]-{$key}"><input id="row[jinyantype]-{$key}" name="row[jinyantype]" type="radio" value="{$key}" {in name="key" value="$row.jinyantype"}checked{/in} /> {$vo}</label>
+            <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">{:__('Open_match_video')}:</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>
                 {/foreach}
-            </div>
+            </select>
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Open_match_audio')}:</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>
 
+        </div>
+    </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Jinyantime')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Match_video_price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-jinyantime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[jinyantime]" type="text" value="{:$row.jinyantime?datetime($row.jinyantime):''}">
+            <input id="c-match_video_price" data-rule="required" class="form-control" name="row[match_video_price]" type="number" value="{$row.match_video_price|htmlentities}">
         </div>
     </div>
-
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Match_audio_price')}:</label>
         <div class="col-xs-12 col-sm-8">
-
-            <select  id="c-gender" data-rule="required" min="0" class="form-control selectpicker" name="row[gender]">
-                {foreach name="genderList" item="vo"}
-                <option value="{$key}" {in name="key" value="$row.gender"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
+            <input id="c-match_audio_price" data-rule="required" class="form-control" name="row[match_audio_price]" type="number" value="{$row.match_audio_price|htmlentities}">
         </div>
     </div>
-
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Match_typing_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-match_typing_price" data-rule="required" class="form-control" name="row[match_typing_price]" type="number" value="{$row.match_typing_price|htmlentities}">
+        </div>
+    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jinyantime')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <textarea id="c-bio" class="form-control" rows="5" name="row[bio]" cols="50">{$row.bio|htmlentities}</textarea>
+            <input id="c-jinyantime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[jinyantime]" type="text" value="{:$row.jinyantime?datetime($row.jinyantime):''}">
         </div>
     </div>
-
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Photo_images')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jinyantype')}:</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" value="{$row.photo_images|htmlentities}">
-                <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>
-                </div>
-                <span class="msg-box n-right" for="c-photo_images"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-photo_images"></ul>
+                        
+            <select  id="c-jinyantype" data-rule="required" class="form-control selectpicker" name="row[jinyantype]">
+                {foreach name="jinyantypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.jinyantype"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
+    <!--<div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_shouchong')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_shouchong" data-rule="required" class="form-control selectpicker" name="row[is_shouchong]">
+                {foreach name="isShouchongList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_shouchong"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
 
+        </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="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>
+                                <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>
                             </ul>
-                        </div>
+                        </div>-->
 
                         
                     </div>

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

@@ -25,15 +25,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id'),sortable:true},
-//                        {field: 'intro_uid', title: __('Intro_uid')},
-                        {field: 'username', title: __('Username'), operate: 'LIKE',sortable:true},
+                        {field: 'id', title: __('Id')},
+//                        {field: 'group_id', title: __('Group_id')},
+                        {field: 'usergroup.name', title: __('Usergroup.name'), operate: 'LIKE'},
+                        {field: 'intro_uid', title: __('Intro_uid')},
+                        {field: 'agent_id', title: __('Agent_id')},
+                        {field: 'yaoqingtime', title: __('Yaoqingtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'invite_uid', title: __('Invite_uid')},
+                        {field: 'username', title: __('Username'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
+                        {field: 'agentname', title: __('Agentname'), 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: 'simplemobile', title: __('Simplemobile'), operate: 'LIKE'},
                         {field: 'avatar', title: __('Avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'gender', title: __('Gender'), searchList: {"1":__('Gender 1'),"0":__('Gender 0')}, formatter: Table.api.formatter.normal},
 //                        {field: 'height', title: __('Height'), operate: 'LIKE'},
@@ -41,39 +44,37 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {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'),"3":__('Idcard_status 3')}, 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'),sortable:true, operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
-//                        {field: 'loginfailure', title: __('Loginfailure')},
+//                        {field: 'video_bio', title: __('Video_bio'), operate: 'LIKE'},
+                        {field: 'idcard_status', title: __('Idcard_status'), searchList: {"-1":__('Idcard_status -1'),"0":__('Idcard_status 0'),"1":__('Idcard_status 1')}, formatter: Table.api.formatter.status},
+                        {field: 'real_status', title: __('Real_status'), searchList: {"-1":__('Real_status -1'),"0":__('Real_status 0'),"1":__('Real_status 1')}, formatter: Table.api.formatter.status},
+//                        {field: 'logintime', title: __('Logintime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'loginip', title: __('Loginip'), operate: 'LIKE'},
 //                        {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: 'provincename', title: __('Provincename'), 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: 'ios_user_id', title: __('Ios_user_id'), operate: 'LIKE'},
-                        {field: 'plat_unique_id', title: __('Plat_unique_id'), operate: 'LIKE'},
-                        {field: 'jinyantype', title: __('Jinyantype'), searchList: {"1":__('Jinyantype 1'),"2":__('Jinyantype 2'),"3":__('Jinyantype 3')}, formatter: Table.api.formatter.normal},
+//                        {field: 'plat_unique_id', title: __('Plat_unique_id'), operate: 'LIKE'},
+//                        {field: 'marital_id', title: __('Marital_id'), operate: 'LIKE'},
+//                        {field: 'job_id', title: __('Job_id'), operate: 'LIKE'},
+//                        {field: 'wages_id', title: __('Wages_id'), operate: 'LIKE'},
+//                        {field: 'suqiu_id', title: __('Suqiu_id'), operate: 'LIKE'},
+//                        {field: 'tag_ids', title: __('Tag_ids'), operate: 'LIKE'},
+//                        {field: 'hobby_ids', title: __('Hobby_ids'), operate: 'LIKE'},
+//                        {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: 'match_video_price', title: __('Match_video_price')},
+//                        {field: 'match_audio_price', title: __('Match_audio_price')},
+//                        {field: 'match_typing_price', title: __('Match_typing_price')},
                         {field: 'jinyantime', title: __('Jinyantime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'userwallet.money', title: __('Userwallet.money'), operate:'BETWEEN'},
-                        {field: 'userwallet.gold', title: __('Userwallet.gold')},
-//                        {field: 'userwallet.vip_endtime', title: __('Userwallet.vip_endtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-
+                        {field: 'jinyantype', title: __('Jinyantype'), searchList: {"1":__('Jinyantype 1'),"2":__('Jinyantype 2'),"3":__('Jinyantype 3')}, formatter: Table.api.formatter.normal},
+//                        {field: 'is_shouchong', title: __('Is_shouchong'), searchList: {"0":__('Is_shouchong 0'),"1":__('Is_shouchong 1')}, formatter: Table.api.formatter.normal},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]