外包项目 / signUpForCar · 提交

转到一个项目

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

登录处理

内嵌 并排对比
正在显示 2 个修改的文件 包含 49 行增加 和 72 行删除
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> 4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" afterDir="false" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -17,11 +17,11 @@ @@ -17,11 +17,11 @@
17 </component> 17 </component>
18 <component name="FileEditorManager"> 18 <component name="FileEditorManager">
19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20 - <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true"> 20 + <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">
21 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 21 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
22 <provider selected="true" editor-type-id="text-editor"> 22 <provider selected="true" editor-type-id="text-editor">
23 - <state relative-caret-position="555">  
24 - <caret line="158" column="52" selection-start-line="158" selection-start-column="52" selection-end-line="158" selection-end-column="52" /> 23 + <state relative-caret-position="660">
  24 + <caret line="162" column="47" lean-forward="true" selection-start-line="162" selection-start-column="47" selection-end-line="162" selection-end-column="47" />
25 <folding> 25 <folding>
26 <element signature="e#636#668#0#PHP" expanded="true" /> 26 <element signature="e#636#668#0#PHP" expanded="true" />
27 <element signature="e#17688#17731#0#PHP" /> 27 <element signature="e#17688#17731#0#PHP" />
@@ -31,11 +31,11 @@ @@ -31,11 +31,11 @@
31 </provider> 31 </provider>
32 </entry> 32 </entry>
33 </file> 33 </file>
34 - <file leaf-file-name="order_details_1.html" pinned="false" current-in-tab="false">  
35 - <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html"> 34 + <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
  35 + <entry file="file://$PROJECT_DIR$/public/index.php">
36 <provider selected="true" editor-type-id="text-editor"> 36 <provider selected="true" editor-type-id="text-editor">
37 - <state relative-caret-position="315">  
38 - <caret line="15" column="48" selection-start-line="15" selection-start-column="48" selection-end-line="15" selection-end-column="48" /> 37 + <state relative-caret-position="126">
  38 + <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
39 </state> 39 </state>
40 </provider> 40 </provider>
41 </entry> 41 </entry>
@@ -72,11 +72,11 @@ @@ -72,11 +72,11 @@
72 <provider selected="true" editor-type-id="text-editor" /> 72 <provider selected="true" editor-type-id="text-editor" />
73 </entry> 73 </entry>
74 </file> 74 </file>
75 - <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false"> 75 + <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
76 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php"> 76 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
77 <provider selected="true" editor-type-id="text-editor"> 77 <provider selected="true" editor-type-id="text-editor">
78 - <state relative-caret-position="231">  
79 - <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" /> 78 + <state relative-caret-position="84">
  79 + <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
80 </state> 80 </state>
81 </provider> 81 </provider>
82 </entry> 82 </entry>
@@ -160,8 +160,9 @@ @@ -160,8 +160,9 @@
160 <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" /> 160 <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
161 <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" /> 161 <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
162 <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" /> 162 <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
163 - <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />  
164 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" /> 163 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
  164 + <option value="$PROJECT_DIR$/public/index.php" />
  165 + <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
165 </list> 166 </list>
166 </option> 167 </option>
167 </component> 168 </component>
@@ -214,51 +215,7 @@ @@ -214,51 +215,7 @@
214 <path> 215 <path>
215 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 216 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
216 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 217 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
217 - <item name="app" type="462c0819:PsiDirectoryNode" />  
218 - </path>  
219 - <path>  
220 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
221 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
222 - <item name="app" type="462c0819:PsiDirectoryNode" />  
223 - <item name="portal" type="462c0819:PsiDirectoryNode" />  
224 - </path>  
225 - <path>  
226 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
227 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
228 - <item name="app" type="462c0819:PsiDirectoryNode" />  
229 - <item name="portal" type="462c0819:PsiDirectoryNode" />  
230 - <item name="controller" type="462c0819:PsiDirectoryNode" />  
231 - </path>  
232 - <path>  
233 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
234 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
235 - <item name="app" type="462c0819:PsiDirectoryNode" />  
236 - <item name="user" type="462c0819:PsiDirectoryNode" />  
237 - </path>  
238 - <path>  
239 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
240 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
241 - <item name="app" type="462c0819:PsiDirectoryNode" />  
242 - <item name="user" type="462c0819:PsiDirectoryNode" />  
243 - <item name="controller" type="462c0819:PsiDirectoryNode" />  
244 - </path>  
245 - <path>  
246 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
247 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
248 - <item name="simplewind" type="462c0819:PsiDirectoryNode" />  
249 - </path>  
250 - <path>  
251 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
252 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
253 - <item name="simplewind" type="462c0819:PsiDirectoryNode" />  
254 - <item name="cmf" type="462c0819:PsiDirectoryNode" />  
255 - </path>  
256 - <path>  
257 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
258 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
259 - <item name="simplewind" type="462c0819:PsiDirectoryNode" />  
260 - <item name="cmf" type="462c0819:PsiDirectoryNode" />  
261 - <item name="controller" type="462c0819:PsiDirectoryNode" /> 218 + <item name="public" type="462c0819:PsiDirectoryNode" />
262 </path> 219 </path>
263 </expand> 220 </expand>
264 <select /> 221 <select />
@@ -313,7 +270,7 @@ @@ -313,7 +270,7 @@
313 <workItem from="1535514127808" duration="727000" /> 270 <workItem from="1535514127808" duration="727000" />
314 <workItem from="1535532970259" duration="2527000" /> 271 <workItem from="1535532970259" duration="2527000" />
315 <workItem from="1535546044129" duration="20814000" /> 272 <workItem from="1535546044129" duration="20814000" />
316 - <workItem from="1535633001243" duration="3011000" /> 273 + <workItem from="1535633001243" duration="3381000" />
317 </task> 274 </task>
318 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题"> 275 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
319 <created>1535458170068</created> 276 <created>1535458170068</created>
@@ -560,11 +517,25 @@ @@ -560,11 +517,25 @@
560 <option name="project" value="LOCAL" /> 517 <option name="project" value="LOCAL" />
561 <updated>1535635277832</updated> 518 <updated>1535635277832</updated>
562 </task> 519 </task>
563 - <option name="localTasksCounter" value="36" /> 520 + <task id="LOCAL-00036" summary="登录处理">
  521 + <created>1535636528548</created>
  522 + <option name="number" value="00036" />
  523 + <option name="presentableId" value="LOCAL-00036" />
  524 + <option name="project" value="LOCAL" />
  525 + <updated>1535636528548</updated>
  526 + </task>
  527 + <task id="LOCAL-00037" summary="登录处理">
  528 + <created>1535636670545</created>
  529 + <option name="number" value="00037" />
  530 + <option name="presentableId" value="LOCAL-00037" />
  531 + <option name="project" value="LOCAL" />
  532 + <updated>1535636670545</updated>
  533 + </task>
  534 + <option name="localTasksCounter" value="38" />
