commit

app/admin/model/user/User.php

@@ -651,7 +651,7 @@ class User extends BaseModel
         $models = self::setWherePage(self::alias('A'), $where, [], ['A.nickname', 'A.uid'])
             ->leftjoin('user_bill B', 'B.uid=A.uid')
             ->group('A.uid')
-            ->where('B.type', 'in','brokerage,push,sale,jt_push,zt_sale')
+            ->where('B.type', 'in','brokerage,push,sale,jt_push,zt_sale,bonus,team')
             ->where('B.category', 'now_money')
             ->field('sum(B.number) as sum_number,A.nickname,A.uid,A.now_money,A.brokerage_price');
         if ($where['order'] == '') {

app/admin/model/user/UserBill.php

@@ -127,7 +127,7 @@ class UserBill extends BaseModel
     public static function getFanList($where){
         $list=self::alias('a')->join('user r','a.uid=r.uid')
             ->where('a.category','now_money')
-            ->where('a.type', 'in','brokerage,push,sale,jt_push,zt_sale')
+            ->where('a.type', 'in','brokerage,push,sale,jt_push,zt_sale,team,bonus')
             ->where('a.pm', 1)
             ->order('a.number desc')
             ->join('store_order o','o.id=a.link_id')
@@ -179,7 +179,7 @@ class UserBill extends BaseModel
     }
     //设置单个用户查询
     public static function setOneWhere($where,$uid){
-        $model=self::where('uid', $uid)->where('category', 'now_money')->where('type', 'in', 'brokerage,push,sale,jt_push,zt_sale');
+        $model=self::where('uid', $uid)->where('category', 'now_money')->where('type', 'in', 'brokerage,push,sale,jt_push,zt_sale,team,bonus');
         $time['data'] = '';
         if(strlen(trim($where['start_time'])) && strlen(trim($where['end_time']))){
             $time['data'] = $where['start_time'].' - '.$where['end_time'];

app/admin/view/user/achievement/details.php

@@ -133,7 +133,7 @@
     layList.tableList('List', "{:Url('details_list')}?id="+id, function () {
         return [
             {type: 'checkbox'},
-            {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
+            {field: 'id', title: 'ID', sort: true, event: 'id', width: '10%', templet: '#id'},
             {field: 'order_id', title: '订单号',  align: 'center'},
             {field: 'uid', title: '购买用户uid', align: 'center'},
             {field: 'price', title: '订单产生奖励', align: 'center'},