提交 111541f6 authored 作者: chengye's avatar chengye

test

上级 9f80de36
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php"> <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465"> <state relative-caret-position="217">
<caret line="70" column="10" selection-start-line="70" selection-start-column="10" selection-end-line="70" selection-end-column="10" /> <caret line="62" column="10" selection-start-line="62" selection-start-column="10" selection-end-line="62" selection-end-column="10" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -221,12 +221,12 @@ ...@@ -221,12 +221,12 @@
<workItem from="1578817951649" duration="618000" /> <workItem from="1578817951649" duration="618000" />
<workItem from="1578900535997" duration="5097000" /> <workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" /> <workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="5341000" /> <workItem from="1578972376079" duration="5459000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="11288000" /> <option name="totallyTimeSpent" value="11406000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" /> <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
...@@ -499,8 +499,8 @@ ...@@ -499,8 +499,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php"> <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465"> <state relative-caret-position="217">
<caret line="70" column="10" selection-start-line="70" selection-start-column="10" selection-end-line="70" selection-end-column="10" /> <caret line="62" column="10" selection-start-line="62" selection-start-column="10" selection-end-line="62" selection-end-column="10" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -60,6 +60,7 @@ class Invoice extends Base ...@@ -60,6 +60,7 @@ class Invoice extends Base
$page =Request::param('page')?Request::param('page'):1; $page =Request::param('page')?Request::param('page'):1;
$limit = Request::param('limit')?Request::param('limit'):10; $limit = Request::param('limit')?Request::param('limit'):10;
$data = (new EmInvoice)->getInvoiceList($map,$page,$limit); $data = (new EmInvoice)->getInvoiceList($map,$page,$limit);
dd($data);
foreach ( $data as $key => &$v) { foreach ( $data as $key => &$v) {
$v['status']=parseStatus($v['status']); $v['status']=parseStatus($v['status']);
} }
...@@ -68,7 +69,7 @@ class Invoice extends Base ...@@ -68,7 +69,7 @@ class Invoice extends Base
return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data]; return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
} }
//return $this->fetch(); return $this->fetch();
} }
//查看账单信息 //查看账单信息
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论