564 <servers /> 535 <servers />
565 </component> 536 </component>
566 <component name="TimeTrackingManager"> 537 <component name="TimeTrackingManager">
567 - <option name="totallyTimeSpent" value="57463000" /> 538 + <option name="totallyTimeSpent" value="57833000" />
568 </component> 539 </component>
569 <component name="ToolWindowManager"> 540 <component name="ToolWindowManager">
570 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 541 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -611,9 +582,6 @@ @@ -611,9 +582,6 @@
611 <option name="LAST_COMMIT_MESSAGE" value="登录处理" /> 582 <option name="LAST_COMMIT_MESSAGE" value="登录处理" />
612 </component> 583 </component>
613 <component name="editorHistoryManager"> 584 <component name="editorHistoryManager">
614 - <entry file="file://$PROJECT_DIR$/api/debug.php">  
615 - <provider selected="true" editor-type-id="text-editor" />  
616 - </entry>  
617 <entry file="file://$PROJECT_DIR$/api/database.php"> 585 <entry file="file://$PROJECT_DIR$/api/database.php">
618 <provider selected="true" editor-type-id="text-editor" /> 586 <provider selected="true" editor-type-id="text-editor" />
619 </entry> 587 </entry>
@@ -881,17 +849,10 @@ @@ -881,17 +849,10 @@
881 </state> 849 </state>
882 </provider> 850 </provider>
883 </entry> 851 </entry>
884 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">  
885 - <provider selected="true" editor-type-id="text-editor">  
886 - <state relative-caret-position="231">  
887 - <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />  
888 - </state>  
889 - </provider>  
890 - </entry>  
891 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 852 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
892 <provider selected="true" editor-type-id="text-editor"> 853 <provider selected="true" editor-type-id="text-editor">
893 - <state relative-caret-position="555">  
894 - <caret line="158" column="52" selection-start-line="158" selection-start-column="52" selection-end-line="158" selection-end-column="52" /> 854 + <state relative-caret-position="660">
  855 + <caret line="162" column="47" lean-forward="true" selection-start-line="162" selection-start-column="47" selection-end-line="162" selection-end-column="47" />
895 <folding> 856 <folding>
896 <element signature="e#636#668#0#PHP" expanded="true" /> 857 <element signature="e#636#668#0#PHP" expanded="true" />
897 <element signature="e#17688#17731#0#PHP" /> 858 <element signature="e#17688#17731#0#PHP" />
@@ -900,5 +861,19 @@ @@ -900,5 +861,19 @@
900 </state> 861 </state>
901 </provider> 862 </provider>
902 </entry> 863 </entry>
  864 + <entry file="file://$PROJECT_DIR$/public/index.php">
  865 + <provider selected="true" editor-type-id="text-editor">
  866 + <state relative-caret-position="126">
  867 + <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
  868 + </state>
  869 + </provider>
  870 + </entry>
  871 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
  872 + <provider selected="true" editor-type-id="text-editor">
  873 + <state relative-caret-position="84">
  874 + <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
  875 + </state>
  876 + </provider>
  877 + </entry>
903 </component> 878 </component>
904 </project> 879 </project>
@@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
10 // +---------------------------------------------------------------------- 10 // +----------------------------------------------------------------------
11 namespace cmf\controller; 11 namespace cmf\controller;
12 12
  13 +use think\db;
  14 +
13 class UserBaseController extends HomeBaseController 15 class UserBaseController extends HomeBaseController
14 { 16 {
15 17