添加标题

@@ -4,7 +4,6 @@
     <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" />
@@ -14,38 +13,13 @@
     <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="true">
+      <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="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" />
+            <state relative-caret-position="654">
+              <caret line="75" column="53" lean-forward="true" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
               <folding>
                 <element signature="e#392#610#0#PHP" expanded="false" />
               </folding>
@@ -53,6 +27,72 @@
           </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="354">
+              <caret line="343" column="51" lean-forward="true" selection-start-line="343" selection-start-column="51" selection-end-line="343" selection-end-column="51" />
+              <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#11894#12596#0#PHP" expanded="false" />
+                <element signature="e#12601#13801#0#PHP" expanded="false" />
+                <element signature="e#13807#14383#0#PHP" expanded="false" />
+                <element signature="e#14388#14935#0#PHP" expanded="false" />
+                <element signature="e#14941#15625#0#PHP" expanded="false" />
+                <element signature="e#15630#17726#0#PHP" expanded="false" />
+                <element signature="e#17732#18602#0#PHP" expanded="false" />
+                <element signature="e#18607#21103#0#PHP" expanded="false" />
+                <element signature="e#21109#21486#0#PHP" expanded="false" />
+                <element signature="e#21491#21812#0#PHP" expanded="false" />
+                <element signature="e#21818#22323#0#PHP" expanded="false" />
+                <element signature="e#22328#22579#0#PHP" expanded="false" />
+                <element signature="e#22585#23064#0#PHP" expanded="false" />
+                <element signature="e#23069#23826#0#PHP" expanded="false" />
+                <element signature="e#23832#24313#0#PHP" expanded="false" />
+                <element signature="e#24318#25088#0#PHP" expanded="false" />
+                <element signature="e#25094#25457#0#PHP" expanded="false" />
+                <element signature="e#25462#25653#0#PHP" expanded="false" />
+                <element signature="e#25659#26017#0#PHP" expanded="false" />
+                <element signature="e#26022#26212#0#PHP" expanded="false" />
+                <element signature="e#26218#27361#0#PHP" expanded="false" />
+                <element signature="e#27366#30031#0#PHP" expanded="false" />
+                <element signature="e#30037#30535#0#PHP" expanded="false" />
+                <element signature="e#30540#32286#0#PHP" expanded="false" />
+                <element signature="e#32292#32705#0#PHP" expanded="false" />
+                <element signature="e#32710#33189#0#PHP" expanded="false" />
+                <element signature="e#33195#33729#0#PHP" expanded="false" />
+                <element signature="e#33734#35119#0#PHP" expanded="false" />
+                <element signature="e#35125#35779#0#PHP" expanded="false" />
+                <element signature="e#35784#37737#0#PHP" expanded="false" />
+                <element signature="e#35938#36024#0#PHP" expanded="false" />
+                <element signature="e#36113#36201#0#PHP" expanded="false" />
+                <element signature="e#37743#38503#0#PHP" expanded="false" />
+                <element signature="e#38508#41217#0#PHP" expanded="false" />
+                <element signature="e#41243#42074#0#PHP" expanded="false" />
+                <element signature="e#42080#42500#0#PHP" expanded="false" />
+                <element signature="e#42505#42988#0#PHP" expanded="false" />
+                <element signature="e#42994#43800#0#PHP" expanded="false" />
+                <element signature="e#43805#46959#0#PHP" expanded="false" />
+                <element signature="e#46974#48302#0#PHP" expanded="false" />
+                <element signature="e#48318#49345#0#PHP" expanded="false" />
+                <element signature="e#49351#50109#0#PHP" expanded="false" />
+                <element signature="e#50114#52501#0#PHP" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -111,10 +151,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/controller/Order.php" />
         <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>
   </component>
@@ -133,10 +173,10 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="151" />
-    <option name="y" value="78" />
+    <option name="x" value="281" />
+    <option name="y" value="39" />
     <option name="width" value="1776" />
-    <option name="height" value="950" />
+    <option name="height" value="966" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -153,7 +193,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -183,47 +222,20 @@
               <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="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="api" 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="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" />
+              <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -281,6 +293,7 @@
       <workItem from="1574469667436" duration="25235000" />
       <workItem from="1574641631900" duration="15479000" />
       <workItem from="1574669596135" duration="11747000" />
+      <workItem from="1574727687281" duration="1888000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -293,7 +306,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="230271000" />
+    <option name="totallyTimeSpent" value="232159000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -305,19 +318,18 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="151" y="78" width="1776" height="950" extended-state="0" />
-    <editor active="true" />
+    <frame x="281" y="39" width="1776" height="966" extended-state="0" />
     <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="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" />
       <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" />
       <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" />
       <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" />
-      <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="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="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="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="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="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="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="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" />
       <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" />
       <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 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1875">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -609,7 +620,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-150">
           <caret line="9" column="43" lean-forward="true" selection-start-line="9" selection-start-column="43" selection-end-line="9" selection-end-column="43" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -617,7 +627,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="175">
           <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -636,7 +645,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -644,7 +652,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="325">
           <caret line="22" column="6" lean-forward="true" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -660,7 +667,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -668,7 +674,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1030">
           <caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -676,7 +681,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="654">
           <caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -684,79 +688,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="425">
           <caret line="44" column="129" lean-forward="false" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="129" />
