Skip to content

施宇 / icsales

Go to a project
Commit b9fb0596 by 叶明星
Options

zc

parent 85fffd49
Inline Side-by-side
Showing with 84 additions and 48 deletions
.idea/workspace.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="abcc2269-704e-4742-961a-998c3ad58297" name="Default Changelist" comment=""> <list default="true" id="abcc2269-704e-4742-961a-998c3ad58297" name="Default Changelist" comment="" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php" beforeDir="false" afterPath="$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -28,37 +25,37 @@ ...@@ -28,37 +25,37 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Search/Controller/IndexController.class.php"> <entry file="file://$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400"> <state relative-caret-position="550">
<caret line="16" selection-start-line="16" selection-end-line="16" /> <caret line="22" column="18" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Search/View/Index/search.html"> <entry file="file://$PROJECT_DIR$/Application/Home/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425"> <state relative-caret-position="550">
<caret line="17" column="92" selection-start-line="17" selection-start-column="92" selection-end-line="17" selection-end-column="92" /> <caret line="22" column="26" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="26" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Search/Conf/config_url.php"> <entry file="file://$PROJECT_DIR$/Application/Home/Controller/CmsController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="400">
<caret line="3" column="49" selection-start-line="3" selection-start-column="49" selection-end-line="3" selection-end-column="49" /> <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php"> <entry file="file://$USER_HOME$/Desktop/icsalesV5.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="75">
<caret line="10" column="47" lean-forward="true" selection-start-line="10" selection-start-column="47" selection-end-line="10" selection-end-column="47" /> <caret line="3" selection-start-line="3" selection-end-line="4" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -77,7 +74,7 @@ ...@@ -77,7 +74,7 @@
<entry file="file://$PROJECT_DIR$/Application/Common/View/public/indexheader.html"> <entry file="file://$PROJECT_DIR$/Application/Common/View/public/indexheader.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275"> <state relative-caret-position="275">
<caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> <caret line="11" column="14" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -169,7 +166,7 @@ ...@@ -169,7 +166,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="68" /> <option name="x" value="68" />
<option name="y" value="-8" /> <option name="y" value="-8" />
<option name="width" value="1860" /> <option name="width" value="1860" />
...@@ -199,6 +196,40 @@ ...@@ -199,6 +196,40 @@
<item name="Application" type="462c0819:PsiDirectoryNode" /> <item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Common" type="462c0819:PsiDirectoryNode" /> <item name="Common" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Common" type="462c0819:PsiDirectoryNode" />
<item name="Controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Home" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Home" type="462c0819:PsiDirectoryNode" />
<item name="Conf" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Home" type="462c0819:PsiDirectoryNode" />
<item name="Controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="ic_www" type="b2602c69:ProjectViewProjectNode" />
<item name="ic_www" type="462c0819:PsiDirectoryNode" />
<item name="Application" type="462c0819:PsiDirectoryNode" />
<item name="Home" type="462c0819:PsiDirectoryNode" />
<item name="Model" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -254,17 +285,18 @@ ...@@ -254,17 +285,18 @@
<workItem from="1565834074799" duration="131000" /> <workItem from="1565834074799" duration="131000" />
<workItem from="1565834220474" duration="3124000" /> <workItem from="1565834220474" duration="3124000" />
<workItem from="1565840183251" duration="416000" /> <workItem from="1565840183251" duration="416000" />
<workItem from="1565859304142" duration="1273000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="21424000" /> <option name="totallyTimeSpent" value="22697000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="68" y="-8" width="1860" height="1096" extended-state="6" /> <frame x="68" y="-8" width="1860" height="1096" extended-state="7" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26004463" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26339287" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -289,16 +321,6 @@ ...@@ -289,16 +321,6 @@
<option name="version" value="1" /> <option name="version" value="1" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Application/item/Conf/config.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/Application/item/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" selection-start-line="3" selection-end-line="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/Conf/config.php"> <entry file="file://$PROJECT_DIR$/Application/Search/Conf/config.php">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
...@@ -586,13 +608,6 @@ ...@@ -586,13 +608,6 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/EmptyController.class.php" /> <entry file="file://$PROJECT_DIR$/Application/Home/Controller/EmptyController.class.php" />
<entry file="file://$PROJECT_DIR$/Application/Home/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="20" column="35" lean-forward="true" selection-start-line="20" selection-start-column="35" selection-end-line="20" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php"> <entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250"> <state relative-caret-position="250">
...@@ -619,13 +634,6 @@ ...@@ -619,13 +634,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Search/Controller/IndexController.class.php"> <entry file="file://$PROJECT_DIR$/Application/Search/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400"> <state relative-caret-position="400">
...@@ -656,7 +664,7 @@ ...@@ -656,7 +664,7 @@
<entry file="file://$PROJECT_DIR$/Application/Common/View/public/indexheader.html"> <entry file="file://$PROJECT_DIR$/Application/Common/View/public/indexheader.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275"> <state relative-caret-position="275">
<caret line="11" column="14" lean-forward="true" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> <caret line="11" column="14" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -674,10 +682,38 @@ ...@@ -674,10 +682,38 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="12" selection-start-line="13" selection-start-column="12" selection-end-line="13" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php"> <entry file="file://$PROJECT_DIR$/Application/Common/Controller/BaseController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="550">
<caret line="10" column="47" lean-forward="true" selection-start-line="10" selection-start-column="47" selection-end-line="10" selection-end-column="47" /> <caret line="22" column="18" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Conf/config_url.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="22" column="26" selection-start-line="22" selection-start-column="23" selection-end-line="22" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/CmsController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/icsalesV5.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" selection-start-line="3" selection-end-line="4" selection-end-column="20" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment