|
@@ -66,7 +66,7 @@ |
|
@@ -66,7 +66,7 @@ |
66
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
|
66
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
|
67
|
<provider selected="true" editor-type-id="text-editor">
|
67
|
<provider selected="true" editor-type-id="text-editor">
|
68
|
<state relative-caret-position="510">
|
68
|
<state relative-caret-position="510">
|
69
|
- <caret line="194" column="20" selection-start-line="194" selection-start-column="20" selection-end-line="194" selection-end-column="20" />
|
69
|
+ <caret line="194" column="41" lean-forward="true" selection-start-line="194" selection-start-column="27" selection-end-line="194" selection-end-column="41" />
|
70
|
</state>
|
70
|
</state>
|
71
|
</provider>
|
71
|
</provider>
|
72
|
</entry>
|
72
|
</entry>
|
|
@@ -101,8 +101,8 @@ |
|
@@ -101,8 +101,8 @@ |
101
|
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true">
|
101
|
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true">
|
102
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
102
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
103
|
<provider selected="true" editor-type-id="text-editor">
|
103
|
<provider selected="true" editor-type-id="text-editor">
|
104
|
- <state relative-caret-position="231">
|
|
|
105
|
- <caret line="85" column="75" selection-start-line="85" selection-start-column="75" selection-end-line="85" selection-end-column="75" />
|
104
|
+ <state relative-caret-position="336">
|
|
|
105
|
+ <caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
|
106
|
</state>
|
106
|
</state>
|
107
|
</provider>
|
107
|
</provider>
|
108
|
</entry>
|
108
|
</entry>
|
|
@@ -169,9 +169,9 @@ |
|
@@ -169,9 +169,9 @@ |
169
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
|
169
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
|
170
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
|
170
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
|
171
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
|
171
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
|
172
|
- <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
|
|
|
173
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
|
172
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
|
174
|
<option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
|
173
|
<option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
|
|
|
174
|
+ <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
|
175
|
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
|
175
|
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
|
176
|
</list>
|
176
|
</list>
|
177
|
</option>
|
177
|
</option>
|
|
@@ -373,7 +373,7 @@ |
|
@@ -373,7 +373,7 @@ |
373
|
<workItem from="1535514127808" duration="727000" />
|
373
|
<workItem from="1535514127808" duration="727000" />
|
374
|
<workItem from="1535532970259" duration="2527000" />
|
374
|
<workItem from="1535532970259" duration="2527000" />
|
375
|
<workItem from="1535546044129" duration="20814000" />
|
375
|
<workItem from="1535546044129" duration="20814000" />
|
376
|
- <workItem from="1535633001243" duration="1354000" />
|
376
|
+ <workItem from="1535633001243" duration="1606000" />
|
377
|
</task>
|
377
|
</task>
|
378
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
378
|
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
|
379
|
<created>1535458170068</created>
|
379
|
<created>1535458170068</created>
|
|
@@ -585,11 +585,25 @@ |
|
@@ -585,11 +585,25 @@ |
585
|
<option name="project" value="LOCAL" />
|
585
|
<option name="project" value="LOCAL" />
|
586
|
<updated>1535634119952</updated>
|
586
|
<updated>1535634119952</updated>
|
587
|
</task>
|
587
|
</task>
|
588
|
- <option name="localTasksCounter" value="31" />
|
588
|
+ <task id="LOCAL-00031" summary="我的订单详情标题">
|
|
|
589
|
+ <created>1535634366456</created>
|
|
|
590
|
+ <option name="number" value="00031" />
|
|
|
591
|
+ <option name="presentableId" value="LOCAL-00031" />
|
|
|
592
|
+ <option name="project" value="LOCAL" />
|
|
|
593
|
+ <updated>1535634366456</updated>
|
|
|
594
|
+ </task>
|
|
|
595
|
+ <task id="LOCAL-00032" summary="我的订单详情标题">
|
|
|
596
|
+ <created>1535634457149</created>
|
|
|
597
|
+ <option name="number" value="00032" />
|
|
|
598
|
+ <option name="presentableId" value="LOCAL-00032" />
|
|
|
599
|
+ <option name="project" value="LOCAL" />
|
|
|
600
|
+ <updated>1535634457149</updated>
|
|
|
601
|
+ </task>
|
|
|
602
|
+ <option name="localTasksCounter" value="33" />
|
589
|
<servers />
|
603
|
<servers />
|
590
|
</component>
|
604
|
</component>
|
591
|
<component name="TimeTrackingManager">
|
605
|
<component name="TimeTrackingManager">
|
592
|
- <option name="totallyTimeSpent" value="55806000" />
|
606
|
+ <option name="totallyTimeSpent" value="56058000" />
|
593
|
</component>
|
607
|
</component>
|
594
|
<component name="ToolWindowManager">
|
608
|
<component name="ToolWindowManager">
|
595
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
609
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -887,13 +901,6 @@ |
|
@@ -887,13 +901,6 @@ |
887
|
</state>
|
901
|
</state>
|
888
|
</provider>
|
902
|
</provider>
|
889
|
</entry>
|
903
|
</entry>
|
890
|
- <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
|
|
|
891
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
892
|
- <state relative-caret-position="510">
|
|
|
893
|
- <caret line="194" column="20" selection-start-line="194" selection-start-column="20" selection-end-line="194" selection-end-column="20" />
|
|
|
894
|
- </state>
|
|
|
895
|
- </provider>
|
|
|
896
|
- </entry>
|
|
|
897
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
|
904
|
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
|
898
|
<provider selected="true" editor-type-id="text-editor">
|
905
|
<provider selected="true" editor-type-id="text-editor">
|
899
|
<state relative-caret-position="420">
|
906
|
<state relative-caret-position="420">
|
|
@@ -915,10 +922,17 @@ |
|
@@ -915,10 +922,17 @@ |
915
|
</state>
|
922
|
</state>
|
916
|
</provider>
|
923
|
</provider>
|
917
|
</entry>
|
924
|
</entry>
|
|
|
925
|
+ <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
|
|
|
926
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
927
|
+ <state relative-caret-position="510">
|
|
|
928
|
+ <caret line="194" column="41" lean-forward="true" selection-start-line="194" selection-start-column="27" selection-end-line="194" selection-end-column="41" />
|
|
|
929
|
+ </state>
|
|
|
930
|
+ </provider>
|
|
|
931
|
+ </entry>
|
918
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
932
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
919
|
<provider selected="true" editor-type-id="text-editor">
|
933
|
<provider selected="true" editor-type-id="text-editor">
|
920
|
- <state relative-caret-position="231">
|
|
|
921
|
- <caret line="85" column="75" selection-start-line="85" selection-start-column="75" selection-end-line="85" selection-end-column="75" />
|
934
|
+ <state relative-caret-position="336">
|
|
|
935
|
+ <caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
|
922
|
</state>
|
936
|
</state>
|
923
|
</provider>
|
937
|
</provider>
|
924
|
</entry>
|
938
|
</entry>
|