zac3533 1 jaar geleden
bovenliggende
commit
2e674f16d4
2 gewijzigde bestanden met toevoegingen van 11 en 11 verwijderingen
  1. 1 3
      application/admin/controller/user/User.php
  2. 10 8
      public/assets/js/backend/user/user.js

+ 1 - 3
application/admin/controller/user/User.php

@@ -50,7 +50,7 @@ class User extends Backend
             }
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
-            $list = $this->model
+            $list = $this->model->with('parent')
                 ->where($where)
                 ->order($sort, $order)
                 ->paginate($limit);
@@ -59,8 +59,6 @@ class User extends Backend
             $out = model('MoneyOut');
             $path= model('UsersPath');
             foreach ($list as &$item) {
-                $item->parent_name = $this->model::where('id', $item->parent_id)->value('mobile');
-
                 $item->agent = $this->model
                     ->where('id', '=',
                         $path->where('user_id', $item->id)->where('is_agent', 1)->order('distance', 'desc')->value('parent_id')

+ 10 - 8
public/assets/js/backend/user/user.js

@@ -8,6 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'user/user/index',
                     edit_url: 'user/user/edit',
                     del_url: 'user/user/del',
+                    multi_url: 'user/user/multi',
                     balance_url: 'user/user/balance',
                     cardslip_url: 'user/user/cardslip',
                     collection_url: 'user/user/collection',
@@ -20,8 +21,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             // 初始化表格
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
-                pk: 'a.id',
-                sortName: 'a.id',
+                pk: 'id',
+                sortName: 'id',
                 columns: [
                     [
                         {checkbox: true},
@@ -29,15 +30,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
                         {field: 'agent', title: __('Group_id'), operate: false},
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE'},
-                        {field: 'parent_name', title: __('Parent_id'), operate: false},
+                        {field: 'parent.mobile', title: __('Parent_id'), operate: false},
                         {field: 'balance', title: __('Balance'), operate: false},
                         {field: 'freeze', title: __('Freeze'), operate: false},
                         {field: 'task_num', title: __('Task'), operate: false},
-
-                        {field: 'id', title: __('Recharge'), operate: false},
-                        {field: 'id', title: __('Withdrawal'), operate: false},
-                        {field: 'id', title: __('Income'), operate: false},
-
+                        {field: 'recharge', title: __('Recharge'), operate: false},
+                        {field: 'withdraw', title: __('Withdrawal'), operate: false},
+                        {field: 'id', title: __('Income'), operate: false, formatter: function(value, row, index) {
+                            var income = row.withdraw - row.recharge;
+                            return income < 0?0:income;
+                        }},
                         {field: 'invitation_code', title: __('Invitation_code'), operate: false},
                         {field: 'is_agent', title: __('Is_agent'), searchList: {1: __('Yes'), 0: __('No')}, formatter: Table.api.formatter.status},