外包项目 / signUpForCar · 提交

转到一个项目

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

已评价无数据情况

内嵌 并排对比
正在显示 2 个修改的文件 包含 69 行增加 和 85 行删除
@@ -20,8 +20,8 @@ @@ -20,8 +20,8 @@
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="true">
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="609">  
24 - <caret line="186" column="81" selection-start-line="186" selection-start-column="81" selection-end-line="186" selection-end-column="81" /> 23 + <state relative-caret-position="279">
  24 + <caret line="539" column="63" selection-start-line="539" selection-start-column="63" selection-end-line="539" selection-end-column="63" />
25 <folding> 25 <folding>
26 <element signature="e#911#990#0#PHP" /> 26 <element signature="e#911#990#0#PHP" />
27 <element signature="e#1015#1432#0#PHP" /> 27 <element signature="e#1015#1432#0#PHP" />
@@ -39,34 +39,6 @@ @@ -39,34 +39,6 @@
39 <element signature="e#3631#3704#0#PHP" /> 39 <element signature="e#3631#3704#0#PHP" />
40 <element signature="e#4913#5015#0#PHP" /> 40 <element signature="e#4913#5015#0#PHP" />
41 <element signature="e#5338#5425#0#PHP" /> 41 <element signature="e#5338#5425#0#PHP" />
42 - <element signature="e#6595#7177#1#PHP" />  
43 - <element signature="e#7503#8007#1#PHP" />  
44 - <element signature="e#8213#8299#0#PHP" />  
45 - <element signature="e#8355#8539#0#PHP" />  
46 - <element signature="e#8564#9616#0#PHP" />  
47 - <element signature="e#8820#8865#0#PHP" />  
48 - <element signature="e#8820#8914#0#PHP" />  
49 - <element signature="e#8820#8955#0#PHP" />  
50 - <element signature="e#8820#8998#0#PHP" />  
51 - <element signature="e#9076#9149#0#PHP" />  
52 - <element signature="e#9641#10319#0#PHP" />  
53 - <element signature="e#10344#14313#0#PHP" />  
54 - <element signature="e#10608#14305#0#PHP" />  
55 - <element signature="e#10697#14305#0#PHP" />  
56 - <element signature="e#11141#11228#0#PHP" />  
57 - <element signature="e#11376#14295#0#PHP" />  
58 - <element signature="e#12117#13054#0#PHP" />  
59 - <element signature="e#12425#13036#1#PHP" />  
60 - <element signature="e#13082#14019#0#PHP" />  
61 - <element signature="e#13390#14001#1#PHP" />  
62 - <element signature="e#14209#14295#0#PHP" />  
63 - <element signature="e#14492#14586#0#PHP" />  
64 - <element signature="e#14605#14647#0#PHP" />  
65 - <element signature="e#14605#14697#0#PHP" />  
66 - <element signature="e#14605#14746#0#PHP" />  
67 - <element signature="e#14605#14816#0#PHP" />  
68 - <element signature="e#14605#14858#0#PHP" />  
69 - <element signature="e#14605#14886#0#PHP" />  
70 </folding> 42 </folding>
71 </state> 43 </state>
72 </provider> 44 </provider>
@@ -134,7 +106,7 @@ @@ -134,7 +106,7 @@
134 <file leaf-file-name="enter_jituanjiagou.htm" pinned="false" current-in-tab="false"> 106 <file leaf-file-name="enter_jituanjiagou.htm" pinned="false" current-in-tab="false">
135 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm"> 107 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm">
136 <provider selected="true" editor-type-id="text-editor"> 108 <provider selected="true" editor-type-id="text-editor">
137 - <state relative-caret-position="447"> 109 + <state relative-caret-position="2772">
138 <caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" /> 110 <caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" />
139 <folding> 111 <folding>
140 <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 112 <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 @@ @@ -389,7 +361,8 @@
389 <workItem from="1531747533208" duration="2488000" /> 361 <workItem from="1531747533208" duration="2488000" />
390 <workItem from="1531794895610" duration="20000" /> 362 <workItem from="1531794895610" duration="20000" />
391 <workItem from="1535458114609" duration="13848000" /> 363 <workItem from="1535458114609" duration="13848000" />
392 - <workItem from="1535514127808" duration="19000" /> 364 + <workItem from="1535514127808" duration="727000" />
  365 + <workItem from="1535532970259" duration="501000" />
