外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 b9c05ebf6b676ac8c5373aa9eadd424582686cd8 1 个父辈 79218a95

测试获取当前时段的老师

内嵌 并排对比
正在显示 2 个修改的文件 包含 329 行增加 和 50 行删除
@@ -20,47 +20,187 @@ @@ -20,47 +20,187 @@
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="468">  
24 - <caret line="444" lean-forward="true" selection-start-line="444" selection-end-line="444" /> 23 + <state relative-caret-position="672">
  24 + <caret line="75" column="48" lean-forward="true" selection-start-line="75" selection-start-column="48" selection-end-line="75" selection-end-column="48" />
25 <folding> 25 <folding>
  26 + <element signature="e#636#668#0#PHP" expanded="true" />
26 <element signature="e#911#990#0#PHP" /> 27 <element signature="e#911#990#0#PHP" />
27 <element signature="e#1015#1432#0#PHP" /> 28 <element signature="e#1015#1432#0#PHP" />
28 - <element signature="e#1459#2877#0#PHP" />  
29 <element signature="e#1502#1569#0#PHP" /> 29 <element signature="e#1502#1569#0#PHP" />
30 - <element signature="e#1717#1797#0#PHP" />  
31 - <element signature="e#1884#2341#0#PHP" />  
32 - <element signature="e#1946#2053#0#PHP" />  
33 - <element signature="e#2209#2331#0#PHP" />  
34 <element signature="e#2902#4247#0#PHP" /> 30 <element signature="e#2902#4247#0#PHP" />
35 <element signature="e#3375#3420#0#PHP" /> 31 <element signature="e#3375#3420#0#PHP" />
36 <element signature="e#3375#3469#0#PHP" /> 32 <element signature="e#3375#3469#0#PHP" />
37 <element signature="e#3375#3510#0#PHP" /> 33 <element signature="e#3375#3510#0#PHP" />
38 <element signature="e#3375#3553#0#PHP" /> 34 <element signature="e#3375#3553#0#PHP" />
39 <element signature="e#3631#3704#0#PHP" /> 35 <element signature="e#3631#3704#0#PHP" />
  36 + <element signature="e#4272#8454#0#PHP" />
  37 + <element signature="e#4379#8447#0#PHP" />
  38 + <element signature="e#4468#8447#0#PHP" />
