外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 d279555de370afb179272e63f89a726718642035 1 个父辈 16a921e7

修复教练的时间段可以重复预约

内嵌 并排对比
正在显示 2 个修改的文件 包含 42 行增加 和 63 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="" />
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -38,8 +40,8 @@
<file leaf-file-name="admin_menu.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2961">
<caret line="141" column="2" selection-start-line="141" selection-start-column="2" selection-end-line="141" selection-end-column="2" />
<state relative-caret-position="1113">
<caret line="53" column="2" selection-start-line="53" selection-start-column="2" selection-end-line="53" selection-end-column="2" />
</state>
</provider>
</entry>
... ... @@ -48,7 +50,7 @@
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="33" column="7" selection-start-line="33" selection-start-column="7" selection-end-line="33" selection-end-column="7" />
<caret line="33" selection-start-line="33" selection-end-line="33" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
... ... @@ -68,8 +70,8 @@
<file leaf-file-name="header.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="19" column="36" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="36" />
<state relative-caret-position="546">
<caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
</state>
</provider>
</entry>
... ... @@ -129,6 +131,9 @@
<dir>$PROJECT_DIR$</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
... ... @@ -196,52 +201,13 @@
<subPane>
<expand>
<path>
<item name="dm162jiajiao" type="b2602c69:ProjectViewProjectNode" />
<item name="dm162jiajiao" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm162jiajiao" type="b2602c69:ProjectViewProjectNode" />
<item name="dm162jiajiao" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm162jiajiao" type="b2602c69:ProjectViewProjectNode" />
<item name="dm162jiajiao" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm162jiajiao" type="b2602c69:ProjectViewProjectNode" />
<item name="dm162jiajiao" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm162jiajiao" type="b2602c69:ProjectViewProjectNode" />
<item name="dm162jiajiao" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm162jiajiao" type="b2602c69:ProjectViewProjectNode" />
<item name="dm162jiajiao" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm162jiajiao" type="b2602c69:ProjectViewProjectNode" />
<item name="dm162jiajiao" 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="dm162jiajiao" type="b2602c69:ProjectViewProjectNode" />
<item name="dm162jiajiao" 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="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
... ... @@ -251,7 +217,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../lwyz" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
... ... @@ -288,22 +254,31 @@
<workItem from="1531653353141" duration="7654000" />
<workItem from="1531747533208" duration="2488000" />
<workItem from="1531794895610" duration="20000" />
<workItem from="1535458114609" duration="473000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1535458170068</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16536000" />
<option name="totallyTimeSpent" value="17009000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21669106" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1401919" />
<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="Version Control" order="7" show_stripe_button="false" />
<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" />
... ... @@ -314,9 +289,9 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
... ... @@ -325,6 +300,10 @@
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="修复预约后不能再预约的问题" />
<option name="LAST_COMMIT_MESSAGE" value="修复预约后不能再预约的问题" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/vendor/tcg/voyager/publishable/lang/en/login.php" />
<entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/.env" />
... ... @@ -538,15 +517,15 @@
<entry file="file://$PROJECT_DIR$/public/static/css/viyagerapp.css" />
<entry file="file://$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2961">
<caret line="141" column="2" selection-start-line="141" selection-start-column="2" selection-end-line="141" selection-end-column="2" />
<state relative-caret-position="1113">
<caret line="53" column="2" selection-start-line="53" selection-start-column="2" selection-end-line="53" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="33" column="7" selection-start-line="33" selection-start-column="7" selection-end-line="33" selection-end-column="7" />
<caret line="33" selection-start-line="33" selection-end-line="33" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
... ... @@ -562,8 +541,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="19" column="36" selection-start-line="19" selection-start-column="29" selection-end-line="19" selection-end-column="36" />
<state relative-caret-position="546">
<caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
</state>
</provider>
</entry>
... ...
... ... @@ -28,7 +28,7 @@ class ToolController extends HomeBaseController
$res = Db::name('yuyue')->where(['yuyue_day'=>$day,'teach_id'=>$uid])->select()->toArray();
$all_arr = [];
for($t = 7;$t<=18;$t++){
for($t = 6;$t<=18;$t++){
$all_arr[]=$t;
}
... ...