...
|
...
|
@@ -3,7 +3,9 @@ |
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -45,11 +47,11 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="375">
|
|
|
<caret line="918" column="13" lean-forward="false" selection-start-line="918" selection-start-column="13" selection-end-line="918" selection-end-column="13" />
|
|
|
<state relative-caret-position="250">
|
|
|
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
|
|
|
<folding>
|
|
|
<element signature="e#366#791#0#PHP" expanded="false" />
|
|
|
<element signature="e#796#1608#0#PHP" expanded="false" />
|
...
|
...
|
@@ -90,6 +92,7 @@ |
|
|
<element signature="e#26512#26864#0#PHP" expanded="false" />
|
|
|
<element signature="e#26869#27947#0#PHP" expanded="false" />
|
|
|
<element signature="e#27953#28308#0#PHP" expanded="false" />
|
|
|
<element signature="e#28313#29709#0#PHP" expanded="false" />
|
|
|
<element signature="e#29715#30139#0#PHP" expanded="false" />
|
|
|
<element signature="e#30144#30755#0#PHP" expanded="false" />
|
|
|
<element signature="e#30761#31257#0#PHP" expanded="false" />
|
...
|
...
|
@@ -120,6 +123,18 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="540">
|
|
|
<caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
|
|
|
<folding>
|
|
|
<element signature="e#3168#3696#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FileTemplateManagerImpl">
|
...
|
...
|
@@ -175,14 +190,11 @@ |
|
|
<option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/config.php" />
|
|
|
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
|
|
|
<option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html" />
|
...
|
...
|
@@ -191,6 +203,9 @@ |
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
|
|
|
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -209,10 +224,10 @@ |
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds" extendedState="1">
|
|
|
<option name="x" value="104" />
|
|
|
<option name="y" value="46" />
|
|
|
<option name="x" value="64" />
|
|
|
<option name="y" value="65" />
|
|
|
<option name="width" value="1618" />
|
|
|
<option name="height" value="1008" />
|
|
|
<option name="height" value="1013" />
|
|
|
</component>
|
|
|
<component name="ProjectView">
|
|
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
...
|
...
|
@@ -369,18 +384,18 @@ |
|
|
<workItem from="1575860170691" duration="607000" />
|
|
|
<workItem from="1576027263250" duration="3000" />
|
|
|
<workItem from="1576049946357" duration="1233000" />
|
|
|
<workItem from="1576056936489" duration="1996000" />
|
|
|
<workItem from="1576056936489" duration="4526000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="531862000" />
|
|
|
<option name="totallyTimeSpent" value="534392000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="104" y="46" width="1618" height="1008" extended-state="1" />
|
|
|
<frame x="64" y="65" width="1618" height="1013" extended-state="1" />
|
|
|
<editor active="true" />
|
|
|
<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.24582799" sideWeight="0.5" order="0" 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.24582799" sideWeight="0.5" order="0" 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.33" sideWeight="0.5" order="6" 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="7" 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.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
...
|
...
|
@@ -616,13 +631,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-82">
|
|
|
<caret line="396" column="31" lean-forward="true" selection-start-line="396" selection-start-column="31" selection-end-line="396" selection-end-column="31" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="150">
|
...
|
...
|
@@ -726,20 +734,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="561">
|
|
|
<caret line="150" column="29" lean-forward="false" selection-start-line="150" selection-start-column="29" selection-end-line="150" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-89">
|
|
|
<caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$USER_HOME$/Desktop/腾讯地图/public/themes/admin_simpleboot3/admin/dialog/map2.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-593">
|
...
|
...
|
@@ -798,10 +792,53 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="139">
|
|
|
<caret line="243" column="29" lean-forward="false" selection-start-line="243" selection-start-column="29" selection-end-line="243" selection-end-column="29" />
|
|
|
<folding>
|
|
|
<element signature="e#4855#5051#0#PHP" expanded="false" />
|
|
|
<element signature="e#5056#5318#0#PHP" expanded="false" />
|
|
|
<element signature="e#5324#5779#0#PHP" expanded="false" />
|
|
|
<element signature="e#5784#6508#0#PHP" expanded="false" />
|
|
|
<element signature="e#6514#6857#0#PHP" expanded="false" />
|
|
|
<element signature="e#6862#7343#0#PHP" expanded="false" />
|
|
|
<element signature="e#7349#7640#0#PHP" expanded="false" />
|
|
|
<element signature="e#7645#7996#0#PHP" expanded="false" />
|
|
|
<element signature="e#8002#8355#0#PHP" expanded="false" />
|
|
|
<element signature="e#8360#8765#0#PHP" expanded="false" />
|
|
|
<element signature="e#8771#9154#0#PHP" expanded="false" />
|
|
|
<element signature="e#9159#9826#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="604">
|
|
|
<caret line="206" column="59" lean-forward="false" selection-start-line="206" selection-start-column="59" selection-end-line="206" selection-end-column="59" />
|
|
|
<folding>
|
|
|
<element signature="e#4667#5257#0#PHP" expanded="false" />
|
|
|
<element signature="e#6314#6632#0#PHP" expanded="false" />
|
|
|
<element signature="e#6637#7013#0#PHP" expanded="false" />
|
|
|
<element signature="e#7019#7374#0#PHP" expanded="false" />
|
|
|
<element signature="e#7379#7788#0#PHP" expanded="false" />
|
|
|
<element signature="e#7794#8179#0#PHP" expanded="false" />
|
|
|
<element signature="e#8184#8855#0#PHP" expanded="false" />
|
|
|
<element signature="e#8861#9307#0#PHP" expanded="false" />
|
|
|
<element signature="e#9312#10163#0#PHP" expanded="false" />
|
|
|
<element signature="e#10169#10439#0#PHP" expanded="false" />
|
|
|
<element signature="e#10444#10920#0#PHP" expanded="false" />
|
|
|
<element signature="e#10926#11556#0#PHP" expanded="false" />
|
|
|
<element signature="e#11561#13493#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="375">
|
|
|
<caret line="918" column="13" lean-forward="false" selection-start-line="918" selection-start-column="13" selection-end-line="918" selection-end-column="13" />
|
|
|
<state relative-caret-position="250">
|
|
|
<caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
|
|
|
<folding>
|
|
|
<element signature="e#366#791#0#PHP" expanded="false" />
|
|
|
<element signature="e#796#1608#0#PHP" expanded="false" />
|
...
|
...
|
@@ -842,6 +879,7 @@ |
|
|
<element signature="e#26512#26864#0#PHP" expanded="false" />
|
|
|
<element signature="e#26869#27947#0#PHP" expanded="false" />
|
|
|
<element signature="e#27953#28308#0#PHP" expanded="false" />
|
|
|
<element signature="e#28313#29709#0#PHP" expanded="false" />
|
|
|
<element signature="e#29715#30139#0#PHP" expanded="false" />
|
|
|
<element signature="e#30144#30755#0#PHP" expanded="false" />
|
|
|
<element signature="e#30761#31257#0#PHP" expanded="false" />
|
...
|
...
|
@@ -871,5 +909,15 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="540">
|
|
|
<caret line="167" column="59" lean-forward="false" selection-start-line="167" selection-start-column="59" selection-end-line="167" selection-end-column="59" />
|
|
|
<folding>
|
|
|
<element signature="e#3168#3696#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</component>
|
|
|
</project> |
|
|
\ No newline at end of file |
...
|
...
|
|