40 <element signature="e#4913#5015#0#PHP" /> 39 <element signature="e#4913#5015#0#PHP" />
41 <element signature="e#5338#5425#0#PHP" /> 40 <element signature="e#5338#5425#0#PHP" />
  41 + <element signature="e#5575#8437#0#PHP" />
  42 + <element signature="e#6315#7223#0#PHP" />
  43 + <element signature="e#6623#7205#1#PHP" />
  44 + <element signature="e#7251#8163#0#PHP" />
  45 + <element signature="e#7559#8145#1#PHP" />
  46 + <element signature="e#8351#8437#0#PHP" />
  47 + <element signature="e#8493#8677#0#PHP" />
  48 + <element signature="e#8702#9754#0#PHP" />
  49 + <element signature="e#8958#9003#0#PHP" />
  50 + <element signature="e#8958#9052#0#PHP" />
  51 + <element signature="e#8958#9093#0#PHP" />
  52 + <element signature="e#8958#9136#0#PHP" />
  53 + <element signature="e#9214#9287#0#PHP" />
  54 + <element signature="e#9779#10457#0#PHP" />
  55 + <element signature="e#10482#14397#0#PHP" />
  56 + <element signature="e#10746#14389#0#PHP" />
  57 + <element signature="e#10835#14389#0#PHP" />
  58 + <element signature="e#11279#11366#0#PHP" />
  59 + <element signature="e#11514#14379#0#PHP" />
  60 + <element signature="e#12255#13163#0#PHP" />
  61 + <element signature="e#12563#13145#1#PHP" />
  62 + <element signature="e#13191#14103#0#PHP" />
  63 + <element signature="e#13499#14085#1#PHP" />
  64 + <element signature="e#14293#14379#0#PHP" />
  65 + <element signature="e#14431#17090#0#PHP" />
  66 + <element signature="e#14576#14670#0#PHP" />
  67 + <element signature="e#14689#14731#0#PHP" />
  68 + <element signature="e#14689#14781#0#PHP" />
  69 + <element signature="e#14689#14830#0#PHP" />
  70 + <element signature="e#14689#14900#0#PHP" />
  71 + <element signature="e#14689#14942#0#PHP" />
  72 + <element signature="e#14689#14970#0#PHP" />
  73 + <element signature="e#14989#15032#0#PHP" />
  74 + <element signature="e#14989#15085#0#PHP" />
  75 + <element signature="e#14989#15121#0#PHP" />
  76 + <element signature="e#14989#15194#0#PHP" />
  77 + <element signature="e#14989#15234#0#PHP" />
  78 + <element signature="e#15291#15459#0#PHP" />
  79 + <element signature="e#15333#15449#0#PHP" />
  80 + <element signature="e#15478#15521#0#PHP" />
  81 + <element signature="e#15478#15574#0#PHP" />
  82 + <element signature="e#15478#15625#0#PHP" />
  83 + <element signature="e#15478#15698#0#PHP" />
  84 + <element signature="e#15478#15738#0#PHP" />
  85 + <element signature="e#15805#15848#0#PHP" />
  86 + <element signature="e#15805#15901#0#PHP" />
  87 + <element signature="e#15805#15963#0#PHP" />
  88 + <element signature="e#15805#16036#0#PHP" />
  89 + <element signature="e#15805#16076#0#PHP" />
  90 + <element signature="e#16133#16297#0#PHP" />
  91 + <element signature="e#16177#16287#0#PHP" />
  92 + <element signature="e#16316#16359#0#PHP" />
  93 + <element signature="e#16316#16412#0#PHP" />
  94 + <element signature="e#16316#16463#0#PHP" />
  95 + <element signature="e#16316#16536#0#PHP" />
  96 + <element signature="e#16316#16576#0#PHP" />
  97 + <element signature="e#16642#16710#0#PHP" />
  98 + <element signature="e#17110#19971#0#PHP" />
  99 + <element signature="e#17270#17313#0#PHP" />
  100 + <element signature="e#17270#17361#0#PHP" />
  101 + <element signature="e#17270#17492#0#PHP" />
  102 + <element signature="e#17270#17581#0#PHP" />
  103 + <element signature="e#17270#17621#0#PHP" />
  104 + <element signature="e#17688#17731#0#PHP" />
  105 + <element signature="e#17688#17779#0#PHP" />
  106 + <element signature="e#17688#17910#0#PHP" />
  107 + <element signature="e#17688#17952#0#PHP" />
  108 + <element signature="e#17688#18041#0#PHP" />
  109 + <element signature="e#17688#18081#0#PHP" />
  110 + <element signature="e#18147#18190#0#PHP" />
  111 + <element signature="e#18147#18238#0#PHP" />
  112 + <element signature="e#18147#18369#0#PHP" />
  113 + <element signature="e#18147#18411#0#PHP" />
  114 + <element signature="e#18147#18500#0#PHP" />
  115 + <element signature="e#18147#18540#0#PHP" />
  116 + <element signature="e#18606#18649#0#PHP" />
  117 + <element signature="e#18606#18697#0#PHP" />
  118 + <element signature="e#18606#18828#0#PHP" />
  119 + <element signature="e#18606#18870#0#PHP" />
  120 + <element signature="e#18606#18959#0#PHP" />
  121 + <element signature="e#18606#18999#0#PHP" />
  122 + <element signature="e#19065#19108#0#PHP" />
  123 + <element signature="e#19065#19156#0#PHP" />
  124 + <element signature="e#19065#19287#0#PHP" />
  125 + <element signature="e#19065#19329#0#PHP" />
  126 + <element signature="e#19065#19418#0#PHP" />
  127 + <element signature="e#19065#19458#0#PHP" />
  128 + <element signature="e#19524#19597#0#PHP" />
