外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 ba8c496d581105be74c69b6250ac2097ed31607d 1 个父辈 3d67717d

已评价无数据情况

内嵌 并排对比
正在显示 2 个修改的文件 包含 333 行增加 和 33 行删除
<?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" />
<change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -67,47 +68,155 @@
</provider>
</entry>
</file>
<file leaf-file-name="header.html" pinned="false" current-in-tab="true">
<file leaf-file-name="header.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html">
<provider selected="true" editor-type-id="text-editor">
<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 relative-caret-position="819">
<caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
</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="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="714">
<caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
<state relative-caret-position="336">
<caret line="66" column="46" selection-start-line="66" selection-start-column="46" selection-end-line="66" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="FavoritesController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/user/controller/FavoritesController.php">
<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="126">
<caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
<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" />
<folding>
<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#8316#0#PHP" />
<element signature="e#4379#8309#0#PHP" />
<element signature="e#4468#8309#0#PHP" />
<element signature="e#4913#5015#0#PHP" />
<element signature="e#5338#5425#0#PHP" />
<element signature="e#5575#8299#0#PHP" />
<element signature="e#6315#7195#0#PHP" />
<element signature="e#6595#7177#1#PHP" />
<element signature="e#7223#8025#0#PHP" />
<element signature="e#7503#8007#1#PHP" />
<element signature="e#8213#8299#0#PHP" />
<element signature="e#8355#8539#0#PHP" />
<element signature="e#8564#9616#0#PHP" />
<element signature="e#8820#8865#0#PHP" />
<element signature="e#8820#8914#0#PHP" />
<element signature="e#8820#8955#0#PHP" />
<element signature="e#8820#8998#0#PHP" />
<element signature="e#9076#9149#0#PHP" />
<element signature="e#9641#10319#0#PHP" />
<element signature="e#10344#14313#0#PHP" />
<element signature="e#10608#14305#0#PHP" />
<element signature="e#10697#14305#0#PHP" />
<element signature="e#11141#11228#0#PHP" />
<element signature="e#11376#14295#0#PHP" />
<element signature="e#12117#13054#0#PHP" />
<element signature="e#12425#13036#1#PHP" />
<element signature="e#13082#14019#0#PHP" />
<element signature="e#13390#14001#1#PHP" />
<element signature="e#14209#14295#0#PHP" />
<element signature="e#14492#14586#0#PHP" />
<element signature="e#14605#14647#0#PHP" />
<element signature="e#14605#14697#0#PHP" />
<element signature="e#14605#14746#0#PHP" />
<element signature="e#14605#14816#0#PHP" />
<element signature="e#14605#14858#0#PHP" />
<element signature="e#14605#14886#0#PHP" />
<element signature="e#16374#16442#0#PHP" />
<element signature="e#16842#19703#0#PHP" />
<element signature="e#17002#17045#0#PHP" />
<element signature="e#17002#17093#0#PHP" />
<element signature="e#17002#17139#0#PHP" />
<element signature="e#17002#17183#0#PHP" />
<element signature="e#17002#17224#0#PHP" />
<element signature="e#17002#17313#0#PHP" />
<element signature="e#17002#17353#0#PHP" />
<element signature="e#17420#17463#0#PHP" />
<element signature="e#17420#17511#0#PHP" />
<element signature="e#17420#17557#0#PHP" />
<element signature="e#17420#17601#0#PHP" />
<element signature="e#17420#17642#0#PHP" />
<element signature="e#17420#17684#0#PHP" />
<element signature="e#17420#17773#0#PHP" />
<element signature="e#17420#17813#0#PHP" />
<element signature="e#17879#17922#0#PHP" />
<element signature="e#17879#17970#0#PHP" />
<element signature="e#17879#18016#0#PHP" />
<element signature="e#17879#18060#0#PHP" />
<element signature="e#17879#18101#0#PHP" />
<element signature="e#17879#18143#0#PHP" />
<element signature="e#17879#18232#0#PHP" />
<element signature="e#17879#18272#0#PHP" />
<element signature="e#18338#18381#0#PHP" />
<element signature="e#18338#18429#0#PHP" />
<element signature="e#18338#18475#0#PHP" />
<element signature="e#18338#18519#0#PHP" />
<element signature="e#18338#18560#0#PHP" />
<element signature="e#18338#18602#0#PHP" />
<element signature="e#18338#18691#0#PHP" />
<element signature="e#18338#18731#0#PHP" />
<element signature="e#18797#18840#0#PHP" />
<element signature="e#18797#18888#0#PHP" />
<element signature="e#18797#18934#0#PHP" />
<element signature="e#18797#18978#0#PHP" />
<element signature="e#18797#19019#0#PHP" />
<element signature="e#18797#19061#0#PHP" />
<element signature="e#18797#19150#0#PHP" />
<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" />
<element signature="e#21362#21537#0#PHP" />
<element signature="e#21451#21537#0#PHP" />
<element signature="e#21572#22043#0#PHP" />
<element signature="e#21659#22036#0#PHP" />
<element signature="e#21743#22036#0#PHP" />
<element signature="e#21851#22026#0#PHP" />
<element signature="e#21940#22026#0#PHP" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="route.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/user/route.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="105">
<caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="22" />
</state>
<state relative-caret-position="-1701" />
</provider>
</entry>
</file>
<file leaf-file-name="common.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<file leaf-file-name="WXBizDataCrypt.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30093">
<caret line="1448" column="29" selection-start-line="1448" selection-start-column="29" selection-end-line="1448" selection-end-column="29" />
<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>
</provider>
</entry>
... ... @@ -154,6 +263,9 @@
<option value="$PROJECT_DIR$/public/static/css/viyagerapp.css" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" />
<option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" />
<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" />
</list>
</option>
</component>
... ... @@ -207,6 +319,37 @@
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="app" 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" />
</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="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
... ... @@ -254,7 +397,7 @@
<workItem from="1531653353141" duration="7654000" />
<workItem from="1531747533208" duration="2488000" />
<workItem from="1531794895610" duration="20000" />
<workItem from="1535458114609" duration="473000" />
<workItem from="1535458114609" duration="2307000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
... ... @@ -263,14 +406,29 @@
<option name="project" value="LOCAL" />
<updated>1535458170068</updated>
</task>
<option name="localTasksCounter" value="2" />
<task id="LOCAL-00002" summary="修复教练的时间段可以重复预约">
<created>1535458750848</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1535458750848</updated>
</task>
<task id="LOCAL-00003" summary="已经成功报名的用户，不能再次报名 放在确认订单页面">
<created>1535459632689</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1535459632689</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="17009000" />
<option name="totallyTimeSpent" value="18843000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1401919" />
<window_info anchor="bottom" id="TODO" order="6" />
... ... @@ -302,13 +460,11 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="修复预约后不能再预约的问题" />
<option name="LAST_COMMIT_MESSAGE" value="修复预约后不能再预约的问题" />
<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/vendor/tcg/voyager/publishable/lang/en/login.php" />
<entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/.env" />
<entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/1.html" />
<entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php" />
<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">
... ... @@ -539,10 +695,149 @@
</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="166">
<caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
<folding>
<element signature="e#769#1822#0#PHP" />
</folding>
</state>
</provider>
</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="546">
<caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
<state relative-caret-position="819">
<caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" 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="336">
<caret line="66" column="46" selection-start-line="66" selection-start-column="46" selection-end-line="66" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1701" />
</provider>
</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" />
<folding>
<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#8316#0#PHP" />
<element signature="e#4379#8309#0#PHP" />
<element signature="e#4468#8309#0#PHP" />
<element signature="e#4913#5015#0#PHP" />
<element signature="e#5338#5425#0#PHP" />
<element signature="e#5575#8299#0#PHP" />
<element signature="e#6315#7195#0#PHP" />
<element signature="e#6595#7177#1#PHP" />
<element signature="e#7223#8025#0#PHP" />
<element signature="e#7503#8007#1#PHP" />
<element signature="e#8213#8299#0#PHP" />
<element signature="e#8355#8539#0#PHP" />
<element signature="e#8564#9616#0#PHP" />
<element signature="e#8820#8865#0#PHP" />
<element signature="e#8820#8914#0#PHP" />
<element signature="e#8820#8955#0#PHP" />
<element signature="e#8820#8998#0#PHP" />
<element signature="e#9076#9149#0#PHP" />
<element signature="e#9641#10319#0#PHP" />
<element signature="e#10344#14313#0#PHP" />
<element signature="e#10608#14305#0#PHP" />
<element signature="e#10697#14305#0#PHP" />
<element signature="e#11141#11228#0#PHP" />
<element signature="e#11376#14295#0#PHP" />
<element signature="e#12117#13054#0#PHP" />
<element signature="e#12425#13036#1#PHP" />
<element signature="e#13082#14019#0#PHP" />
<element signature="e#13390#14001#1#PHP" />
<element signature="e#14209#14295#0#PHP" />
<element signature="e#14492#14586#0#PHP" />
<element signature="e#14605#14647#0#PHP" />
<element signature="e#14605#14697#0#PHP" />
<element signature="e#14605#14746#0#PHP" />
<element signature="e#14605#14816#0#PHP" />
<element signature="e#14605#14858#0#PHP" />
<element signature="e#14605#14886#0#PHP" />
<element signature="e#16374#16442#0#PHP" />
<element signature="e#16842#19703#0#PHP" />
<element signature="e#17002#17045#0#PHP" />
<element signature="e#17002#17093#0#PHP" />
<element signature="e#17002#17139#0#PHP" />
<element signature="e#17002#17183#0#PHP" />
<element signature="e#17002#17224#0#PHP" />
<element signature="e#17002#17313#0#PHP" />
<element signature="e#17002#17353#0#PHP" />
<element signature="e#17420#17463#0#PHP" />
<element signature="e#17420#17511#0#PHP" />
<element signature="e#17420#17557#0#PHP" />
<element signature="e#17420#17601#0#PHP" />
<element signature="e#17420#17642#0#PHP" />
<element signature="e#17420#17684#0#PHP" />
<element signature="e#17420#17773#0#PHP" />
<element signature="e#17420#17813#0#PHP" />
<element signature="e#17879#17922#0#PHP" />
<element signature="e#17879#17970#0#PHP" />
<element signature="e#17879#18016#0#PHP" />
<element signature="e#17879#18060#0#PHP" />
<element signature="e#17879#18101#0#PHP" />
<element signature="e#17879#18143#0#PHP" />
<element signature="e#17879#18232#0#PHP" />
<element signature="e#17879#18272#0#PHP" />
<element signature="e#18338#18381#0#PHP" />
<element signature="e#18338#18429#0#PHP" />
<element signature="e#18338#18475#0#PHP" />
<element signature="e#18338#18519#0#PHP" />
<element signature="e#18338#18560#0#PHP" />
<element signature="e#18338#18602#0#PHP" />
<element signature="e#18338#18691#0#PHP" />
<element signature="e#18338#18731#0#PHP" />
<element signature="e#18797#18840#0#PHP" />
<element signature="e#18797#18888#0#PHP" />
<element signature="e#18797#18934#0#PHP" />
<element signature="e#18797#18978#0#PHP" />
<element signature="e#18797#19019#0#PHP" />
<element signature="e#18797#19061#0#PHP" />
<element signature="e#18797#19150#0#PHP" />
<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" />
<element signature="e#21362#21537#0#PHP" />
<element signature="e#21451#21537#0#PHP" />
<element signature="e#21572#22043#0#PHP" />
<element signature="e#21659#22036#0#PHP" />
<element signature="e#21743#22036#0#PHP" />
<element signature="e#21851#22026#0#PHP" />
<element signature="e#21940#22026#0#PHP" />
</folding>
</state>
</provider>
</entry>
... ...
... ... @@ -393,15 +393,20 @@ class YuyueController extends UserBaseController
$dpdata = Db::name('yuyue')
->alias('yy')
->join('qnb_user u', 'u.id=yy.teach_id')
->where(['uid' => $id, 'status' => 2])
->where(['uid' => $id, 'status' => ['in','2,3']])
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id')
->order('create_time desc')
->select()
->toArray();
foreach ($dpdata as $k => $v) {
if ($v['status'] == '3' && $v['pingjia_jiaolian'] == '1') {
unset ($dpdata[$k]);
}
}
$ypdata = Db::name('yuyue')
->alias('yy')
->join('qnb_user u', 'u.id=yy.teach_id')
->where(['uid' => $id, 'status' => 5])
->where(['uid' => $id, 'status' => 3])
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id')
->order('create_time desc')
->select()
... ...