393 </task> 366 </task>
394 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题"> 367 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
395 <created>1535458170068</created> 368 <created>1535458170068</created>
@@ -468,28 +441,35 @@ @@ -468,28 +441,35 @@
468 <option name="project" value="LOCAL" /> 441 <option name="project" value="LOCAL" />
469 <updated>1535465827689</updated> 442 <updated>1535465827689</updated>
470 </task> 443 </task>
471 - <option name="localTasksCounter" value="12" /> 444 + <task id="LOCAL-00012" summary="已评价无数据情况">
  445 + <created>1535514168713</created>
  446 + <option name="number" value="00012" />
  447 + <option name="presentableId" value="LOCAL-00012" />
  448 + <option name="project" value="LOCAL" />
  449 + <updated>1535514168713</updated>
  450 + </task>
  451 + <option name="localTasksCounter" value="13" />
472 <servers /> 452 <servers />
473 </component> 453 </component>
474 <component name="TimeTrackingManager"> 454 <component name="TimeTrackingManager">
475 - <option name="totallyTimeSpent" value="30403000" /> 455 + <option name="totallyTimeSpent" value="31612000" />
476 </component> 456 </component>
477 <component name="ToolWindowManager"> 457 <component name="ToolWindowManager">
478 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 458 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
479 <editor active="true" /> 459 <editor active="true" />
480 <layout> 460 <layout>
481 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14179105" /> 461 + <window_info content_ui="combo" id="Project" order="0" weight="0.1433902" />
482 <window_info anchor="bottom" id="TODO" order="6" /> 462 <window_info anchor="bottom" id="TODO" order="6" />
483 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 463 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
484 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> 464 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
485 <window_info anchor="right" id="Database" order="3" /> 465 <window_info anchor="right" id="Database" order="3" />
486 <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> 466 <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
487 - <window_info anchor="bottom" id="Run" order="2" />  
488 <window_info anchor="bottom" id="Version Control" order="7" /> 467 <window_info anchor="bottom" id="Version Control" order="7" />
  468 + <window_info anchor="bottom" id="Run" order="2" />
489 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 469 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
490 <window_info anchor="bottom" id="Terminal" order="7" /> 470 <window_info anchor="bottom" id="Terminal" order="7" />
491 - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />  
492 <window_info id="Favorites" order="2" side_tool="true" /> 471 <window_info id="Favorites" order="2" side_tool="true" />
  472 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
493 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 473 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
494 <window_info id="npm" order="2" side_tool="true" /> 474 <window_info id="npm" order="2" side_tool="true" />
495 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 475 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -776,7 +756,7 @@ @@ -776,7 +756,7 @@
776 </entry> 756 </entry>
777 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm"> 757 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm">
778 <provider selected="true" editor-type-id="text-editor"> 758 <provider selected="true" editor-type-id="text-editor">
779 - <state relative-caret-position="447"> 759 + <state relative-caret-position="2772">
780 <caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" /> 760 <caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" />
781 <folding> 761 <folding>
782 <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 762 <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 @@ @@ -838,8 +818,8 @@
838 </entry> 818 </entry>
839 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 819 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
840 <provider selected="true" editor-type-id="text-editor"> 820 <provider selected="true" editor-type-id="text-editor">
841 - <state relative-caret-position="609">  
842 - <caret line="186" column="81" selection-start-line="186" selection-start-column="81" selection-end-line="186" selection-end-column="81" /> 821 + <state relative-caret-position="279">
  822 + <caret line="539" column="63" selection-start-line="539" selection-start-column="63" selection-end-line="539" selection-end-column="63" />