42 <element signature="e#19988#23151#0#PHP" /> 129 <element signature="e#19988#23151#0#PHP" />
  130 + <element signature="e#20080#20160#0#PHP" />
  131 + <element signature="e#20234#23144#0#PHP" />
  132 + <element signature="e#20399#23134#0#PHP" />
  133 + <element signature="e#20504#23120#0#PHP" />
  134 + <element signature="e#21213#22002#0#PHP" />
  135 + <element signature="e#21541#21980#1#PHP" />
  136 + <element signature="e#22034#22823#0#PHP" />
  137 + <element signature="e#22362#22801#1#PHP" />
  138 + <element signature="e#23026#23120#0#PHP" />
43 <element signature="e#23168#23642#0#PHP" /> 139 <element signature="e#23168#23642#0#PHP" />
  140 + <element signature="e#23256#23634#0#PHP" />
  141 + <element signature="e#23340#23634#0#PHP" />
  142 + <element signature="e#23449#23624#0#PHP" />
  143 + <element signature="e#23538#23624#0#PHP" />
44 <element signature="e#23659#24130#0#PHP" /> 144 <element signature="e#23659#24130#0#PHP" />
  145 + <element signature="e#23746#24123#0#PHP" />
  146 + <element signature="e#23830#24123#0#PHP" />
  147 + <element signature="e#23938#24113#0#PHP" />
  148 + <element signature="e#24027#24113#0#PHP" />
45 </folding> 149 </folding>
46 </state> 150 </state>
47 </provider> 151 </provider>
48 </entry> 152 </entry>
49 </file> 153 </file>
  154 + <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
  155 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
  156 + <provider selected="true" editor-type-id="text-editor">
  157 + <state relative-caret-position="3507">
  158 + <caret line="175" column="36" lean-forward="true" selection-start-line="175" selection-start-column="36" selection-end-line="175" selection-end-column="36" />
  159 + </state>
  160 + </provider>
  161 + </entry>
  162 + </file>
  163 + <file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">
  164 + <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
  165 + <provider selected="true" editor-type-id="text-editor">
  166 + <state relative-caret-position="189">
  167 + <caret line="20" column="63" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="63" />
  168 + </state>
  169 + </provider>
  170 + </entry>
  171 + </file>
  172 + <file leaf-file-name="database.php" pinned="false" current-in-tab="false">
  173 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/database.php">
  174 + <provider selected="true" editor-type-id="text-editor">
  175 + <state relative-caret-position="147">
  176 + <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
  177 + </state>
  178 + </provider>
  179 + </entry>
  180 + </file>
50 <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false"> 181 <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
51 <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php"> 182 <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
52 <provider selected="true" editor-type-id="text-editor"> 183 <provider selected="true" editor-type-id="text-editor">
53 <state relative-caret-position="1134"> 184 <state relative-caret-position="1134">
54 - <caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" /> 185 + <caret line="65" column="23" lean-forward="true" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
55 </state> 186 </state>
56 </provider> 187 </provider>
57 </entry> 188 </entry>
58 </file> 189 </file>
59 - <file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">  
60 - <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php"> 190 + <file leaf-file-name="SysconfigController.php" pinned="false" current-in-tab="false">
  191 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SysconfigController.php">
61 <provider selected="true" editor-type-id="text-editor"> 192 <provider selected="true" editor-type-id="text-editor">
62 - <state relative-caret-position="21">  
63 - <caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" /> 193 + <state relative-caret-position="405">
  194 + <caret line="529" column="42" selection-start-line="529" selection-start-column="38" selection-end-line="529" selection-end-column="42" />
  195 + </state>
  196 + </provider>
  197 + </entry>
  198 + </file>
  199 + <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
  200 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php">
  201 + <provider selected="true" editor-type-id="text-editor">
  202 + <state relative-caret-position="3108">
  203 + <caret line="158" column="18" lean-forward="true" selection-start-line="158" selection-start-column="18" selection-end-line="158" selection-end-column="18" />
