外包项目 / signUpForCar · 提交

转到一个项目

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

已评价无数据情况

内嵌 并排对比
正在显示 2 个修改的文件 包含 333 行增加 和 33 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> 4 + <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="已评价无数据情况">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
6 </list> 7 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -67,47 +68,155 @@ @@ -67,47 +68,155 @@
67 </provider> 68 </provider>
68 </entry> 69 </entry>
69 </file> 70 </file>
70 - <file leaf-file-name="header.html" pinned="false" current-in-tab="true"> 71 + <file leaf-file-name="header.html" pinned="false" current-in-tab="false">
71 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html"> 72 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html">
72 <provider selected="true" editor-type-id="text-editor"> 73 <provider selected="true" editor-type-id="text-editor">
73 - <state relative-caret-position="546">  
74 - <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" /> 74 + <state relative-caret-position="819">
  75 + <caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
75 </state> 76 </state>
76 </provider> 77 </provider>
77 </entry> 78 </entry>
78 </file> 79 </file>
79 - <file leaf-file-name="WXBizDataCrypt.php" pinned="false" current-in-tab="false">  
80 - <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php"> 80 + <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
  81 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
81 <provider selected="true" editor-type-id="text-editor"> 82 <provider selected="true" editor-type-id="text-editor">
82 - <state relative-caret-position="714">  
83 - <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" /> 83 + <state relative-caret-position="336">
  84 + <caret line="66" column="46" selection-start-line="66" selection-start-column="46" selection-end-line="66" selection-end-column="46" />
84 </state> 85 </state>
85 </provider> 86 </provider>
86 </entry> 87 </entry>
87 </file> 88 </file>
88 - <file leaf-file-name="FavoritesController.php" pinned="false" current-in-tab="false">  
89 - <entry file="file://$PROJECT_DIR$/api/user/controller/FavoritesController.php"> 89 + <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
  90 + <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
