外包项目 / signUpForCar · 提交

转到一个项目

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

测试获取当前时段的老师

内嵌 并排对比
正在显示 2 个修改的文件 包含 329 行增加 和 50 行删除
... ... @@ -20,47 +20,187 @@
<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="468">
<caret line="444" lean-forward="true" selection-start-line="444" selection-end-line="444" />
<state relative-caret-position="672">
<caret line="75" column="48" lean-forward="true" selection-start-line="75" selection-start-column="48" selection-end-line="75" selection-end-column="48" />
<folding>
<element signature="e#636#668#0#PHP" expanded="true" />
<element signature="e#911#990#0#PHP" />
<element signature="e#1015#1432#0#PHP" />
<element signature="e#1459#2877#0#PHP" />
<element signature="e#1502#1569#0#PHP" />
<element signature="e#1717#1797#0#PHP" />
<element signature="e#1884#2341#0#PHP" />
<element signature="e#1946#2053#0#PHP" />
<element signature="e#2209#2331#0#PHP" />
<element signature="e#2902#4247#0#PHP" />
<element signature="e#3375#3420#0#PHP" />
<element signature="e#3375#3469#0#PHP" />
<element signature="e#3375#3510#0#PHP" />
<element signature="e#3375#3553#0#PHP" />
<element signature="e#3631#3704#0#PHP" />
<element signature="e#4272#8454#0#PHP" />
<element signature="e#4379#8447#0#PHP" />
<element signature="e#4468#8447#0#PHP" />
<element signature="e#4913#5015#0#PHP" />
<element signature="e#5338#5425#0#PHP" />
<element signature="e#5575#8437#0#PHP" />
<element signature="e#6315#7223#0#PHP" />
<element signature="e#6623#7205#1#PHP" />
<element signature="e#7251#8163#0#PHP" />
<element signature="e#7559#8145#1#PHP" />
<element signature="e#8351#8437#0#PHP" />
<element signature="e#8493#8677#0#PHP" />
<element signature="e#8702#9754#0#PHP" />
<element signature="e#8958#9003#0#PHP" />
<element signature="e#8958#9052#0#PHP" />
<element signature="e#8958#9093#0#PHP" />
<element signature="e#8958#9136#0#PHP" />
<element signature="e#9214#9287#0#PHP" />
<element signature="e#9779#10457#0#PHP" />
<element signature="e#10482#14397#0#PHP" />
<element signature="e#10746#14389#0#PHP" />
<element signature="e#10835#14389#0#PHP" />
<element signature="e#11279#11366#0#PHP" />
<element signature="e#11514#14379#0#PHP" />
<element signature="e#12255#13163#0#PHP" />
<element signature="e#12563#13145#1#PHP" />
<element signature="e#13191#14103#0#PHP" />
<element signature="e#13499#14085#1#PHP" />
<element signature="e#14293#14379#0#PHP" />
<element signature="e#14431#17090#0#PHP" />
<element signature="e#14576#14670#0#PHP" />
<element signature="e#14689#14731#0#PHP" />
<element signature="e#14689#14781#0#PHP" />
<element signature="e#14689#14830#0#PHP" />
<element signature="e#14689#14900#0#PHP" />
<element signature="e#14689#14942#0#PHP" />
<element signature="e#14689#14970#0#PHP" />
<element signature="e#14989#15032#0#PHP" />
<element signature="e#14989#15085#0#PHP" />
<element signature="e#14989#15121#0#PHP" />
<element signature="e#14989#15194#0#PHP" />
<element signature="e#14989#15234#0#PHP" />
<element signature="e#15291#15459#0#PHP" />
<element signature="e#15333#15449#0#PHP" />
<element signature="e#15478#15521#0#PHP" />
<element signature="e#15478#15574#0#PHP" />
<element signature="e#15478#15625#0#PHP" />
<element signature="e#15478#15698#0#PHP" />
<element signature="e#15478#15738#0#PHP" />
<element signature="e#15805#15848#0#PHP" />
<element signature="e#15805#15901#0#PHP" />
<element signature="e#15805#15963#0#PHP" />
<element signature="e#15805#16036#0#PHP" />
<element signature="e#15805#16076#0#PHP" />
<element signature="e#16133#16297#0#PHP" />
<element signature="e#16177#16287#0#PHP" />
<element signature="e#16316#16359#0#PHP" />
<element signature="e#16316#16412#0#PHP" />
<element signature="e#16316#16463#0#PHP" />
<element signature="e#16316#16536#0#PHP" />
<element signature="e#16316#16576#0#PHP" />
<element signature="e#16642#16710#0#PHP" />
<element signature="e#17110#19971#0#PHP" />
<element signature="e#17270#17313#0#PHP" />
<element signature="e#17270#17361#0#PHP" />
<element signature="e#17270#17492#0#PHP" />
<element signature="e#17270#17581#0#PHP" />
<element signature="e#17270#17621#0#PHP" />
<element signature="e#17688#17731#0#PHP" />
<element signature="e#17688#17779#0#PHP" />
<element signature="e#17688#17910#0#PHP" />
<element signature="e#17688#17952#0#PHP" />
<element signature="e#17688#18041#0#PHP" />
<element signature="e#17688#18081#0#PHP" />
<element signature="e#18147#18190#0#PHP" />
<element signature="e#18147#18238#0#PHP" />
<element signature="e#18147#18369#0#PHP" />
<element signature="e#18147#18411#0#PHP" />
<element signature="e#18147#18500#0#PHP" />
<element signature="e#18147#18540#0#PHP" />
<element signature="e#18606#18649#0#PHP" />
<element signature="e#18606#18697#0#PHP" />
<element signature="e#18606#18828#0#PHP" />
<element signature="e#18606#18870#0#PHP" />
<element signature="e#18606#18959#0#PHP" />
<element signature="e#18606#18999#0#PHP" />
<element signature="e#19065#19108#0#PHP" />
<element signature="e#19065#19156#0#PHP" />
<element signature="e#19065#19287#0#PHP" />
<element signature="e#19065#19329#0#PHP" />
<element signature="e#19065#19418#0#PHP" />
<element signature="e#19065#19458#0#PHP" />
<element signature="e#19524#19597#0#PHP" />
<element signature="e#19988#23151#0#PHP" />
<element signature="e#20080#20160#0#PHP" />
<element signature="e#20234#23144#0#PHP" />
<element signature="e#20399#23134#0#PHP" />
<element signature="e#20504#23120#0#PHP" />
<element signature="e#21213#22002#0#PHP" />
<element signature="e#21541#21980#1#PHP" />
<element signature="e#22034#22823#0#PHP" />
<element signature="e#22362#22801#1#PHP" />
<element signature="e#23026#23120#0#PHP" />
<element signature="e#23168#23642#0#PHP" />
<element signature="e#23256#23634#0#PHP" />
<element signature="e#23340#23634#0#PHP" />
<element signature="e#23449#23624#0#PHP" />
<element signature="e#23538#23624#0#PHP" />
<element signature="e#23659#24130#0#PHP" />
<element signature="e#23746#24123#0#PHP" />
<element signature="e#23830#24123#0#PHP" />
<element signature="e#23938#24113#0#PHP" />
<element signature="e#24027#24113#0#PHP" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3507">
<caret line="175" column="36" lean-forward="true" selection-start-line="175" selection-start-column="36" selection-end-line="175" selection-end-column="36" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="20" column="63" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="63" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="database.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1134">
<caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
<caret line="65" column="23" lean-forward="true" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
<file leaf-file-name="SysconfigController.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SysconfigController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="21">
<caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" />
<state relative-caret-position="405">
<caret line="529" column="42" selection-start-line="529" selection-start-column="38" selection-end-line="529" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3108">
<caret line="158" column="18" lean-forward="true" selection-start-line="158" selection-start-column="18" selection-end-line="158" selection-end-column="18" />
</state>
</provider>
</entry>
... ... @@ -111,10 +251,11 @@
<option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
<option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
<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/user/controller/YuyueController.php" />
</list>
</option>
... ... @@ -175,13 +316,13 @@
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="user" 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="app" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="portal" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -237,7 +378,7 @@
<workItem from="1535458114609" duration="13848000" />
<workItem from="1535514127808" duration="727000" />
<workItem from="1535532970259" duration="2527000" />
<workItem from="1535546044129" duration="1063000" />
<workItem from="1535546044129" duration="9763000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
... ... @@ -351,11 +492,25 @@
<option name="project" value="LOCAL" />
<updated>1535546965523</updated>
</task>
<option name="localTasksCounter" value="17" />
<task id="LOCAL-00017" summary="ceshi wode jiaolian">
<created>1535547118071</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1535547118071</updated>
</task>
<task id="LOCAL-00018" summary="ceshi wode jiaolian">
<created>1535548842017</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1535548842017</updated>
</task>
<option name="localTasksCounter" value="19" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="34701000" />
<option name="totallyTimeSpent" value="43401000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -399,15 +554,6 @@
<option name="LAST_COMMIT_MESSAGE" value="ceshi wode jiaolian" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/portal/route.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/tags.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/portal/validate/ArticlesValidate.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/portal/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-21" />
... ... @@ -621,7 +767,6 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2646">
... ... @@ -704,44 +849,176 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="147">
<caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
</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="1134">
<caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
<caret line="65" column="23" lean-forward="true" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SysconfigController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405">
<caret line="529" column="42" selection-start-line="529" selection-start-column="38" selection-end-line="529" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3108">
<caret line="158" column="18" lean-forward="true" selection-start-line="158" selection-start-column="18" selection-end-line="158" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="21">
<caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" />
<state relative-caret-position="189">
<caret line="20" column="63" selection-start-line="20" selection-start-column="52" selection-end-line="20" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3507">
<caret line="175" column="36" lean-forward="true" selection-start-line="175" selection-start-column="36" selection-end-line="175" selection-end-column="36" />
</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="468">
<caret line="444" lean-forward="true" selection-start-line="444" selection-end-line="444" />
<state relative-caret-position="672">
<caret line="75" column="48" lean-forward="true" selection-start-line="75" selection-start-column="48" selection-end-line="75" selection-end-column="48" />
<folding>
<element signature="e#636#668#0#PHP" expanded="true" />
<element signature="e#911#990#0#PHP" />
<element signature="e#1015#1432#0#PHP" />
<element signature="e#1459#2877#0#PHP" />
<element signature="e#1502#1569#0#PHP" />
<element signature="e#1717#1797#0#PHP" />
<element signature="e#1884#2341#0#PHP" />
<element signature="e#1946#2053#0#PHP" />
<element signature="e#2209#2331#0#PHP" />
<element signature="e#2902#4247#0#PHP" />
<element signature="e#3375#3420#0#PHP" />
<element signature="e#3375#3469#0#PHP" />
<element signature="e#3375#3510#0#PHP" />
<element signature="e#3375#3553#0#PHP" />
<element signature="e#3631#3704#0#PHP" />
<element signature="e#4272#8454#0#PHP" />
<element signature="e#4379#8447#0#PHP" />
<element signature="e#4468#8447#0#PHP" />
<element signature="e#4913#5015#0#PHP" />
<element signature="e#5338#5425#0#PHP" />
<element signature="e#5575#8437#0#PHP" />
<element signature="e#6315#7223#0#PHP" />
<element signature="e#6623#7205#1#PHP" />
<element signature="e#7251#8163#0#PHP" />
<element signature="e#7559#8145#1#PHP" />
<element signature="e#8351#8437#0#PHP" />
<element signature="e#8493#8677#0#PHP" />
<element signature="e#8702#9754#0#PHP" />
<element signature="e#8958#9003#0#PHP" />
<element signature="e#8958#9052#0#PHP" />
<element signature="e#8958#9093#0#PHP" />
<element signature="e#8958#9136#0#PHP" />
<element signature="e#9214#9287#0#PHP" />
<element signature="e#9779#10457#0#PHP" />
<element signature="e#10482#14397#0#PHP" />
<element signature="e#10746#14389#0#PHP" />
<element signature="e#10835#14389#0#PHP" />
<element signature="e#11279#11366#0#PHP" />
<element signature="e#11514#14379#0#PHP" />
<element signature="e#12255#13163#0#PHP" />
<element signature="e#12563#13145#1#PHP" />
<element signature="e#13191#14103#0#PHP" />
<element signature="e#13499#14085#1#PHP" />
<element signature="e#14293#14379#0#PHP" />
<element signature="e#14431#17090#0#PHP" />
<element signature="e#14576#14670#0#PHP" />
<element signature="e#14689#14731#0#PHP" />
<element signature="e#14689#14781#0#PHP" />
<element signature="e#14689#14830#0#PHP" />
<element signature="e#14689#14900#0#PHP" />
<element signature="e#14689#14942#0#PHP" />
<element signature="e#14689#14970#0#PHP" />
<element signature="e#14989#15032#0#PHP" />
<element signature="e#14989#15085#0#PHP" />
<element signature="e#14989#15121#0#PHP" />
<element signature="e#14989#15194#0#PHP" />
<element signature="e#14989#15234#0#PHP" />
<element signature="e#15291#15459#0#PHP" />
<element signature="e#15333#15449#0#PHP" />
<element signature="e#15478#15521#0#PHP" />
<element signature="e#15478#15574#0#PHP" />
<element signature="e#15478#15625#0#PHP" />
<element signature="e#15478#15698#0#PHP" />
<element signature="e#15478#15738#0#PHP" />
<element signature="e#15805#15848#0#PHP" />
<element signature="e#15805#15901#0#PHP" />
<element signature="e#15805#15963#0#PHP" />
<element signature="e#15805#16036#0#PHP" />
<element signature="e#15805#16076#0#PHP" />
<element signature="e#16133#16297#0#PHP" />
<element signature="e#16177#16287#0#PHP" />
<element signature="e#16316#16359#0#PHP" />
<element signature="e#16316#16412#0#PHP" />
<element signature="e#16316#16463#0#PHP" />
<element signature="e#16316#16536#0#PHP" />
<element signature="e#16316#16576#0#PHP" />
<element signature="e#16642#16710#0#PHP" />
<element signature="e#17110#19971#0#PHP" />
<element signature="e#17270#17313#0#PHP" />
<element signature="e#17270#17361#0#PHP" />
<element signature="e#17270#17492#0#PHP" />
<element signature="e#17270#17581#0#PHP" />
<element signature="e#17270#17621#0#PHP" />
<element signature="e#17688#17731#0#PHP" />
<element signature="e#17688#17779#0#PHP" />
<element signature="e#17688#17910#0#PHP" />
<element signature="e#17688#17952#0#PHP" />
<element signature="e#17688#18041#0#PHP" />
<element signature="e#17688#18081#0#PHP" />
<element signature="e#18147#18190#0#PHP" />
<element signature="e#18147#18238#0#PHP" />
<element signature="e#18147#18369#0#PHP" />
<element signature="e#18147#18411#0#PHP" />
<element signature="e#18147#18500#0#PHP" />
<element signature="e#18147#18540#0#PHP" />
<element signature="e#18606#18649#0#PHP" />
<element signature="e#18606#18697#0#PHP" />
<element signature="e#18606#18828#0#PHP" />
<element signature="e#18606#18870#0#PHP" />
<element signature="e#18606#18959#0#PHP" />
<element signature="e#18606#18999#0#PHP" />
<element signature="e#19065#19108#0#PHP" />
<element signature="e#19065#19156#0#PHP" />
<element signature="e#19065#19287#0#PHP" />
<element signature="e#19065#19329#0#PHP" />
<element signature="e#19065#19418#0#PHP" />
<element signature="e#19065#19458#0#PHP" />
<element signature="e#19524#19597#0#PHP" />
<element signature="e#19988#23151#0#PHP" />
<element signature="e#20080#20160#0#PHP" />
<element signature="e#20234#23144#0#PHP" />
<element signature="e#20399#23134#0#PHP" />
<element signature="e#20504#23120#0#PHP" />
<element signature="e#21213#22002#0#PHP" />
<element signature="e#21541#21980#1#PHP" />
<element signature="e#22034#22823#0#PHP" />
<element signature="e#22362#22801#1#PHP" />
<element signature="e#23026#23120#0#PHP" />
<element signature="e#23168#23642#0#PHP" />
<element signature="e#23256#23634#0#PHP" />
<element signature="e#23340#23634#0#PHP" />
<element signature="e#23449#23624#0#PHP" />
<element signature="e#23538#23624#0#PHP" />
<element signature="e#23659#24130#0#PHP" />
<element signature="e#23746#24123#0#PHP" />
<element signature="e#23830#24123#0#PHP" />
<element signature="e#23938#24113#0#PHP" />
<element signature="e#24027#24113#0#PHP" />
</folding>
</state>
</provider>
... ...
... ... @@ -17,7 +17,6 @@ use think\Db;
use think\Request;
use app\portal\controller\ToolController as tool;
class YuyueController extends UserBaseController
{
... ... @@ -45,7 +44,7 @@ class YuyueController extends UserBaseController
}
//step3：选择响应时间教练
public function coach_list()
public function coach_list(tool $tool)
{
if (!session('yuyue_pre.day')) {
echo '非法请求';
... ... @@ -62,17 +61,20 @@ class YuyueController extends UserBaseController
//获取当前时段已被预约的教练
$ex = '';
foreach ($rr as $v) {
$day_find = [];
for ($i = $v['yuyue_begin']; $i <= $v['yuyue_end']; $i++) {
$day_find[] = $i;
}
$f1 = array_search($bbegin, $day_find);
$f2 = array_search($eend, $day_find);
$ac = count($day_find) - 1;
// $day_find = [];
// for ($i = $v['yuyue_begin']; $i <= $v['yuyue_end']; $i++) {
// $day_find[] = $i;
// }
// $f1 = array_search($bbegin, $day_find);
// $f2 = array_search($eend, $day_find);
// $ac = count($day_find) - 1;
//
// if (($f2 && ($f2 > '0')) || ($f1 && ($f1 < $ac)) || ($f1 && $f2)) {
// $ex .= $v['teach_id'] . ',';
// }
$res = $tool->isMixTime($bbegin,$eend,$v['yuyue_begin'],$v['yuyue_end']);
$res && $ex .= $v['teach_id'] . ',';
if (($f2 && ($f2 > '0')) || ($f1 && ($f1 < $ac)) || ($f1 && $f2)) {
$ex .= $v['teach_id'] . ',';
}
}
//获取当前时段有时间的教练
... ...