外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 ced17ced2a12870c5db0b7d726d00f08519315c2 1 个父辈 1c2ec196

登录处理

内嵌 并排对比
正在显示 2 个修改的文件 包含 40 行增加 和 39 行删除
... ... @@ -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$/simplewind/cmf/controller/UserBaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/user/controller/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/LoginController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -72,20 +72,20 @@
</provider>
</entry>
</file>
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true">
<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 relative-caret-position="321">
<caret line="30" column="78" selection-start-line="30" selection-start-column="78" selection-end-line="30" selection-end-column="78" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false">
<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="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="32" />
<caret line="21" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
... ... @@ -153,7 +153,6 @@
<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/admin/controller/BookingController.php" />
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php" />
... ... @@ -165,6 +164,7 @@
<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" />
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
</list>
</option>
</component>
... ... @@ -338,28 +338,7 @@
<workItem from="1535514127808" duration="727000" />
<workItem from="1535532970259" duration="2527000" />
<workItem from="1535546044129" duration="20814000" />
<workItem from="1535633001243" duration="12448000" />
</task>
<task id="LOCAL-00006" summary="已评价无数据情况">
<created>1535462141136</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1535462141136</updated>
</task>
<task id="LOCAL-00007" summary="已评价无数据情况">
<created>1535462428440</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1535462428440</updated>
</task>
<task id="LOCAL-00008" summary="已评价无数据情况">
<created>1535462581974</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1535462581974</updated>
<workItem from="1535633001243" duration="13155000" />
</task>
<task id="LOCAL-00009" summary="已评价无数据情况">
<created>1535465324978</created>
... ... @@ -683,17 +662,38 @@
<option name="project" value="LOCAL" />
<updated>1535647314219</updated>
</task>
<option name="localTasksCounter" value="55" />
<task id="LOCAL-00055" summary="登录处理">
<created>1535649389001</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1535649389001</updated>
</task>
<task id="LOCAL-00056" summary="登录处理">
<created>1535649825078</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1535649825078</updated>
</task>
<task id="LOCAL-00057" summary="登录处理">
<created>1535649911424</created>
<option name="number" value="00057" />
<option name="presentableId" value="LOCAL-00057" />
<option name="project" value="LOCAL" />
<updated>1535649911425</updated>
</task>
<option name="localTasksCounter" value="58" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="66900000" />
<option name="totallyTimeSpent" value="67607000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
<window_info content_ui="combo" id="Project" order="0" weight="0.14658849" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
... ... @@ -1066,17 +1066,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.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 relative-caret-position="273">
<caret line="21" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="32" />
<state relative-caret-position="321">
<caret line="30" column="78" selection-start-line="30" selection-start-column="78" selection-end-line="30" selection-end-column="78" />
</state>
</provider>
</entry>
... ...
... ... @@ -26,8 +26,9 @@ class LoginController extends HomeBaseController
//session('user.id','10');
$ress = Db::name('user')->where(['openid'=>session('openid')])->find();
if($ress && $ress['mobile'] != '' ){
//已支付学员
if($ress['user_type'] == '2'){
if($ress['student_type'] == '1'){
if($ress['student_type'] == '1' and $ress['delete_time'] == '0'){
session('user.id',$ress['id']);
return redirect($this->request->root() . '/user/profile/percenter');
}
... ...