test

.idea/workspace.xml

@@ -66,8 +66,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="216">
-              <caret line="65" column="10" selection-start-line="65" selection-start-column="10" selection-end-line="65" selection-end-column="10" />
+            <state>
+              <caret line="70" column="30" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
             </state>
           </provider>
         </entry>
@@ -221,12 +221,12 @@
       <workItem from="1578817951649" duration="618000" />
       <workItem from="1578900535997" duration="5097000" />
       <workItem from="1578907167448" duration="144000" />
-      <workItem from="1578972376079" duration="4482000" />
+      <workItem from="1578972376079" duration="5007000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10429000" />
+    <option name="totallyTimeSpent" value="10954000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
@@ -499,8 +499,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="65" column="10" selection-start-line="65" selection-start-column="10" selection-end-line="65" selection-end-column="10" />
+        <state>
+          <caret line="70" column="30" selection-start-line="70" selection-start-column="30" selection-end-line="70" selection-end-column="30" />
         </state>
       </provider>
     </entry>

application/em/controller/Invoice.php

@@ -63,23 +63,12 @@ class Invoice extends Base
         foreach ( $data as $key => &$v) {
             $v['status']=parseStatus($v['status']);
         }
-        //$InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
+        $InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
         if(Request::param('page')){
-            return ['code'=>0,'msg'=>'','count'=>0,'data'=>$data];
+            return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
         }
 
         return $this->fetch();
-
-
-
-
-//        $data = (new EmInvoice)->getList();
-//
-//        $page = $data->render();
-//
-//        $this->assign('data',$data);
-//        $this->assign('page',$page);
-//        return $this->fetch();
     }
 
     //查看账单信息