64 </state> 204 </state>
65 </provider> 205 </provider>
66 </entry> 206 </entry>
@@ -111,10 +251,11 @@ @@ -111,10 +251,11 @@
111 <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" /> 251 <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
112 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" /> 252 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
113 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" /> 253 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
114 - <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />  
115 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" /> 254 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
116 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" /> 255 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
117 <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" /> 256 <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
  257 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" />
  258 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
118 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" /> 259 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
119 </list> 260 </list>
120 </option> 261 </option>
@@ -175,13 +316,13 @@ @@ -175,13 +316,13 @@
175 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 316 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
176 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 317 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
177 <item name="app" type="462c0819:PsiDirectoryNode" /> 318 <item name="app" type="462c0819:PsiDirectoryNode" />
178 - <item name="user" type="462c0819:PsiDirectoryNode" /> 319 + <item name="portal" type="462c0819:PsiDirectoryNode" />
179 </path> 320 </path>
180 <path> 321 <path>
181 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 322 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
182 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 323 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
183 <item name="app" type="462c0819:PsiDirectoryNode" /> 324 <item name="app" type="462c0819:PsiDirectoryNode" />
184 - <item name="user" type="462c0819:PsiDirectoryNode" /> 325 + <item name="portal" type="462c0819:PsiDirectoryNode" />
185 <item name="controller" type="462c0819:PsiDirectoryNode" /> 326 <item name="controller" type="462c0819:PsiDirectoryNode" />
186 </path> 327 </path>
187 <path> 328 <path>
@@ -237,7 +378,7 @@ @@ -237,7 +378,7 @@
237 <workItem from="1535458114609" duration="13848000" /> 378 <workItem from="1535458114609" duration="13848000" />
238 <workItem from="1535514127808" duration="727000" /> 379 <workItem from="1535514127808" duration="727000" />
239 <workItem from="1535532970259" duration="2527000" /> 380 <workItem from="1535532970259" duration="2527000" />
240 - <workItem from="1535546044129" duration="1063000" /> 381 + <workItem from="1535546044129" duration="9763000" />
241 </task> 382 </task>
242 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题"> 383 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
243 <created>1535458170068</created> 384 <created>1535458170068</created>
@@ -351,11 +492,25 @@ @@ -351,11 +492,25 @@
351 <option name="project" value="LOCAL" /> 492 <option name="project" value="LOCAL" />
352 <updated>1535546965523</updated> 493 <updated>1535546965523</updated>
353 </task> 494 </task>
354 - <option name="localTasksCounter" value="17" /> 495 + <task id="LOCAL-00017" summary="ceshi wode jiaolian">
  496 + <created>1535547118071</created>
  497 + <option name="number" value="00017" />
  498 + <option name="presentableId" value="LOCAL-00017" />
  499 + <option name="project" value="LOCAL" />
  500 + <updated>1535547118071</updated>
  501 + </task>
  502 + <task id="LOCAL-00018" summary="ceshi wode jiaolian">
  503 + <created>1535548842017</created>
  504 + <option name="number" value="00018" />
  505 + <option name="presentableId" value="LOCAL-00018" />
  506 + <option name="project" value="LOCAL" />
  507 + <updated>1535548842017</updated>
  508 + </task>
  509 + <option name="localTasksCounter" value="19" />