90 <provider selected="true" editor-type-id="text-editor"> 91 <provider selected="true" editor-type-id="text-editor">
91 - <state relative-caret-position="126">  
92 - <caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" /> 92 + <state relative-caret-position="615">
  93 + <caret line="402" column="36" lean-forward="true" selection-start-line="402" selection-start-column="36" selection-end-line="402" selection-end-column="36" />
  94 + <folding>
  95 + <element signature="e#911#990#0#PHP" />
  96 + <element signature="e#1015#1432#0#PHP" />
  97 + <element signature="e#1459#2877#0#PHP" />
  98 + <element signature="e#1502#1569#0#PHP" />
  99 + <element signature="e#1717#1797#0#PHP" />
  100 + <element signature="e#1884#2341#0#PHP" />
  101 + <element signature="e#1946#2053#0#PHP" />
  102 + <element signature="e#2209#2331#0#PHP" />
  103 + <element signature="e#2902#4247#0#PHP" />
  104 + <element signature="e#3375#3420#0#PHP" />
  105 + <element signature="e#3375#3469#0#PHP" />
  106 + <element signature="e#3375#3510#0#PHP" />
  107 + <element signature="e#3375#3553#0#PHP" />
  108 + <element signature="e#3631#3704#0#PHP" />
  109 + <element signature="e#4272#8316#0#PHP" />
  110 + <element signature="e#4379#8309#0#PHP" />
  111 + <element signature="e#4468#8309#0#PHP" />
  112 + <element signature="e#4913#5015#0#PHP" />
  113 + <element signature="e#5338#5425#0#PHP" />
  114 + <element signature="e#5575#8299#0#PHP" />
  115 + <element signature="e#6315#7195#0#PHP" />
  116 + <element signature="e#6595#7177#1#PHP" />
  117 + <element signature="e#7223#8025#0#PHP" />
  118 + <element signature="e#7503#8007#1#PHP" />
  119 + <element signature="e#8213#8299#0#PHP" />
  120 + <element signature="e#8355#8539#0#PHP" />
  121 + <element signature="e#8564#9616#0#PHP" />
  122 + <element signature="e#8820#8865#0#PHP" />
  123 + <element signature="e#8820#8914#0#PHP" />
  124 + <element signature="e#8820#8955#0#PHP" />
  125 + <element signature="e#8820#8998#0#PHP" />
  126 + <element signature="e#9076#9149#0#PHP" />
  127 + <element signature="e#9641#10319#0#PHP" />
  128 + <element signature="e#10344#14313#0#PHP" />
  129 + <element signature="e#10608#14305#0#PHP" />
  130 + <element signature="e#10697#14305#0#PHP" />
  131 + <element signature="e#11141#11228#0#PHP" />
  132 + <element signature="e#11376#14295#0#PHP" />
  133 + <element signature="e#12117#13054#0#PHP" />
  134 + <element signature="e#12425#13036#1#PHP" />
  135 + <element signature="e#13082#14019#0#PHP" />
  136 + <element signature="e#13390#14001#1#PHP" />
  137 + <element signature="e#14209#14295#0#PHP" />
  138 + <element signature="e#14492#14586#0#PHP" />
  139 + <element signature="e#14605#14647#0#PHP" />
  140 + <element signature="e#14605#14697#0#PHP" />
  141 + <element signature="e#14605#14746#0#PHP" />
  142 + <element signature="e#14605#14816#0#PHP" />
  143 + <element signature="e#14605#14858#0#PHP" />
  144 + <element signature="e#14605#14886#0#PHP" />
  145 + <element signature="e#16374#16442#0#PHP" />
  146 + <element signature="e#16842#19703#0#PHP" />
  147 + <element signature="e#17002#17045#0#PHP" />
  148 + <element signature="e#17002#17093#0#PHP" />
  149 + <element signature="e#17002#17139#0#PHP" />
  150 + <element signature="e#17002#17183#0#PHP" />
  151 + <element signature="e#17002#17224#0#PHP" />
  152 + <element signature="e#17002#17313#0#PHP" />
  153 + <element signature="e#17002#17353#0#PHP" />
  154 + <element signature="e#17420#17463#0#PHP" />
  155 + <element signature="e#17420#17511#0#PHP" />
  156 + <element signature="e#17420#17557#0#PHP" />
  157 + <element signature="e#17420#17601#0#PHP" />
  158 + <element signature="e#17420#17642#0#PHP" />
  159 + <element signature="e#17420#17684#0#PHP" />
  160 + <element signature="e#17420#17773#0#PHP" />
  161 + <element signature="e#17420#17813#0#PHP" />
  162 + <element signature="e#17879#17922#0#PHP" />
  163 + <element signature="e#17879#17970#0#PHP" />
  164 + <element signature="e#17879#18016#0#PHP" />
  165 + <element signature="e#17879#18060#0#PHP" />
  166 + <element signature="e#17879#18101#0#PHP" />
  167 + <element signature="e#17879#18143#0#PHP" />
  168 + <element signature="e#17879#18232#0#PHP" />
  169 + <element signature="e#17879#18272#0#PHP" />
  170 + <element signature="e#18338#18381#0#PHP" />
  171 + <element signature="e#18338#18429#0#PHP" />
  172 + <element signature="e#18338#18475#0#PHP" />
  173 + <element signature="e#18338#18519#0#PHP" />
  174 + <element signature="e#18338#18560#0#PHP" />
  175 + <element signature="e#18338#18602#0#PHP" />
  176 + <element signature="e#18338#18691#0#PHP" />
  177 + <element signature="e#18338#18731#0#PHP" />
  178 + <element signature="e#18797#18840#0#PHP" />
  179 + <element signature="e#18797#18888#0#PHP" />
  180 + <element signature="e#18797#18934#0#PHP" />
  181 + <element signature="e#18797#18978#0#PHP" />
  182 + <element signature="e#18797#19019#0#PHP" />
  183 + <element signature="e#18797#19061#0#PHP" />
  184 + <element signature="e#18797#19150#0#PHP" />
  185 + <element signature="e#18797#19190#0#PHP" />
  186 + <element signature="e#19256#19329#0#PHP" />
  187 + <element signature="e#19720#21064#0#PHP" />
  188 + <element signature="e#19812#19892#0#PHP" />
  189 + <element signature="e#19966#21057#0#PHP" />
  190 + <element signature="e#20131#21047#0#PHP" />
  191 + <element signature="e#20236#21033#0#PHP" />
  192 + <element signature="e#20939#21033#0#PHP" />
  193 + <element signature="e#21081#21555#0#PHP" />
  194 + <element signature="e#21169#21547#0#PHP" />
  195 + <element signature="e#21253#21547#0#PHP" />
  196 + <element signature="e#21362#21537#0#PHP" />
  197 + <element signature="e#21451#21537#0#PHP" />
  198 + <element signature="e#21572#22043#0#PHP" />
  199 + <element signature="e#21659#22036#0#PHP" />
  200 + <element signature="e#21743#22036#0#PHP" />
  201 + <element signature="e#21851#22026#0#PHP" />
  202 + <element signature="e#21940#22026#0#PHP" />
  203 + </folding>
