郭盛 / areial · 提交

转到一个项目

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

添加订单管理

内嵌 并排对比
正在显示 4 个修改的文件 包含 136 行增加 和 136 行删除
@@ -3,6 +3,8 @@ @@ -3,6 +3,8 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
7 </list> 9 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -12,82 +14,40 @@ @@ -12,82 +14,40 @@
12 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 14 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
13 <option name="LAST_RESOLUTION" value="IGNORE" /> 15 <option name="LAST_RESOLUTION" value="IGNORE" />
14 </component> 16 </component>
15 - <component name="FileEditorManager">  
16 - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">  
17 - <file leaf-file-name="Order.php" pinned="false" current-in-tab="false">  
18 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> 17 + <component name="DockManager">
  18 + <window id="1">
  19 + <content type="file-editors">
  20 + <state>
  21 + <leaf>
  22 + <file leaf-file-name="Pic.php" pinned="false" current-in-tab="true">
  23 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
19 <provider selected="true" editor-type-id="text-editor"> 24 <provider selected="true" editor-type-id="text-editor">
20 - <state relative-caret-position="653">  
21 - <caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" /> 25 + <state relative-caret-position="494">
  26 + <caret line="60" column="12" lean-forward="true" selection-start-line="60" selection-start-column="12" selection-end-line="63" selection-end-column="13" />
22 <folding> 27 <folding>
23 - <element signature="e#392#610#0#PHP" expanded="false" />  
24 - <element signature="e#643#1763#0#PHP" expanded="false" /> 28 + <element signature="e#1854#3656#0#PHP" expanded="false" />
  29 + <element signature="e#3688#5728#0#PHP" expanded="false" />
  30 + <element signature="e#5734#5978#0#PHP" expanded="false" />
  31 + <element signature="e#6135#11936#0#PHP" expanded="false" />
25 </folding> 32 </folding>
26 </state> 33 </state>
27 </provider> 34 </provider>
28 </entry> 35 </entry>
29 </file> 36 </file>
30 - <file leaf-file-name="User.php" pinned="false" current-in-tab="true">  
31 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 37 + </leaf>
  38 + </state>
  39 + </content>
  40 + </window>
  41 + </component>
  42 + <component name="FileEditorManager">
  43 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  44 + <file leaf-file-name="Order.php" pinned="false" current-in-tab="true">
  45 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
32 <provider selected="true" editor-type-id="text-editor"> 46 <provider selected="true" editor-type-id="text-editor">
33 - <state relative-caret-position="441">  
34 - <caret line="1311" column="8" lean-forward="false" selection-start-line="1311" selection-start-column="8" selection-end-line="1311" selection-end-column="8" /> 47 + <state relative-caret-position="513">
  48 + <caret line="80" column="64" lean-forward="true" selection-start-line="80" selection-start-column="64" selection-end-line="80" selection-end-column="64" />
35 <folding> 49 <folding>
36 - <element signature="e#365#484#0#PHP" expanded="false" />  
37 - <element signature="e#490#1228#0#PHP" expanded="false" />  
38 - <element signature="e#1233#2896#0#PHP" expanded="false" />  
39 - <element signature="e#2902#3430#0#PHP" expanded="false" />  
40 - <element signature="e#3435#4206#0#PHP" expanded="false" />  
41 - <element signature="e#4212#4619#0#PHP" expanded="false" />  
42 - <element signature="e#4624#4967#0#PHP" expanded="false" />  
43 - <element signature="e#4973#5810#0#PHP" expanded="false" />  
44 - <element signature="e#5815#8010#0#PHP" expanded="false" />  
45 - <element signature="e#8016#8661#0#PHP" expanded="false" />  
46 - <element signature="e#8666#9762#0#PHP" expanded="false" />  
47 - <element signature="e#9768#10557#0#PHP" expanded="false" />  
48 - <element signature="e#10562#11880#0#PHP" expanded="false" />  
49 - <element signature="e#11888#12590#0#PHP" expanded="false" />  
50 - <element signature="e#12595#13795#0#PHP" expanded="false" />  
51 - <element signature="e#13801#14377#0#PHP" expanded="false" />  
52 - <element signature="e#14382#14929#0#PHP" expanded="false" />  
53 - <element signature="e#14935#15619#0#PHP" expanded="false" />  
54 - <element signature="e#15624#17720#0#PHP" expanded="false" />  
55 - <element signature="e#17726#18596#0#PHP" expanded="false" />  
56 - <element signature="e#18601#21097#0#PHP" expanded="false" />  
57 - <element signature="e#21103#21480#0#PHP" expanded="false" />  
58 - <element signature="e#21485#21806#0#PHP" expanded="false" />  
59 - <element signature="e#21812#22317#0#PHP" expanded="false" />  
60 - <element signature="e#22322#22573#0#PHP" expanded="false" />  
61 - <element signature="e#22579#23058#0#PHP" expanded="false" />  
62 - <element signature="e#23063#23820#0#PHP" expanded="false" />  
63 - <element signature="e#23826#24307#0#PHP" expanded="false" />  
64 - <element signature="e#24312#25082#0#PHP" expanded="false" />  
65 - <element signature="e#25088#25451#0#PHP" expanded="false" />  
66 - <element signature="e#25456#25647#0#PHP" expanded="false" />  
67 - <element signature="e#25653#26011#0#PHP" expanded="false" />  
68 - <element signature="e#26016#26206#0#PHP" expanded="false" />  
69 - <element signature="e#26212#27355#0#PHP" expanded="false" />  
70 - <element signature="e#27360#30025#0#PHP" expanded="false" />  
71 - <element signature="e#30031#30529#0#PHP" expanded="false" />  
72 - <element signature="e#30534#32280#0#PHP" expanded="false" />  
73 - <element signature="e#32286#32699#0#PHP" expanded="false" />  
74 - <element signature="e#32704#33183#0#PHP" expanded="false" />  
75 - <element signature="e#33189#33723#0#PHP" expanded="false" />  
76 - <element signature="e#33728#35113#0#PHP" expanded="false" />  
77 - <element signature="e#35119#35773#0#PHP" expanded="false" />  
78 - <element signature="e#35778#37731#0#PHP" expanded="false" />  
79 - <element signature="e#35932#36018#0#PHP" expanded="false" />  
80 - <element signature="e#36107#36195#0#PHP" expanded="false" />  
81 - <element signature="e#37737#38497#0#PHP" expanded="false" />  
82 - <element signature="e#38502#41211#0#PHP" expanded="false" />  
83 - <element signature="e#41237#42068#0#PHP" expanded="false" />  
84 - <element signature="e#42074#42494#0#PHP" expanded="false" />  
85 - <element signature="e#42499#42982#0#PHP" expanded="false" />  
86 - <element signature="e#42988#43794#0#PHP" expanded="false" />  
87 - <element signature="e#46977#48305#0#PHP" expanded="false" />  
88 - <element signature="e#48321#49348#0#PHP" expanded="false" />  
89 - <element signature="e#49354#50112#0#PHP" expanded="false" />  
90 - <element signature="e#50117#52504#0#PHP" expanded="false" /> 50 + <element signature="e#392#610#0#PHP" expanded="false" />
91 </folding> 51 </folding>
92 </state> 52 </state>
93 </provider> 53 </provider>
@@ -151,10 +111,10 @@ @@ -151,10 +111,10 @@
151 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" /> 111 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
152 <option value="$PROJECT_DIR$/application/admin/model/User.php" /> 112 <option value="$PROJECT_DIR$/application/admin/model/User.php" />
153 <option value="$PROJECT_DIR$/application/admin/model/Order.php" /> 113 <option value="$PROJECT_DIR$/application/admin/model/Order.php" />
  114 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
154 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> 115 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
155 - <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />  
156 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> 116 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
157 - <option value="$PROJECT_DIR$/application/api/controller/User.php" /> 117 + <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
158 </list> 118 </list>
159 </option> 119 </option>
160 </component> 120 </component>
@@ -172,11 +132,11 @@ @@ -172,11 +132,11 @@
172 <sorting>DEFINITION_ORDER</sorting> 132 <sorting>DEFINITION_ORDER</sorting>
173 </component> 133 </component>
174 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 134 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
175 - <component name="ProjectFrameBounds" extendedState="1">  
176 - <option name="x" value="40" />  
177 - <option name="y" value="43" /> 135 + <component name="ProjectFrameBounds">
  136 + <option name="x" value="151" />
  137 + <option name="y" value="78" />