355 <servers /> 510 <servers />
356 </component> 511 </component>
357 <component name="TimeTrackingManager"> 512 <component name="TimeTrackingManager">
358 - <option name="totallyTimeSpent" value="34701000" /> 513 + <option name="totallyTimeSpent" value="43401000" />
359 </component> 514 </component>
360 <component name="ToolWindowManager"> 515 <component name="ToolWindowManager">
361 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 516 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -399,15 +554,6 @@ @@ -399,15 +554,6 @@
399 <option name="LAST_COMMIT_MESSAGE" value="ceshi wode jiaolian" /> 554 <option name="LAST_COMMIT_MESSAGE" value="ceshi wode jiaolian" />
400 </component> 555 </component>
401 <component name="editorHistoryManager"> 556 <component name="editorHistoryManager">
402 - <entry file="file://$PROJECT_DIR$/api/portal/route.php">  
403 - <provider selected="true" editor-type-id="text-editor" />  
404 - </entry>  
405 - <entry file="file://$PROJECT_DIR$/api/tags.php">  
406 - <provider selected="true" editor-type-id="text-editor" />  
407 - </entry>  
408 - <entry file="file://$PROJECT_DIR$/api/portal/validate/ArticlesValidate.php">  
409 - <provider selected="true" editor-type-id="text-editor" />  
410 - </entry>  
411 <entry file="file://$PROJECT_DIR$/api/portal/controller/UserController.php"> 557 <entry file="file://$PROJECT_DIR$/api/portal/controller/UserController.php">
412 <provider selected="true" editor-type-id="text-editor"> 558 <provider selected="true" editor-type-id="text-editor">
413 <state relative-caret-position="-21" /> 559 <state relative-caret-position="-21" />
@@ -621,7 +767,6 @@ @@ -621,7 +767,6 @@
621 </state> 767 </state>
622 </provider> 768 </provider>
623 </entry> 769 </entry>
624 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />  
625 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log"> 770 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log">
626 <provider selected="true" editor-type-id="text-editor"> 771 <provider selected="true" editor-type-id="text-editor">
627 <state relative-caret-position="2646"> 772 <state relative-caret-position="2646">
@@ -704,44 +849,176 @@ @@ -704,44 +849,176 @@
704 </state> 849 </state>
705 </provider> 850 </provider>
706 </entry> 851 </entry>
  852 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/database.php">
  853 + <provider selected="true" editor-type-id="text-editor">
  854 + <state relative-caret-position="147">
  855 + <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
  856 + </state>
  857 + </provider>
  858 + </entry>
707 <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php"> 859 <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
708 <provider selected="true" editor-type-id="text-editor"> 860 <provider selected="true" editor-type-id="text-editor">
709 <state relative-caret-position="1134"> 861 <state relative-caret-position="1134">
710 - <caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" /> 862 + <caret line="65" column="23" lean-forward="true" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
  863 + </state>
  864 + </provider>
  865 + </entry>
  866 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SysconfigController.php">
  867 + <provider selected="true" editor-type-id="text-editor">
  868 + <state relative-caret-position="405">
  869 + <caret line="529" column="42" selection-start-line="529" selection-start-column="38" selection-end-line="529" selection-end-column="42" />
  870 + </state>
  871 + </provider>
  872 + </entry>
  873 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php">
  874 + <provider selected="true" editor-type-id="text-editor">
  875 + <state relative-caret-position="3108">
  876 + <caret line="158" column="18" lean-forward="true" selection-start-line="158" selection-start-column="18" selection-end-line="158" selection-end-column="18" />
711 </state> 877 </state>
712 </provider> 878 </provider>
713 </entry> 879 </entry>
714 <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php"> 880 <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
715 <provider selected="true" editor-type-id="text-editor"> 881 <provider selected="true" editor-type-id="text-editor">
716 - <state relative-caret-position="21">  
717 - <caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" /> 882 + <state relative-caret-position="189">
  883 + <caret line="20" column="63" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="63" />
  884 + </state>
  885 + </provider>
  886 + </entry>
  887 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
  888 + <provider selected="true" editor-type-id="text-editor">
  889 + <state relative-caret-position="3507">
  890 + <caret line="175" column="36" lean-forward="true" selection-start-line="175" selection-start-column="36" selection-end-line="175" selection-end-column="36" />
718 </state> 891 </state>
719 </provider> 892 </provider>
720 </entry> 893 </entry>
721 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 894 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
722 <provider selected="true" editor-type-id="text-editor"> 895 <provider selected="true" editor-type-id="text-editor">
723 - <state relative-caret-position="468">  
724 - <caret line="444" lean-forward="true" selection-start-line="444" selection-end-line="444" /> 896 + <state relative-caret-position="672">
  897 + <caret line="75" column="48" lean-forward="true" selection-start-line="75" selection-start-column="48" selection-end-line="75" selection-end-column="48" />
