郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 042836717eb795f1ce7bc5844cd82284d8d2abe4 1 个父辈 8a43b0f3
1 个管道 的构建 通过 耗费 9 秒

添加标题

内嵌 并排对比
正在显示 4 个修改的文件 包含 161 行增加 和 159 行删除
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
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" /> 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" />  
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
9 </list> 8 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -14,38 +13,13 @@ @@ -14,38 +13,13 @@
14 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 13 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
15 <option name="LAST_RESOLUTION" value="IGNORE" /> 14 <option name="LAST_RESOLUTION" value="IGNORE" />
16 </component> 15 </component>
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">  
24 - <provider selected="true" editor-type-id="text-editor">  
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" />  
27 - <folding>  
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" />  
32 - </folding>  
33 - </state>  
34 - </provider>  
35 - </entry>  
36 - </file>  
37 - </leaf>  
38 - </state>  
39 - </content>  
40 - </window>  
41 - </component>  
42 <component name="FileEditorManager"> 16 <component name="FileEditorManager">
43 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 17 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
44 - <file leaf-file-name="Order.php" pinned="false" current-in-tab="true"> 18 + <file leaf-file-name="Order.php" pinned="false" current-in-tab="false">
45 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> 19 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
46 <provider selected="true" editor-type-id="text-editor"> 20 <provider selected="true" editor-type-id="text-editor">
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" /> 21 + <state relative-caret-position="654">
  22 + <caret line="75" column="53" lean-forward="true" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
49 <folding> 23 <folding>
50 <element signature="e#392#610#0#PHP" expanded="false" /> 24 <element signature="e#392#610#0#PHP" expanded="false" />
51 </folding> 25 </folding>
@@ -53,6 +27,72 @@ @@ -53,6 +27,72 @@
53 </provider> 27 </provider>
54 </entry> 28 </entry>
55 </file> 29 </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">
  32 + <provider selected="true" editor-type-id="text-editor">
  33 + <state relative-caret-position="354">
  34 + <caret line="343" column="51" lean-forward="true" selection-start-line="343" selection-start-column="51" selection-end-line="343" selection-end-column="51" />
  35 + <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#11894#12596#0#PHP" expanded="false" />
  49 + <element signature="e#12601#13801#0#PHP" expanded="false" />
  50 + <element signature="e#13807#14383#0#PHP" expanded="false" />
  51 + <element signature="e#14388#14935#0#PHP" expanded="false" />
  52 + <element signature="e#14941#15625#0#PHP" expanded="false" />
  53 + <element signature="e#15630#17726#0#PHP" expanded="false" />
  54 + <element signature="e#17732#18602#0#PHP" expanded="false" />
  55 + <element signature="e#18607#21103#0#PHP" expanded="false" />
  56 + <element signature="e#21109#21486#0#PHP" expanded="false" />
  57 + <element signature="e#21491#21812#0#PHP" expanded="false" />
  58 + <element signature="e#21818#22323#0#PHP" expanded="false" />
  59 + <element signature="e#22328#22579#0#PHP" expanded="false" />
  60 + <element signature="e#22585#23064#0#PHP" expanded="false" />
  61 + <element signature="e#23069#23826#0#PHP" expanded="false" />
  62 + <element signature="e#23832#24313#0#PHP" expanded="false" />
  63 + <element signature="e#24318#25088#0#PHP" expanded="false" />
  64 + <element signature="e#25094#25457#0#PHP" expanded="false" />
  65 + <element signature="e#25462#25653#0#PHP" expanded="false" />
  66 + <element signature="e#25659#26017#0#PHP" expanded="false" />
  67 + <element signature="e#26022#26212#0#PHP" expanded="false" />
  68 + <element signature="e#26218#27361#0#PHP" expanded="false" />
  69 + <element signature="e#27366#30031#0#PHP" expanded="false" />
  70 + <element signature="e#30037#30535#0#PHP" expanded="false" />
  71 + <element signature="e#30540#32286#0#PHP" expanded="false" />
  72 + <element signature="e#32292#32705#0#PHP" expanded="false" />
  73 + <element signature="e#32710#33189#0#PHP" expanded="false" />
  74 + <element signature="e#33195#33729#0#PHP" expanded="false" />
  75 + <element signature="e#33734#35119#0#PHP" expanded="false" />
  76 + <element signature="e#35125#35779#0#PHP" expanded="false" />
  77 + <element signature="e#35784#37737#0#PHP" expanded="false" />
  78 + <element signature="e#35938#36024#0#PHP" expanded="false" />
  79 + <element signature="e#36113#36201#0#PHP" expanded="false" />
  80 + <element signature="e#37743#38503#0#PHP" expanded="false" />
  81 + <element signature="e#38508#41217#0#PHP" expanded="false" />
  82 + <element signature="e#41243#42074#0#PHP" expanded="false" />
  83 + <element signature="e#42080#42500#0#PHP" expanded="false" />
  84 + <element signature="e#42505#42988#0#PHP" expanded="false" />
  85 + <element signature="e#42994#43800#0#PHP" expanded="false" />
  86 + <element signature="e#43805#46959#0#PHP" expanded="false" />
  87 + <element signature="e#46974#48302#0#PHP" expanded="false" />
  88 + <element signature="e#48318#49345#0#PHP" expanded="false" />
  89 + <element signature="e#49351#50109#0#PHP" expanded="false" />
  90 + <element signature="e#50114#52501#0#PHP" expanded="false" />
  91 + </folding>
  92 + </state>
  93 + </provider>
  94 + </entry>
  95 + </file>
