pc

application/admin/controller/seller/MyTeam.php

@@ -22,29 +22,21 @@ class MyTeam extends Backend
                 $list=OrderInfo::whereExists(
                     Orders::whereRaw("orders.id=order_info.order_id and admin_id={$this->admin('id')}")->buildSql()
                 )
-                    ->group('category_id,order_id')
-                    ->field('count(order_id) as num,category_name')
-                    ->order('num','desc')
-                    ->paginate($limit);
+                    ->group('category_id')
+                    ->field('count(order_id) as num,group_concat(order_id) as order_ids,category_name,category_id')
+                    ->select();
             }else{
                 $list=OrderInfo::whereExists(
                     Orders::whereRaw("orders.id=order_info.order_id and admin_id={$this->admin('id')}")->buildSql()
                 )
-                    ->group('category_id,order_id')
-                    ->field('sum(amount_pay) as num,category_name')
+                    ->group('category_id')
+                    ->field('sum(amount_pay) as num,category_name,category_id')
                     ->order('num','desc')
-                    ->paginate($limit);
-            }
-            $offset=input('offset',0);
-            $limit=input('limit',20);
-            $page=$offset/$limit+1;
-            $index=$list->listRows()*$list->currentPage()-$list->listRows();
-            foreach ($list as $idx=>&$item){
-                $item['rank']=$index+$idx+1;
+                    ->select();
             }
             return json([
-                'rows'=>$list->items(),
-                'total'=>$list->total(),
+                'rows'=>$list,
+                'total'=>count($list),
             ]);
         }
         $this->assign('date',$date);

public/assets/js/backend/seller/my_team.js

@@ -18,8 +18,8 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                 columns: [
                     [
                         {field: 'rank', title: __('排名'), operate: false,},
-                        {field: 'nickname', title: __('销售人'), operate: false,},
-                        {field: 'amount', title: __('销售额'), operate: false,},
+                        {field: 'category_name', title: __('名称'), operate: false,},
+                        {field: 'num', title: __('数量'), operate: false,},
                     ]
                 ]
             });
@@ -34,8 +34,8 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'table', 'echarts', 'echart
                 columns: [
                     [
                         {field: 'rank', title: __('排名'), operate: false,},
-                        {field: 'nickname', title: __('销售人'), operate: false,},
-                        {field: 'amount', title: __('提成额'), operate: false,},
+                        {field: 'category_name', title: __('销售人'), operate: false,},
+                        {field: 'num', title: __('金额'), operate: false,},
                     ]
                 ]
             });