切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
d4001b4108c4e9b81e32bf30a3fae76569c51679
1 个父辈
3075cda9
1 个管道 的构建
通过
耗费 1 秒
修改发票后台
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
38 行增加
和
24 行删除
.idea/workspace.xml
application/admin/controller/Order.php
.idea/workspace.xml
查看文件 @
d4001b4
...
...
@@ -2,7 +2,7 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/a
pi/controller/User.php"
afterPath=
"$PROJECT_DIR$/application/api/controller/Us
er.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/a
dmin/controller/Order.php"
afterPath=
"$PROJECT_DIR$/application/admin/controller/Ord
er.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -13,7 +13,7 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"111"
>
...
...
@@ -92,6 +92,19 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"Order.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Order.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"304"
>
<caret
line=
"34"
column=
"0"
lean-forward=
"true"
selection-start-line=
"34"
selection-start-column=
"0"
selection-end-line=
"34"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#40#74#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#955#3141#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component
name=
"FileTemplateManagerImpl"
>
...
...
@@ -167,9 +180,9 @@
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/accredit.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/order.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/order.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/controller/Order.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/order/fapiao.html"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/controller/Order.php"
/>
</list>
</option>
</component>
...
...
@@ -187,9 +200,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"115"
/>
<option
name=
"y"
value=
"145"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"695"
/>
<option
name=
"y"
value=
"231"
/>
<option
name=
"width"
value=
"1624"
/>
<option
name=
"height"
value=
"918"
/>
</component>
...
...
@@ -225,13 +238,13 @@
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"a
pi
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"a
dmin
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"a
pi
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"a
dmin
"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
...
...
@@ -326,7 +339,7 @@
<workItem
from=
"1575773423431"
duration=
"694000"
/>
<workItem
from=
"1575776183372"
duration=
"2267000"
/>
<workItem
from=
"1575790089275"
duration=
"377000"
/>
<workItem
from=
"1575851041026"
duration=
"12
727
000"
/>
<workItem
from=
"1575851041026"
duration=
"12
832
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -339,7 +352,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"353
194
000"
/>
<option
name=
"totallyTimeSpent"
value=
"353
299
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -351,7 +364,8 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"115"
y=
"145"
width=
"1624"
height=
"918"
extended-state=
"1"
/>
<frame
x=
"695"
y=
"231"
width=
"1624"
height=
"918"
extended-state=
"0"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.1528133"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32912987"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -361,7 +375,7 @@
<window_info
id=
"Run"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Version Control"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"
true"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"tru
e"
show_stripe_button=
"true"
weight=
"0.16901408"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"
false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"fals
e"
show_stripe_button=
"true"
weight=
"0.16901408"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -767,17 +781,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Order.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"529"
>
<caret
line=
"40"
column=
"21"
lean-forward=
"false"
selection-start-line=
"40"
selection-start-column=
"21"
selection-end-line=
"40"
selection-end-column=
"21"
/>
<folding>
<element
signature=
"e#40#74#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#951#3137#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"111"
>
...
...
@@ -855,5 +858,16 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Order.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"304"
>
<caret
line=
"34"
column=
"0"
lean-forward=
"true"
selection-start-line=
"34"
selection-start-column=
"0"
selection-end-line=
"34"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#40#74#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#955#3141#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
application/admin/controller/Order.php
查看文件 @
d4001b4
...
...
@@ -37,7 +37,7 @@ class Order extends Backend
$id
=
$this
->
request
->
param
(
'ids'
);
$order_id
=
','
.
$id
.
','
;
$data
=
Db
::
name
(
'invoice'
)
->
whereLike
(
'order_id'
,
$order_id
)
->
whereLike
(
'order_id'
,
"%
$order_id
%"
)
->
find
();
$this
->
assign
(
'data'
,
$data
);
return
$this
->
view
->
fetch
();
...
...
请
注册
或
登录
后发表评论