...
|
...
|
@@ -2,11 +2,19 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="61dc3f00-6d8a-4d88-a90a-bb5e2de6911f" name="Default" comment="">
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/controller/Invoice.php" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/invoice.php" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/model/Invoice.php" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/validate/Invoice.php" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/invoice/add.html" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/invoice/edit.html" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/invoice/index.html" />
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/js/backend/invoice.js" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Person.php" afterPath="$PROJECT_DIR$/application/api/controller/Person.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Wxpay.php" afterPath="$PROJECT_DIR$/application/api/controller/Wxpay.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/extra/site.php" afterPath="$PROJECT_DIR$/application/extra/site.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/runtime/cache/cb/78ef4a9130f39208ff10858ddd8377.php" afterPath="$PROJECT_DIR$/runtime/cache/cb/78ef4a9130f39208ff10858ddd8377.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -20,8 +28,8 @@ |
|
|
<file leaf-file-name="site.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/extra/site.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="714">
|
|
|
<caret line="174" column="25" lean-forward="false" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="25" />
|
|
|
<state relative-caret-position="300">
|
|
|
<caret line="124" column="11" lean-forward="false" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="11" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -31,8 +39,10 @@ |
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Person.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="553">
|
|
|
<caret line="349" column="90" lean-forward="false" selection-start-line="349" selection-start-column="90" selection-end-line="349" selection-end-column="90" />
|
|
|
<folding />
|
|
|
<caret line="483" column="35" lean-forward="false" selection-start-line="483" selection-start-column="35" selection-end-line="483" selection-end-column="35" />
|
|
|
<folding>
|
|
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -40,8 +50,8 @@ |
|
|
<file leaf-file-name="Wxpay.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="668">
|
|
|
<caret line="316" column="7" lean-forward="true" selection-start-line="316" selection-start-column="7" selection-end-line="316" selection-end-column="7" />
|
|
|
<state relative-caret-position="7084">
|
|
|
<caret line="316" column="7" lean-forward="false" selection-start-line="316" selection-start-column="7" selection-end-line="316" selection-end-column="7" />
|
|
|
<folding>
|
|
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
</folding>
|
...
|
...
|
@@ -99,8 +109,6 @@ |
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/customer/add.html" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/customer/edit.html" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/customer.php" />
|
|
|
<option value="$USER_HOME$/AppData/Local/Temp/gjr_user.sql" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/meal/index.html" />
|
...
|
...
|
@@ -148,6 +156,8 @@ |
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pplate.js" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/Ptube.php" />
|
|
|
<option value="$PROJECT_DIR$/application/api/controller/Wxpay.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/invoice.php" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/invoice.js" />
|
|
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
|
|
<option value="$PROJECT_DIR$/application/api/controller/Person.php" />
|
|
|
</list>
|
...
|
...
|
@@ -232,6 +242,30 @@ |
|
|
<path>
|
|
|
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="gangjuren" 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" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="gangjuren" 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="gangjuren" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="gangjuren" 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" />
|
|
|
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
...
|
...
|
@@ -271,7 +305,7 @@ |
|
|
<property name="node.js.path.for.package.standard" value="project" />
|
|
|
<property name="node.js.selected.package.standard" value="" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/../xiaofang" />
|
|
|
<property name="node.js.detected.package.jscs" value="true" />
|
|
|
<property name="node.js.detected.package.eslint" value="true" />
|
|
|
</component>
|
...
|
...
|
@@ -321,17 +355,18 @@ |
|
|
<workItem from="1566547320999" duration="10575000" />
|
|
|
<workItem from="1566607074350" duration="21141000" />
|
|
|
<workItem from="1566780240850" duration="14011000" />
|
|
|
<workItem from="1566866516544" duration="5708000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="180037000" />
|
|
|
<option name="totallyTimeSpent" value="185745000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
<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.20042644" 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.20255864" 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.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
...
|
...
|
@@ -382,21 +417,6 @@ |
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Meal.php" />
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Abouts.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="7" column="9" lean-forward="true" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/user/rule/index.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" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/user/user/edit.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="299">
|
...
|
...
|
@@ -510,13 +530,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/user/user.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="691">
|
|
|
<caret line="32" column="29" lean-forward="false" selection-start-line="32" selection-start-column="29" selection-end-line="32" selection-end-column="29" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="714">
|
...
|
...
|
@@ -648,13 +661,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/equipment.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="437">
|
|
|
<caret line="34" column="71" lean-forward="false" selection-start-line="34" selection-start-column="71" selection-end-line="34" selection-end-column="71" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pplate.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="391">
|
...
|
...
|
@@ -709,18 +715,58 @@ |
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="668">
|
|
|
<caret line="316" column="7" lean-forward="true" selection-start-line="316" selection-start-column="7" selection-end-line="316" selection-end-column="7" />
|
|
|
<state relative-caret-position="7084">
|
|
|
<caret line="316" column="7" lean-forward="false" selection-start-line="316" selection-start-column="7" selection-end-line="316" selection-end-column="7" />
|
|
|
<folding>
|
|
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/model/Invoice.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="161">
|
|
|
<caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/user/user.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="691">
|
|
|
<caret line="32" column="31" lean-forward="true" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/invoice.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="69">
|
|
|
<caret line="3" column="24" lean-forward="false" selection-start-line="3" selection-start-column="24" selection-end-line="3" selection-end-column="24" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/equipment.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="299">
|
|
|
<caret line="28" column="94" lean-forward="false" selection-start-line="28" selection-start-column="89" selection-end-line="28" selection-end-column="94" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/invoice.js">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="690">
|
|
|
<caret line="36" column="152" lean-forward="true" selection-start-line="36" selection-start-column="152" selection-end-line="36" selection-end-column="152" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/extra/site.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="714">
|
|
|
<caret line="174" column="25" lean-forward="false" selection-start-line="174" selection-start-column="13" selection-end-line="174" selection-end-column="25" />
|
|
|
<state relative-caret-position="300">
|
|
|
<caret line="124" column="11" lean-forward="false" selection-start-line="124" selection-start-column="5" selection-end-line="124" selection-end-column="11" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
...
|
...
|
@@ -728,8 +774,10 @@ |
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Person.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="553">
|
|
|
<caret line="349" column="90" lean-forward="false" selection-start-line="349" selection-start-column="90" selection-end-line="349" selection-end-column="90" />
|
|
|
<folding />
|
|
|
<caret line="483" column="35" lean-forward="false" selection-start-line="483" selection-start-column="35" selection-end-line="483" selection-end-column="35" />
|
|
|
<folding>
|
|
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|