178 <option name="width" value="1776" /> 138 <option name="width" value="1776" />
179 - <option name="height" value="956" /> 139 + <option name="height" value="950" />
180 </component> 140 </component>
181 <component name="ProjectView"> 141 <component name="ProjectView">
182 <navigator currentView="ProjectPane" proportions="" version="1"> 142 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -223,14 +183,42 @@ @@ -223,14 +183,42 @@
223 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 183 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
224 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 184 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
225 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 185 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
226 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 186 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  187 + <item name="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
227 </path> 188 </path>
228 <path> 189 <path>
229 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 190 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
230 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 191 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
231 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 192 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
232 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
233 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 193 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  194 + <item name="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
  195 + <item name="zh-cn" type="2a2b976b:PhpTreeStructureProvider$1" />
  196 + </path>
  197 + <path>
  198 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  199 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  200 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  201 + </path>
  202 + <path>
  203 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  204 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  205 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  206 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  207 + </path>
  208 + <path>
  209 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  210 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  211 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  212 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  213 + <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
  214 + </path>
  215 + <path>
  216 + <item name="areial" type="b2602c69:ProjectViewProjectNode" />
  217 + <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
  218 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  219 + <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
  220 + <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
  221 + <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
234 </path> 222 </path>
235 </expand> 223 </expand>
236 <select /> 224 <select />
@@ -292,7 +280,7 @@ @@ -292,7 +280,7 @@
292 <workItem from="1574410294356" duration="15863000" /> 280 <workItem from="1574410294356" duration="15863000" />
293 <workItem from="1574469667436" duration="25235000" /> 281 <workItem from="1574469667436" duration="25235000" />
294 <workItem from="1574641631900" duration="15479000" /> 282 <workItem from="1574641631900" duration="15479000" />
295 - <workItem from="1574669596135" duration="9186000" /> 283 + <workItem from="1574669596135" duration="11747000" />
296 </task> 284 </task>
297 <task id="LOCAL-00001" summary="调试"> 285 <task id="LOCAL-00001" summary="调试">
298 <created>1574145133364</created> 286 <created>1574145133364</created>
@@ -305,7 +293,7 @@ @@ -305,7 +293,7 @@
305 <servers /> 293 <servers />
306 </component> 294 </component>
307 <component name="TimeTrackingManager"> 295 <component name="TimeTrackingManager">
308 - <option name="totallyTimeSpent" value="227710000" /> 296 + <option name="totallyTimeSpent" value="230271000" />
309 </component> 297 </component>
310 <component name="TodoView"> 298 <component name="TodoView">
311 <todo-panel id="selected-file"> 299 <todo-panel id="selected-file">
@@ -317,7 +305,7 @@ @@ -317,7 +305,7 @@
317 </todo-panel> 305 </todo-panel>
318 </component> 306 </component>
319 <component name="ToolWindowManager"> 307 <component name="ToolWindowManager">
320 - <frame x="40" y="43" width="1776" height="956" extended-state="1" /> 308 + <frame x="151" y="78" width="1776" height="950" extended-state="0" />
321 <editor active="true" /> 309 <editor active="true" />
322 <layout> 310 <layout>
323 <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" /> 311 <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 @@ @@ -633,18 +621,6 @@
633 </state> 621 </state>
634 </provider> 622 </provider>
635 </entry> 623 </entry>
636 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">  
637 - <provider selected="true" editor-type-id="text-editor">  
638 - <state relative-caret-position="234">  
639 - <caret line="169" column="4" lean-forward="true" selection-start-line="169" selection-start-column="4" selection-end-line="176" selection-end-column="5" />  
640 - <folding>  
641 - <element signature="e#684#1822#0#PHP" expanded="false" />  
642 - <element signature="e#1854#3656#0#PHP" expanded="false" />  
643 - <element signature="e#3688#5728#0#PHP" expanded="false" />  
644 - </folding>  
645 - </state>  
646 - </provider>  
647 - </entry>  
648 <entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php"> 624 <entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
649 <provider selected="true" editor-type-id="text-editor"> 625 <provider selected="true" editor-type-id="text-editor">
650 <state relative-caret-position="275"> 626 <state relative-caret-position="275">
@@ -680,14 +656,6 @@ @@ -680,14 +656,6 @@
680 </state> 656 </state>
681 </provider> 657 </provider>
682 </entry> 658 </entry>
683 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">  
684 - <provider selected="true" editor-type-id="text-editor">  
685 - <state relative-caret-position="309">  
686 - <caret line="30" column="100" lean-forward="true" selection-start-line="30" selection-start-column="100" selection-end-line="30" selection-end-column="100" />  
687 - <folding />  
688 - </state>  
689 - </provider>  
690 - </entry>  
691 <entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html"> 659 <entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
692 <provider selected="true" editor-type-id="text-editor"> 660 <provider selected="true" editor-type-id="text-editor">
693 <state relative-caret-position="0"> 661 <state relative-caret-position="0">
@@ -720,37 +688,10 @@ @@ -720,37 +688,10 @@
720 </state> 688 </state>
721 </provider> 689 </provider>
722 </entry> 690 </entry>
723 - <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php">  
724 - <provider selected="true" editor-type-id="text-editor">  
725 - <state relative-caret-position="175">  
726 - <caret line="7" column="32" lean-forward="false" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />  
727 - <folding />  
728 - </state>  
729 - </provider>  
730 - </entry>  
731 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">  
732 - <provider selected="true" editor-type-id="text-editor">  
733 - <state relative-caret-position="425">  
734 - <caret line="31" column="70" lean-forward="false" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />  
735 - <folding />  
736 - </state>  
737 - </provider>  
738 - </entry>  
739 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">  
740 - <provider selected="true" editor-type-id="text-editor">  
741 - <state relative-caret-position="653">  
742 - <caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />  
743 - <folding>  
744 - <element signature="e#392#610#0#PHP" expanded="false" />  
745 - <element signature="e#643#1763#0#PHP" expanded="false" />  
746 - </folding>  
747 - </state>  
748 - </provider>  
749 - </entry>  
750 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 691 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
751 <provider selected="true" editor-type-id="text-editor"> 692 <provider selected="true" editor-type-id="text-editor">
752 - <state relative-caret-position="441">  
753 - <caret line="1311" column="8" lean-forward="false" selection-start-line="1311" selection-start-column="8" selection-end-line="1311" selection-end-column="8" /> 693 + <state relative-caret-position="294">
  694 + <caret line="1309" column="29" lean-forward="false" selection-start-line="1309" selection-start-column="29" selection-end-line="1309" selection-end-column="29" />
