外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 8ba5291e29ed5bc7ac5a807fc99acc8ae165386c 1 个父辈 1b8322f6

登录处理

内嵌 并排对比
正在显示 2 个修改的文件 包含 49 行增加 和 72 行删除
... ... @@ -3,7 +3,7 @@
<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/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -17,11 +17,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
<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="555">
<caret line="158" column="52" selection-start-line="158" selection-start-column="52" selection-end-line="158" selection-end-column="52" />
<state relative-caret-position="660">
<caret line="162" column="47" lean-forward="true" selection-start-line="162" selection-start-column="47" selection-end-line="162" selection-end-column="47" />
<folding>
<element signature="e#636#668#0#PHP" expanded="true" />
<element signature="e#17688#17731#0#PHP" />
... ... @@ -31,11 +31,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="order_details_1.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html">
<file leaf-file-name="index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="15" column="48" selection-start-line="15" selection-start-column="48" selection-end-line="15" selection-end-column="48" />
<state relative-caret-position="126">
<caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
</state>
</provider>
</entry>
... ... @@ -72,11 +72,11 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false">
<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="231">
<caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
<state relative-caret-position="84">
<caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
</state>
</provider>
</entry>
... ... @@ -160,8 +160,9 @@
<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$/simplewind/cmf/controller/UserBaseController.php" />
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
</list>
</option>
</component>
... ... @@ -214,51 +215,7 @@
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="app" 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" />
</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="controller" 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" />
</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="simplewind" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
<item name="cmf" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
<item name="cmf" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
... ... @@ -313,7 +270,7 @@
<workItem from="1535514127808" duration="727000" />
<workItem from="1535532970259" duration="2527000" />
<workItem from="1535546044129" duration="20814000" />
<workItem from="1535633001243" duration="3011000" />
<workItem from="1535633001243" duration="3381000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
... ... @@ -560,11 +517,25 @@
<option name="project" value="LOCAL" />
<updated>1535635277832</updated>
</task>
<option name="localTasksCounter" value="36" />
<task id="LOCAL-00036" summary="登录处理">
<created>1535636528548</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1535636528548</updated>
</task>
<task id="LOCAL-00037" summary="登录处理">
<created>1535636670545</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1535636670545</updated>
</task>
<option name="localTasksCounter" value="38" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="57463000" />
<option name="totallyTimeSpent" value="57833000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -611,9 +582,6 @@
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/debug.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/database.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -881,17 +849,10 @@
</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="231">
<caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
<caret line="158" column="52" selection-start-line="158" selection-start-column="52" selection-end-line="158" selection-end-column="52" />
<state relative-caret-position="660">
<caret line="162" column="47" lean-forward="true" selection-start-line="162" selection-start-column="47" selection-end-line="162" selection-end-column="47" />
<folding>
<element signature="e#636#668#0#PHP" expanded="true" />
<element signature="e#17688#17731#0#PHP" />
... ... @@ -900,5 +861,19 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
</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="84">
<caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -10,6 +10,8 @@
// +----------------------------------------------------------------------
namespace cmf\controller;
use think\db;
class UserBaseController extends HomeBaseController
{
... ...