93 </state> 204 </state>
94 </provider> 205 </provider>
95 </entry> 206 </entry>
96 </file> 207 </file>
97 - <file leaf-file-name="route.php" pinned="false" current-in-tab="false">  
98 - <entry file="file://$PROJECT_DIR$/api/user/route.php"> 208 + <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false">
  209 + <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
99 <provider selected="true" editor-type-id="text-editor"> 210 <provider selected="true" editor-type-id="text-editor">
100 - <state relative-caret-position="105">  
101 - <caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="22" />  
102 - </state> 211 + <state relative-caret-position="-1701" />
103 </provider> 212 </provider>
104 </entry> 213 </entry>
105 </file> 214 </file>
106 - <file leaf-file-name="common.php" pinned="false" current-in-tab="false">  
107 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php"> 215 + <file leaf-file-name="WXBizDataCrypt.php" pinned="false" current-in-tab="false">
  216 + <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php">
108 <provider selected="true" editor-type-id="text-editor"> 217 <provider selected="true" editor-type-id="text-editor">
109 - <state relative-caret-position="30093">  
110 - <caret line="1448" column="29" selection-start-line="1448" selection-start-column="29" selection-end-line="1448" selection-end-column="29" /> 218 + <state relative-caret-position="714">
  219 + <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
111 </state> 220 </state>
112 </provider> 221 </provider>
113 </entry> 222 </entry>
@@ -154,6 +263,9 @@ @@ -154,6 +263,9 @@
154 <option value="$PROJECT_DIR$/public/static/css/viyagerapp.css" /> 263 <option value="$PROJECT_DIR$/public/static/css/viyagerapp.css" />
155 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" /> 264 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" />
156 <option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" /> 265 <option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" />
  266 + <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
  267 + <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
  268 + <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
157 </list> 269 </list>
158 </option> 270 </option>
159 </component> 271 </component>
@@ -207,6 +319,37 @@ @@ -207,6 +319,37 @@
207 <path> 319 <path>
208 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 320 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
209 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 321 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  322 + <item name="app" type="462c0819:PsiDirectoryNode" />
  323 + </path>
  324 + <path>
  325 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  326 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  327 + <item name="app" type="462c0819:PsiDirectoryNode" />
  328 + <item name="portal" type="462c0819:PsiDirectoryNode" />
  329 + </path>
  330 + <path>
  331 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  332 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  333 + <item name="app" type="462c0819:PsiDirectoryNode" />
  334 + <item name="portal" type="462c0819:PsiDirectoryNode" />
  335 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  336 + </path>
  337 + <path>
  338 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  339 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  340 + <item name="app" type="462c0819:PsiDirectoryNode" />
  341 + <item name="user" type="462c0819:PsiDirectoryNode" />
  342 + </path>
  343 + <path>
  344 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  345 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  346 + <item name="app" type="462c0819:PsiDirectoryNode" />
  347 + <item name="user" type="462c0819:PsiDirectoryNode" />
  348 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  349 + </path>
  350 + <path>
  351 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  352 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
210 <item name="simplewind" type="462c0819:PsiDirectoryNode" /> 353 <item name="simplewind" type="462c0819:PsiDirectoryNode" />
211 </path> 354 </path>
212 </expand> 355 </expand>
@@ -254,7 +397,7 @@ @@ -254,7 +397,7 @@
254 <workItem from="1531653353141" duration="7654000" /> 397 <workItem from="1531653353141" duration="7654000" />
255 <workItem from="1531747533208" duration="2488000" /> 398 <workItem from="1531747533208" duration="2488000" />
256 <workItem from="1531794895610" duration="20000" /> 399 <workItem from="1531794895610" duration="20000" />
257 - <workItem from="1535458114609" duration="473000" /> 400 + <workItem from="1535458114609" duration="2307000" />
258 </task> 401 </task>
259 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题"> 402 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
260 <created>1535458170068</created> 403 <created>1535458170068</created>
@@ -263,14 +406,29 @@ @@ -263,14 +406,29 @@
263 <option name="project" value="LOCAL" /> 406 <option name="project" value="LOCAL" />
264 <updated>1535458170068</updated> 407 <updated>1535458170068</updated>
265 </task> 408 </task>
266 - <option name="localTasksCounter" value="2" /> 409 + <task id="LOCAL-00002" summary="修复教练的时间段可以重复预约">
  410 + <created>1535458750848</created>
  411 + <option name="number" value="00002" />
  412 + <option name="presentableId" value="LOCAL-00002" />
  413 + <option name="project" value="LOCAL" />
  414 + <updated>1535458750848</updated>
  415 + </task>
  416 + <task id="LOCAL-00003" summary="已经成功报名的用户，不能再次报名 放在确认订单页面">
  417 + <created>1535459632689</created>
  418 + <option name="number" value="00003" />
  419 + <option name="presentableId" value="LOCAL-00003" />
  420 + <option name="project" value="LOCAL" />
  421 + <updated>1535459632689</updated>
  422 + </task>
  423 + <option name="localTasksCounter" value="4" />
