test

application/em/controller/Invoice.php

@@ -65,21 +65,11 @@ class Invoice extends Base
         }
         $InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
         if(Request::param('page')){
-            return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
+            return ['code'=>0,'msg'=>'','count'=>100,'data'=>$data];
         }
 
         return $this->fetch();
 
-
-
-
-//        $data = (new EmInvoice)->getList();
-//
-//        $page = $data->render();
-//
-//        $this->assign('data',$data);
-//        $this->assign('page',$page);
-//        return $this->fetch();
     }
 
     //查看账单信息

application/em/model/EmInvoice.php

@@ -57,13 +57,15 @@ class EmInvoice extends Base
     public function getInvoiceCount($map){
         $data = self::alias('inv')
             ->field('inv.*')
+            ->field('station.station_name')
+            ->field('em.em_numb')
             ->leftJoin(['em_invoice_useage'=>'eiu'],'eiu.invoice_id=inv.invoice_id')
             ->leftJoin(['em_useage'=>'eu'],'eu.useage_id = eiu.useage_id')
             ->leftJoin(['em'],'em.id=eu.em_id')
             ->leftJoin(['station_info'=>'station'],'station.station_id=em.station_id')
             ->where($map)
             ->count();
-        return 100;
+        return $data;
     }
     //通过invoice_id查询列表数据
     public function getListByInvIds($ids){