郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 1c1fde41dabfe3d6f803d93a118ad9ac5eb3e51d 1 个父辈 991d6ed2
1 个管道 的构建 通过 耗费 1 秒

测试

内嵌 并排对比
正在显示 2 个修改的文件 包含 19 行增加 和 21 行删除
... ... @@ -3,7 +3,6 @@
<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" />
... ... @@ -31,8 +30,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="166">
<caret line="667" column="5" lean-forward="true" selection-start-line="667" selection-start-column="5" selection-end-line="667" selection-end-column="5" />
<state relative-caret-position="441">
<caret line="1311" column="8" lean-forward="false" selection-start-line="1311" selection-start-column="8" selection-end-line="1311" selection-end-column="8" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -85,11 +84,10 @@
<element signature="e#42074#42494#0#PHP" expanded="false" />
<element signature="e#42499#42982#0#PHP" expanded="false" />
<element signature="e#42988#43794#0#PHP" expanded="false" />
<element signature="e#43799#46953#0#PHP" expanded="false" />
<element signature="e#46968#48296#0#PHP" expanded="false" />
<element signature="e#48312#49339#0#PHP" expanded="false" />
<element signature="e#49345#50103#0#PHP" expanded="false" />
<element signature="e#50108#52495#0#PHP" expanded="false" />
<element signature="e#46977#48305#0#PHP" expanded="false" />
<element signature="e#48321#49348#0#PHP" expanded="false" />
<element signature="e#49354#50112#0#PHP" expanded="false" />
<element signature="e#50117#52504#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -174,9 +172,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="386" />
<option name="y" value="61" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="40" />
<option name="y" value="43" />
<option name="width" value="1776" />
<option name="height" value="956" />
</component>
... ... @@ -294,7 +292,7 @@
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="25235000" />
<workItem from="1574641631900" duration="15479000" />
<workItem from="1574669596135" duration="8724000" />
<workItem from="1574669596135" duration="9186000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -307,7 +305,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="227248000" />
<option name="totallyTimeSpent" value="227710000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -319,7 +317,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="386" y="61" width="1776" height="956" extended-state="0" />
<frame x="40" y="43" width="1776" height="956" extended-state="1" />
<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.15617716" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -751,8 +749,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="166">
<caret line="667" column="5" lean-forward="true" selection-start-line="667" selection-start-column="5" selection-end-line="667" selection-end-column="5" />
<state relative-caret-position="441">
<caret line="1311" column="8" lean-forward="false" selection-start-line="1311" selection-start-column="8" selection-end-line="1311" selection-end-column="8" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -805,11 +803,10 @@
<element signature="e#42074#42494#0#PHP" expanded="false" />
<element signature="e#42499#42982#0#PHP" expanded="false" />
<element signature="e#42988#43794#0#PHP" expanded="false" />
<element signature="e#43799#46953#0#PHP" expanded="false" />
<element signature="e#46968#48296#0#PHP" expanded="false" />
<element signature="e#48312#49339#0#PHP" expanded="false" />
<element signature="e#49345#50103#0#PHP" expanded="false" />
<element signature="e#50108#52495#0#PHP" expanded="false" />
<element signature="e#46977#48305#0#PHP" expanded="false" />
<element signature="e#48321#49348#0#PHP" expanded="false" />
<element signature="e#49354#50112#0#PHP" expanded="false" />
<element signature="e#50117#52504#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -1309,6 +1309,7 @@ class User extends Api
*/
public function myorder()
{
$user_id = $this->uid;
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
... ...