|
@@ -63,8 +63,8 @@ |
|
@@ -63,8 +63,8 @@ |
63
|
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
|
63
|
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
|
64
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
64
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
65
|
<provider selected="true" editor-type-id="text-editor">
|
65
|
<provider selected="true" editor-type-id="text-editor">
|
66
|
- <state relative-caret-position="2520">
|
|
|
67
|
- <caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
|
66
|
+ <state relative-caret-position="188">
|
|
|
67
|
+ <caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
|
68
|
<folding>
|
68
|
<folding>
|
69
|
<element signature="e#628#666#0#PHP" expanded="true" />
|
69
|
<element signature="e#628#666#0#PHP" expanded="true" />
|
70
|
</folding>
|
70
|
</folding>
|
|
@@ -72,11 +72,20 @@ |
|
@@ -72,11 +72,20 @@ |
72
|
</provider>
|
72
|
</provider>
|
73
|
</entry>
|
73
|
</entry>
|
74
|
</file>
|
74
|
</file>
|
|
|
75
|
+ <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
|
|
|
76
|
+ <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
|
|
77
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
78
|
+ <state relative-caret-position="216">
|
|
|
79
|
+ <caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" />
|
|
|
80
|
+ </state>
|
|
|
81
|
+ </provider>
|
|
|
82
|
+ </entry>
|
|
|
83
|
+ </file>
|
75
|
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
|
84
|
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
|
76
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
85
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
77
|
<provider selected="true" editor-type-id="text-editor">
|
86
|
<provider selected="true" editor-type-id="text-editor">
|
78
|
<state relative-caret-position="273">
|
87
|
<state relative-caret-position="273">
|
79
|
- <caret line="21" column="12" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
|
88
|
+ <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="32" />
|
80
|
</state>
|
89
|
</state>
|
81
|
</provider>
|
90
|
</provider>
|
82
|
</entry>
|
91
|
</entry>
|
|
@@ -143,7 +152,6 @@ |
|
@@ -143,7 +152,6 @@ |
143
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
|
152
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
|
144
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
|
153
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
|
145
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
|
154
|
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
|
146
|
- <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
|
|
|
147
|
<option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
|
155
|
<option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
|
148
|
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
|
156
|
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
|
149
|
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
|
157
|
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
|
|
@@ -155,6 +163,7 @@ |
|
@@ -155,6 +163,7 @@ |
155
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" />
|
163
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" />
|
156
|
<option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
|
164
|
<option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
|
157
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html" />
|
165
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html" />
|
|
|
166
|
+ <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
|
158
|
<option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
|
167
|
<option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
|
159
|
</list>
|
168
|
</list>
|
160
|
</option>
|
169
|
</option>
|
|
@@ -214,13 +223,13 @@ |
|
@@ -214,13 +223,13 @@ |
214
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
223
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
215
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
224
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
216
|
<item name="app" type="462c0819:PsiDirectoryNode" />
|
225
|
<item name="app" type="462c0819:PsiDirectoryNode" />
|
217
|
- <item name="portal" type="462c0819:PsiDirectoryNode" />
|
226
|
+ <item name="user" type="462c0819:PsiDirectoryNode" />
|
218
|
</path>
|
227
|
</path>
|
219
|
<path>
|
228
|
<path>
|
220
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
229
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
221
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
230
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
222
|
<item name="app" type="462c0819:PsiDirectoryNode" />
|
231
|
<item name="app" type="462c0819:PsiDirectoryNode" />
|
223
|
- <item name="portal" type="462c0819:PsiDirectoryNode" />
|
232
|
+ <item name="user" type="462c0819:PsiDirectoryNode" />
|
224
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
233
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
225
|
</path>
|
234
|
</path>
|
226
|
<path>
|
235
|
<path>
|
|
@@ -329,35 +338,7 @@ |
|
@@ -329,35 +338,7 @@ |
329
|
<workItem from="1535514127808" duration="727000" />
|
338
|
<workItem from="1535514127808" duration="727000" />
|
330
|
<workItem from="1535532970259" duration="2527000" />
|
339
|
<workItem from="1535532970259" duration="2527000" />
|
331
|
<workItem from="1535546044129" duration="20814000" />
|
340
|
<workItem from="1535546044129" duration="20814000" />
|
332
|
- <workItem from="1535633001243" duration="11133000" />
|
|
|
333
|
- </task>
|
|
|
334
|
- <task id="LOCAL-00002" summary="修复教练的时间段可以重复预约">
|
|
|
335
|
- <created>1535458750848</created>
|
|
|
336
|
- <option name="number" value="00002" />
|
|
|
337
|
- <option name="presentableId" value="LOCAL-00002" />
|
|
|
338
|
- <option name="project" value="LOCAL" />
|
|
|
339
|
- <updated>1535458750848</updated>
|
|
|
340
|
- </task>
|
|
|
341
|
- <task id="LOCAL-00003" summary="已经成功报名的用户,不能再次报名 放在确认订单页面">
|
|
|
342
|
- <created>1535459632689</created>
|
|
|
343
|
- <option name="number" value="00003" />
|
|
|
344
|
- <option name="presentableId" value="LOCAL-00003" />
|
|
|
345
|
- <option name="project" value="LOCAL" />
|
|
|
346
|
- <updated>1535459632689</updated>
|
|
|
347
|
- </task>
|
|
|
348
|
- <task id="LOCAL-00004" summary="已评价无数据情况">
|
|
|
349
|
- <created>1535460444090</created>
|
|
|
350
|
- <option name="number" value="00004" />
|
|
|
351
|
- <option name="presentableId" value="LOCAL-00004" />
|
|
|
352
|
- <option name="project" value="LOCAL" />
|
|
|
353
|
- <updated>1535460444090</updated>
|
|
|
354
|
- </task>
|
|
|
355
|
- <task id="LOCAL-00005" summary="已评价无数据情况">
|
|
|
356
|
- <created>1535461932931</created>
|
|
|
357
|
- <option name="number" value="00005" />
|
|
|
358
|
- <option name="presentableId" value="LOCAL-00005" />
|
|
|
359
|
- <option name="project" value="LOCAL" />
|
|
|
360
|
- <updated>1535461932931</updated>
|
341
|
+ <workItem from="1535633001243" duration="12448000" />
|
361
|
</task>
|
342
|
</task>
|
362
|
<task id="LOCAL-00006" summary="已评价无数据情况">
|
343
|
<task id="LOCAL-00006" summary="已评价无数据情况">
|
363
|
<created>1535462141136</created>
|
344
|
<created>1535462141136</created>
|
|
@@ -674,11 +655,39 @@ |
|
@@ -674,11 +655,39 @@ |
674
|
<option name="project" value="LOCAL" />
|
655
|
<option name="project" value="LOCAL" />
|
675
|
<updated>1535646952275</updated>
|
656
|
<updated>1535646952275</updated>
|
676
|
</task>
|
657
|
</task>
|
677
|
- <option name="localTasksCounter" value="51" />
|
658
|
+ <task id="LOCAL-00051" summary="登录处理">
|
|
|
659
|
+ <created>1535647131693</created>
|
|
|
660
|
+ <option name="number" value="00051" />
|
|
|
661
|
+ <option name="presentableId" value="LOCAL-00051" />
|
|
|
662
|
+ <option name="project" value="LOCAL" />
|
|
|
663
|
+ <updated>1535647131693</updated>
|
|
|
664
|
+ </task>
|
|
|
665
|
+ <task id="LOCAL-00052" summary="登录处理">
|
|
|
666
|
+ <created>1535647189771</created>
|
|
|
667
|
+ <option name="number" value="00052" />
|
|
|
668
|
+ <option name="presentableId" value="LOCAL-00052" />
|
|
|
669
|
+ <option name="project" value="LOCAL" />
|
|
|
670
|
+ <updated>1535647189771</updated>
|
|
|
671
|
+ </task>
|
|
|
672
|
+ <task id="LOCAL-00053" summary="登录处理">
|
|
|
673
|
+ <created>1535647275205</created>
|
|
|
674
|
+ <option name="number" value="00053" />
|
|
|
675
|
+ <option name="presentableId" value="LOCAL-00053" />
|
|
|
676
|
+ <option name="project" value="LOCAL" />
|
|
|
677
|
+ <updated>1535647275205</updated>
|
|
|
678
|
+ </task>
|
|
|
679
|
+ <task id="LOCAL-00054" summary="登录处理">
|
|
|
680
|
+ <created>1535647314219</created>
|
|
|
681
|
+ <option name="number" value="00054" />
|
|
|
682
|
+ <option name="presentableId" value="LOCAL-00054" />
|
|
|
683
|
+ <option name="project" value="LOCAL" />
|
|
|
684
|
+ <updated>1535647314219</updated>
|
|
|
685
|
+ </task>
|
|
|
686
|
+ <option name="localTasksCounter" value="55" />
|
678
|
<servers />
|
687
|
<servers />
|
679
|
</component>
|
688
|
</component>
|
680
|
<component name="TimeTrackingManager">
|
689
|
<component name="TimeTrackingManager">
|
681
|
- <option name="totallyTimeSpent" value="65585000" />
|
690
|
+ <option name="totallyTimeSpent" value="66900000" />
|
682
|
</component>
|
691
|
</component>
|
683
|
<component name="ToolWindowManager">
|
692
|
<component name="ToolWindowManager">
|
684
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
693
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -690,7 +699,7 @@ |
|
@@ -690,7 +699,7 @@ |
690
|
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
699
|
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
691
|
<window_info anchor="right" id="Database" order="3" />
|
700
|
<window_info anchor="right" id="Database" order="3" />
|
692
|
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
701
|
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
693
|
- <window_info anchor="bottom" id="Version Control" order="7" />
|
702
|
+ <window_info anchor="bottom" id="Version Control" order="7" weight="0.3293348" />
|
694
|
<window_info anchor="bottom" id="Run" order="2" />
|
703
|
<window_info anchor="bottom" id="Run" order="2" />
|
695
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
704
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
696
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
705
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
|
@@ -1019,13 +1028,6 @@ |
|
@@ -1019,13 +1028,6 @@ |
1019
|
</state>
|
1028
|
</state>
|
1020
|
</provider>
|
1029
|
</provider>
|
1021
|
</entry>
|
1030
|
</entry>
|
1022
|
- <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
|
|
1023
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
1024
|
- <state relative-caret-position="-99">
|
|
|
1025
|
- <caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />
|
|
|
1026
|
- </state>
|
|
|
1027
|
- </provider>
|
|
|
1028
|
- </entry>
|
|
|
1029
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
|
1031
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
|
1030
|
<provider selected="true" editor-type-id="text-editor">
|
1032
|
<provider selected="true" editor-type-id="text-editor">
|
1031
|
<state relative-caret-position="534">
|
1033
|
<state relative-caret-position="534">
|
|
@@ -1056,18 +1058,25 @@ |
|
@@ -1056,18 +1058,25 @@ |
1056
|
</entry>
|
1058
|
</entry>
|
1057
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
1059
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
1058
|
<provider selected="true" editor-type-id="text-editor">
|
1060
|
<provider selected="true" editor-type-id="text-editor">
|
1059
|
- <state relative-caret-position="2520">
|
|
|
1060
|
- <caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
|
1061
|
+ <state relative-caret-position="188">
|
|
|
1062
|
+ <caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
|
1061
|
<folding>
|
1063
|
<folding>
|
1062
|
<element signature="e#628#666#0#PHP" expanded="true" />
|
1064
|
<element signature="e#628#666#0#PHP" expanded="true" />
|
1063
|
</folding>
|
1065
|
</folding>
|
1064
|
</state>
|
1066
|
</state>
|
1065
|
</provider>
|
1067
|
</provider>
|
1066
|
</entry>
|
1068
|
</entry>
|
|
|
1069
|
+ <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
|
|
1070
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
1071
|
+ <state relative-caret-position="216">
|
|
|
1072
|
+ <caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" />
|
|
|
1073
|
+ </state>
|
|
|
1074
|
+ </provider>
|
|
|
1075
|
+ </entry>
|
1067
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
1076
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
1068
|
<provider selected="true" editor-type-id="text-editor">
|
1077
|
<provider selected="true" editor-type-id="text-editor">
|
1069
|
<state relative-caret-position="273">
|
1078
|
<state relative-caret-position="273">
|
1070
|
- <caret line="21" column="12" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
|
1079
|
+ <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="32" />
|
1071
|
</state>
|
1080
|
</state>
|
1072
|
</provider>
|
1081
|
</provider>
|
1073
|
</entry>
|
1082
|
</entry>
|