754 <folding> 695 <folding>
755 <element signature="e#365#484#0#PHP" expanded="false" /> 696 <element signature="e#365#484#0#PHP" expanded="false" />
756 <element signature="e#490#1228#0#PHP" expanded="false" /> 697 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -803,10 +744,58 @@ @@ -803,10 +744,58 @@
803 <element signature="e#42074#42494#0#PHP" expanded="false" /> 744 <element signature="e#42074#42494#0#PHP" expanded="false" />
804 <element signature="e#42499#42982#0#PHP" expanded="false" /> 745 <element signature="e#42499#42982#0#PHP" expanded="false" />
805 <element signature="e#42988#43794#0#PHP" expanded="false" /> 746 <element signature="e#42988#43794#0#PHP" expanded="false" />
806 - <element signature="e#46977#48305#0#PHP" expanded="false" />  
807 - <element signature="e#48321#49348#0#PHP" expanded="false" />  
808 - <element signature="e#49354#50112#0#PHP" expanded="false" />  
809 - <element signature="e#50117#52504#0#PHP" expanded="false" /> 747 + <element signature="e#43799#46953#0#PHP" expanded="false" />
  748 + <element signature="e#46968#48296#0#PHP" expanded="false" />
  749 + <element signature="e#48312#49339#0#PHP" expanded="false" />
  750 + <element signature="e#49345#50103#0#PHP" expanded="false" />
  751 + <element signature="e#50108#52495#0#PHP" expanded="false" />
  752 + </folding>
  753 + </state>
  754 + </provider>
  755 + </entry>
  756 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
  757 + <provider selected="true" editor-type-id="text-editor">
  758 + <state relative-caret-position="494">
  759 + <caret line="60" column="12" lean-forward="true" selection-start-line="60" selection-start-column="12" selection-end-line="63" selection-end-column="13" />
  760 + <folding>
  761 + <element signature="e#1854#3656#0#PHP" expanded="false" />
  762 + <element signature="e#3688#5728#0#PHP" expanded="false" />
  763 + <element signature="e#5734#5978#0#PHP" expanded="false" />
  764 + <element signature="e#6135#11936#0#PHP" expanded="false" />
  765 + </folding>
  766 + </state>
  767 + </provider>
  768 + </entry>
  769 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
  770 + <provider selected="true" editor-type-id="text-editor">
  771 + <state relative-caret-position="400">
  772 + <caret line="27" column="78" lean-forward="true" selection-start-line="27" selection-start-column="78" selection-end-line="27" selection-end-column="78" />
  773 + <folding />
  774 + </state>
  775 + </provider>
  776 + </entry>
  777 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
  778 + <provider selected="true" editor-type-id="text-editor">
  779 + <state relative-caret-position="234">
  780 + <caret line="27" column="75" lean-forward="true" selection-start-line="27" selection-start-column="75" selection-end-line="27" selection-end-column="75" />
  781 + <folding />
  782 + </state>
  783 + </provider>
  784 + </entry>
  785 + <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php">
  786 + <provider selected="true" editor-type-id="text-editor">
  787 + <state relative-caret-position="150">
  788 + <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
  789 + <folding />
  790 + </state>
  791 + </provider>
  792 + </entry>
  793 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
  794 + <provider selected="true" editor-type-id="text-editor">
  795 + <state relative-caret-position="513">
  796 + <caret line="80" column="64" lean-forward="true" selection-start-line="80" selection-start-column="64" selection-end-line="80" selection-end-column="64" />
  797 + <folding>
  798 + <element signature="e#392#610#0#PHP" expanded="false" />