267 <servers /> 424 <servers />
268 </component> 425 </component>
269 <component name="TimeTrackingManager"> 426 <component name="TimeTrackingManager">
270 - <option name="totallyTimeSpent" value="17009000" /> 427 + <option name="totallyTimeSpent" value="18843000" />
271 </component> 428 </component>
272 <component name="ToolWindowManager"> 429 <component name="ToolWindowManager">
273 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 430 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
  431 + <editor active="true" />
274 <layout> 432 <layout>
275 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1401919" /> 433 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1401919" />
276 <window_info anchor="bottom" id="TODO" order="6" /> 434 <window_info anchor="bottom" id="TODO" order="6" />
@@ -302,13 +460,11 @@ @@ -302,13 +460,11 @@
302 </component> 460 </component>
303 <component name="VcsManagerConfiguration"> 461 <component name="VcsManagerConfiguration">
304 <MESSAGE value="修复预约后不能再预约的问题" /> 462 <MESSAGE value="修复预约后不能再预约的问题" />
305 - <option name="LAST_COMMIT_MESSAGE" value="修复预约后不能再预约的问题" /> 463 + <MESSAGE value="修复教练的时间段可以重复预约" />
  464 + <MESSAGE value="已经成功报名的用户，不能再次报名 放在确认订单页面" />
  465 + <option name="LAST_COMMIT_MESSAGE" value="已经成功报名的用户，不能再次报名 放在确认订单页面" />
306 </component> 466 </component>
307 <component name="editorHistoryManager"> 467 <component name="editorHistoryManager">
308 - <entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/vendor/tcg/voyager/publishable/lang/en/login.php" />  
309 - <entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/.env" />  
310 - <entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/1.html" />  
311 - <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php" />  
312 <entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/3.html" /> 468 <entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/3.html" />
313 <entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/2.html" /> 469 <entry file="file://$PROJECT_DIR$/../07-08-voyager/your-project-name/2.html" />
314 <entry file="file://$PROJECT_DIR$/public/static/js/noty/noty.js"> 470 <entry file="file://$PROJECT_DIR$/public/static/js/noty/noty.js">
@@ -539,10 +695,149 @@ @@ -539,10 +695,149 @@
539 </state> 695 </state>
540 </provider> 696 </provider>
541 </entry> 697 </entry>
  698 + <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
  699 + <provider selected="true" editor-type-id="text-editor">
  700 + <state relative-caret-position="166">
  701 + <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
  702 + <folding>
  703 + <element signature="e#769#1822#0#PHP" />
  704 + </folding>
  705 + </state>
  706 + </provider>
  707 + </entry>