56 </leaf> 96 </leaf>
57 </component> 97 </component>
58 <component name="FindInProjectRecents"> 98 <component name="FindInProjectRecents">
@@ -111,10 +151,10 @@ @@ -111,10 +151,10 @@
111 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" /> 151 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
112 <option value="$PROJECT_DIR$/application/admin/model/User.php" /> 152 <option value="$PROJECT_DIR$/application/admin/model/User.php" />
113 <option value="$PROJECT_DIR$/application/admin/model/Order.php" /> 153 <option value="$PROJECT_DIR$/application/admin/model/Order.php" />
114 - <option value="$PROJECT_DIR$/application/api/controller/User.php" />  
115 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> 154 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
116 - <option value="$PROJECT_DIR$/application/admin/controller/Order.php" />  
117 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" /> 155 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
  156 + <option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
  157 + <option value="$PROJECT_DIR$/application/api/controller/User.php" />
118 </list> 158 </list>
119 </option> 159 </option>
120 </component> 160 </component>
@@ -133,10 +173,10 @@ @@ -133,10 +173,10 @@
133 </component> 173 </component>
134 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 174 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
135 <component name="ProjectFrameBounds"> 175 <component name="ProjectFrameBounds">
136 - <option name="x" value="151" />  
137 - <option name="y" value="78" /> 176 + <option name="x" value="281" />
  177 + <option name="y" value="39" />
138 <option name="width" value="1776" /> 178 <option name="width" value="1776" />
139 - <option name="height" value="950" /> 179 + <option name="height" value="966" />
140 </component> 180 </component>
141 <component name="ProjectView"> 181 <component name="ProjectView">
142 <navigator currentView="ProjectPane" proportions="" version="1"> 182 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -153,7 +193,6 @@ @@ -153,7 +193,6 @@
153 <foldersAlwaysOnTop value="true" /> 193 <foldersAlwaysOnTop value="true" />
154 </navigator> 194 </navigator>
155 <panes> 195 <panes>
156 - <pane id="Scratches" />  
157 <pane id="ProjectPane"> 196 <pane id="ProjectPane">
158 <subPane> 197 <subPane>
159 <expand> 198 <expand>
@@ -183,47 +222,20 @@ @@ -183,47 +222,20 @@
183 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 222 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
184 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 223 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
185 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 224 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
186 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />  
187 - <item name="lang" type="2a2b976b:PhpTreeStructureProvider$1" /> 225 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
188 </path> 226 </path>
189 <path> 227 <path>
190 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 228 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
191 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 229 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
192 <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> 230 <item name="application" 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" /> 231 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  232 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
222 </path> 233 </path>
223 </expand> 234 </expand>
224 <select /> 235 <select />
225 </subPane> 236 </subPane>
226 </pane> 237 </pane>
  238 + <pane id="Scratches" />
