Browse Source

代理单独一个列表

lizhen_gitee 11 months ago
parent
commit
3e96cb00a9

+ 35 - 0
application/admin/controller/Agent.php

@@ -46,4 +46,39 @@ class Agent 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(['usergroup','userwallet'])
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                
+                $row->getRelation('usergroup')->visible(['name']);
+				$row->getRelation('userwallet')->visible(['agentjewel','status']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
 }

+ 87 - 82
application/admin/lang/zh-cn/agent.php

@@ -1,86 +1,91 @@
 <?php
 
 return [
-    'Id'                   => 'ID',
-    'Group_id'             => '角色id',
-    'Intro_uid'            => '超推上级UID',
-    'Agent_id'             => '一级代理ID',
-    'Yaoqingtime'          => '邀请时间',
-    'Invite_uid'           => '直推上级UID',
-    'Username'             => '用户名',
-    'Nickname'             => '昵称',
-    'Agentname'            => '代理名',
-    'Introcode'            => '邀请码',
-    'Mobile'               => '手机号',
-    'Avatar'               => '头像',
-    'Gender'               => '性别',
-    'Gender -1'            => '未知',
-    'Gender 1'             => '男',
-    'Gender 0'             => '女',
-    'Height'               => '身高',
-    'Weight'               => '体重',
-    'Birthday'             => '生日',
-    'Bio'                  => '个性签名',
-    'Audio_bio'            => '语音签名',
-    'Video_bio'            => '视频秀',
-    'Idcard_status'        => '实名认证',
-    'Idcard_status -1'     => '未申请',
-    'Idcard_status 0'      => '待审核',
-    'Idcard_status 1'      => '审核通过',
-    'Idcard_status 2'      => '审核驳回',
-    'Real_status'          => '真人认证',
-    'Real_status -1'       => '未申请',
-    'Real_status 0'        => '待审核',
-    'Real_status 1'        => '审核通过',
-    'Real_status 2'        => '审核驳回',
-    '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_from'            => '登录设备系统',
-    'Plat_unique_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'       => '完成',
-    'Wealth_level'         => '财富等级',
-    'Wealth_value'         => '财富值',
-    'Charm_level'          => '魅力等级',
-    'Charm_value'          => '魅力值'
+    'Id'                    => 'ID',
+    'Group_id'              => '角色id',
+    'Intro_uid'             => '超推上级UID',
+    'Agent_id'              => '一级代理ID',
+    'Yaoqingtime'           => '邀请时间',
+    'Invite_uid'            => '直推上级UID',
+    'Username'              => '用户名',
+    'Nickname'              => '昵称',
+    'Agentname'             => '代理名',
+    'Introcode'             => '邀请码',
+    'Mobile'                => '手机号',
+    'Avatar'                => '头像',
+    'Gender'                => '性别',
+    'Gender -1'             => '未知',
+    'Gender 1'              => '男',
+    'Gender 0'              => '女',
+    'Height'                => '身高',
+    'Weight'                => '体重',
+    'Birthday'              => '生日',
+    'Bio'                   => '个性签名',
+    'Audio_bio'             => '语音签名',
+    'Video_bio'             => '视频秀',
+    'Idcard_status'         => '实名认证',
+    'Idcard_status -1'      => '未申请',
+    'Idcard_status 0'       => '待审核',
+    'Idcard_status 1'       => '审核通过',
+    'Idcard_status 2'       => '审核驳回',
+    'Real_status'           => '真人认证',
+    'Real_status -1'        => '未申请',
+    'Real_status 0'         => '待审核',
+    'Real_status 1'         => '审核通过',
+    'Real_status 2'         => '审核驳回',
+    '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_from'             => '登录设备系统',
+    'Plat_unique_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'        => '完成',
+    'Wealth_level'          => '财富等级',
+    'Wealth_value'          => '财富值',
+    'Charm_level'           => '魅力等级',
+    'Charm_value'           => '魅力值',
+    'Usergroup.name'        => '组名',
+    'Userwallet.agentjewel' => '代理收益账户',
+    'Userwallet.status'     => '资金状态',
+    'Userwallet.status 1'   => '正常',
+    'Userwallet.status 2'   => '冻结'
 ];

+ 10 - 0
application/admin/model/Agent.php

@@ -222,4 +222,14 @@ class Agent extends Model
     }
 
 
