...
|
...
|
@@ -2,48 +2,8 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/1026035a34a8d37243b285b9d25cda58.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/4246a0593e908faf3749431d8ccd0179.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/JLYMBOT8EPCHF.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/LOGO8.8-1_画板 1.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/aec64c321cf9ade724f89cf847285170.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/bg82.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/fanhui.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/righthui.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_01.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_02.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_03.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_04.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_05.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_06.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_07.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_08.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_09.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_33.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_34.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_35.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_40.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_41.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_42.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_43.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_44.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_46.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_47.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_48.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/sun_50.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/世界环境日-05.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/微信图片_20190925170523.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/组 7297.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/组 7298.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/image/预览图_千图网_编号32389077.png" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/js/base.js" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/style/base.css" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/style/common.css" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/style/index.css" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/swiper3/swiper.min.css" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/swiper3/swiper.min.js" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config.php" afterPath="$PROJECT_DIR$/app/config.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -109,11 +69,27 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="150">
|
|
|
<caret line="24" column="62" lean-forward="false" selection-start-line="24" selection-start-column="62" selection-end-line="24" selection-end-column="62" />
|
|
|
<state relative-caret-position="275">
|
|
|
<caret line="20" column="27" lean-forward="false" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
|
|
|
<folding>
|
|
|
<element signature="e#361#615#0#PHP" expanded="false" />
|
|
|
<element signature="e#632#1322#0#PHP" expanded="false" />
|
|
|
<element signature="e#1340#1586#0#PHP" expanded="false" />
|
|
|
<element signature="e#1604#2000#0#PHP" expanded="false" />
|
|
|
<element signature="e#2018#2406#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="photo.html" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="250">
|
|
|
<caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -144,7 +120,6 @@ |
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/select.html" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
|
...
|
...
|
@@ -195,6 +170,7 @@ |
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
|
|
|
<option value="$PROJECT_DIR$/app/config.php" />
|
|
|
<option value="$PROJECT_DIR$/public/static/style/base.css" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -212,9 +188,9 @@ |
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
|
</component>
|
|
|
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="485" />
|
|
|
<option name="y" value="47" />
|
|
|
<component name="ProjectFrameBounds" extendedState="1">
|
|
|
<option name="x" value="160" />
|
|
|
<option name="y" value="40" />
|
|
|
<option name="width" value="1678" />
|
|
|
<option name="height" value="1086" />
|
|
|
</component>
|
...
|
...
|
@@ -250,14 +226,31 @@ |
|
|
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="static" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="static" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="style" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="shopgoods" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
...
|
...
|
@@ -329,15 +322,15 @@ |
|
|
<workItem from="1573448892997" duration="1343000" />
|
|
|
<workItem from="1573450754427" duration="9613000" />
|
|
|
<workItem from="1573463816109" duration="4867000" />
|
|
|
<workItem from="1573517804403" duration="4682000" />
|
|
|
<workItem from="1573517804403" duration="4950000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="188525000" />
|
|
|
<option name="totallyTimeSpent" value="188793000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="485" y="47" width="1678" height="1086" extended-state="0" />
|
|
|
<frame x="160" y="40" width="1678" height="1086" extended-state="1" />
|
|
|
<editor active="true" />
|
|
|
<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.17428924" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
...
|
...
|
@@ -391,31 +384,6 @@ |
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/app/index/controller/DoorController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="659">
|
|
|
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="456">
|
|
|
<caret line="92" column="15" lean-forward="true" selection-start-line="92" selection-start-column="15" selection-end-line="92" selection-end-column="15" />
|
|
|
<folding>
|
|
|
<element signature="e#266#1001#0#PHP" expanded="false" />
|
|
|
<element signature="e#3943#4413#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="300">
|
|
|
<caret line="12" column="53" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="153" selection-end-column="0" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="625">
|
...
|
...
|
@@ -813,8 +781,38 @@ |
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="150">
|
|
|
<caret line="24" column="62" lean-forward="false" selection-start-line="24" selection-start-column="62" selection-end-line="24" selection-end-column="62" />
|
|
|
<state relative-caret-position="275">
|
|
|
<caret line="20" column="27" lean-forward="false" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
|
|
|
<folding>
|
|
|
<element signature="e#361#615#0#PHP" expanded="false" />
|
|
|
<element signature="e#632#1322#0#PHP" expanded="false" />
|
|
|
<element signature="e#1340#1586#0#PHP" expanded="false" />
|
|
|
<element signature="e#1604#2000#0#PHP" expanded="false" />
|
|
|
<element signature="e#2018#2406#0#PHP" expanded="false" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html">
|
|
|
<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>
|
|
|
<entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="425">
|
|
|
<caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="250">
|
|
|
<caret line="10" column="39" lean-forward="true" selection-start-line="10" selection-start-column="39" selection-end-line="10" selection-end-column="39" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
|