切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
25730f7401ac10122b6a4293ba010df5741aa6c5
1 个父辈
edb25e47
1 个管道 的构建
通过
耗费 0 秒
修改授权书
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
18 行增加
和
20 行删除
.idea/workspace.xml
application/api/controller/User.php
.idea/workspace.xml
查看文件 @
25730f7
...
...
@@ -2,8 +2,6 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/admin/controller/Order.php"
afterPath=
"$PROJECT_DIR$/application/admin/controller/Order.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/api/controller/User.php"
afterPath=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -94,12 +92,12 @@
<element
signature=
"e#64776#64913#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#64943#65083#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#65094#65185#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65601#65847#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66457#66625#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66703#67714#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67776#68155#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68574#69083#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69088#69760#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65611#65857#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66467#66635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66713#67724#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67786#68165#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68584#69093#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69098#69770#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -434,8 +432,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"420"
/>
<option
name=
"y"
value=
"57"
/>
<option
name=
"x"
value=
"383"
/>
<option
name=
"y"
value=
"50"
/>
<option
name=
"width"
value=
"1569"
/>
<option
name=
"height"
value=
"924"
/>
</component>
...
...
@@ -582,7 +580,7 @@
<workItem
from=
"1576028218954"
duration=
"680000"
/>
<workItem
from=
"1576128183316"
duration=
"7364000"
/>
<workItem
from=
"1576135696788"
duration=
"17540000"
/>
<workItem
from=
"1576153922472"
duration=
"3
448
000"
/>
<workItem
from=
"1576153922472"
duration=
"3
621
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -609,7 +607,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"418
586
000"
/>
<option
name=
"totallyTimeSpent"
value=
"418
759
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -621,7 +619,7 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
420"
y=
"57
"
width=
"1569"
height=
"924"
extended-state=
"0"
/>
<frame
x=
"
383"
y=
"50
"
width=
"1569"
height=
"924"
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.17958914"
sideWeight=
"0.5"
order=
"1"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -1519,12 +1517,12 @@
<element
signature=
"e#64776#64913#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#64943#65083#1#PHP"
expanded=
"false"
/>
<element
signature=
"e#65094#65185#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65601#65847#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66457#66625#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66703#67714#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67776#68155#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68574#69083#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69088#69760#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65611#65857#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66467#66635#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66713#67724#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67786#68165#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68584#69093#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#69098#69770#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
application/api/controller/User.php
查看文件 @
25730f7
...
...
@@ -1896,7 +1896,7 @@ class User extends Api
$res
[
'createtime'
]
=
time
();
$res
[
'order_id'
]
=
','
.
$param
[
'order_id'
]
.
','
;
$order
=
explode
(
','
,
$res
[
'order_id'
]
);
$order
=
explode
(
','
,
trim
(
$res
[
'order_id'
],
','
)
);
$shou
=
Db
::
name
(
'shou'
)
->
where
(
'user_id'
,
$res
[
'user_id'
])
->
column
(
'order_id'
);
...
...
请
注册
或
登录
后发表评论