542 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html"> 708 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html">
543 <provider selected="true" editor-type-id="text-editor"> 709 <provider selected="true" editor-type-id="text-editor">
544 - <state relative-caret-position="546">  
545 - <caret line="26" column="28" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" /> 710 + <state relative-caret-position="819">
  711 + <caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
  712 + </state>
  713 + </provider>
  714 + </entry>
  715 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
  716 + <provider selected="true" editor-type-id="text-editor">
  717 + <state relative-caret-position="336">
  718 + <caret line="66" column="46" selection-start-line="66" selection-start-column="46" selection-end-line="66" selection-end-column="46" />
  719 + </state>
  720 + </provider>
  721 + </entry>
  722 + <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
  723 + <provider selected="true" editor-type-id="text-editor">
  724 + <state relative-caret-position="-1701" />
  725 + </provider>
  726 + </entry>
  727 + <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
  728 + <provider selected="true" editor-type-id="text-editor">
  729 + <state relative-caret-position="615">
  730 + <caret line="402" column="36" lean-forward="true" selection-start-line="402" selection-start-column="36" selection-end-line="402" selection-end-column="36" />
  731 + <folding>
  732 + <element signature="e#911#990#0#PHP" />
  733 + <element signature="e#1015#1432#0#PHP" />
  734 + <element signature="e#1459#2877#0#PHP" />
  735 + <element signature="e#1502#1569#0#PHP" />
  736 + <element signature="e#1717#1797#0#PHP" />
  737 + <element signature="e#1884#2341#0#PHP" />
  738 + <element signature="e#1946#2053#0#PHP" />
  739 + <element signature="e#2209#2331#0#PHP" />
  740 + <element signature="e#2902#4247#0#PHP" />
  741 + <element signature="e#3375#3420#0#PHP" />
  742 + <element signature="e#3375#3469#0#PHP" />
  743 + <element signature="e#3375#3510#0#PHP" />
  744 + <element signature="e#3375#3553#0#PHP" />
  745 + <element signature="e#3631#3704#0#PHP" />
  746 + <element signature="e#4272#8316#0#PHP" />
  747 + <element signature="e#4379#8309#0#PHP" />
  748 + <element signature="e#4468#8309#0#PHP" />
  749 + <element signature="e#4913#5015#0#PHP" />
  750 + <element signature="e#5338#5425#0#PHP" />
  751 + <element signature="e#5575#8299#0#PHP" />
  752 + <element signature="e#6315#7195#0#PHP" />
  753 + <element signature="e#6595#7177#1#PHP" />
  754 + <element signature="e#7223#8025#0#PHP" />
  755 + <element signature="e#7503#8007#1#PHP" />
  756 + <element signature="e#8213#8299#0#PHP" />
  757 + <element signature="e#8355#8539#0#PHP" />
  758 + <element signature="e#8564#9616#0#PHP" />
  759 + <element signature="e#8820#8865#0#PHP" />
  760 + <element signature="e#8820#8914#0#PHP" />
  761 + <element signature="e#8820#8955#0#PHP" />
  762 + <element signature="e#8820#8998#0#PHP" />
  763 + <element signature="e#9076#9149#0#PHP" />
  764 + <element signature="e#9641#10319#0#PHP" />
  765 + <element signature="e#10344#14313#0#PHP" />
  766 + <element signature="e#10608#14305#0#PHP" />
  767 + <element signature="e#10697#14305#0#PHP" />
  768 + <element signature="e#11141#11228#0#PHP" />
  769 + <element signature="e#11376#14295#0#PHP" />
  770 + <element signature="e#12117#13054#0#PHP" />
  771 + <element signature="e#12425#13036#1#PHP" />
  772 + <element signature="e#13082#14019#0#PHP" />
  773 + <element signature="e#13390#14001#1#PHP" />
  774 + <element signature="e#14209#14295#0#PHP" />
  775 + <element signature="e#14492#14586#0#PHP" />
  776 + <element signature="e#14605#14647#0#PHP" />
  777 + <element signature="e#14605#14697#0#PHP" />
  778 + <element signature="e#14605#14746#0#PHP" />
  779 + <element signature="e#14605#14816#0#PHP" />
  780 + <element signature="e#14605#14858#0#PHP" />
  781 + <element signature="e#14605#14886#0#PHP" />
  782 + <element signature="e#16374#16442#0#PHP" />
  783 + <element signature="e#16842#19703#0#PHP" />
  784 + <element signature="e#17002#17045#0#PHP" />
  785 + <element signature="e#17002#17093#0#PHP" />
  786 + <element signature="e#17002#17139#0#PHP" />
  787 + <element signature="e#17002#17183#0#PHP" />
  788 + <element signature="e#17002#17224#0#PHP" />
  789 + <element signature="e#17002#17313#0#PHP" />
  790 + <element signature="e#17002#17353#0#PHP" />
  791 + <element signature="e#17420#17463#0#PHP" />
  792 + <element signature="e#17420#17511#0#PHP" />
  793 + <element signature="e#17420#17557#0#PHP" />
  794 + <element signature="e#17420#17601#0#PHP" />
  795 + <element signature="e#17420#17642#0#PHP" />
  796 + <element signature="e#17420#17684#0#PHP" />
  797 + <element signature="e#17420#17773#0#PHP" />
  798 + <element signature="e#17420#17813#0#PHP" />
  799 + <element signature="e#17879#17922#0#PHP" />
  800 + <element signature="e#17879#17970#0#PHP" />
  801 + <element signature="e#17879#18016#0#PHP" />
  802 + <element signature="e#17879#18060#0#PHP" />
  803 + <element signature="e#17879#18101#0#PHP" />
  804 + <element signature="e#17879#18143#0#PHP" />
  805 + <element signature="e#17879#18232#0#PHP" />
  806 + <element signature="e#17879#18272#0#PHP" />
  807 + <element signature="e#18338#18381#0#PHP" />
  808 + <element signature="e#18338#18429#0#PHP" />
  809 + <element signature="e#18338#18475#0#PHP" />
  810 + <element signature="e#18338#18519#0#PHP" />
  811 + <element signature="e#18338#18560#0#PHP" />
  812 + <element signature="e#18338#18602#0#PHP" />
  813 + <element signature="e#18338#18691#0#PHP" />
  814 + <element signature="e#18338#18731#0#PHP" />
  815 + <element signature="e#18797#18840#0#PHP" />
  816 + <element signature="e#18797#18888#0#PHP" />
  817 + <element signature="e#18797#18934#0#PHP" />
  818 + <element signature="e#18797#18978#0#PHP" />
  819 + <element signature="e#18797#19019#0#PHP" />
  820 + <element signature="e#18797#19061#0#PHP" />
  821 + <element signature="e#18797#19150#0#PHP" />
  822 + <element signature="e#18797#19190#0#PHP" />
  823 + <element signature="e#19256#19329#0#PHP" />
  824 + <element signature="e#19720#21064#0#PHP" />
  825 + <element signature="e#19812#19892#0#PHP" />
  826 + <element signature="e#19966#21057#0#PHP" />
  827 + <element signature="e#20131#21047#0#PHP" />
  828 + <element signature="e#20236#21033#0#PHP" />
  829 + <element signature="e#20939#21033#0#PHP" />
  830 + <element signature="e#21081#21555#0#PHP" />
  831 + <element signature="e#21169#21547#0#PHP" />
  832 + <element signature="e#21253#21547#0#PHP" />
  833 + <element signature="e#21362#21537#0#PHP" />
  834 + <element signature="e#21451#21537#0#PHP" />
  835 + <element signature="e#21572#22043#0#PHP" />
  836 + <element signature="e#21659#22036#0#PHP" />
  837 + <element signature="e#21743#22036#0#PHP" />
  838 + <element signature="e#21851#22026#0#PHP" />
  839 + <element signature="e#21940#22026#0#PHP" />
  840 + </folding>
