Skip to content

J
Jz-Php
提交 64326d17 authored 作者: chengye's avatar chengye
浏览文件
操作

2020-2-7-1

上级 1f0d5f56 8e62c899
隐藏空白字符变更
内嵌 并排
正在显示 包含 175 行增加 和 60 行删除
.gitignore
浏览文件 @ 64326d17
......@@ -11,4 +11,5 @@
/LICENSE.txt
/phpinfo.php
/README.md
/think
\ No newline at end of file
/think
/config/database.php
.idea/workspace.xml
浏览文件 @ 64326d17
......@@ -15,6 +15,7 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<<<<<<< HEAD
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Copy.php">
<provider selected="true" editor-type-id="text-editor">
......@@ -29,11 +30,19 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="702">
<caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
=======
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="341">
<caret line="149" column="23" lean-forward="true" selection-start-line="148" selection-end-line="149" selection-end-column="23" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="756">
......@@ -47,19 +56,36 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="47">
<caret line="257" column="5" selection-start-line="257" selection-start-column="5" selection-end-line="257" selection-end-column="5" />
=======
<entry file="file://$PROJECT_DIR$/application/em/model/Useage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="96" column="25" selection-start-line="96" selection-start-column="20" selection-end-line="96" selection-end-column="25" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/application/admin/controller/Em.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="13446">
<caret line="509" column="29" selection-start-line="509" selection-start-column="29" selection-end-line="509" selection-end-column="29" />
=======
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="78" column="44" selection-start-line="78" selection-start-column="44" selection-end-line="78" selection-end-column="44" />
<folding>
<element signature="e#554#2398#0#PHP" />
</folding>
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
</state>
</provider>
</entry>
</file>
<<<<<<< HEAD
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Upload.php">
<provider selected="true" editor-type-id="text-editor">
......@@ -96,6 +122,8 @@
</provider>
</entry>
</file>
=======
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
</leaf>
</component>
<component name="FindInProjectRecents">
......@@ -143,11 +171,19 @@
<path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
</include_path>
</component>
<<<<<<< HEAD
<component name="ProjectFrameBounds">
<option name="x" value="966" />
<option name="y" value="298" />
<option name="width" value="1919" />
<option name="height" value="1020" />
=======
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="2078" />
<option name="y" value="-22" />
<option name="width" value="1222" />
<option name="height" value="821" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
......@@ -170,28 +206,29 @@
<expand>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="E:\86\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="E:\86\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="E:\86\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="admin" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="E:\86\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="admin" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="view" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<<<<<<< HEAD
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="admin" type="9f88c78c:ScopeViewTreeModel$FileNode" />
......@@ -209,12 +246,17 @@
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="em" type="9f88c78c:ScopeViewTreeModel$FileNode" />
=======
<item name="E:\86\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="application" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="em" type="9f88c78c:ScopeViewTreeModel$FileNode" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
<item name="model" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
<path>
<item name="Jz-Php" type="3d21c010:ScopeViewTreeModel$ProjectNode" />
<item name="E:\master\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="route" type="9f88c78c:ScopeViewTreeModel$FileNode" />
<item name="E:\86\Jz-Php" type="442cc68d:ScopeViewTreeModel$RootNode" />
<item name="config" type="9f88c78c:ScopeViewTreeModel$FileNode" />
</path>
</expand>
<select />
......@@ -255,6 +297,7 @@
<workItem from="1578817951649" duration="618000" />
<workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" />
<<<<<<< HEAD
<workItem from="1578972376079" duration="9405000" />
<workItem from="1579059424177" duration="1050000" />
<workItem from="1579079847870" duration="1330000" />
......@@ -262,16 +305,28 @@
<workItem from="1580875021110" duration="4605000" />
<workItem from="1580965592495" duration="809000" />
<workItem from="1581065334523" duration="1656000" />
=======
<workItem from="1578972376079" duration="6515000" />
<workItem from="1579067299817" duration="6924000" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<<<<<<< HEAD
<option name="totallyTimeSpent" value="24944000" />
=======
<option name="totallyTimeSpent" value="19386000" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
</component>
<component name="ToolWindowManager">
<frame x="644" y="199" width="1279" height="680" extended-state="0" />
<layout>
<<<<<<< HEAD
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.32923833" />
=======
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15282215" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -284,7 +339,11 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" />
<<<<<<< HEAD
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.6478102" />
=======
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.23695652" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
......@@ -325,10 +384,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/db/Query.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403">
<caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
<state relative-caret-position="19592">
<caret line="655" column="45" selection-start-line="655" selection-start-column="40" selection-end-line="655" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/view/invoice/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1302">
<caret line="42" column="92" selection-start-line="42" selection-start-column="84" selection-end-line="42" selection-end-column="92" />
<folding>
<element signature="n#style#0;n#input#0;n#div#1;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/route/admin.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4619">
<caret line="149" column="32" selection-start-line="149" selection-start-column="25" selection-end-line="149" selection-end-column="32" />
</state>
</provider>
</entry>
......@@ -339,16 +415,25 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/application/em/view/invoice/index.html">
=======
<entry file="file://$PROJECT_DIR$/application/em/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="208">
<caret line="42" column="92" selection-start-line="42" selection-start-column="84" selection-end-line="42" selection-end-column="92" />
<folding>
<element signature="n#style#0;n#input#0;n#div#1;n#form#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="8587">
<caret line="277" column="29" selection-start-line="277" selection-start-column="29" selection-end-line="277" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="9" column="11" lean-forward="true" selection-start-line="9" selection-start-column="11" selection-end-line="9" selection-end-column="11" />
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/db/Query.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
......@@ -426,11 +511,35 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="11772">
<caret line="463" column="30" selection-start-line="463" selection-end-line="464" />
=======
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="78" column="44" selection-start-line="78" selection-start-column="44" selection-end-line="78" selection-end-column="44" />
<folding>
<element signature="e#554#2398#0#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Model.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="26" column="3" selection-start-line="26" selection-start-column="3" selection-end-line="26" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/model/Useage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="372">
<caret line="96" column="25" selection-start-line="96" selection-start-column="20" selection-end-line="96" selection-end-column="25" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="702">
<caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
</state>
......@@ -482,6 +591,10 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="47">
<caret line="257" column="5" selection-start-line="257" selection-start-column="5" selection-end-line="257" selection-end-column="5" />
=======
<state relative-caret-position="341">
<caret line="149" column="23" lean-forward="true" selection-start-line="148" selection-end-line="149" selection-end-column="23" />
>>>>>>> 8e62c899479b4e4e49266ddd3151b129ed00b68e
</state>
</provider>
</entry>
......
application/em/controller/Invoice.php
浏览文件 @ 64326d17
......@@ -59,11 +59,13 @@ class Invoice extends Base
}
$page =Request::param('page')?Request::param('page'):1;
$limit = Request::param('limit')?Request::param('limit'):10;
$data = (new EmInvoice)->getInvoiceList($map,$page,$limit);
$emInvModel = new EmInvoice;
$data = $emInvModel->getInvoiceList($map,$page,$limit);
foreach ( $data as $key => &$v) {
$v['status']=parseStatus($v['status']);
}
$InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
$InvoiceCount = $emInvModel->getInvoiceCount($map);
if(Request::param('page')){
return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
}
......
config/cache.php
浏览文件 @ 64326d17
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
// +----------------------------------------------------------------------
// | 缓存设置
// +----------------------------------------------------------------------
return [
// 缓存配置为复合类型
'type' => 'complex',
'default' => [
'type' => 'file',
// 全局缓存有效期（0为永久有效）
'expire'=> 0,
// 缓存前缀
'prefix'=> '',
// 缓存目录
'path' => '',
],
'redis' => [
'type' => 'redis',
'host' => '127.0.0.1',
// 全局缓存有效期（0为永久有效）
'expire'=> 0,
// 缓存前缀
'prefix'=> '',
],
// 添加更多的缓存类型设置
];
<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
// +----------------------------------------------------------------------
// | 缓存设置
// +----------------------------------------------------------------------
return [
// 缓存配置为复合类型
'type' => 'complex',
'default' => [
'type' => 'file',
// 全局缓存有效期（0为永久有效）
'expire'=> 0,
// 缓存前缀
'prefix'=> '',
// 缓存目录
'path' => '',
],
'redis' => [
'type' => 'redis',
'host' => '192.168.1.71',
// 全局缓存有效期（0为永久有效）
'expire'=> 0,
// 缓存前缀
'prefix'=> '',
],
// 添加更多的缓存类型设置
];
config/database.php
浏览文件 @ 64326d17
......@@ -13,15 +13,15 @@ return [
// 数据库类型
'type' => 'mysql',
// 服务器地址
'hostname' => '127.0.0.1',
'hostname' => '192.168.1.71',
// 数据库名
'database' => 'gonn',
'database' => 'gonn_release',
// 用户名
'username' => 'root',
// 密码
'password' => 'pvv5718J0CwhNfn4B^8^H3igPj#oiQkX',
'password' => 'aLN%4Jx7ZsmsoMlOB0XEd7',
// 端口
'hostport' => '10036',
'hostport' => '3306',
// 连接dsn
'dsn' => '',
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论