外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 d920db61649beb5843f6ce6b8db22888d4085858 1 个父辈 de6efd9c

已评价无数据情况

内嵌 并排对比
正在显示 2 个修改的文件 包含 69 行增加 和 85 行删除
... ... @@ -20,8 +20,8 @@
<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="609">
<caret line="186" column="81" selection-start-line="186" selection-start-column="81" selection-end-line="186" selection-end-column="81" />
<state relative-caret-position="279">
<caret line="539" column="63" selection-start-line="539" selection-start-column="63" selection-end-line="539" selection-end-column="63" />
<folding>
<element signature="e#911#990#0#PHP" />
<element signature="e#1015#1432#0#PHP" />
... ... @@ -39,34 +39,6 @@
<element signature="e#3631#3704#0#PHP" />
<element signature="e#4913#5015#0#PHP" />
<element signature="e#5338#5425#0#PHP" />
<element signature="e#6595#7177#1#PHP" />
<element signature="e#7503#8007#1#PHP" />
<element signature="e#8213#8299#0#PHP" />
<element signature="e#8355#8539#0#PHP" />
<element signature="e#8564#9616#0#PHP" />
<element signature="e#8820#8865#0#PHP" />
<element signature="e#8820#8914#0#PHP" />
<element signature="e#8820#8955#0#PHP" />
<element signature="e#8820#8998#0#PHP" />
<element signature="e#9076#9149#0#PHP" />
<element signature="e#9641#10319#0#PHP" />
<element signature="e#10344#14313#0#PHP" />
<element signature="e#10608#14305#0#PHP" />
<element signature="e#10697#14305#0#PHP" />
<element signature="e#11141#11228#0#PHP" />
<element signature="e#11376#14295#0#PHP" />
<element signature="e#12117#13054#0#PHP" />
<element signature="e#12425#13036#1#PHP" />
<element signature="e#13082#14019#0#PHP" />
<element signature="e#13390#14001#1#PHP" />
<element signature="e#14209#14295#0#PHP" />
<element signature="e#14492#14586#0#PHP" />
<element signature="e#14605#14647#0#PHP" />
<element signature="e#14605#14697#0#PHP" />
<element signature="e#14605#14746#0#PHP" />
<element signature="e#14605#14816#0#PHP" />
<element signature="e#14605#14858#0#PHP" />
<element signature="e#14605#14886#0#PHP" />
</folding>
</state>
</provider>
... ... @@ -134,7 +106,7 @@
<file leaf-file-name="enter_jituanjiagou.htm" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<state relative-caret-position="2772">
<caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -389,7 +361,8 @@
<workItem from="1531747533208" duration="2488000" />
<workItem from="1531794895610" duration="20000" />
<workItem from="1535458114609" duration="13848000" />
<workItem from="1535514127808" duration="19000" />
<workItem from="1535514127808" duration="727000" />
<workItem from="1535532970259" duration="501000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
... ... @@ -468,28 +441,35 @@
<option name="project" value="LOCAL" />
<updated>1535465827689</updated>
</task>
<option name="localTasksCounter" value="12" />
<task id="LOCAL-00012" summary="已评价无数据情况">
<created>1535514168713</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1535514168713</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="30403000" />
<option name="totallyTimeSpent" value="31612000" />
</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.14179105" />
<window_info content_ui="combo" id="Project" order="0" weight="0.1433902" />
<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" />
<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="Run" order="2" />
<window_info anchor="bottom" id="Version Control" order="7" />
<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" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info id="npm" order="2" side_tool="true" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
... ... @@ -776,7 +756,7 @@
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<state relative-caret-position="2772">
<caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -838,8 +818,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="609">
<caret line="186" column="81" selection-start-line="186" selection-start-column="81" selection-end-line="186" selection-end-column="81" />
<state relative-caret-position="279">
<caret line="539" column="63" selection-start-line="539" selection-start-column="63" selection-end-line="539" selection-end-column="63" />
<folding>
<element signature="e#911#990#0#PHP" />
<element signature="e#1015#1432#0#PHP" />
... ... @@ -857,34 +837,6 @@
<element signature="e#3631#3704#0#PHP" />
<element signature="e#4913#5015#0#PHP" />
<element signature="e#5338#5425#0#PHP" />
<element signature="e#6595#7177#1#PHP" />
<element signature="e#7503#8007#1#PHP" />
<element signature="e#8213#8299#0#PHP" />
<element signature="e#8355#8539#0#PHP" />
<element signature="e#8564#9616#0#PHP" />
<element signature="e#8820#8865#0#PHP" />
<element signature="e#8820#8914#0#PHP" />
<element signature="e#8820#8955#0#PHP" />
<element signature="e#8820#8998#0#PHP" />
<element signature="e#9076#9149#0#PHP" />
<element signature="e#9641#10319#0#PHP" />
<element signature="e#10344#14313#0#PHP" />
<element signature="e#10608#14305#0#PHP" />
<element signature="e#10697#14305#0#PHP" />
<element signature="e#11141#11228#0#PHP" />
<element signature="e#11376#14295#0#PHP" />
<element signature="e#12117#13054#0#PHP" />
<element signature="e#12425#13036#1#PHP" />
<element signature="e#13082#14019#0#PHP" />
<element signature="e#13390#14001#1#PHP" />
<element signature="e#14209#14295#0#PHP" />
<element signature="e#14492#14586#0#PHP" />
<element signature="e#14605#14647#0#PHP" />
<element signature="e#14605#14697#0#PHP" />
<element signature="e#14605#14746#0#PHP" />
<element signature="e#14605#14816#0#PHP" />
<element signature="e#14605#14858#0#PHP" />
<element signature="e#14605#14886#0#PHP" />
</folding>
</state>
</provider>
... ...
... ... @@ -190,7 +190,8 @@ class YuyueController extends UserBaseController
'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => $stu_info['mobile']),
'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword4' => array('value' => "点击查看预约并确认预约")
'keyword4' => array('value' => $tea_info['user_nickname']),
'remark' => array('value' => "点击查看预约并确认预约")
)
];
... ... @@ -310,28 +311,28 @@ class YuyueController extends UserBaseController
'touser' => $stu_info['openid'],
'topcolor' => '#7B68EE',
'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
'template_id' => 'kmRG7k7OOLd3m5a3sTvvMknbIySIifBtptFPxs3lgUo',
'template_id' => 'Ei5jEwFCIe-tS2hatyRRLDkklA2e3prk85rpTx2JBfE',
'data' => array(
'first' => array('value' => '学车预约通知'),
'keyword1' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword2' => array('value' => $stu_info['kemu'], 'color' => '#0099FF'),
'keyword3' => array('value' => $tea_info['user_nickname'], 'color' => '#0099FF'),
'keyword4' => array('value' => $tea_info['mobile']),
'keyword5' => array('value' => '无', 'color' => '#0099FF')
'first' => array('value' => '您的预约成功啦'),
'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => $stu_info['mobile']),
'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword4' => array('value' => $tea_info['user_nickname']),
'remark' => array('value' => "点击查看预约")
)
];
$param2 = [
'touser' => $tea_info['openid'],
'topcolor' => '#7B68EE',
'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
'template_id' => 'kmRG7k7OOLd3m5a3sTvvMknbIySIifBtptFPxs3lgUo',
'template_id' => 'Ei5jEwFCIe-tS2hatyRRLDkklA2e3prk85rpTx2JBfE',
'data' => array(
'first' => array('value' => '学车预约通知'),
'keyword1' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword2' => array('value' => $stu_info['kemu'], 'color' => '#0099FF'),
'keyword3' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword4' => array('value' => $stu_info['mobile']),
'keyword5' => array('value' => '无', 'color' => '#0099FF')
'first' => array('value' => '有新的学员预约啦'),
'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => $stu_info['mobile']),
'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword4' => array('value' => $tea_info['user_nickname']),
'remark' => array('value' => "点击查看预约并确认预约")
)
];
... ... @@ -521,11 +522,42 @@ class YuyueController extends UserBaseController
if ($rres) {
$stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
$tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
$msg = "您好！您已成功取消：{$data['yuyue_day1']}--{$data['yuyue_hour1']}时间段{$tea_info['user_nickname']}的课程，欢迎您再次预约。【悠乐驾】";
$msg = "您好！您已成功取消：{$data['yuyue_day1']}--{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，欢迎您再次预约。【悠乐驾】";
$tool->get_sms_code_p($stu_info['mobile'], $msg);
$msg1 = "您好！您的：{$data['yuyue_day1']}--{$data['yuyue_hour1']}时间段课程已被{$stu_info['user_nickname']}学员取消，该时间段将进入待预约状态。
$msg1 = "您好！您的：{$data['yuyue_day1']}--{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员取消，该时间段将进入待预约状态。
【悠乐驾】";
$tool->get_sms_code_p($tea_info['mobile'], $msg1);
$param1 = [
'touser' => $stu_info['openid'],
'topcolor' => '#7B68EE',
'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
'template_id' => 'u4uRiWRnlZb8xQ4mbInvtv5AiVxPJZ13mpYQxZh7P0o',
'data' => array(
'first' => array('value' => '您的预约已取消'),
'keyword1' => array('value' => $tea_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'remark' => array('value' => "谢谢使用")
)
];
$param2 = [
'touser' => $tea_info['openid'],
'topcolor' => '#7B68EE',
'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
'template_id' => 'u4uRiWRnlZb8xQ4mbInvtv5AiVxPJZ13mpYQxZh7P0o',
'data' => array(
'first' => array('value' => '您的预约已取消'),
'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'remark' => array('value' => "谢谢使用")
)
];
$res = $tool->wxtemsg_send($param1);
$res = $tool->wxtemsg_send($param2);
return json(['code' => '1', 'msg' => '删除成功']);
} else {
return json(['code' => '0', 'msg' => '抱歉，删除失败']);
... ...