843 <folding> 823 <folding>
844 <element signature="e#911#990#0#PHP" /> 824 <element signature="e#911#990#0#PHP" />
845 <element signature="e#1015#1432#0#PHP" /> 825 <element signature="e#1015#1432#0#PHP" />
@@ -857,34 +837,6 @@ @@ -857,34 +837,6 @@
857 <element signature="e#3631#3704#0#PHP" /> 837 <element signature="e#3631#3704#0#PHP" />
858 <element signature="e#4913#5015#0#PHP" /> 838 <element signature="e#4913#5015#0#PHP" />
859 <element signature="e#5338#5425#0#PHP" /> 839 <element signature="e#5338#5425#0#PHP" />
860 - <element signature="e#6595#7177#1#PHP" />  
861 - <element signature="e#7503#8007#1#PHP" />  
862 - <element signature="e#8213#8299#0#PHP" />  
863 - <element signature="e#8355#8539#0#PHP" />  
864 - <element signature="e#8564#9616#0#PHP" />  
865 - <element signature="e#8820#8865#0#PHP" />  
866 - <element signature="e#8820#8914#0#PHP" />  
867 - <element signature="e#8820#8955#0#PHP" />  
868 - <element signature="e#8820#8998#0#PHP" />  
869 - <element signature="e#9076#9149#0#PHP" />  
870 - <element signature="e#9641#10319#0#PHP" />  
871 - <element signature="e#10344#14313#0#PHP" />  
872 - <element signature="e#10608#14305#0#PHP" />  
873 - <element signature="e#10697#14305#0#PHP" />  
874 - <element signature="e#11141#11228#0#PHP" />  
875 - <element signature="e#11376#14295#0#PHP" />  
876 - <element signature="e#12117#13054#0#PHP" />  
877 - <element signature="e#12425#13036#1#PHP" />  
878 - <element signature="e#13082#14019#0#PHP" />  
879 - <element signature="e#13390#14001#1#PHP" />  
880 - <element signature="e#14209#14295#0#PHP" />  
881 - <element signature="e#14492#14586#0#PHP" />  
882 - <element signature="e#14605#14647#0#PHP" />  
883 - <element signature="e#14605#14697#0#PHP" />  
884 - <element signature="e#14605#14746#0#PHP" />  
885 - <element signature="e#14605#14816#0#PHP" />  
886 - <element signature="e#14605#14858#0#PHP" />  
887 - <element signature="e#14605#14886#0#PHP" />  
888 </folding> 840 </folding>
889 </state> 841 </state>
890 </provider> 842 </provider>
@@ -190,7 +190,8 @@ class YuyueController extends UserBaseController @@ -190,7 +190,8 @@ class YuyueController extends UserBaseController
190 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'), 190 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
191 'keyword2' => array('value' => $stu_info['mobile']), 191 'keyword2' => array('value' => $stu_info['mobile']),
192 'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'), 192 'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
193 - 'keyword4' => array('value' => "点击查看预约并确认预约") 193 + 'keyword4' => array('value' => $tea_info['user_nickname']),
  194 + 'remark' => array('value' => "点击查看预约并确认预约")