+    public function usergroup()
+    {
+        return $this->belongsTo('UserGroup', 'group_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+
+    public function userwallet()
+    {
+        return $this->belongsTo('Userwallet', 'id', 'user_id', [], 'LEFT')->setEagerlyType(0);
+    }
 }

+ 33 - 33
application/admin/view/agent/edit.html

@@ -3,7 +3,7 @@
     <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="{$row.group_id|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 class="form-group">
@@ -24,13 +24,13 @@
             <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 class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Invite_uid')}:</label>
         <div class="col-xs-12 col-sm-8">
             <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">
+    </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="{$row.username|htmlentities}">
@@ -41,26 +41,26 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-nickname" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Agentname')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-agentname" class="form-control" name="row[agentname]" type="text" value="{$row.agentname|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<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">
+    </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">
+    </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">
@@ -73,8 +73,8 @@
             </div>
             <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
         </div>
-    </div>
-    <div class="form-group">
+    </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">
                         
@@ -85,8 +85,8 @@
             </select>
 
         </div>
-    </div>
-    <div class="form-group">
+    </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">
             <input id="c-height" class="form-control" name="row[height]" type="text" value="{$row.height|htmlentities}">
@@ -133,8 +133,8 @@
             </div>
 
         </div>
-    </div>
-    <div class="form-group">
+    </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">
             
@@ -145,8 +145,8 @@
             </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):''}">
@@ -175,8 +175,8 @@
         <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 class="form-group">
+    </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">
             
@@ -187,8 +187,8 @@
             </div>
 
         </div>
-    </div>
-    <div class="form-group">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Provincename')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-provincename" class="form-control" name="row[provincename]" type="text" value="{$row.provincename|htmlentities}">
@@ -225,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}">
@@ -261,8 +261,8 @@
         <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">
+    </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}">
@@ -297,8 +297,8 @@
         <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">
+    </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">
                         
@@ -339,8 +339,8 @@
         <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">
+    </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">
             <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):''}">
@@ -369,8 +369,8 @@
             </select>
 
         </div>
-    </div>
-    <div class="form-group">
+    </div>-->
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Wealth_level')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-wealth_level" class="form-control" name="row[wealth_level]" type="number" value="{$row.wealth_level|htmlentities}">
@@ -393,7 +393,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-charm_value" class="form-control" name="row[charm_value]" type="number" value="{$row.charm_value|htmlentities}">
         </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">

+ 2 - 2
application/admin/view/agent/index.html

@@ -17,7 +17,7 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('agent/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('agent/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('agent/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('agent/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('agent/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>
@@ -28,7 +28,7 @@
                                 <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>

+ 48 - 44
public/assets/js/backend/agent.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'agent/index' + location.search,
                     add_url: 'agent/add',
                     edit_url: 'agent/edit',
-                    del_url: 'agent/del',
+//                    del_url: 'agent/del',
                     multi_url: 'agent/multi',
                     import_url: 'agent/import',
                     table: 'user',
@@ -26,11 +26,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'group_id', title: __('Group_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: 'invite_uid', title: __('Invite_uid')},
                         {field: 'username', title: __('Username'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
                         {field: 'agentname', title: __('Agentname'), operate: 'LIKE'},
@@ -38,47 +40,49 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'mobile', title: __('Mobile'), 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'),"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: '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'),"2":__('Idcard_status 2')}, formatter: Table.api.formatter.status},
-                        {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: '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: '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: 'provincename', title: __('Provincename'), operate: 'LIKE'},
-                        {field: 'cityname', title: __('Cityname'), 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: 'ios_user_id', title: __('Ios_user_id'), operate: 'LIKE'},
-                        {field: 'plat_from', title: __('Plat_from'), operate: 'LIKE'},
-                        {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: '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: 'wealth_level', title: __('Wealth_level')},
-                        {field: 'wealth_value', title: __('Wealth_value')},
-                        {field: 'charm_level', title: __('Charm_level')},
-                        {field: 'charm_value', title: __('Charm_value')},
+//                        {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: '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'),"2":__('Idcard_status 2')}, formatter: Table.api.formatter.status},
+//                        {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: '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: '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: 'provincename', title: __('Provincename'), operate: 'LIKE'},
+//                        {field: 'cityname', title: __('Cityname'), 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: 'ios_user_id', title: __('Ios_user_id'), operate: 'LIKE'},
+//                        {field: 'plat_from', title: __('Plat_from'), operate: 'LIKE'},
+//                        {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: '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: 'wealth_level', title: __('Wealth_level')},
+//                        {field: 'wealth_value', title: __('Wealth_value')},
+//                        {field: 'charm_level', title: __('Charm_level')},
+//                        {field: 'charm_value', title: __('Charm_value')},
+                        {field: 'userwallet.agentjewel', title: __('Userwallet.agentjewel'), operate:'BETWEEN'},
+//                        {field: 'userwallet.status', title: __('Userwallet.status')},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

+ 3 - 3
public/assets/js/backend/user/user.js

@@ -28,9 +28,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {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: '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'},