...
|
...
|
@@ -63,8 +63,8 @@ |
|
|
<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="2520">
|
|
|
<caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
|
|
|
<state relative-caret-position="188">
|
|
|
<caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
|
|
|
<folding>
|
|
|
<element signature="e#628#666#0#PHP" expanded="true" />
|
|
|
</folding>
|
...
|
...
|
@@ -72,11 +72,20 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="216">
|
|
|
<caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="273">
|
|
|
<caret line="21" column="12" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
|
|
|
<caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="32" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -143,7 +152,6 @@ |
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
|
|
|
<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/admin/controller/BookingController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
|
...
|
...
|
@@ -155,6 +163,7 @@ |
|
|
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" />
|
|
|
<option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
|
|
|
<option value="$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html" />
|
|
|
<option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
|
|
|
<option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
|
|
|
</list>
|
|
|
</option>
|
...
|
...
|
@@ -214,13 +223,13 @@ |
|
|
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="app" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="portal" 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="portal" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="user" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
...
|
...
|
@@ -329,35 +338,7 @@ |
|
|
<workItem from="1535514127808" duration="727000" />
|
|
|
<workItem from="1535532970259" duration="2527000" />
|
|
|
<workItem from="1535546044129" duration="20814000" />
|
|
|
<workItem from="1535633001243" duration="11133000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00002" summary="修复教练的时间段可以重复预约">
|
|
|
<created>1535458750848</created>
|
|
|
<option name="number" value="00002" />
|
|
|
<option name="presentableId" value="LOCAL-00002" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535458750848</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00003" summary="已经成功报名的用户,不能再次报名 放在确认订单页面">
|
|
|
<created>1535459632689</created>
|
|
|
<option name="number" value="00003" />
|
|
|
<option name="presentableId" value="LOCAL-00003" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535459632689</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00004" summary="已评价无数据情况">
|
|
|
<created>1535460444090</created>
|
|
|
<option name="number" value="00004" />
|
|
|
<option name="presentableId" value="LOCAL-00004" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535460444090</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00005" summary="已评价无数据情况">
|
|
|
<created>1535461932931</created>
|
|
|
<option name="number" value="00005" />
|
|
|
<option name="presentableId" value="LOCAL-00005" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535461932931</updated>
|
|
|
<workItem from="1535633001243" duration="12448000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00006" summary="已评价无数据情况">
|
|
|
<created>1535462141136</created>
|
...
|
...
|
@@ -674,11 +655,39 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535646952275</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="51" />
|
|
|
<task id="LOCAL-00051" summary="登录处理">
|
|
|
<created>1535647131693</created>
|
|
|
<option name="number" value="00051" />
|
|
|
<option name="presentableId" value="LOCAL-00051" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535647131693</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00052" summary="登录处理">
|
|
|
<created>1535647189771</created>
|
|
|
<option name="number" value="00052" />
|
|
|
<option name="presentableId" value="LOCAL-00052" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535647189771</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00053" summary="登录处理">
|
|
|
<created>1535647275205</created>
|
|
|
<option name="number" value="00053" />
|
|
|
<option name="presentableId" value="LOCAL-00053" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535647275205</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00054" summary="登录处理">
|
|
|
<created>1535647314219</created>
|
|
|
<option name="number" value="00054" />
|
|
|
<option name="presentableId" value="LOCAL-00054" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1535647314219</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="55" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="65585000" />
|
|
|
<option name="totallyTimeSpent" value="66900000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -690,7 +699,7 @@ |
|
|
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
|
|
<window_info anchor="right" id="Database" order="3" />
|
|
|
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
|
|
|
<window_info anchor="bottom" id="Version Control" order="7" />
|
|
|
<window_info anchor="bottom" id="Version Control" order="7" weight="0.3293348" />
|
|
|
<window_info anchor="bottom" id="Run" order="2" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Terminal" order="7" />
|
...
|
...
|
@@ -1019,13 +1028,6 @@ |
|
|
</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="-99">
|
|
|
<caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="534">
|
...
|
...
|
@@ -1056,18 +1058,25 @@ |
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="2520">
|
|
|
<caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
|
|
|
<state relative-caret-position="188">
|
|
|
<caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
|
|
|
<folding>
|
|
|
<element signature="e#628#666#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</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="216">
|
|
|
<caret line="82" lean-forward="true" selection-start-line="82" selection-end-line="82" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="273">
|
|
|
<caret line="21" column="12" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
|
|
|
<caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="32" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|