227 <pane id="Scope" /> 239 <pane id="Scope" />
228 </panes> 240 </panes>
229 </component> 241 </component>
@@ -281,6 +293,7 @@ @@ -281,6 +293,7 @@
281 <workItem from="1574469667436" duration="25235000" /> 293 <workItem from="1574469667436" duration="25235000" />
282 <workItem from="1574641631900" duration="15479000" /> 294 <workItem from="1574641631900" duration="15479000" />
283 <workItem from="1574669596135" duration="11747000" /> 295 <workItem from="1574669596135" duration="11747000" />
  296 + <workItem from="1574727687281" duration="1888000" />
284 </task> 297 </task>
285 <task id="LOCAL-00001" summary="调试"> 298 <task id="LOCAL-00001" summary="调试">
286 <created>1574145133364</created> 299 <created>1574145133364</created>
@@ -293,7 +306,7 @@ @@ -293,7 +306,7 @@
293 <servers /> 306 <servers />
294 </component> 307 </component>
295 <component name="TimeTrackingManager"> 308 <component name="TimeTrackingManager">
296 - <option name="totallyTimeSpent" value="230271000" /> 309 + <option name="totallyTimeSpent" value="232159000" />
297 </component> 310 </component>
298 <component name="TodoView"> 311 <component name="TodoView">
299 <todo-panel id="selected-file"> 312 <todo-panel id="selected-file">
@@ -305,19 +318,18 @@ @@ -305,19 +318,18 @@
305 </todo-panel> 318 </todo-panel>
306 </component> 319 </component>
307 <component name="ToolWindowManager"> 320 <component name="ToolWindowManager">
308 - <frame x="151" y="78" width="1776" height="950" extended-state="0" />  
309 - <editor active="true" /> 321 + <frame x="281" y="39" width="1776" height="966" extended-state="0" />
310 <layout> 322 <layout>
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" /> 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.15792541" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
312 <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" /> 324 <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" />
313 <window_info id="Event Log" 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="0" side_tool="true" content_ui="tabs" /> 325 <window_info id="Event Log" 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="0" side_tool="true" content_ui="tabs" />
314 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 326 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
315 - <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" />  
316 <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" /> 327 <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" />
  328 + <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" />
317 <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" /> 329 <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" />
318 - <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" />  
319 - <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" /> 330 + <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" />
320 <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" /> 331 <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" />
  332 + <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" />