725 <folding> 898 <folding>
  899 + <element signature="e#636#668#0#PHP" expanded="true" />
726 <element signature="e#911#990#0#PHP" /> 900 <element signature="e#911#990#0#PHP" />
727 <element signature="e#1015#1432#0#PHP" /> 901 <element signature="e#1015#1432#0#PHP" />
728 - <element signature="e#1459#2877#0#PHP" />  
729 <element signature="e#1502#1569#0#PHP" /> 902 <element signature="e#1502#1569#0#PHP" />
730 - <element signature="e#1717#1797#0#PHP" />  
731 - <element signature="e#1884#2341#0#PHP" />  
732 - <element signature="e#1946#2053#0#PHP" />  
733 - <element signature="e#2209#2331#0#PHP" />  
734 <element signature="e#2902#4247#0#PHP" /> 903 <element signature="e#2902#4247#0#PHP" />
735 <element signature="e#3375#3420#0#PHP" /> 904 <element signature="e#3375#3420#0#PHP" />
736 <element signature="e#3375#3469#0#PHP" /> 905 <element signature="e#3375#3469#0#PHP" />
737 <element signature="e#3375#3510#0#PHP" /> 906 <element signature="e#3375#3510#0#PHP" />
738 <element signature="e#3375#3553#0#PHP" /> 907 <element signature="e#3375#3553#0#PHP" />
739 <element signature="e#3631#3704#0#PHP" /> 908 <element signature="e#3631#3704#0#PHP" />
  909 + <element signature="e#4272#8454#0#PHP" />
  910 + <element signature="e#4379#8447#0#PHP" />
  911 + <element signature="e#4468#8447#0#PHP" />
