|
...
|
...
|
@@ -2,9 +2,8 @@ |
|
|
|
<project version="4">
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
<list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
|
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/app/admin/controller/BookingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/BookingController.php" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/app/portal/controller/IndexController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/portal/controller/IndexController.php" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/app/user/controller/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/LoginController.php" afterDir="false" />
|
|
|
|
</list>
|
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
...
|
...
|
@@ -18,20 +17,6 @@ |
|
|
|
</component>
|
|
|
|
<component name="FileEditorManager">
|
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
|
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="1092">
|
|
|
|
<caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
|
|
|
|
<folding>
|
|
|
|
<element signature="e#636#668#0#PHP" expanded="true" />
|
|
|
|
<element signature="e#17688#17731#0#PHP" />
|
|
|
|
<element signature="e#17688#17779#0#PHP" />
|
|
|
|
</folding>
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</file>
|
|
|
|
<file leaf-file-name="hezuo_huigu.htm" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
...
|
...
|
@@ -103,11 +88,11 @@ |
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</file>
|
|
|
|
<file leaf-file-name="listing.html" pinned="false" current-in-tab="true">
|
|
|
|
<file leaf-file-name="listing.html" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="504">
|
|
|
|
<caret line="51" column="65" selection-start-line="51" selection-start-column="65" selection-end-line="51" selection-end-column="65" />
|
|
|
|
<state relative-caret-position="420">
|
|
|
|
<caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
...
|
...
|
@@ -121,11 +106,20 @@ |
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</file>
|
|
|
|
<file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
|
|
|
|
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="321">
|
|
|
|
<caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
</file>
|
|
|
|
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true">
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="630">
|
|
|
|
<caret line="38" column="36" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" />
|
|
|
|
<state relative-caret-position="189">
|
|
|
|
<caret line="32" column="17" lean-forward="true" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
...
|
...
|
@@ -172,7 +166,6 @@ |
|
|
|
<option value="$PROJECT_DIR$/public/static/css/viyagerapp.css" />
|
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" />
|
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" />
|
|
|
|
<option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
|
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
|
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
|
|
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
|
|
...
|
...
|
@@ -186,6 +179,8 @@ |
|
|
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
|
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
|
|
|
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
|
|
|
|
<option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
|
|
|
|
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
|
|
|
|
</list>
|
|
|
|
</option>
|
|
|
|
</component>
|
|
...
|
...
|
@@ -244,32 +239,38 @@ |
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="app" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="portal" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="app" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="portal" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="app" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="user" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="app" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="user" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="themes" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="themes" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
...
|
...
|
@@ -277,7 +278,6 @@ |
|
|
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="themes" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
...
|
...
|
@@ -286,7 +286,6 @@ |
|
|
|
<item name="themes" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="admin" type="462c0819:PsiDirectoryNode" />
|
|
|
|
<item name="booking" type="462c0819:PsiDirectoryNode" />
|
|
|
|
</path>
|
|
|
|
<path>
|
|
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
...
|
...
|
@@ -345,7 +344,7 @@ |
|
|
|
<workItem from="1535514127808" duration="727000" />
|
|
|
|
<workItem from="1535532970259" duration="2527000" />
|
|
|
|
<workItem from="1535546044129" duration="20814000" />
|
|
|
|
<workItem from="1535633001243" duration="190000" />
|
|
|
|
<workItem from="1535633001243" duration="972000" />
|
|
|
|
</task>
|
|
|
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
|
|
|
<created>1535458170068</created>
|
|
...
|
...
|
@@ -536,11 +535,18 @@ |
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1535600080734</updated>
|
|
|
|
</task>
|
|
|
|
<option name="localTasksCounter" value="28" />
|
|
|
|
<task id="LOCAL-00028" summary="我的订单详情标题">
|
|
|
|
<created>1535633219778</created>
|
|
|
|
<option name="number" value="00028" />
|
|
|
|
<option name="presentableId" value="LOCAL-00028" />
|
|
|
|
<option name="project" value="LOCAL" />
|
|
|
|
<updated>1535633219778</updated>
|
|
|
|
</task>
|
|
|
|
<option name="localTasksCounter" value="29" />
|
|
|
|
<servers />
|
|
|
|
</component>
|
|
|
|
<component name="TimeTrackingManager">
|
|
|
|
<option name="totallyTimeSpent" value="54642000" />
|
|
|
|
<option name="totallyTimeSpent" value="55424000" />
|
|
|
|
</component>
|
|
|
|
<component name="ToolWindowManager">
|
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
...
|
...
|
@@ -586,11 +592,6 @@ |
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="我的订单详情标题" />
|
|
|
|
</component>
|
|
|
|
<component name="editorHistoryManager">
|
|
|
|
<entry file="file://$PROJECT_DIR$/api/home/controller/RestController.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="-280" />
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/api/home/route.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="76">
|
|
...
|
...
|
@@ -772,13 +773,6 @@ |
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="1134">
|
|
|
|
<caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="630">
|
|
...
|
...
|
@@ -866,8 +860,22 @@ |
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="504">
|
|
|
|
<caret line="51" column="65" selection-start-line="51" selection-start-column="65" selection-end-line="51" selection-end-column="65" />
|
|
|
|
<state relative-caret-position="420">
|
|
|
|
<caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="321">
|
|
|
|
<caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
|
<state relative-caret-position="189">
|
|
|
|
<caret line="32" column="17" lean-forward="true" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
|
|
|
|
</state>
|
|
|
|
</provider>
|
|
|
|
</entry>
|
...
|
...
|
|