810 </folding> 799 </folding>
811 </state> 800 </state>
812 </provider> 801 </provider>
@@ -67,8 +67,20 @@ class Order extends Backend @@ -67,8 +67,20 @@ class Order extends Backend
67 67
68 } 68 }
69 $list = collection($list)->toArray(); 69 $list = collection($list)->toArray();
  70 + $type = new \app\admin\model\Pic();
  71 + $video = new \app\admin\model\Video();
  72 + foreach ($list as &$v){
  73 + $type_ids = $type->whereIn('id',$v['pic_id'])->column('title');
  74 + if($v['video_id']){
  75 + $videos = unserialize($v['video_id']);
  76 + foreach ($videos as &$v1){
  77 + $v1['id'] = $video->where('id',$v1['id'])->column('title');
  78 + }
  79 + $v['video_id'] = $v1['id'];
  80 + }
  81 + $v['pic_id'] = trim(implode(',',$type_ids),',');
  82 + }
70 $result = array("total" => $total, "rows" => $list); 83 $result = array("total" => $total, "rows" => $list);
71 -  
72 return json($result); 84 return json($result);
73 } 85 }
74 return $this->view->fetch(); 86 return $this->view->fetch();
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 return [ 3 return [
4 'User_id' => '用户ID', 4 'User_id' => '用户ID',
5 - 'Pic_id' => '图片ID',  
6 - 'Video_id' => '视频ID', 5 + 'Pic_id' => '图片标题',
  6 + 'Video_id' => '视频标题',
7 'Total' => '价格', 7 'Total' => '价格',
8 'Status' => '状态', 8 'Status' => '状态',
9 'Num' => '订单号', 9 'Num' => '订单号',
@@ -1309,7 +1309,6 @@ class User extends Api @@ -1309,7 +1309,6 @@ class User extends Api
1309 */ 1309 */
1310 public function myorder() 1310 public function myorder()
1311 { 1311 {
1312 -  
1313 $user_id = $this->uid; 1312 $user_id = $this->uid;
1314 $page = $this->request->param('page',1,'intval'); 1313 $page = $this->request->param('page',1,'intval');
1315 $pageNum = $this->request->param('pageNum',10,'intval'); 1314 $pageNum = $this->request->param('pageNum',10,'intval');