郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 991d6ed2b138d0f084667207daa52e01f9e050a2 1 个父辈 aba2c5b0
1 个管道 的构建 失败 耗费 1 秒

历史记录

内嵌 并排对比
正在显示 3 个修改的文件 包含 130 行增加 和 99 行删除
... ... @@ -4,11 +4,7 @@
<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/admin/lang/zh-cn/order.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/model/Order.php" afterPath="$PROJECT_DIR$/application/admin/model/Order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/order/index.html" afterPath="$PROJECT_DIR$/application/admin/view/order/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -19,11 +15,24 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Order.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="653">
<caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
<folding>
<element signature="e#392#610#0#PHP" expanded="false" />
<element signature="e#643#1763#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<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="248">
<caret line="355" column="0" lean-forward="true" selection-start-line="355" selection-start-column="0" selection-end-line="355" selection-end-column="0" />
<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" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -36,6 +45,8 @@
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9762#0#PHP" expanded="false" />
<element signature="e#9768#10557#0#PHP" expanded="false" />
<element signature="e#10562#11880#0#PHP" expanded="false" />
<element signature="e#11888#12590#0#PHP" expanded="false" />
<element signature="e#12595#13795#0#PHP" expanded="false" />
<element signature="e#13801#14377#0#PHP" expanded="false" />
... ... @@ -45,40 +56,40 @@
<element signature="e#17726#18596#0#PHP" expanded="false" />
<element signature="e#18601#21097#0#PHP" expanded="false" />
<element signature="e#21103#21480#0#PHP" expanded="false" />
<element signature="e#21485#21749#0#PHP" expanded="false" />
<element signature="e#21755#22260#0#PHP" expanded="false" />
<element signature="e#22265#22516#0#PHP" expanded="false" />
<element signature="e#22522#23001#0#PHP" expanded="false" />
<element signature="e#23006#23763#0#PHP" expanded="false" />
<element signature="e#23769#24250#0#PHP" expanded="false" />
<element signature="e#24255#25025#0#PHP" expanded="false" />
<element signature="e#25031#25394#0#PHP" expanded="false" />
<element signature="e#25399#25590#0#PHP" expanded="false" />
<element signature="e#25596#25954#0#PHP" expanded="false" />
<element signature="e#25959#26149#0#PHP" expanded="false" />
<element signature="e#26155#27298#0#PHP" expanded="false" />
<element signature="e#27303#29968#0#PHP" expanded="false" />
<element signature="e#29974#30472#0#PHP" expanded="false" />
<element signature="e#30477#32223#0#PHP" expanded="false" />
<element signature="e#32229#32642#0#PHP" expanded="false" />
<element signature="e#32647#33126#0#PHP" expanded="false" />
<element signature="e#33132#33666#0#PHP" expanded="false" />
<element signature="e#33671#35056#0#PHP" expanded="false" />
<element signature="e#35062#35716#0#PHP" expanded="false" />
<element signature="e#35721#37674#0#PHP" expanded="false" />
<element signature="e#35875#35961#0#PHP" expanded="false" />
<element signature="e#36050#36138#0#PHP" expanded="false" />
<element signature="e#37680#38440#0#PHP" expanded="false" />
<element signature="e#38445#41154#0#PHP" expanded="false" />
<element signature="e#41180#42011#0#PHP" expanded="false" />
<element signature="e#42017#42437#0#PHP" expanded="false" />
<element signature="e#42442#42925#0#PHP" expanded="false" />
<element signature="e#42931#43737#0#PHP" expanded="false" />
<element signature="e#43742#46896#0#PHP" expanded="false" />
<element signature="e#46911#48239#0#PHP" expanded="false" />
<element signature="e#48255#49282#0#PHP" expanded="false" />
<element signature="e#49288#50046#0#PHP" expanded="false" />
<element signature="e#50051#52438#0#PHP" expanded="false" />
<element signature="e#21485#21806#0#PHP" expanded="false" />
<element signature="e#21812#22317#0#PHP" expanded="false" />
<element signature="e#22322#22573#0#PHP" expanded="false" />
<element signature="e#22579#23058#0#PHP" expanded="false" />
<element signature="e#23063#23820#0#PHP" expanded="false" />
<element signature="e#23826#24307#0#PHP" expanded="false" />
<element signature="e#24312#25082#0#PHP" expanded="false" />
<element signature="e#25088#25451#0#PHP" expanded="false" />
<element signature="e#25456#25647#0#PHP" expanded="false" />
<element signature="e#25653#26011#0#PHP" expanded="false" />
<element signature="e#26016#26206#0#PHP" expanded="false" />
<element signature="e#26212#27355#0#PHP" expanded="false" />
<element signature="e#27360#30025#0#PHP" expanded="false" />
<element signature="e#30031#30529#0#PHP" expanded="false" />
<element signature="e#30534#32280#0#PHP" expanded="false" />
<element signature="e#32286#32699#0#PHP" expanded="false" />
<element signature="e#32704#33183#0#PHP" expanded="false" />
<element signature="e#33189#33723#0#PHP" expanded="false" />
<element signature="e#33728#35113#0#PHP" expanded="false" />
<element signature="e#35119#35773#0#PHP" expanded="false" />
<element signature="e#35778#37731#0#PHP" expanded="false" />
<element signature="e#35932#36018#0#PHP" expanded="false" />
<element signature="e#36107#36195#0#PHP" expanded="false" />
<element signature="e#37737#38497#0#PHP" expanded="false" />
<element signature="e#38502#41211#0#PHP" expanded="false" />
<element signature="e#41237#42068#0#PHP" expanded="false" />
<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" />
</folding>
</state>
</provider>
... ... @@ -140,11 +151,11 @@
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/admin/model/User.php" />
<option value="$PROJECT_DIR$/application/admin/model/Order.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
... ... @@ -163,11 +174,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-31" />
<option name="y" value="63" />
<component name="ProjectFrameBounds">
<option name="x" value="386" />
<option name="y" value="61" />
<option name="width" value="1776" />
<option name="height" value="966" />
<option name="height" value="956" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -201,6 +212,19 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" 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="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" 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="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
... ... @@ -270,7 +294,7 @@
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="25235000" />
<workItem from="1574641631900" duration="15479000" />
<workItem from="1574669596135" duration="7667000" />
<workItem from="1574669596135" duration="8724000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -283,7 +307,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="226191000" />
<option name="totallyTimeSpent" value="227248000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -295,7 +319,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-31" y="63" width="1776" height="966" extended-state="1" />
<frame x="386" y="61" width="1776" height="956" 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.15617716" 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" />
... ... @@ -304,7 +329,7 @@
<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="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="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="true" show_stripe_button="true" weight="0.1363088" 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="false" show_stripe_button="true" weight="0.1363088" sideWeight="0.5" order="2" 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="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="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" />
... ... @@ -689,14 +714,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="679">
<caret line="61" column="27" lean-forward="true" selection-start-line="61" selection-start-column="27" selection-end-line="61" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
... ... @@ -721,10 +738,21 @@
</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="653">
<caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
<folding>
<element signature="e#392#610#0#PHP" expanded="false" />
<element signature="e#643#1763#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="248">
<caret line="355" column="0" lean-forward="true" selection-start-line="355" selection-start-column="0" selection-end-line="355" selection-end-column="0" />
<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" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -737,6 +765,8 @@
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9762#0#PHP" expanded="false" />
<element signature="e#9768#10557#0#PHP" expanded="false" />
<element signature="e#10562#11880#0#PHP" expanded="false" />
<element signature="e#11888#12590#0#PHP" expanded="false" />
<element signature="e#12595#13795#0#PHP" expanded="false" />
<element signature="e#13801#14377#0#PHP" expanded="false" />
... ... @@ -746,40 +776,40 @@
<element signature="e#17726#18596#0#PHP" expanded="false" />
<element signature="e#18601#21097#0#PHP" expanded="false" />
<element signature="e#21103#21480#0#PHP" expanded="false" />
<element signature="e#21485#21749#0#PHP" expanded="false" />
<element signature="e#21755#22260#0#PHP" expanded="false" />
<element signature="e#22265#22516#0#PHP" expanded="false" />
<element signature="e#22522#23001#0#PHP" expanded="false" />
<element signature="e#23006#23763#0#PHP" expanded="false" />
<element signature="e#23769#24250#0#PHP" expanded="false" />
<element signature="e#24255#25025#0#PHP" expanded="false" />
<element signature="e#25031#25394#0#PHP" expanded="false" />
<element signature="e#25399#25590#0#PHP" expanded="false" />
<element signature="e#25596#25954#0#PHP" expanded="false" />
<element signature="e#25959#26149#0#PHP" expanded="false" />
<element signature="e#26155#27298#0#PHP" expanded="false" />
<element signature="e#27303#29968#0#PHP" expanded="false" />
<element signature="e#29974#30472#0#PHP" expanded="false" />
<element signature="e#30477#32223#0#PHP" expanded="false" />
<element signature="e#32229#32642#0#PHP" expanded="false" />
<element signature="e#32647#33126#0#PHP" expanded="false" />
<element signature="e#33132#33666#0#PHP" expanded="false" />
<element signature="e#33671#35056#0#PHP" expanded="false" />
<element signature="e#35062#35716#0#PHP" expanded="false" />
<element signature="e#35721#37674#0#PHP" expanded="false" />
<element signature="e#35875#35961#0#PHP" expanded="false" />
<element signature="e#36050#36138#0#PHP" expanded="false" />
<element signature="e#37680#38440#0#PHP" expanded="false" />
<element signature="e#38445#41154#0#PHP" expanded="false" />
<element signature="e#41180#42011#0#PHP" expanded="false" />
<element signature="e#42017#42437#0#PHP" expanded="false" />
<element signature="e#42442#42925#0#PHP" expanded="false" />
<element signature="e#42931#43737#0#PHP" expanded="false" />
<element signature="e#43742#46896#0#PHP" expanded="false" />
<element signature="e#46911#48239#0#PHP" expanded="false" />
<element signature="e#48255#49282#0#PHP" expanded="false" />
<element signature="e#49288#50046#0#PHP" expanded="false" />
<element signature="e#50051#52438#0#PHP" expanded="false" />
<element signature="e#21485#21806#0#PHP" expanded="false" />
<element signature="e#21812#22317#0#PHP" expanded="false" />
<element signature="e#22322#22573#0#PHP" expanded="false" />
<element signature="e#22579#23058#0#PHP" expanded="false" />
<element signature="e#23063#23820#0#PHP" expanded="false" />
<element signature="e#23826#24307#0#PHP" expanded="false" />
<element signature="e#24312#25082#0#PHP" expanded="false" />
<element signature="e#25088#25451#0#PHP" expanded="false" />
<element signature="e#25456#25647#0#PHP" expanded="false" />
<element signature="e#25653#26011#0#PHP" expanded="false" />
<element signature="e#26016#26206#0#PHP" expanded="false" />
<element signature="e#26212#27355#0#PHP" expanded="false" />
<element signature="e#27360#30025#0#PHP" expanded="false" />
<element signature="e#30031#30529#0#PHP" expanded="false" />
<element signature="e#30534#32280#0#PHP" expanded="false" />
<element signature="e#32286#32699#0#PHP" expanded="false" />
<element signature="e#32704#33183#0#PHP" expanded="false" />
<element signature="e#33189#33723#0#PHP" expanded="false" />
<element signature="e#33728#35113#0#PHP" expanded="false" />
<element signature="e#35119#35773#0#PHP" expanded="false" />
<element signature="e#35778#37731#0#PHP" expanded="false" />
<element signature="e#35932#36018#0#PHP" expanded="false" />
<element signature="e#36107#36195#0#PHP" expanded="false" />
<element signature="e#37737#38497#0#PHP" expanded="false" />
<element signature="e#38502#41211#0#PHP" expanded="false" />
<element signature="e#41237#42068#0#PHP" expanded="false" />
<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" />
</folding>
</state>
</provider>
... ...
... ... @@ -30,7 +30,7 @@ class Order extends Backend
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
*/
/**
* 查看
... ... @@ -63,8 +63,8 @@ class Order extends Backend
->select();
foreach ($list as $row) {
}
$list = collection($list)->toArray();
$result = array("total" => $total, "rows" => $list);
... ...
... ... @@ -631,9 +631,10 @@ class User extends Api
$data = Db::name('history')
->where('user_id',$user_id)
->order('id desc')
->limit(10)
->select();
$this->success('SUCCESS',$data);
->column('title');
$res = array_unique($data);
$res = array_slice($res,0,10);
$this->success('SUCCESS',$res);
}
/**
... ...