321 <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" /> 333 <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" />
322 <window_info id="Message" 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="3" side_tool="false" content_ui="tabs" /> 334 <window_info id="Message" 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="3" side_tool="false" content_ui="tabs" />
323 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 335 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -601,7 +613,6 @@ @@ -601,7 +613,6 @@
601 <provider selected="true" editor-type-id="text-editor"> 613 <provider selected="true" editor-type-id="text-editor">
602 <state relative-caret-position="-1875"> 614 <state relative-caret-position="-1875">
603 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 615 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
604 - <folding />  
605 </state> 616 </state>
606 </provider> 617 </provider>
607 </entry> 618 </entry>
@@ -609,7 +620,6 @@ @@ -609,7 +620,6 @@
609 <provider selected="true" editor-type-id="text-editor"> 620 <provider selected="true" editor-type-id="text-editor">
610 <state relative-caret-position="-150"> 621 <state relative-caret-position="-150">
611 <caret line="9" column="43" lean-forward="true" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="43" /> 622 <caret line="9" column="43" lean-forward="true" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="43" />
612 - <folding />  
613 </state> 623 </state>
614 </provider> 624 </provider>
615 </entry> 625 </entry>
@@ -617,7 +627,6 @@ @@ -617,7 +627,6 @@
617 <provider selected="true" editor-type-id="text-editor"> 627 <provider selected="true" editor-type-id="text-editor">
618 <state relative-caret-position="175"> 628 <state relative-caret-position="175">
619 <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" /> 629 <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
620 - <folding />  
621 </state> 630 </state>
622 </provider> 631 </provider>
623 </entry> 632 </entry>
@@ -636,7 +645,6 @@ @@ -636,7 +645,6 @@
636 <provider selected="true" editor-type-id="text-editor"> 645 <provider selected="true" editor-type-id="text-editor">
637 <state relative-caret-position="0"> 646 <state relative-caret-position="0">
638 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 647 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
639 - <folding />  
640 </state> 648 </state>
641 </provider> 649 </provider>
642 </entry> 650 </entry>
@@ -644,7 +652,6 @@ @@ -644,7 +652,6 @@
644 <provider selected="true" editor-type-id="text-editor"> 652 <provider selected="true" editor-type-id="text-editor">
645 <state relative-caret-position="325"> 653 <state relative-caret-position="325">
646 <caret line="22" column="6" lean-forward="true" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" /> 654 <caret line="22" column="6" lean-forward="true" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
647 - <folding />  
648 </state> 655 </state>
649 </provider> 656 </provider>
650 </entry> 657 </entry>
@@ -660,7 +667,6 @@ @@ -660,7 +667,6 @@
660 <provider selected="true" editor-type-id="text-editor"> 667 <provider selected="true" editor-type-id="text-editor">
661 <state relative-caret-position="0"> 668 <state relative-caret-position="0">
662 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 669 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
663 - <folding />  
664 </state> 670 </state>
665 </provider> 671 </provider>
666 </entry> 672 </entry>
@@ -668,7 +674,6 @@ @@ -668,7 +674,6 @@
668 <provider selected="true" editor-type-id="text-editor"> 674 <provider selected="true" editor-type-id="text-editor">
669 <state relative-caret-position="1030"> 675 <state relative-caret-position="1030">
670 <caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" /> 676 <caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
671 - <folding />  
672 </state> 677 </state>
673 </provider> 678 </provider>
674 </entry> 679 </entry>
@@ -676,7 +681,6 @@ @@ -676,7 +681,6 @@
676 <provider selected="true" editor-type-id="text-editor"> 681 <provider selected="true" editor-type-id="text-editor">
677 <state relative-caret-position="654"> 682 <state relative-caret-position="654">
678 <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" /> 683 <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
679 - <folding />  
680 </state> 684 </state>
681 </provider> 685 </provider>
682 </entry> 686 </entry>
@@ -684,79 +688,13 @@ @@ -684,79 +688,13 @@
684 <provider selected="true" editor-type-id="text-editor"> 688 <provider selected="true" editor-type-id="text-editor">
685 <state relative-caret-position="425"> 689 <state relative-caret-position="425">
686 <caret line="44" column="129" lean-forward="false" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="129" /> 690 <caret line="44" column="129" lean-forward="false" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="129" />
687 - <folding />  
688 - </state>  
689 - </provider>  
690 - </entry>  
691 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">  
692 - <provider selected="true" editor-type-id="text-editor">  
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" />  
695 - <folding>  
696 - <element signature="e#365#484#0#PHP" expanded="false" />  
697 - <element signature="e#490#1228#0#PHP" expanded="false" />  
698 - <element signature="e#1233#2896#0#PHP" expanded="false" />  
699 - <element signature="e#2902#3430#0#PHP" expanded="false" />  
700 - <element signature="e#3435#4206#0#PHP" expanded="false" />  
701 - <element signature="e#4212#4619#0#PHP" expanded="false" />  
702 - <element signature="e#4624#4967#0#PHP" expanded="false" />  
703 - <element signature="e#4973#5810#0#PHP" expanded="false" />  
704 - <element signature="e#5815#8010#0#PHP" expanded="false" />  
705 - <element signature="e#8016#8661#0#PHP" expanded="false" />  
706 - <element signature="e#8666#9762#0#PHP" expanded="false" />  
707 - <element signature="e#9768#10557#0#PHP" expanded="false" />  
708 - <element signature="e#10562#11880#0#PHP" expanded="false" />  
709 - <element signature="e#11888#12590#0#PHP" expanded="false" />  
710 - <element signature="e#12595#13795#0#PHP" expanded="false" />  
711 - <element signature="e#13801#14377#0#PHP" expanded="false" />  
712 - <element signature="e#14382#14929#0#PHP" expanded="false" />  
713 - <element signature="e#14935#15619#0#PHP" expanded="false" />  
714 - <element signature="e#15624#17720#0#PHP" expanded="false" />  
715 - <element signature="e#17726#18596#0#PHP" expanded="false" />  
716 - <element signature="e#18601#21097#0#PHP" expanded="false" />  
717 - <element signature="e#21103#21480#0#PHP" expanded="false" />  
718 - <element signature="e#21485#21806#0#PHP" expanded="false" />  
719 - <element signature="e#21812#22317#0#PHP" expanded="false" />  
720 - <element signature="e#22322#22573#0#PHP" expanded="false" />  
721 - <element signature="e#22579#23058#0#PHP" expanded="false" />  
722 - <element signature="e#23063#23820#0#PHP" expanded="false" />  
723 - <element signature="e#23826#24307#0#PHP" expanded="false" />  
724 - <element signature="e#24312#25082#0#PHP" expanded="false" />  
725 - <element signature="e#25088#25451#0#PHP" expanded="false" />  
726 - <element signature="e#25456#25647#0#PHP" expanded="false" />  
727 - <element signature="e#25653#26011#0#PHP" expanded="false" />  
728 - <element signature="e#26016#26206#0#PHP" expanded="false" />  
729 - <element signature="e#26212#27355#0#PHP" expanded="false" />  
730 - <element signature="e#27360#30025#0#PHP" expanded="false" />  
731 - <element signature="e#30031#30529#0#PHP" expanded="false" />  
732 - <element signature="e#30534#32280#0#PHP" expanded="false" />  
733 - <element signature="e#32286#32699#0#PHP" expanded="false" />  
734 - <element signature="e#32704#33183#0#PHP" expanded="false" />  
735 - <element signature="e#33189#33723#0#PHP" expanded="false" />  
736 - <element signature="e#33728#35113#0#PHP" expanded="false" />  
737 - <element signature="e#35119#35773#0#PHP" expanded="false" />  
738 - <element signature="e#35778#37731#0#PHP" expanded="false" />  
739 - <element signature="e#35932#36018#0#PHP" expanded="false" />  
740 - <element signature="e#36107#36195#0#PHP" expanded="false" />  
741 - <element signature="e#37737#38497#0#PHP" expanded="false" />  
742 - <element signature="e#38502#41211#0#PHP" expanded="false" />  
743 - <element signature="e#41237#42068#0#PHP" expanded="false" />  
744 - <element signature="e#42074#42494#0#PHP" expanded="false" />  
745 - <element signature="e#42499#42982#0#PHP" expanded="false" />  
746 - <element signature="e#42988#43794#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> 691 </state>
754 </provider> 692 </provider>
755 </entry> 693 </entry>
756 <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php"> 694 <entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
757 <provider selected="true" editor-type-id="text-editor"> 695 <provider selected="true" editor-type-id="text-editor">
758 <state relative-caret-position="494"> 696 <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" /> 697 + <caret line="60" column="12" lean-forward="false" selection-start-line="60" selection-start-column="12" selection-end-line="63" selection-end-column="13" />
760 <folding> 698 <folding>
761 <element signature="e#1854#3656#0#PHP" expanded="false" /> 699 <element signature="e#1854#3656#0#PHP" expanded="false" />
762 <element signature="e#3688#5728#0#PHP" expanded="false" /> 700 <element signature="e#3688#5728#0#PHP" expanded="false" />
@@ -770,7 +708,6 @@ @@ -770,7 +708,6 @@
770 <provider selected="true" editor-type-id="text-editor"> 708 <provider selected="true" editor-type-id="text-editor">
771 <state relative-caret-position="400"> 709 <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" /> 710 <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> 711 </state>
775 </provider> 712 </provider>
776 </entry> 713 </entry>
@@ -778,7 +715,6 @@ @@ -778,7 +715,6 @@
778 <provider selected="true" editor-type-id="text-editor"> 715 <provider selected="true" editor-type-id="text-editor">
779 <state relative-caret-position="234"> 716 <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" /> 717 <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> 718 </state>
783 </provider> 719 </provider>
784 </entry> 720 </entry>
@@ -792,13 +728,77 @@ @@ -792,13 +728,77 @@
792 </entry> 728 </entry>
793 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> 729 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
794 <provider selected="true" editor-type-id="text-editor"> 730 <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" /> 731 + <state relative-caret-position="654">
  732 + <caret line="75" column="53" lean-forward="true" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