740 <element signature="e#4913#5015#0#PHP" /> 912 <element signature="e#4913#5015#0#PHP" />
741 <element signature="e#5338#5425#0#PHP" /> 913 <element signature="e#5338#5425#0#PHP" />
  914 + <element signature="e#5575#8437#0#PHP" />
  915 + <element signature="e#6315#7223#0#PHP" />
  916 + <element signature="e#6623#7205#1#PHP" />
  917 + <element signature="e#7251#8163#0#PHP" />
  918 + <element signature="e#7559#8145#1#PHP" />
  919 + <element signature="e#8351#8437#0#PHP" />
  920 + <element signature="e#8493#8677#0#PHP" />
  921 + <element signature="e#8702#9754#0#PHP" />
  922 + <element signature="e#8958#9003#0#PHP" />
  923 + <element signature="e#8958#9052#0#PHP" />
  924 + <element signature="e#8958#9093#0#PHP" />
  925 + <element signature="e#8958#9136#0#PHP" />
  926 + <element signature="e#9214#9287#0#PHP" />
  927 + <element signature="e#9779#10457#0#PHP" />
  928 + <element signature="e#10482#14397#0#PHP" />
  929 + <element signature="e#10746#14389#0#PHP" />
  930 + <element signature="e#10835#14389#0#PHP" />
  931 + <element signature="e#11279#11366#0#PHP" />
  932 + <element signature="e#11514#14379#0#PHP" />
  933 + <element signature="e#12255#13163#0#PHP" />
  934 + <element signature="e#12563#13145#1#PHP" />
  935 + <element signature="e#13191#14103#0#PHP" />
  936 + <element signature="e#13499#14085#1#PHP" />
  937 + <element signature="e#14293#14379#0#PHP" />
  938 + <element signature="e#14431#17090#0#PHP" />
  939 + <element signature="e#14576#14670#0#PHP" />
  940 + <element signature="e#14689#14731#0#PHP" />
  941 + <element signature="e#14689#14781#0#PHP" />
  942 + <element signature="e#14689#14830#0#PHP" />
  943 + <element signature="e#14689#14900#0#PHP" />
  944 + <element signature="e#14689#14942#0#PHP" />
  945 + <element signature="e#14689#14970#0#PHP" />
  946 + <element signature="e#14989#15032#0#PHP" />
  947 + <element signature="e#14989#15085#0#PHP" />
  948 + <element signature="e#14989#15121#0#PHP" />
  949 + <element signature="e#14989#15194#0#PHP" />
  950 + <element signature="e#14989#15234#0#PHP" />
  951 + <element signature="e#15291#15459#0#PHP" />
  952 + <element signature="e#15333#15449#0#PHP" />
  953 + <element signature="e#15478#15521#0#PHP" />
  954 + <element signature="e#15478#15574#0#PHP" />
  955 + <element signature="e#15478#15625#0#PHP" />
  956 + <element signature="e#15478#15698#0#PHP" />
  957 + <element signature="e#15478#15738#0#PHP" />
  958 + <element signature="e#15805#15848#0#PHP" />
  959 + <element signature="e#15805#15901#0#PHP" />
  960 + <element signature="e#15805#15963#0#PHP" />
  961 + <element signature="e#15805#16036#0#PHP" />
  962 + <element signature="e#15805#16076#0#PHP" />
  963 + <element signature="e#16133#16297#0#PHP" />
  964 + <element signature="e#16177#16287#0#PHP" />
  965 + <element signature="e#16316#16359#0#PHP" />
  966 + <element signature="e#16316#16412#0#PHP" />
  967 + <element signature="e#16316#16463#0#PHP" />
  968 + <element signature="e#16316#16536#0#PHP" />
  969 + <element signature="e#16316#16576#0#PHP" />
  970 + <element signature="e#16642#16710#0#PHP" />
  971 + <element signature="e#17110#19971#0#PHP" />
  972 + <element signature="e#17270#17313#0#PHP" />
  973 + <element signature="e#17270#17361#0#PHP" />
  974 + <element signature="e#17270#17492#0#PHP" />
  975 + <element signature="e#17270#17581#0#PHP" />
  976 + <element signature="e#17270#17621#0#PHP" />
  977 + <element signature="e#17688#17731#0#PHP" />
  978 + <element signature="e#17688#17779#0#PHP" />
  979 + <element signature="e#17688#17910#0#PHP" />
  980 + <element signature="e#17688#17952#0#PHP" />
  981 + <element signature="e#17688#18041#0#PHP" />
  982 + <element signature="e#17688#18081#0#PHP" />
  983 + <element signature="e#18147#18190#0#PHP" />
  984 + <element signature="e#18147#18238#0#PHP" />
  985 + <element signature="e#18147#18369#0#PHP" />
  986 + <element signature="e#18147#18411#0#PHP" />
  987 + <element signature="e#18147#18500#0#PHP" />
  988 + <element signature="e#18147#18540#0#PHP" />
  989 + <element signature="e#18606#18649#0#PHP" />
  990 + <element signature="e#18606#18697#0#PHP" />
  991 + <element signature="e#18606#18828#0#PHP" />
  992 + <element signature="e#18606#18870#0#PHP" />
  993 + <element signature="e#18606#18959#0#PHP" />
  994 + <element signature="e#18606#18999#0#PHP" />
  995 + <element signature="e#19065#19108#0#PHP" />
  996 + <element signature="e#19065#19156#0#PHP" />
  997 + <element signature="e#19065#19287#0#PHP" />
  998 + <element signature="e#19065#19329#0#PHP" />
  999 + <element signature="e#19065#19418#0#PHP" />
  1000 + <element signature="e#19065#19458#0#PHP" />
  1001 + <element signature="e#19524#19597#0#PHP" />