194 ) 195 )
195 ]; 196 ];
196 197
@@ -310,28 +311,28 @@ class YuyueController extends UserBaseController @@ -310,28 +311,28 @@ class YuyueController extends UserBaseController
310 'touser' => $stu_info['openid'], 311 'touser' => $stu_info['openid'],
311 'topcolor' => '#7B68EE', 312 'topcolor' => '#7B68EE',
312 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue', 313 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
313 - 'template_id' => 'kmRG7k7OOLd3m5a3sTvvMknbIySIifBtptFPxs3lgUo', 314 + 'template_id' => 'Ei5jEwFCIe-tS2hatyRRLDkklA2e3prk85rpTx2JBfE',
314 'data' => array( 315 'data' => array(
315 - 'first' => array('value' => '学车预约通知'),  
316 - 'keyword1' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),  
317 - 'keyword2' => array('value' => $stu_info['kemu'], 'color' => '#0099FF'),  
318 - 'keyword3' => array('value' => $tea_info['user_nickname'], 'color' => '#0099FF'),  
319 - 'keyword4' => array('value' => $tea_info['mobile']),  
320 - 'keyword5' => array('value' => '无', 'color' => '#0099FF') 316 + 'first' => array('value' => '您的预约成功啦'),
  317 + 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
  318 + 'keyword2' => array('value' => $stu_info['mobile']),
  319 + 'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
  320 + 'keyword4' => array('value' => $tea_info['user_nickname']),
  321 + 'remark' => array('value' => "点击查看预约")
321 ) 322 )
322 ]; 323 ];
323 $param2 = [ 324 $param2 = [
324 'touser' => $tea_info['openid'], 325 'touser' => $tea_info['openid'],
325 'topcolor' => '#7B68EE', 326 'topcolor' => '#7B68EE',
326 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue', 327 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
327 - 'template_id' => 'kmRG7k7OOLd3m5a3sTvvMknbIySIifBtptFPxs3lgUo', 328 + 'template_id' => 'Ei5jEwFCIe-tS2hatyRRLDkklA2e3prk85rpTx2JBfE',
328 'data' => array( 329 'data' => array(
329 - 'first' => array('value' => '学车预约通知'),  
330 - 'keyword1' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),  
331 - 'keyword2' => array('value' => $stu_info['kemu'], 'color' => '#0099FF'),  
332 - 'keyword3' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),  
333 - 'keyword4' => array('value' => $stu_info['mobile']),  
334 - 'keyword5' => array('value' => '无', 'color' => '#0099FF') 330 + 'first' => array('value' => '有新的学员预约啦'),
  331 + 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
  332 + 'keyword2' => array('value' => $stu_info['mobile']),
  333 + 'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
  334 + 'keyword4' => array('value' => $tea_info['user_nickname']),
  335 + 'remark' => array('value' => "点击查看预约并确认预约")
335 ) 336 )
336 ]; 337 ];
337 338
@@ -521,11 +522,42 @@ class YuyueController extends UserBaseController @@ -521,11 +522,42 @@ class YuyueController extends UserBaseController
521 if ($rres) { 522 if ($rres) {
522 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find(); 523 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
523 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find(); 524 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
524 - $msg = "您好！您已成功取消：{$data['yuyue_day1']}--{$data['yuyue_hour1']}时间段{$tea_info['user_nickname']}的课程，欢迎您再次预约。【悠乐驾】"; 525 +
  526 +
  527 + $msg = "您好！您已成功取消：{$data['yuyue_day1']}--{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，欢迎您再次预约。【悠乐驾】";
525 $tool->get_sms_code_p($stu_info['mobile'], $msg); 528 $tool->get_sms_code_p($stu_info['mobile'], $msg);
526 - $msg1 = "您好！您的：{$data['yuyue_day1']}--{$data['yuyue_hour1']}时间段课程已被{$stu_info['user_nickname']}学员取消，该时间段将进入待预约状态。 529 + $msg1 = "您好！您的：{$data['yuyue_day1']}--{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员取消，该时间段将进入待预约状态。
527 【悠乐驾】"; 530 【悠乐驾】";
528 $tool->get_sms_code_p($tea_info['mobile'], $msg1); 531 $tool->get_sms_code_p($tea_info['mobile'], $msg1);
  532 +
  533 + $param1 = [
  534 + 'touser' => $stu_info['openid'],
  535 + 'topcolor' => '#7B68EE',
  536 + 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
  537 + 'template_id' => 'u4uRiWRnlZb8xQ4mbInvtv5AiVxPJZ13mpYQxZh7P0o',
  538 + 'data' => array(
  539 + 'first' => array('value' => '您的预约已取消'),
  540 + 'keyword1' => array('value' => $tea_info['user_nickname'], 'color' => '#0099FF'),
  541 + 'keyword2' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
  542 + 'remark' => array('value' => "谢谢使用")
  543 + )
  544 + ];
  545 + $param2 = [
  546 + 'touser' => $tea_info['openid'],
  547 + 'topcolor' => '#7B68EE',
  548 + 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
  549 + 'template_id' => 'u4uRiWRnlZb8xQ4mbInvtv5AiVxPJZ13mpYQxZh7P0o',
  550 + 'data' => array(
  551 + 'first' => array('value' => '您的预约已取消'),
  552 + 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
  553 + 'keyword2' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
  554 + 'remark' => array('value' => "谢谢使用")
  555 + )
  556 + ];
  557 +
  558 + $res = $tool->wxtemsg_send($param1);
  559 + $res = $tool->wxtemsg_send($param2);
  560 +
529 return json(['code' => '1', 'msg' => '删除成功']); 561 return json(['code' => '1', 'msg' => '删除成功']);
530 } else { 562 } else {
531 return json(['code' => '0', 'msg' => '抱歉，删除失败']); 563 return json(['code' => '0', 'msg' => '抱歉，删除失败']);