-          <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="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" />
-            <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#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" />
+          <caret line="60" column="12" lean-forward="false" 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" />
@@ -770,7 +708,6 @@
       <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>
@@ -778,7 +715,6 @@
       <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>
@@ -792,13 +728,77 @@
     </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" />
+        <state relative-caret-position="654">
+          <caret line="75" column="53" lean-forward="true" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
           <folding>
             <element signature="e#392#610#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="354">
+          <caret line="343" column="51" lean-forward="true" selection-start-line="343" selection-start-column="51" selection-end-line="343" selection-end-column="51" />
+          <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#11894#12596#0#PHP" expanded="false" />
+            <element signature="e#12601#13801#0#PHP" expanded="false" />
+            <element signature="e#13807#14383#0#PHP" expanded="false" />
+            <element signature="e#14388#14935#0#PHP" expanded="false" />
+            <element signature="e#14941#15625#0#PHP" expanded="false" />
+            <element signature="e#15630#17726#0#PHP" expanded="false" />
+            <element signature="e#17732#18602#0#PHP" expanded="false" />
+            <element signature="e#18607#21103#0#PHP" expanded="false" />
+            <element signature="e#21109#21486#0#PHP" expanded="false" />
+            <element signature="e#21491#21812#0#PHP" expanded="false" />
+            <element signature="e#21818#22323#0#PHP" expanded="false" />
+            <element signature="e#22328#22579#0#PHP" expanded="false" />
+            <element signature="e#22585#23064#0#PHP" expanded="false" />
+            <element signature="e#23069#23826#0#PHP" expanded="false" />
+            <element signature="e#23832#24313#0#PHP" expanded="false" />
+            <element signature="e#24318#25088#0#PHP" expanded="false" />
+            <element signature="e#25094#25457#0#PHP" expanded="false" />
+            <element signature="e#25462#25653#0#PHP" expanded="false" />
+            <element signature="e#25659#26017#0#PHP" expanded="false" />
+            <element signature="e#26022#26212#0#PHP" expanded="false" />
+            <element signature="e#26218#27361#0#PHP" expanded="false" />
+            <element signature="e#27366#30031#0#PHP" expanded="false" />
+            <element signature="e#30037#30535#0#PHP" expanded="false" />
+            <element signature="e#30540#32286#0#PHP" expanded="false" />
+            <element signature="e#32292#32705#0#PHP" expanded="false" />
+            <element signature="e#32710#33189#0#PHP" expanded="false" />
+            <element signature="e#33195#33729#0#PHP" expanded="false" />
+            <element signature="e#33734#35119#0#PHP" expanded="false" />
+            <element signature="e#35125#35779#0#PHP" expanded="false" />
+            <element signature="e#35784#37737#0#PHP" expanded="false" />
+            <element signature="e#35938#36024#0#PHP" expanded="false" />
+            <element signature="e#36113#36201#0#PHP" expanded="false" />
+            <element signature="e#37743#38503#0#PHP" expanded="false" />
+            <element signature="e#38508#41217#0#PHP" expanded="false" />
+            <element signature="e#41243#42074#0#PHP" expanded="false" />
+            <element signature="e#42080#42500#0#PHP" expanded="false" />
+            <element signature="e#42505#42988#0#PHP" expanded="false" />
+            <element signature="e#42994#43800#0#PHP" expanded="false" />
+            <element signature="e#43805#46959#0#PHP" expanded="false" />
+            <element signature="e#46974#48302#0#PHP" expanded="false" />
+            <element signature="e#48318#49345#0#PHP" expanded="false" />
+            <element signature="e#49351#50109#0#PHP" expanded="false" />
+            <element signature="e#50114#52501#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file

@@ -71,15 +71,17 @@ class Order extends Backend
             $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');
+                if(!empty($v['video_id'])){
+                    $v['video_id'] = unserialize($v['video_id']);
+                    foreach ($v['video_id'] as &$v1){
+                        $v1['id'] = $video->where('id',$v1['id'])->field('title')->find();
                     }
-                    $v['video_id'] = $v1['id'];
+//                    array_push($a,$v1['id']);
+//                    $v['video_id'] = $a;
                 }
                 $v['pic_id'] = trim(implode(',',$type_ids),',');
             }
+            print_r($list);die;
             $result = array("total" => $total, "rows" => $list);
             return json($result);
         }

@@ -341,7 +341,7 @@ class User extends Api
             $where['type_ids'] = ['like',"%$type%"];
             $data = Db::name('video')
                 ->where($where)
-                ->field('id,thumbnail,video')
+                ->field('id,thumbnail,video,title')
                 ->order('id desc')
                 ->page($page,$pageNum)
                 ->select();

@@ -5706,7 +5706,7 @@
 
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2019-11-25 18:32:49                </div>
+                    Generated on 2019-11-26 09:04:16                </div>
                 <div class="col-md-6" align="right">
                     <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
                 </div>