797 <folding> 733 <folding>
798 <element signature="e#392#610#0#PHP" expanded="false" /> 734 <element signature="e#392#610#0#PHP" expanded="false" />
799 </folding> 735 </folding>
800 </state> 736 </state>
801 </provider> 737 </provider>
802 </entry> 738 </entry>
  739 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
  740 + <provider selected="true" editor-type-id="text-editor">
  741 + <state relative-caret-position="354">
  742 + <caret line="343" column="51" lean-forward="true" selection-start-line="343" selection-start-column="51" selection-end-line="343" selection-end-column="51" />
  743 + <folding>
  744 + <element signature="e#365#484#0#PHP" expanded="false" />
  745 + <element signature="e#490#1228#0#PHP" expanded="false" />
  746 + <element signature="e#1233#2896#0#PHP" expanded="false" />
  747 + <element signature="e#2902#3430#0#PHP" expanded="false" />
  748 + <element signature="e#3435#4206#0#PHP" expanded="false" />
  749 + <element signature="e#4212#4619#0#PHP" expanded="false" />
  750 + <element signature="e#4624#4967#0#PHP" expanded="false" />
  751 + <element signature="e#4973#5810#0#PHP" expanded="false" />
  752 + <element signature="e#5815#8010#0#PHP" expanded="false" />
  753 + <element signature="e#8016#8661#0#PHP" expanded="false" />
  754 + <element signature="e#8666#9762#0#PHP" expanded="false" />
  755 + <element signature="e#9768#10557#0#PHP" expanded="false" />
  756 + <element signature="e#11894#12596#0#PHP" expanded="false" />
  757 + <element signature="e#12601#13801#0#PHP" expanded="false" />
  758 + <element signature="e#13807#14383#0#PHP" expanded="false" />
  759 + <element signature="e#14388#14935#0#PHP" expanded="false" />
  760 + <element signature="e#14941#15625#0#PHP" expanded="false" />
  761 + <element signature="e#15630#17726#0#PHP" expanded="false" />
  762 + <element signature="e#17732#18602#0#PHP" expanded="false" />
  763 + <element signature="e#18607#21103#0#PHP" expanded="false" />
  764 + <element signature="e#21109#21486#0#PHP" expanded="false" />
  765 + <element signature="e#21491#21812#0#PHP" expanded="false" />
  766 + <element signature="e#21818#22323#0#PHP" expanded="false" />
  767 + <element signature="e#22328#22579#0#PHP" expanded="false" />
  768 + <element signature="e#22585#23064#0#PHP" expanded="false" />
  769 + <element signature="e#23069#23826#0#PHP" expanded="false" />
  770 + <element signature="e#23832#24313#0#PHP" expanded="false" />
  771 + <element signature="e#24318#25088#0#PHP" expanded="false" />
  772 + <element signature="e#25094#25457#0#PHP" expanded="false" />
  773 + <element signature="e#25462#25653#0#PHP" expanded="false" />
  774 + <element signature="e#25659#26017#0#PHP" expanded="false" />
  775 + <element signature="e#26022#26212#0#PHP" expanded="false" />
  776 + <element signature="e#26218#27361#0#PHP" expanded="false" />
  777 + <element signature="e#27366#30031#0#PHP" expanded="false" />
  778 + <element signature="e#30037#30535#0#PHP" expanded="false" />
  779 + <element signature="e#30540#32286#0#PHP" expanded="false" />
  780 + <element signature="e#32292#32705#0#PHP" expanded="false" />
  781 + <element signature="e#32710#33189#0#PHP" expanded="false" />
  782 + <element signature="e#33195#33729#0#PHP" expanded="false" />
  783 + <element signature="e#33734#35119#0#PHP" expanded="false" />
  784 + <element signature="e#35125#35779#0#PHP" expanded="false" />
  785 + <element signature="e#35784#37737#0#PHP" expanded="false" />
  786 + <element signature="e#35938#36024#0#PHP" expanded="false" />
  787 + <element signature="e#36113#36201#0#PHP" expanded="false" />
  788 + <element signature="e#37743#38503#0#PHP" expanded="false" />
  789 + <element signature="e#38508#41217#0#PHP" expanded="false" />
  790 + <element signature="e#41243#42074#0#PHP" expanded="false" />
  791 + <element signature="e#42080#42500#0#PHP" expanded="false" />
  792 + <element signature="e#42505#42988#0#PHP" expanded="false" />
  793 + <element signature="e#42994#43800#0#PHP" expanded="false" />
  794 + <element signature="e#43805#46959#0#PHP" expanded="false" />
  795 + <element signature="e#46974#48302#0#PHP" expanded="false" />
  796 + <element signature="e#48318#49345#0#PHP" expanded="false" />
  797 + <element signature="e#49351#50109#0#PHP" expanded="false" />
  798 + <element signature="e#50114#52501#0#PHP" expanded="false" />
  799 + </folding>
  800 + </state>
  801 + </provider>
  802 + </entry>
