郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 8a43b0f3949f5d2a875e4450426b477cbafd4945 1 个父辈 1c1fde41
1 个管道 的构建 通过 耗费 6 秒

添加订单管理

内嵌 并排对比
正在显示 4 个修改的文件 包含 139 行增加 和 139 行删除
... ... @@ -3,6 +3,8 @@
<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/admin/lang/zh-cn/order.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/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" />
... ... @@ -12,82 +14,40 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DockManager">
<window id="1">
<content type="file-editors">
<state>
<leaf>
<file leaf-file-name="Pic.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
<caret line="60" column="12" lean-forward="true" selection-start-line="60" selection-start-column="12" selection-end-line="63" selection-end-column="13" />
<folding>
<element signature="e#1854#3656#0#PHP" expanded="false" />
<element signature="e#3688#5728#0#PHP" expanded="false" />
<element signature="e#5734#5978#0#PHP" expanded="false" />
<element signature="e#6135#11936#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Order.php" pinned="false" current-in-tab="false">
<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="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" />
<state relative-caret-position="513">
<caret line="80" column="64" lean-forward="true" selection-start-line="80" selection-start-column="64" selection-end-line="80" selection-end-column="64" />
<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="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" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<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" />
<element signature="e#14382#14929#0#PHP" expanded="false" />
<element signature="e#14935#15619#0#PHP" expanded="false" />
<element signature="e#15624#17720#0#PHP" expanded="false" />
<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#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#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>
... ... @@ -151,10 +111,10 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/application/admin/model/User.php" />
<option value="$PROJECT_DIR$/application/admin/model/Order.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.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" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
</list>
</option>
</component>
... ... @@ -172,11 +132,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="40" />
<option name="y" value="43" />
<component name="ProjectFrameBounds">
<option name="x" value="151" />
<option name="y" value="78" />
<option name="width" value="1776" />
<option name="height" value="956" />
<option name="height" value="950" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -223,14 +183,42 @@
<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" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="lang" 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" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="zh-cn" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -292,7 +280,7 @@
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="25235000" />
<workItem from="1574641631900" duration="15479000" />
<workItem from="1574669596135" duration="9186000" />
<workItem from="1574669596135" duration="11747000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -305,7 +293,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="227710000" />
<option name="totallyTimeSpent" value="230271000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -317,7 +305,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="40" y="43" width="1776" height="956" extended-state="1" />
<frame x="151" y="78" width="1776" height="950" 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" />
... ... @@ -633,18 +621,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="169" column="4" lean-forward="true" selection-start-line="169" selection-start-column="4" selection-end-line="176" selection-end-column="5" />
<folding>
<element signature="e#684#1822#0#PHP" expanded="false" />
<element signature="e#1854#3656#0#PHP" expanded="false" />
<element signature="e#3688#5728#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
... ... @@ -680,14 +656,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="30" column="100" lean-forward="true" selection-start-line="30" selection-start-column="100" selection-end-line="30" selection-end-column="100" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -720,37 +688,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="32" lean-forward="false" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="31" column="70" lean-forward="false" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
<folding />
</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="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" />
<state relative-caret-position="294">
<caret line="1309" column="29" lean-forward="false" selection-start-line="1309" selection-start-column="29" selection-end-line="1309" selection-end-column="29" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -803,10 +744,58 @@
<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#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" />
<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>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
<caret line="60" column="12" lean-forward="true" selection-start-line="60" selection-start-column="12" selection-end-line="63" selection-end-column="13" />
<folding>
<element signature="e#1854#3656#0#PHP" expanded="false" />
<element signature="e#3688#5728#0#PHP" expanded="false" />
<element signature="e#5734#5978#0#PHP" expanded="false" />
<element signature="e#6135#11936#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="27" column="78" lean-forward="true" selection-start-line="27" selection-start-column="78" selection-end-line="27" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="27" column="75" lean-forward="true" selection-start-line="27" selection-start-column="75" selection-end-line="27" selection-end-column="75" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
<folding />
</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="513">
<caret line="80" column="64" lean-forward="true" selection-start-line="80" selection-start-column="64" selection-end-line="80" selection-end-column="64" />
<folding>
<element signature="e#392#610#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -67,8 +67,20 @@ class Order extends Backend
}
$list = collection($list)->toArray();
$type = new \app\admin\model\Pic();
$video = new \app\admin\model\Video();
foreach ($list as &$v){
$type_ids = $type->whereIn('id',$v['pic_id'])->column('title');
if($v['video_id']){
$videos = unserialize($v['video_id']);
foreach ($videos as &$v1){
$v1['id'] = $video->where('id',$v1['id'])->column('title');
}
$v['video_id'] = $v1['id'];
}
$v['pic_id'] = trim(implode(',',$type_ids),',');
}
$result = array("total" => $total, "rows" => $list);
return json($result);
}
return $this->view->fetch();
... ...
... ... @@ -2,8 +2,8 @@
return [
'User_id' => '用户ID',
'Pic_id' => '图片ID',
'Video_id' => '视频ID',
'Pic_id' => '图片标题',
'Video_id' => '视频标题',
'Total' => '价格',
'Status' => '状态',
'Num' => '订单号',
... ...
... ... @@ -1309,7 +1309,6 @@ 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');
... ...