后台用户列表总收入修改

@@ -49,9 +49,8 @@ class UsersController extends AdminBaseController{
             $list[$k]['invite_nickname'] = $invite_nickname;
             $list[$k]['invite_nickname'] = $invite_nickname;
             // 获取提现数据
             // 获取提现数据
             $ti_count = Db::name('money_expend')->where('uid',$v['uid'])->where('state',1)->sum('money');// 已提金额
             $ti_count = Db::name('money_expend')->where('uid',$v['uid'])->where('state',1)->sum('money');// 已提金额
-//            $unti_count = Db::name('money_expend')->where('uid',$v['uid'])->where('state',0)->sum('money');// 提现审核中金额
             $list[$k]['ti_count'] = $ti_count;
             $list[$k]['ti_count'] = $ti_count;
-            $list[$k]['all_count'] = $ti_count + $v['balance'];
+            $list[$k]['all_count'] = Db::name('money_income')->where('uid',$v['uid'])->sum('money');
             // 获取邀请人数
             // 获取邀请人数
             $invite_count = 0;
             $invite_count = 0;
             if(in_array($v['status'],[2,3])) {
             if(in_array($v['status'],[2,3])) {
@@ -176,7 +175,7 @@ class UsersController extends AdminBaseController{
     public function users_money(){
     public function users_money(){
 
 
         $uid = $this -> request -> param();
         $uid = $this -> request -> param();
-        $data = Db::name('money_income') -> where('uid',$uid['uid'])->order('create_time','DESC') -> select() -> toArray();
+        $data = Db::name('money_income')->where('uid',$uid['uid'])->order('create_time','DESC')->select()->toArray();
         if(!empty($data)){
         if(!empty($data)){
             foreach ($data as $key => $val){
             foreach ($data as $key => $val){
                 if($val['type'] == 2){
                 if($val['type'] == 2){