外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 3f4ce4798d199801ac4600dc6c7d6240fcecf86a 1 个父辈 5270b1f9

登录处理

内嵌 并排对比
正在显示 2 个修改的文件 包含 101 行增加 和 137 行删除
... ... @@ -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/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/LoginController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -17,42 +17,20 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="hezuo_jiuda.htm" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm">
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1932">
<caret line="797" column="85" selection-start-line="797" selection-start-column="85" selection-end-line="797" selection-end-column="85" />
<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" />
<folding>
<element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#a#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#span#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#font#0;n#div#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#font#0;n#div#0;n#div#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#ul#0;n#div#0;n#div#1;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#li#0;n#ul#0;n#div#0;n#div#1;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="e#636#668#0#PHP" expanded="true" />
<element signature="e#17688#17731#0#PHP" />
<element signature="e#17688#17779#0#PHP" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="my_order.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/my_order.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="order_details.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details.html">
<provider selected="true" editor-type-id="text-editor" />
</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">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -80,33 +58,43 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.htm" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm">
<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="3864">
<caret line="184" column="28" selection-start-line="184" selection-start-column="28" selection-end-line="184" selection-end-column="46" />
<state relative-caret-position="321">
<caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<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="321">
<caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
<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>
</file>
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true">
<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="336">
<caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
<state relative-caret-position="153">
<caret line="25" column="12" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HomeBaseController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="pay_success.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -165,7 +153,6 @@
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
<option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
<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" />
... ... @@ -173,6 +160,8 @@
<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" />
</list>
</option>
</component>
... ... @@ -256,69 +245,20 @@
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="admin" 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="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" 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="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" 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="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="portal" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" 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="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="order" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
<item name="cmf" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
... ... @@ -373,7 +313,7 @@
<workItem from="1535514127808" duration="727000" />
<workItem from="1535532970259" duration="2527000" />
<workItem from="1535546044129" duration="20814000" />
<workItem from="1535633001243" duration="1606000" />
<workItem from="1535633001243" duration="3011000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
... ... @@ -599,11 +539,32 @@
<option name="project" value="LOCAL" />
<updated>1535634457149</updated>
</task>
<option name="localTasksCounter" value="33" />
<task id="LOCAL-00033" summary="我的订单详情标题">
<created>1535634619847</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1535634619847</updated>
</task>
<task id="LOCAL-00034" summary="登录处理">
<created>1535635187586</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1535635187586</updated>
</task>
<task id="LOCAL-00035" summary="登录处理">
<created>1535635277832</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1535635277832</updated>
</task>
<option name="localTasksCounter" value="36" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="56058000" />
<option name="totallyTimeSpent" value="57463000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -646,15 +607,10 @@
<MESSAGE value="ceshi wode jiaolian" />
<MESSAGE value="测试获取当前时段的老师" />
<MESSAGE value="我的订单详情标题" />
<option name="LAST_COMMIT_MESSAGE" value="我的订单详情标题" />
<MESSAGE value="登录处理" />
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/route.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/release.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/debug.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -784,11 +740,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1701" />
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log" />
... ... @@ -830,18 +781,6 @@
</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="1092">
<caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
<folding>
<element signature="e#636#668#0#PHP" expanded="true" />
<element signature="e#17688#17731#0#PHP" />
<element signature="e#17688#17779#0#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7602">
... ... @@ -908,13 +847,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
... ... @@ -929,10 +861,42 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="321">
<caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
<state relative-caret-position="153">
<caret line="25" column="12" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="34" />
</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" />
<folding>
<element signature="e#636#668#0#PHP" expanded="true" />
<element signature="e#17688#17731#0#PHP" />
<element signature="e#17688#17779#0#PHP" />
</folding>
</state>
</provider>
</entry>
... ...
... ... @@ -154,9 +154,9 @@ class YuyueController extends UserBaseController
if ($res) {
$stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
$tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
$msg = "您好！您已成功预约：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
$msg = "您好！您已成功预约：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
$tool->get_sms_code_p($stu_info['mobile'], $msg);
$msg1 = "您好！您的：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
$msg1 = "您好！您的：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
$tool->get_sms_code_p($tea_info['mobile'], $msg1);
$param1 = [
'touser' => $stu_info['openid'],
... ... @@ -295,9 +295,9 @@ class YuyueController extends UserBaseController
$stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
$tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
$msg = "您好！您已成功预约：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
$msg = "您好！您已成功预约：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
$tool->get_sms_code_p($stu_info['mobile'], $msg);
$msg1 = "您好！您的：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
$msg1 = "您好！您的：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
$tool->get_sms_code_p($tea_info['mobile'], $msg1);
$param1 = [
'touser' => $stu_info['openid'],
... ...