外包项目 / signUpForCar · 提交

转到一个项目

作者 654550265
提交 a5dad623456a9603477699a48150570bd458ed5a 2 个父辈 1832a499 43cd3e01

Merge branch 'master' of http://114.215.101.231:8099/outsource/signUpForCar

内嵌 并排对比
正在显示 2 个修改的文件 包含 64 行增加 和 49 行删除
... ... @@ -3,7 +3,7 @@
<component name="ChangeListManager">
<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" />
<change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/admin/controller/BookingController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/BookingController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -86,11 +86,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="615">
<caret line="402" column="36" lean-forward="true" selection-start-line="402" selection-start-column="36" selection-end-line="402" selection-end-column="36" />
<state relative-caret-position="1050">
<caret line="506" column="10" lean-forward="true" selection-start-line="506" selection-start-column="10" selection-end-line="506" selection-end-column="10" />
<folding>
<element signature="e#911#990#0#PHP" />
<element signature="e#1015#1432#0#PHP" />
... ... @@ -135,6 +135,7 @@
<element signature="e#13082#14019#0#PHP" />
<element signature="e#13390#14001#1#PHP" />
<element signature="e#14209#14295#0#PHP" />
<element signature="e#14347#16822#0#PHP" />
<element signature="e#14492#14586#0#PHP" />
<element signature="e#14605#14647#0#PHP" />
<element signature="e#14605#14697#0#PHP" />
... ... @@ -185,11 +186,6 @@
<element signature="e#18797#19190#0#PHP" />
<element signature="e#19256#19329#0#PHP" />
<element signature="e#19720#21064#0#PHP" />
<element signature="e#19812#19892#0#PHP" />
<element signature="e#19966#21057#0#PHP" />
<element signature="e#20131#21047#0#PHP" />
<element signature="e#20236#21033#0#PHP" />
<element signature="e#20939#21033#0#PHP" />
<element signature="e#21081#21555#0#PHP" />
<element signature="e#21169#21547#0#PHP" />
<element signature="e#21253#21547#0#PHP" />
... ... @@ -205,19 +201,19 @@
</provider>
</entry>
</file>
<file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<file leaf-file-name="BookingController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1701" />
<state relative-caret-position="678">
<caret line="139" column="46" lean-forward="true" selection-start-line="139" selection-start-column="46" selection-end-line="139" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WXBizDataCrypt.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php">
<file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
</state>
<state relative-caret-position="-1701" />
</provider>
</entry>
</file>
... ... @@ -266,6 +262,7 @@
<option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
<option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
</list>
</option>
</component>
... ... @@ -325,26 +322,13 @@
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="portal" type="462c0819:PsiDirectoryNode" />
<item name="admin" 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="portal" type="462c0819:PsiDirectoryNode" />
<item name="controller" 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" />
</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="admin" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -397,7 +381,7 @@
<workItem from="1531653353141" duration="7654000" />
<workItem from="1531747533208" duration="2488000" />
<workItem from="1531794895610" duration="20000" />
<workItem from="1535458114609" duration="2307000" />
<workItem from="1535458114609" duration="4019000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
... ... @@ -420,11 +404,39 @@
<option name="project" value="LOCAL" />
<updated>1535459632689</updated>
</task>
<option name="localTasksCounter" value="4" />
<task id="LOCAL-00004" summary="已评价无数据情况">
<created>1535460444090</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1535460444090</updated>
</task>
<task id="LOCAL-00005" summary="已评价无数据情况">
<created>1535461932931</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1535461932931</updated>
</task>
<task id="LOCAL-00006" summary="已评价无数据情况">
<created>1535462141136</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1535462141136</updated>
</task>
<task id="LOCAL-00007" summary="已评价无数据情况">
<created>1535462428440</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1535462428440</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="18843000" />
<option name="totallyTimeSpent" value="20555000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -462,10 +474,10 @@
<MESSAGE value="修复预约后不能再预约的问题" />
<MESSAGE value="修复教练的时间段可以重复预约" />
<MESSAGE value="已经成功报名的用户，不能再次报名 放在确认订单页面" />
<option name="LAST_COMMIT_MESSAGE" value="已经成功报名的用户，不能再次报名 放在确认订单页面" />
<MESSAGE value="已评价无数据情况" />
<option name="LAST_COMMIT_MESSAGE" value="已评价无数据情况" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/3.html" />
<entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/2.html" />
<entry file="file://$PROJECT_DIR$/public/static/js/noty/noty.js">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -726,8 +738,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="615">
<caret line="402" column="36" lean-forward="true" selection-start-line="402" selection-start-column="36" selection-end-line="402" selection-end-column="36" />
<state relative-caret-position="1050">
<caret line="506" column="10" lean-forward="true" selection-start-line="506" selection-start-column="10" selection-end-line="506" selection-end-column="10" />
<folding>
<element signature="e#911#990#0#PHP" />
<element signature="e#1015#1432#0#PHP" />
... ... @@ -772,6 +784,7 @@
<element signature="e#13082#14019#0#PHP" />
<element signature="e#13390#14001#1#PHP" />
<element signature="e#14209#14295#0#PHP" />
<element signature="e#14347#16822#0#PHP" />
<element signature="e#14492#14586#0#PHP" />
<element signature="e#14605#14647#0#PHP" />
<element signature="e#14605#14697#0#PHP" />
... ... @@ -822,11 +835,6 @@
<element signature="e#18797#19190#0#PHP" />
<element signature="e#19256#19329#0#PHP" />
<element signature="e#19720#21064#0#PHP" />
<element signature="e#19812#19892#0#PHP" />
<element signature="e#19966#21057#0#PHP" />
<element signature="e#20131#21047#0#PHP" />
<element signature="e#20236#21033#0#PHP" />
<element signature="e#20939#21033#0#PHP" />
<element signature="e#21081#21555#0#PHP" />
<element signature="e#21169#21547#0#PHP" />
<element signature="e#21253#21547#0#PHP" />
... ... @@ -841,5 +849,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="678">
<caret line="139" column="46" lean-forward="true" selection-start-line="139" selection-start-column="46" selection-end-line="139" selection-end-column="46" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -128,16 +128,16 @@ class BookingController extends AdminBaseController
}
$arr1 = [];
for($i = 0;$i<count($res);$i++){
$begin = $res[$i]["yuyue_begin"];
$end = $res[$i]["yuyue_end"];
for($i = 0;$i<count($res1);$i++){
$begin = $res1[$i]["yuyue_begin"];
$end = $res1[$i]["yuyue_end"];
for($j= $begin;$j<$end;$j++){
$arr1[]=$j;
}
}
$ok_arr1 = [];
for($q = 0;$q< count($all_arr);$q++){
if(in_array($all_arr[$q],$arr)){
for($q = 0;$q< count($all_arr1);$q++){
if(in_array($all_arr1[$q],$arr1)){
$ok_arr1[] = "no";
}else{
$ok_arr1[] = "yes";
... ...