...
|
...
|
@@ -2,7 +2,7 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
|
|
|
<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" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -16,8 +16,8 @@ |
|
|
<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="204">
|
|
|
<caret line="1811" column="31" lean-forward="true" selection-start-line="1811" selection-start-column="31" selection-end-line="1811" selection-end-column="31" />
|
|
|
<state relative-caret-position="111">
|
|
|
<caret line="1826" column="21" lean-forward="false" selection-start-line="1826" selection-start-column="21" selection-end-line="1826" selection-end-column="21" />
|
|
|
<folding>
|
|
|
<element signature="e#365#484#0#PHP" expanded="false" />
|
|
|
<element signature="e#490#1228#0#PHP" expanded="false" />
|
...
|
...
|
@@ -85,19 +85,8 @@ |
|
|
<element signature="e#59824#60251#0#PHP" expanded="false" />
|
|
|
<element signature="e#60256#60725#0#PHP" expanded="false" />
|
|
|
<element signature="e#60732#61937#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<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="529">
|
|
|
<caret line="40" column="21" lean-forward="false" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
|
|
|
<folding>
|
|
|
<element signature="e#40#74#0#PHP" expanded="true" />
|
|
|
<element signature="e#951#3137#0#PHP" expanded="false" />
|
|
|
<element signature="e#62089#62428#1#PHP" expanded="false" />
|
|
|
<element signature="e#62458#62812#1#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -198,11 +187,11 @@ |
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="313" />
|
|
|
<option name="y" value="89" />
|
|
|
<component name="ProjectFrameBounds" extendedState="1">
|
|
|
<option name="x" value="115" />
|
|
|
<option name="y" value="145" />
|
|
|
<option name="width" value="1624" />
|
|
|
<option name="height" value="916" />
|
|
|
<option name="height" value="918" />
|
|
|
</component>
|
|
|
<component name="ProjectView">
|
|
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
...
|
...
|
@@ -236,42 +225,6 @@ |
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="view" 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="view" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="order" 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="view" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="pic" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
...
|
...
|
@@ -281,32 +234,6 @@ |
|
|
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
...
|
...
|
@@ -399,7 +326,7 @@ |
|
|
<workItem from="1575773423431" duration="694000" />
|
|
|
<workItem from="1575776183372" duration="2267000" />
|
|
|
<workItem from="1575790089275" duration="377000" />
|
|
|
<workItem from="1575851041026" duration="10769000" />
|
|
|
<workItem from="1575851041026" duration="12727000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="调试">
|
|
|
<created>1574145133364</created>
|
...
|
...
|
@@ -412,7 +339,7 @@ |
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="351236000" />
|
|
|
<option name="totallyTimeSpent" value="353194000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
...
|
...
|
@@ -424,10 +351,9 @@ |
|
|
</todo-panel>
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="313" y="89" width="1624" height="916" extended-state="0" />
|
|
|
<editor active="true" />
|
|
|
<frame x="115" y="145" width="1624" height="918" extended-state="1" />
|
|
|
<layout>
|
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15345268" 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.1528133" 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" />
|
...
|
...
|
@@ -435,7 +361,7 @@ |
|
|
<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="true" show_stripe_button="true" weight="0.169448" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16901408" 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" />
|
...
|
...
|
@@ -833,6 +759,14 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="129">
|
|
|
<caret line="31" column="10" lean-forward="true" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="529">
|
...
|
...
|
@@ -844,18 +778,10 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="129">
|
|
|
<caret line="31" column="10" lean-forward="true" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
|
|
|
<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="204">
|
|
|
<caret line="1811" column="31" lean-forward="true" selection-start-line="1811" selection-start-column="31" selection-end-line="1811" selection-end-column="31" />
|
|
|
<state relative-caret-position="111">
|
|
|
<caret line="1826" column="21" lean-forward="false" selection-start-line="1826" selection-start-column="21" selection-end-line="1826" selection-end-column="21" />
|
|
|
<folding>
|
|
|
<element signature="e#365#484#0#PHP" expanded="false" />
|
|
|
<element signature="e#490#1228#0#PHP" expanded="false" />
|
...
|
...
|
@@ -923,6 +849,8 @@ |
|
|
<element signature="e#59824#60251#0#PHP" expanded="false" />
|
|
|
<element signature="e#60256#60725#0#PHP" expanded="false" />
|
|
|
<element signature="e#60732#61937#0#PHP" expanded="false" />
|
|
|
<element signature="e#62089#62428#1#PHP" expanded="false" />
|
|
|
<element signature="e#62458#62812#1#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
|