lizhen_gitee před 1 rokem
rodič
revize
37050d5441

+ 34 - 0
application/admin/controller/user/User.php

@@ -46,4 +46,38 @@ class User extends Backend
      */
     
 
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage,则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                    ->with(['userwallet'])
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                
+                $row->getRelation('userwallet')->visible(['money','gold','vip_endtime']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
 }

+ 65 - 64
application/admin/lang/zh-cn/user/user.php

@@ -1,68 +1,69 @@
 <?php
 
 return [
-    'Id'                   => 'ID',
-    'Intro_uid'            => '推荐人UID',
-    'Username'             => '用户名',
-    'Nickname'             => '昵称',
-    'Introcode'            => '邀请码',
-    'Password'             => '密码',
-    'Salt'                 => '密码盐',
-    'Mobile'               => '手机号',
-    'Avatar'               => '头像',
-    'Gender'               => '性别',
-    'Gender 1'             => '男',
-    'Gender 0'             => '女',
-    'Height'               => '身高',
-    'Weight'               => '体重',
-    'Birthday'             => '生日',
-    'Bio'                  => '个性签名',
-    'Audio_bio'            => '语音签名',
-    'Idcard_status'        => '实名认证',
-    'Idcard_status -1'     => '未申请',
-    'Idcard_status 0'      => '待审核',
-    'Idcard_status 1'      => '审核通过',
-    'Idcard_status 2'      => '审核驳回',
-    'Successions'          => '连续登录天数',
-    'Maxsuccessions'       => '最大连续登录天数',
-    'Prevtime'             => '上次登录时间',
-    'Logintime'            => '登录时间',
-    'Loginip'              => '登录IP',
-    'Loginfailure'         => '失败次数',
-    'Joinip'               => '加入IP',
-    'Jointime'             => '加入时间',
-    'Createtime'           => '创建时间',
-    'Updatetime'           => '更新时间',
-    'Token'                => 'Token',
-    'Status'               => '状态',
-    'Status 1'             => '正常',
-    'Status 0'             => '禁用',
-    'Status -1'            => '注销',
-    'Verification'         => '验证',
-    'Longitude'            => '经度',
-    'Latitude'             => '纬度',
-    'Cityname'             => '即时城市名',
-    'Photo_images'         => '相册',
-    'Tag_ids'              => '标签ids',
-    'Hide_is_finishinfo'   => '是否完善资料',
-    'Hide_is_finishinfo 1' => '是',
-    'Hide_is_finishinfo 0' => '否',
-    'Wechat_openid'        => '微信openid',
-    'Is_active'            => '是否活跃',
-    'Is_active 1'          => '是',
-    'Is_active 0'          => '否',
-    'Attribute'            => '属性',
-    'Shoesize'             => '鞋码',
-    'Is_tuijian'           => '首页推荐',
-    'Is_tuijian 1'         => '是',
-    'Is_tuijian 0'         => '否',
-    'plat_unique_id'       => '设备唯一ID',
-    'jinyantime'           => '禁言截止时间',
-    'Ios_user_id'          => '苹果用户ID',
-    'Plat_unique_id'       => '设备唯一ID',
-    'Jinyantime'           => '禁言截止时间',
-    'Jinyantype'           => '禁言状态',
-    'Jinyantype 1'         => '不禁',
-    'Jinyantype 2'         => '限制时间',
-    'Jinyantype 3'         => '永久'
+    'Id'                     => 'ID',
+    'Intro_uid'              => '推荐人UID',
+    'Username'               => '用户名',
+    'Nickname'               => '昵称',
+    'Introcode'              => '邀请码',
+    'Password'               => '密码',
+    'Salt'                   => '密码盐',
+    'Mobile'                 => '手机号',
+    'Avatar'                 => '头像',
+    'Gender'                 => '性别',
+    'Gender 1'               => '男',
+    'Gender 0'               => '女',
+    'Height'                 => '身高',
+    'Weight'                 => '体重',
+    'Birthday'               => '生日',
+    'Bio'                    => '个性签名',
+    'Audio_bio'              => '语音签名',
+    'Idcard_status'          => '实名认证',
+    'Idcard_status -1'       => '未申请',
+    'Idcard_status 0'        => '待审核',
+    'Idcard_status 1'        => '审核通过',
+    'Idcard_status 2'        => '审核驳回',
+    'Successions'            => '连续登录天数',
+    'Maxsuccessions'         => '最大连续登录天数',
+    'Prevtime'               => '上次登录时间',
+    'Logintime'              => '登录时间',
+    'Loginip'                => '登录IP',
+    'Loginfailure'           => '失败次数',
+    'Joinip'                 => '加入IP',
+    'Jointime'               => '加入时间',
+    'Createtime'             => '创建时间',
+    'Updatetime'             => '更新时间',
+    'Token'                  => 'Token',
+    'Status'                 => '状态',
+    'Status 1'               => '正常',
+    'Status 0'               => '禁用',
+    'Status -1'              => '注销',
+    'Verification'           => '验证',
+    'Longitude'              => '经度',
+    'Latitude'               => '纬度',
+    'Cityname'               => '即时城市名',
+    'Photo_images'           => '相册',
+    'Tag_ids'                => '标签ids',
+    'Hide_is_finishinfo'     => '是否完善资料',
+    'Hide_is_finishinfo 1'   => '是',
+    'Hide_is_finishinfo 0'   => '否',
+    'Wechat_openid'          => '微信openid',
+    'Is_active'              => '是否活跃',
+    'Is_active 1'            => '是',
+    'Is_active 0'            => '否',
+    'Attribute'              => '属性',
+    'Shoesize'               => '鞋码',
+    'Is_tuijian'             => '首页推荐',
+    'Is_tuijian 1'           => '是',
+    'Is_tuijian 0'           => '否',
+    'Ios_user_id'            => '苹果用户ID',
+    'Plat_unique_id'         => '设备唯一ID',
+    'Jinyantime'             => '禁言截止时间',
+    'Jinyantype'             => '禁言状态',
+    'Jinyantype 1'           => '不禁',
+    'Jinyantype 2'           => '限制时间',
+    'Jinyantype 3'           => '永久',
+    'Userwallet.money'       => '余额',
+    'Userwallet.gold'        => '金币',
+    'Userwallet.vip_endtime' => 'vip结束时间'
 ];

+ 4 - 0
application/admin/model/User.php

@@ -249,4 +249,8 @@ class User extends Model
     }
 
 
+    public function userwallet()
+    {
+        return $this->belongsTo('UserWallet', 'id', 'user_id', [], 'LEFT')->setEagerlyType(0);
+    }
 }

+ 5 - 1
public/assets/js/backend/user/user.js

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'user/user/index' + location.search,
                     add_url: 'user/user/add',
                     edit_url: 'user/user/edit',
-//                    del_url: 'user/user/del',
+                    del_url: 'user/user/del',
                     multi_url: 'user/user/multi',
                     import_url: 'user/user/import',
                     table: 'user',
@@ -69,6 +69,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {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: '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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]