742 <element signature="e#19988#23151#0#PHP" /> 1002 <element signature="e#19988#23151#0#PHP" />
  1003 + <element signature="e#20080#20160#0#PHP" />
  1004 + <element signature="e#20234#23144#0#PHP" />
  1005 + <element signature="e#20399#23134#0#PHP" />
  1006 + <element signature="e#20504#23120#0#PHP" />
  1007 + <element signature="e#21213#22002#0#PHP" />
  1008 + <element signature="e#21541#21980#1#PHP" />
  1009 + <element signature="e#22034#22823#0#PHP" />
  1010 + <element signature="e#22362#22801#1#PHP" />
  1011 + <element signature="e#23026#23120#0#PHP" />
743 <element signature="e#23168#23642#0#PHP" /> 1012 <element signature="e#23168#23642#0#PHP" />
  1013 + <element signature="e#23256#23634#0#PHP" />
  1014 + <element signature="e#23340#23634#0#PHP" />
  1015 + <element signature="e#23449#23624#0#PHP" />
  1016 + <element signature="e#23538#23624#0#PHP" />
744 <element signature="e#23659#24130#0#PHP" /> 1017 <element signature="e#23659#24130#0#PHP" />
  1018 + <element signature="e#23746#24123#0#PHP" />
  1019 + <element signature="e#23830#24123#0#PHP" />
  1020 + <element signature="e#23938#24113#0#PHP" />
  1021 + <element signature="e#24027#24113#0#PHP" />
745 </folding> 1022 </folding>
746 </state> 1023 </state>
747 </provider> 1024 </provider>
@@ -17,7 +17,6 @@ use think\Db; @@ -17,7 +17,6 @@ use think\Db;
17 use think\Request; 17 use think\Request;
18 use app\portal\controller\ToolController as tool; 18 use app\portal\controller\ToolController as tool;
19 19
20 -  
21 class YuyueController extends UserBaseController 20 class YuyueController extends UserBaseController
22 { 21 {
23 22
@@ -45,7 +44,7 @@ class YuyueController extends UserBaseController @@ -45,7 +44,7 @@ class YuyueController extends UserBaseController
45 } 44 }
46 45
47 //step3：选择响应时间教练 46 //step3：选择响应时间教练
48 - public function coach_list() 47 + public function coach_list(tool $tool)
49 { 48 {
50 if (!session('yuyue_pre.day')) { 49 if (!session('yuyue_pre.day')) {
51 echo '非法请求'; 50 echo '非法请求';
@@ -62,17 +61,20 @@ class YuyueController extends UserBaseController @@ -62,17 +61,20 @@ class YuyueController extends UserBaseController
62 //获取当前时段已被预约的教练 61 //获取当前时段已被预约的教练
63 $ex = ''; 62 $ex = '';
64 foreach ($rr as $v) { 63 foreach ($rr as $v) {
65 - $day_find = [];  
66 - for ($i = $v['yuyue_begin']; $i <= $v['yuyue_end']; $i++) {  
67 - $day_find[] = $i;  
68 - }  
69 - $f1 = array_search($bbegin, $day_find);  
70 - $f2 = array_search($eend, $day_find);  
71 - $ac = count($day_find) - 1; 64 +// $day_find = [];
  65 +// for ($i = $v['yuyue_begin']; $i <= $v['yuyue_end']; $i++) {
  66 +// $day_find[] = $i;
  67 +// }
  68 +// $f1 = array_search($bbegin, $day_find);
  69 +// $f2 = array_search($eend, $day_find);
  70 +// $ac = count($day_find) - 1;
  71 +//
  72 +// if (($f2 && ($f2 > '0')) || ($f1 && ($f1 < $ac)) || ($f1 && $f2)) {
  73 +// $ex .= $v['teach_id'] . ',';
  74 +// }
  75 + $res = $tool->isMixTime($bbegin,$eend,$v['yuyue_begin'],$v['yuyue_end']);
  76 + $res && $ex .= $v['teach_id'] . ',';
72 77
73 - if (($f2 && ($f2 > '0')) || ($f1 && ($f1 < $ac)) || ($f1 && $f2)) {  
74 - $ex .= $v['teach_id'] . ',';  
75 - }  
76 } 78 }
77 79
78 //获取当前时段有时间的教练 80 //获取当前时段有时间的教练