803 </component> 803 </component>
804 </project> 804 </project>
@@ -71,15 +71,17 @@ class Order extends Backend @@ -71,15 +71,17 @@ class Order extends Backend
71 $video = new \app\admin\model\Video(); 71 $video = new \app\admin\model\Video();
72 foreach ($list as &$v){ 72 foreach ($list as &$v){
73 $type_ids = $type->whereIn('id',$v['pic_id'])->column('title'); 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'); 74 + if(!empty($v['video_id'])){
  75 + $v['video_id'] = unserialize($v['video_id']);
  76 + foreach ($v['video_id'] as &$v1){
  77 + $v1['id'] = $video->where('id',$v1['id'])->field('title')->find();
78 } 78 }
79 - $v['video_id'] = $v1['id']; 79 +// array_push($a,$v1['id']);
  80 +// $v['video_id'] = $a;
80 } 81 }
81 $v['pic_id'] = trim(implode(',',$type_ids),','); 82 $v['pic_id'] = trim(implode(',',$type_ids),',');
82 } 83 }
  84 + print_r($list);die;
83 $result = array("total" => $total, "rows" => $list); 85 $result = array("total" => $total, "rows" => $list);
84 return json($result); 86 return json($result);
85 } 87 }
@@ -341,7 +341,7 @@ class User extends Api @@ -341,7 +341,7 @@ class User extends Api
341 $where['type_ids'] = ['like',"%$type%"]; 341 $where['type_ids'] = ['like',"%$type%"];
342 $data = Db::name('video') 342 $data = Db::name('video')
343 ->where($where) 343 ->where($where)
344 - ->field('id,thumbnail,video') 344 + ->field('id,thumbnail,video,title')
345 ->order('id desc') 345 ->order('id desc')
346 ->page($page,$pageNum) 346 ->page($page,$pageNum)
347 ->select(); 347 ->select();
@@ -5706,7 +5706,7 @@ @@ -5706,7 +5706,7 @@
5706 5706
5707 <div class="row mt0 footer"> 5707 <div class="row mt0 footer">
5708 <div class="col-md-6" align="left"> 5708 <div class="col-md-6" align="left">
5709 - Generated on 2019-11-25 18:32:49 </div> 5709 + Generated on 2019-11-26 09:04:16 </div>
5710 <div class="col-md-6" align="right"> 5710 <div class="col-md-6" align="right">
5711 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 5711 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
5712 </div> 5712 </div>