546 </state> 841 </state>
547 </provider> 842 </provider>
548 </entry> 843 </entry>
@@ -393,15 +393,20 @@ class YuyueController extends UserBaseController @@ -393,15 +393,20 @@ class YuyueController extends UserBaseController
393 $dpdata = Db::name('yuyue') 393 $dpdata = Db::name('yuyue')
394 ->alias('yy') 394 ->alias('yy')
395 ->join('qnb_user u', 'u.id=yy.teach_id') 395 ->join('qnb_user u', 'u.id=yy.teach_id')
396 - ->where(['uid' => $id, 'status' => 2]) 396 + ->where(['uid' => $id, 'status' => ['in','2,3']])
397 ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id') 397 ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id')
398 ->order('create_time desc') 398 ->order('create_time desc')
399 ->select() 399 ->select()
400 ->toArray(); 400 ->toArray();
  401 + foreach ($dpdata as $k => $v) {
  402 + if ($v['status'] == '3' && $v['pingjia_jiaolian'] == '1') {
  403 + unset ($dpdata[$k]);
  404 + }
  405 + }
401 $ypdata = Db::name('yuyue') 406 $ypdata = Db::name('yuyue')
402 ->alias('yy') 407 ->alias('yy')
403 ->join('qnb_user u', 'u.id=yy.teach_id') 408 ->join('qnb_user u', 'u.id=yy.teach_id')
404 - ->where(['uid' => $id, 'status' => 5]) 409 + ->where(['uid' => $id, 'status' => 3])
405 ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id') 410 ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id')
406 ->order('create_time desc') 411 ->order('create_time desc')
407 ->select() 412 ->select()