外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 e4bf6efcdde40f4957baf0c9f2a7871a972fa905 1 个父辈 8a98c2de

提交评价限制一次哦

内嵌 并排对比
正在显示 2 个修改的文件 包含 415 行增加 和 59 行删除
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
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/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/ProfileController.php" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/app/user/controller/CommentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/CommentController.php" afterDir="false" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -84,29 +84,206 @@ @@ -84,29 +84,206 @@
84 </provider> 84 </provider>
85 </entry> 85 </entry>
86 </file> 86 </file>
87 - <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false"> 87 + <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">
88 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 88 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
89 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
90 - <state relative-caret-position="2314">  
91 - <caret line="191" column="18" lean-forward="true" selection-start-line="191" selection-start-column="18" selection-end-line="191" selection-end-column="18" /> 90 + <state relative-caret-position="315">
  91 + <caret line="49" column="9" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
92 <folding> 92 <folding>
93 <element signature="e#821#1437#0#PHP" /> 93 <element signature="e#821#1437#0#PHP" />
94 <element signature="e#982#1035#0#PHP" /> 94 <element signature="e#982#1035#0#PHP" />
95 - <element signature="e#1455#2315#0#PHP" />  
96 <element signature="e#1543#1618#0#PHP" /> 95 <element signature="e#1543#1618#0#PHP" />
97 <element signature="e#2165#2309#0#PHP" /> 96 <element signature="e#2165#2309#0#PHP" />
98 <element signature="e#2237#2309#0#PHP" /> 97 <element signature="e#2237#2309#0#PHP" />
99 - <element signature="e#2413#2488#0#PHP" /> 98 + <element signature="e#3208#4141#0#PHP" />
  99 + <element signature="e#3305#3358#0#PHP" />
  100 + <element signature="e#3398#3441#0#PHP" />
  101 + <element signature="e#3398#3492#0#PHP" />
  102 + <element signature="e#3398#3551#0#PHP" />
  103 + <element signature="e#3398#3587#0#PHP" />
  104 + <element signature="e#3680#3722#0#PHP" />
  105 + <element signature="e#3680#3773#0#PHP" />
  106 + <element signature="e#3680#3840#0#PHP" />
  107 + <element signature="e#3680#3870#0#PHP" />
  108 + <element signature="e#4164#5267#0#PHP" />
  109 + <element signature="e#4264#4317#0#PHP" />
  110 + <element signature="e#4357#4400#0#PHP" />
  111 + <element signature="e#4357#4457#0#PHP" />
  112 + <element signature="e#4357#4516#0#PHP" />
  113 + <element signature="e#4357#4552#0#PHP" />
  114 + <element signature="e#4655#4697#0#PHP" />
  115 + <element signature="e#4655#4748#0#PHP" />
  116 + <element signature="e#4655#4815#0#PHP" />
  117 + <element signature="e#4655#4845#0#PHP" />
  118 + <element signature="e#5292#6190#0#PHP" />
  119 + <element signature="e#5479#5522#0#PHP" />
  120 + <element signature="e#5479#5574#0#PHP" />
  121 + <element signature="e#5479#5619#0#PHP" />
  122 + <element signature="e#5479#5662#0#PHP" />
  123 + <element signature="e#5479#5747#0#PHP" />
  124 + <element signature="e#5479#5783#0#PHP" />
  125 + <element signature="e#5824#5871#0#PHP" />
  126 + <element signature="e#5824#5928#0#PHP" />
  127 + <element signature="e#5824#5997#0#PHP" />
  128 + <element signature="e#5824#6032#0#PHP" />
  129 + <element signature="e#6504#7386#0#PHP" />
  130 + <element signature="e#6730#7380#0#PHP" />
  131 + <element signature="e#7141#7301#0#PHP" />
  132 + <element signature="e#7221#7301#0#PHP" />
  133 + <element signature="e#7311#7380#0#PHP" />
100 </folding> 134 </folding>
101 </state> 135 </state>
102 </provider> 136 </provider>
103 </entry> 137 </entry>
104 </file> 138 </file>
105 - <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="true"> 139 + <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
106 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php"> 140 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
107 <provider selected="true" editor-type-id="text-editor"> 141 <provider selected="true" editor-type-id="text-editor">
108 - <state relative-caret-position="588">  
109 - <caret line="48" column="41" lean-forward="true" selection-start-line="48" selection-start-column="41" selection-end-line="48" selection-end-column="41" /> 142 + <state relative-caret-position="-4368">
  143 + <caret line="43" column="8" lean-forward="true" selection-start-line="43" selection-start-column="8" selection-end-line="47" selection-end-column="51" />
  144 + </state>
  145 + </provider>
  146 + </entry>
  147 + </file>
  148 + <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">
  149 + <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
  150 + <provider selected="true" editor-type-id="text-editor">
  151 + <state relative-caret-position="210">
  152 + <caret line="427" column="5" lean-forward="true" selection-start-line="427" selection-start-column="5" selection-end-line="427" selection-end-column="5" />
  153 + <folding>
  154 + <element signature="e#910#989#0#PHP" />
  155 + <element signature="e#1014#1431#0#PHP" />
  156 + <element signature="e#1458#2597#0#PHP" />
  157 + <element signature="e#1512#1579#0#PHP" />
  158 + <element signature="e#1727#1807#0#PHP" />
  159 + <element signature="e#1895#2062#0#PHP" />
  160 + <element signature="e#2622#3967#0#PHP" />
  161 + <element signature="e#3095#3140#0#PHP" />
  162 + <element signature="e#3095#3189#0#PHP" />
  163 + <element signature="e#3095#3230#0#PHP" />
  164 + <element signature="e#3095#3273#0#PHP" />
  165 + <element signature="e#3351#3424#0#PHP" />
  166 + <element signature="e#3992#8047#0#PHP" />
  167 + <element signature="e#4099#8040#0#PHP" />
  168 + <element signature="e#4188#8040#0#PHP" />
  169 + <element signature="e#4508#4602#0#PHP" />
  170 + <element signature="e#5168#8030#0#PHP" />
  171 + <element signature="e#5908#6816#0#PHP" />
  172 + <element signature="e#6216#6798#1#PHP" />
  173 + <element signature="e#6844#7756#0#PHP" />
  174 + <element signature="e#7152#7738#1#PHP" />
  175 + <element signature="e#7944#8030#0#PHP" />
  176 + <element signature="e#8086#8270#0#PHP" />
  177 + <element signature="e#8295#9347#0#PHP" />
  178 + <element signature="e#8551#8596#0#PHP" />
  179 + <element signature="e#8551#8645#0#PHP" />
  180 + <element signature="e#8551#8686#0#PHP" />
  181 + <element signature="e#8551#8729#0#PHP" />
  182 + <element signature="e#8807#8880#0#PHP" />
  183 + <element signature="e#9372#10050#0#PHP" />
  184 + <element signature="e#10075#14047#0#PHP" />
  185 + <element signature="e#10339#14039#0#PHP" />
  186 + <element signature="e#10428#14039#0#PHP" />
  187 + <element signature="e#10921#11015#0#PHP" />
  188 + <element signature="e#11164#14029#0#PHP" />
  189 + <element signature="e#11905#12813#0#PHP" />
  190 + <element signature="e#12213#12795#1#PHP" />
  191 + <element signature="e#12841#13753#0#PHP" />
  192 + <element signature="e#13149#13735#1#PHP" />
  193 + <element signature="e#13943#14029#0#PHP" />
  194 + <element signature="e#14081#16740#0#PHP" />
  195 + <element signature="e#14226#14320#0#PHP" />
  196 + <element signature="e#14339#14381#0#PHP" />
  197 + <element signature="e#14339#14431#0#PHP" />
  198 + <element signature="e#14339#14480#0#PHP" />
  199 + <element signature="e#14339#14550#0#PHP" />
  200 + <element signature="e#14339#14592#0#PHP" />
  201 + <element signature="e#14339#14620#0#PHP" />
  202 + <element signature="e#14639#14682#0#PHP" />
  203 + <element signature="e#14639#14735#0#PHP" />
  204 + <element signature="e#14639#14771#0#PHP" />
  205 + <element signature="e#14639#14844#0#PHP" />
  206 + <element signature="e#14639#14884#0#PHP" />
  207 + <element signature="e#14941#15109#0#PHP" />
  208 + <element signature="e#14983#15099#0#PHP" />
  209 + <element signature="e#15128#15171#0#PHP" />
  210 + <element signature="e#15128#15224#0#PHP" />
  211 + <element signature="e#15128#15275#0#PHP" />
  212 + <element signature="e#15128#15348#0#PHP" />
  213 + <element signature="e#15128#15388#0#PHP" />
  214 + <element signature="e#15455#15498#0#PHP" />
  215 + <element signature="e#15455#15551#0#PHP" />
  216 + <element signature="e#15455#15613#0#PHP" />
  217 + <element signature="e#15455#15686#0#PHP" />
  218 + <element signature="e#15455#15726#0#PHP" />
  219 + <element signature="e#15783#15947#0#PHP" />
  220 + <element signature="e#15827#15937#0#PHP" />
  221 + <element signature="e#15966#16009#0#PHP" />
  222 + <element signature="e#15966#16062#0#PHP" />
  223 + <element signature="e#15966#16113#0#PHP" />
  224 + <element signature="e#15966#16186#0#PHP" />
  225 + <element signature="e#15966#16226#0#PHP" />
  226 + <element signature="e#16276#16311#0#PHP" />
  227 + <element signature="e#16448#16521#0#PHP" />
  228 + <element signature="e#16448#16587#0#PHP" />
  229 + <element signature="e#16760#19526#0#PHP" />
  230 + <element signature="e#16920#16963#0#PHP" />
  231 + <element signature="e#16920#17011#0#PHP" />
  232 + <element signature="e#16920#17052#0#PHP" />
  233 + <element signature="e#16920#17141#0#PHP" />
  234 + <element signature="e#16920#17181#0#PHP" />
  235 + <element signature="e#17238#17405#0#PHP" />
  236 + <element signature="e#17280#17395#0#PHP" />
  237 + <element signature="e#17424#17467#0#PHP" />
  238 + <element signature="e#17424#17515#0#PHP" />
  239 + <element signature="e#17424#17556#0#PHP" />
  240 + <element signature="e#17424#17598#0#PHP" />
  241 + <element signature="e#17424#17687#0#PHP" />
  242 + <element signature="e#17424#17727#0#PHP" />
  243 + <element signature="e#17793#17836#0#PHP" />
  244 + <element signature="e#17793#17884#0#PHP" />
  245 + <element signature="e#17793#17925#0#PHP" />
  246 + <element signature="e#17793#17967#0#PHP" />
  247 + <element signature="e#17793#18056#0#PHP" />
  248 + <element signature="e#17793#18096#0#PHP" />
  249 + <element signature="e#18162#18205#0#PHP" />
  250 + <element signature="e#18162#18253#0#PHP" />
  251 + <element signature="e#18162#18294#0#PHP" />
  252 + <element signature="e#18162#18345#0#PHP" />
  253 + <element signature="e#18162#18434#0#PHP" />
  254 + <element signature="e#18162#18474#0#PHP" />
  255 + <element signature="e#18531#18692#0#PHP" />
  256 + <element signature="e#18574#18682#0#PHP" />
  257 + <element signature="e#18710#18753#0#PHP" />
  258 + <element signature="e#18710#18801#0#PHP" />
  259 + <element signature="e#18710#18842#0#PHP" />
  260 + <element signature="e#18710#18884#0#PHP" />
  261 + <element signature="e#18710#18973#0#PHP" />
  262 + <element signature="e#18710#19013#0#PHP" />
  263 + <element signature="e#19302#19337#0#PHP" />
  264 + <element signature="e#19479#19552#0#PHP" />
  265 + <element signature="e#19479#19618#0#PHP" />
  266 + <element signature="e#19543#22706#0#PHP" />
  267 + <element signature="e#19635#19715#0#PHP" />
  268 + <element signature="e#19789#22699#0#PHP" />
  269 + <element signature="e#19954#22689#0#PHP" />
  270 + <element signature="e#20059#22675#0#PHP" />
  271 + <element signature="e#20768#21557#0#PHP" />
  272 + <element signature="e#21096#21535#1#PHP" />
  273 + <element signature="e#21589#22378#0#PHP" />
  274 + <element signature="e#21917#22356#1#PHP" />
  275 + <element signature="e#22581#22675#0#PHP" />
  276 + <element signature="e#22723#23197#0#PHP" />
  277 + <element signature="e#22811#23189#0#PHP" />
  278 + <element signature="e#22895#23189#0#PHP" />
  279 + <element signature="e#23004#23179#0#PHP" />
  280 + <element signature="e#23093#23179#0#PHP" />
  281 + <element signature="e#23214#23685#0#PHP" />
  282 + <element signature="e#23301#23678#0#PHP" />
  283 + <element signature="e#23385#23678#0#PHP" />
  284 + <element signature="e#23493#23668#0#PHP" />
  285 + <element signature="e#23582#23668#0#PHP" />
  286 + </folding>
110 </state> 287 </state>
111 </provider> 288 </provider>
112 </entry> 289 </entry>
@@ -235,14 +412,14 @@ @@ -235,14 +412,14 @@
235 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController.php" /> 412 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController.php" />
236 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [8].php" /> 413 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [8].php" />
237 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" /> 414 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" />
238 - <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />  
239 - <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" />  
240 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" /> 415 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
241 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" /> 416 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
242 <option value="$USER_HOME$/Desktop/开发资料/temp/22.html" /> 417 <option value="$USER_HOME$/Desktop/开发资料/temp/22.html" />
243 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" /> 418 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
244 <option value="$PROJECT_DIR$/public/index.php" /> 419 <option value="$PROJECT_DIR$/public/index.php" />
245 <option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" /> 420 <option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
  421 + <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
  422 + <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" />
246 </list> 423 </list>
247 </option> 424 </option>
248 </component> 425 </component>
@@ -276,10 +453,10 @@ @@ -276,10 +453,10 @@
276 </include_path> 453 </include_path>
277 </component> 454 </component>
278 <component name="ProjectFrameBounds" extendedState="6"> 455 <component name="ProjectFrameBounds" extendedState="6">
279 - <option name="x" value="1912" />  
280 - <option name="y" value="-152" />  
281 - <option name="width" value="1936" />  
282 - <option name="height" value="1056" /> 456 + <option name="x" value="-9" />
  457 + <option name="y" value="-9" />
  458 + <option name="width" value="1938" />
  459 + <option name="height" value="1098" />
283 </component> 460 </component>
284 <component name="ProjectView"> 461 <component name="ProjectView">
285 <navigator proportions="" version="1"> 462 <navigator proportions="" version="1">
@@ -385,21 +562,7 @@ @@ -385,21 +562,7 @@
385 <workItem from="1536326693570" duration="30018000" /> 562 <workItem from="1536326693570" duration="30018000" />
386 <workItem from="1536496471879" duration="16852000" /> 563 <workItem from="1536496471879" duration="16852000" />
387 <workItem from="1536677895835" duration="7811000" /> 564 <workItem from="1536677895835" duration="7811000" />
388 - <workItem from="1536940132237" duration="6229000" />  
389 - </task>  
390 - <task id="LOCAL-00028" summary="我的订单详情标题">  
391 - <created>1535633219778</created>  
392 - <option name="number" value="00028" />  
393 - <option name="presentableId" value="LOCAL-00028" />  
394 - <option name="project" value="LOCAL" />  
395 - <updated>1535633219778</updated>  
396 - </task>  
397 - <task id="LOCAL-00029" summary="我的订单详情标题">  
398 - <created>1535633983516</created>  
399 - <option name="number" value="00029" />  
400 - <option name="presentableId" value="LOCAL-00029" />  
401 - <option name="project" value="LOCAL" />  
402 - <updated>1535633983516</updated> 565 + <workItem from="1536940132237" duration="9678000" />
403 </task> 566 </task>
404 <task id="LOCAL-00030" summary="我的订单详情标题"> 567 <task id="LOCAL-00030" summary="我的订单详情标题">
405 <created>1535634119952</created> 568 <created>1535634119952</created>
@@ -730,17 +893,31 @@ @@ -730,17 +893,31 @@
730 <option name="project" value="LOCAL" /> 893 <option name="project" value="LOCAL" />
731 <updated>1536980477646</updated> 894 <updated>1536980477646</updated>
732 </task> 895 </task>
733 - <option name="localTasksCounter" value="77" /> 896 + <task id="LOCAL-00077" summary="统计学时问题修复">
  897 + <created>1536981518980</created>
  898 + <option name="number" value="00077" />
  899 + <option name="presentableId" value="LOCAL-00077" />
  900 + <option name="project" value="LOCAL" />
  901 + <updated>1536981518980</updated>
  902 + </task>
  903 + <task id="LOCAL-00078" summary="统计学时问题修复">
  904 + <created>1536983829524</created>
  905 + <option name="number" value="00078" />
  906 + <option name="presentableId" value="LOCAL-00078" />
  907 + <option name="project" value="LOCAL" />
  908 + <updated>1536983829524</updated>
  909 + </task>
  910 + <option name="localTasksCounter" value="79" />
734 <servers /> 911 <servers />
735 </component> 912 </component>
736 <component name="TimeTrackingManager"> 913 <component name="TimeTrackingManager">
737 - <option name="totallyTimeSpent" value="145811000" /> 914 + <option name="totallyTimeSpent" value="149260000" />
738 </component> 915 </component>
739 <component name="ToolWindowManager"> 916 <component name="ToolWindowManager">
740 - <frame x="1912" y="-152" width="1936" height="1056" extended-state="6" /> 917 + <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
741 <editor active="true" /> 918 <editor active="true" />
742 <layout> 919 <layout>
743 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23880596" /> 920 + <window_info content_ui="combo" id="Project" order="0" weight="0.16085792" />
744 <window_info anchor="bottom" id="TODO" order="6" /> 921 <window_info anchor="bottom" id="TODO" order="6" />
745 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 922 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
746 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> 923 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
@@ -861,13 +1038,6 @@ @@ -861,13 +1038,6 @@
861 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/HomeBaseController.php" /> 1038 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/HomeBaseController.php" />
862 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [10].php" /> 1039 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [10].php" />
863 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" /> 1040 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" />
864 - <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">  
865 - <provider selected="true" editor-type-id="text-editor">  
866 - <state relative-caret-position="468">  
867 - <caret line="482" column="22" lean-forward="true" selection-start-line="482" selection-start-column="22" selection-end-line="482" selection-end-column="22" />  
868 - </state>  
869 - </provider>  
870 - </entry>  
871 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" /> 1041 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
872 <entry file="file://$USER_HOME$/Desktop/开发资料/temp/22.html"> 1042 <entry file="file://$USER_HOME$/Desktop/开发资料/temp/22.html">
873 <provider selected="true" editor-type-id="text-editor"> 1043 <provider selected="true" editor-type-id="text-editor">
@@ -923,22 +1093,6 @@ @@ -923,22 +1093,6 @@
923 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php"> 1093 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php">
924 <provider selected="true" editor-type-id="text-editor" /> 1094 <provider selected="true" editor-type-id="text-editor" />
925 </entry> 1095 </entry>
926 - <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">  
927 - <provider selected="true" editor-type-id="text-editor">  
928 - <state relative-caret-position="2314">  
929 - <caret line="191" column="18" lean-forward="true" selection-start-line="191" selection-start-column="18" selection-end-line="191" selection-end-column="18" />  
930 - <folding>  
931 - <element signature="e#821#1437#0#PHP" />  
932 - <element signature="e#982#1035#0#PHP" />  
933 - <element signature="e#1455#2315#0#PHP" />  
934 - <element signature="e#1543#1618#0#PHP" />  
935 - <element signature="e#2165#2309#0#PHP" />  
936 - <element signature="e#2237#2309#0#PHP" />  
937 - <element signature="e#2413#2488#0#PHP" />  
938 - </folding>  
939 - </state>  
940 - </provider>  
941 - </entry>  
942 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/refund.php"> 1096 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/refund.php">
943 <provider selected="true" editor-type-id="text-editor" /> 1097 <provider selected="true" editor-type-id="text-editor" />
944 </entry> 1098 </entry>
@@ -979,8 +1133,199 @@ @@ -979,8 +1133,199 @@
979 </entry> 1133 </entry>
980 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php"> 1134 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
981 <provider selected="true" editor-type-id="text-editor"> 1135 <provider selected="true" editor-type-id="text-editor">
982 - <state relative-caret-position="588">  
983 - <caret line="48" column="41" lean-forward="true" selection-start-line="48" selection-start-column="41" selection-end-line="48" selection-end-column="41" /> 1136 + <state relative-caret-position="-4368">
  1137 + <caret line="43" column="8" lean-forward="true" selection-start-line="43" selection-start-column="8" selection-end-line="47" selection-end-column="51" />
  1138 + </state>
  1139 + </provider>
  1140 + </entry>
  1141 + <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
  1142 + <provider selected="true" editor-type-id="text-editor">
  1143 + <state relative-caret-position="210">
  1144 + <caret line="427" column="5" lean-forward="true" selection-start-line="427" selection-start-column="5" selection-end-line="427" selection-end-column="5" />
  1145 + <folding>
  1146 + <element signature="e#910#989#0#PHP" />
  1147 + <element signature="e#1014#1431#0#PHP" />
  1148 + <element signature="e#1458#2597#0#PHP" />
  1149 + <element signature="e#1512#1579#0#PHP" />
  1150 + <element signature="e#1727#1807#0#PHP" />
  1151 + <element signature="e#1895#2062#0#PHP" />
  1152 + <element signature="e#2622#3967#0#PHP" />
  1153 + <element signature="e#3095#3140#0#PHP" />
  1154 + <element signature="e#3095#3189#0#PHP" />
  1155 + <element signature="e#3095#3230#0#PHP" />
  1156 + <element signature="e#3095#3273#0#PHP" />
  1157 + <element signature="e#3351#3424#0#PHP" />
  1158 + <element signature="e#3992#8047#0#PHP" />
  1159 + <element signature="e#4099#8040#0#PHP" />
  1160 + <element signature="e#4188#8040#0#PHP" />
  1161 + <element signature="e#4508#4602#0#PHP" />
  1162 + <element signature="e#5168#8030#0#PHP" />
  1163 + <element signature="e#5908#6816#0#PHP" />
  1164 + <element signature="e#6216#6798#1#PHP" />
  1165 + <element signature="e#6844#7756#0#PHP" />
  1166 + <element signature="e#7152#7738#1#PHP" />
  1167 + <element signature="e#7944#8030#0#PHP" />
  1168 + <element signature="e#8086#8270#0#PHP" />
  1169 + <element signature="e#8295#9347#0#PHP" />
  1170 + <element signature="e#8551#8596#0#PHP" />
  1171 + <element signature="e#8551#8645#0#PHP" />
  1172 + <element signature="e#8551#8686#0#PHP" />
  1173 + <element signature="e#8551#8729#0#PHP" />
  1174 + <element signature="e#8807#8880#0#PHP" />
  1175 + <element signature="e#9372#10050#0#PHP" />
  1176 + <element signature="e#10075#14047#0#PHP" />
  1177 + <element signature="e#10339#14039#0#PHP" />
  1178 + <element signature="e#10428#14039#0#PHP" />
  1179 + <element signature="e#10921#11015#0#PHP" />
  1180 + <element signature="e#11164#14029#0#PHP" />
  1181 + <element signature="e#11905#12813#0#PHP" />
  1182 + <element signature="e#12213#12795#1#PHP" />
  1183 + <element signature="e#12841#13753#0#PHP" />
  1184 + <element signature="e#13149#13735#1#PHP" />
  1185 + <element signature="e#13943#14029#0#PHP" />
  1186 + <element signature="e#14081#16740#0#PHP" />
  1187 + <element signature="e#14226#14320#0#PHP" />
  1188 + <element signature="e#14339#14381#0#PHP" />
  1189 + <element signature="e#14339#14431#0#PHP" />
  1190 + <element signature="e#14339#14480#0#PHP" />
  1191 + <element signature="e#14339#14550#0#PHP" />
  1192 + <element signature="e#14339#14592#0#PHP" />
  1193 + <element signature="e#14339#14620#0#PHP" />
  1194 + <element signature="e#14639#14682#0#PHP" />
  1195 + <element signature="e#14639#14735#0#PHP" />
  1196 + <element signature="e#14639#14771#0#PHP" />
  1197 + <element signature="e#14639#14844#0#PHP" />
  1198 + <element signature="e#14639#14884#0#PHP" />
  1199 + <element signature="e#14941#15109#0#PHP" />
  1200 + <element signature="e#14983#15099#0#PHP" />
  1201 + <element signature="e#15128#15171#0#PHP" />
  1202 + <element signature="e#15128#15224#0#PHP" />
  1203 + <element signature="e#15128#15275#0#PHP" />
  1204 + <element signature="e#15128#15348#0#PHP" />
  1205 + <element signature="e#15128#15388#0#PHP" />
  1206 + <element signature="e#15455#15498#0#PHP" />
  1207 + <element signature="e#15455#15551#0#PHP" />
  1208 + <element signature="e#15455#15613#0#PHP" />
  1209 + <element signature="e#15455#15686#0#PHP" />
  1210 + <element signature="e#15455#15726#0#PHP" />
  1211 + <element signature="e#15783#15947#0#PHP" />
  1212 + <element signature="e#15827#15937#0#PHP" />
  1213 + <element signature="e#15966#16009#0#PHP" />
  1214 + <element signature="e#15966#16062#0#PHP" />
  1215 + <element signature="e#15966#16113#0#PHP" />
  1216 + <element signature="e#15966#16186#0#PHP" />
  1217 + <element signature="e#15966#16226#0#PHP" />
  1218 + <element signature="e#16276#16311#0#PHP" />
  1219 + <element signature="e#16448#16521#0#PHP" />
  1220 + <element signature="e#16448#16587#0#PHP" />
  1221 + <element signature="e#16760#19526#0#PHP" />
  1222 + <element signature="e#16920#16963#0#PHP" />
  1223 + <element signature="e#16920#17011#0#PHP" />
  1224 + <element signature="e#16920#17052#0#PHP" />
  1225 + <element signature="e#16920#17141#0#PHP" />
  1226 + <element signature="e#16920#17181#0#PHP" />
  1227 + <element signature="e#17238#17405#0#PHP" />
  1228 + <element signature="e#17280#17395#0#PHP" />
  1229 + <element signature="e#17424#17467#0#PHP" />
  1230 + <element signature="e#17424#17515#0#PHP" />
  1231 + <element signature="e#17424#17556#0#PHP" />
  1232 + <element signature="e#17424#17598#0#PHP" />
  1233 + <element signature="e#17424#17687#0#PHP" />
  1234 + <element signature="e#17424#17727#0#PHP" />
  1235 + <element signature="e#17793#17836#0#PHP" />
  1236 + <element signature="e#17793#17884#0#PHP" />
  1237 + <element signature="e#17793#17925#0#PHP" />
  1238 + <element signature="e#17793#17967#0#PHP" />
  1239 + <element signature="e#17793#18056#0#PHP" />
  1240 + <element signature="e#17793#18096#0#PHP" />
  1241 + <element signature="e#18162#18205#0#PHP" />
  1242 + <element signature="e#18162#18253#0#PHP" />
  1243 + <element signature="e#18162#18294#0#PHP" />
  1244 + <element signature="e#18162#18345#0#PHP" />
  1245 + <element signature="e#18162#18434#0#PHP" />
  1246 + <element signature="e#18162#18474#0#PHP" />
  1247 + <element signature="e#18531#18692#0#PHP" />
  1248 + <element signature="e#18574#18682#0#PHP" />
  1249 + <element signature="e#18710#18753#0#PHP" />
  1250 + <element signature="e#18710#18801#0#PHP" />
  1251 + <element signature="e#18710#18842#0#PHP" />
  1252 + <element signature="e#18710#18884#0#PHP" />
  1253 + <element signature="e#18710#18973#0#PHP" />
  1254 + <element signature="e#18710#19013#0#PHP" />
  1255 + <element signature="e#19302#19337#0#PHP" />
  1256 + <element signature="e#19479#19552#0#PHP" />
  1257 + <element signature="e#19479#19618#0#PHP" />
  1258 + <element signature="e#19543#22706#0#PHP" />
  1259 + <element signature="e#19635#19715#0#PHP" />
  1260 + <element signature="e#19789#22699#0#PHP" />
  1261 + <element signature="e#19954#22689#0#PHP" />
  1262 + <element signature="e#20059#22675#0#PHP" />
  1263 + <element signature="e#20768#21557#0#PHP" />
  1264 + <element signature="e#21096#21535#1#PHP" />
  1265 + <element signature="e#21589#22378#0#PHP" />
  1266 + <element signature="e#21917#22356#1#PHP" />
  1267 + <element signature="e#22581#22675#0#PHP" />
  1268 + <element signature="e#22723#23197#0#PHP" />
  1269 + <element signature="e#22811#23189#0#PHP" />
  1270 + <element signature="e#22895#23189#0#PHP" />
  1271 + <element signature="e#23004#23179#0#PHP" />
  1272 + <element signature="e#23093#23179#0#PHP" />
  1273 + <element signature="e#23214#23685#0#PHP" />
  1274 + <element signature="e#23301#23678#0#PHP" />
  1275 + <element signature="e#23385#23678#0#PHP" />
  1276 + <element signature="e#23493#23668#0#PHP" />
  1277 + <element signature="e#23582#23668#0#PHP" />
  1278 + </folding>
  1279 + </state>
  1280 + </provider>
  1281 + </entry>
  1282 + <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
  1283 + <provider selected="true" editor-type-id="text-editor">
  1284 + <state relative-caret-position="315">
  1285 + <caret line="49" column="9" selection-start-line="49" selection-start-column="9" selection-end-line="49" selection-end-column="9" />
  1286 + <folding>
  1287 + <element signature="e#821#1437#0#PHP" />
  1288 + <element signature="e#982#1035#0#PHP" />
  1289 + <element signature="e#1543#1618#0#PHP" />
  1290 + <element signature="e#2165#2309#0#PHP" />
  1291 + <element signature="e#2237#2309#0#PHP" />
  1292 + <element signature="e#3208#4141#0#PHP" />
  1293 + <element signature="e#3305#3358#0#PHP" />
  1294 + <element signature="e#3398#3441#0#PHP" />
  1295 + <element signature="e#3398#3492#0#PHP" />
  1296 + <element signature="e#3398#3551#0#PHP" />
  1297 + <element signature="e#3398#3587#0#PHP" />
  1298 + <element signature="e#3680#3722#0#PHP" />
  1299 + <element signature="e#3680#3773#0#PHP" />
  1300 + <element signature="e#3680#3840#0#PHP" />
  1301 + <element signature="e#3680#3870#0#PHP" />
  1302 + <element signature="e#4164#5267#0#PHP" />
  1303 + <element signature="e#4264#4317#0#PHP" />
  1304 + <element signature="e#4357#4400#0#PHP" />
  1305 + <element signature="e#4357#4457#0#PHP" />
  1306 + <element signature="e#4357#4516#0#PHP" />
  1307 + <element signature="e#4357#4552#0#PHP" />
  1308 + <element signature="e#4655#4697#0#PHP" />
  1309 + <element signature="e#4655#4748#0#PHP" />
  1310 + <element signature="e#4655#4815#0#PHP" />
  1311 + <element signature="e#4655#4845#0#PHP" />
  1312 + <element signature="e#5292#6190#0#PHP" />
  1313 + <element signature="e#5479#5522#0#PHP" />
  1314 + <element signature="e#5479#5574#0#PHP" />
  1315 + <element signature="e#5479#5619#0#PHP" />
  1316 + <element signature="e#5479#5662#0#PHP" />
  1317 + <element signature="e#5479#5747#0#PHP" />
  1318 + <element signature="e#5479#5783#0#PHP" />
  1319 + <element signature="e#5824#5871#0#PHP" />
  1320 + <element signature="e#5824#5928#0#PHP" />
  1321 + <element signature="e#5824#5997#0#PHP" />
  1322 + <element signature="e#5824#6032#0#PHP" />
  1323 + <element signature="e#6504#7386#0#PHP" />
  1324 + <element signature="e#6730#7380#0#PHP" />
  1325 + <element signature="e#7141#7301#0#PHP" />
  1326 + <element signature="e#7221#7301#0#PHP" />
  1327 + <element signature="e#7311#7380#0#PHP" />
  1328 + </folding>
984 </state> 1329 </state>
985 </provider> 1330 </provider>
986 </entry> 1331 </entry>
@@ -44,6 +44,10 @@ class CommentController extends UserBaseController @@ -44,6 +44,10 @@ class CommentController extends UserBaseController
44 $dataa['teach_id'] = $data['teach_id']; 44 $dataa['teach_id'] = $data['teach_id'];
45 $dataa['yuyue_id'] = $data['yuyue_id']; 45 $dataa['yuyue_id'] = $data['yuyue_id'];
46 $dataa['uid'] = session('user.id'); 46 $dataa['uid'] = session('user.id');
  47 + $yiping = Db::name('commente')->where($dataa)->find();
  48 + if($yiping){
  49 + return json(['code'=>'1','msg'=>'您已经评价']);
  50 + }
47 $dataa['create_time'] = time(); 51 $dataa['create_time'] = time();
48 $dataa['comment_tag'] = $data['comment_tag']; 52 $dataa['comment_tag'] = $data['comment_tag'];
49 $dataa['comment'] = $data['comment']; 53 $dataa['comment'] = $data['comment'];
@@ -63,9 +67,16 @@ class CommentController extends UserBaseController @@ -63,9 +67,16 @@ class CommentController extends UserBaseController
63 if(!$data){ 67 if(!$data){
64 return json(['code'=>'0','msg'=>'非法提交']); 68 return json(['code'=>'0','msg'=>'非法提交']);
65 } 69 }
  70 +
66 $dataa['teach_id'] = $data['teach_id']; 71 $dataa['teach_id'] = $data['teach_id'];
67 $dataa['yuyue_id'] = $data['yuyue_id']; 72 $dataa['yuyue_id'] = $data['yuyue_id'];
68 $dataa['uid'] = session('user.id'); 73 $dataa['uid'] = session('user.id');
  74 + $yiping = Db::name('commente')->where($dataa)->find();
  75 + if($yiping){
  76 + return json(['code'=>'1','msg'=>'您已经评价']);
  77 + }
  78 +
  79 +
69 $dataa['create_time'] = time(); 80 $dataa['create_time'] = time();
70 $dataa['comment_tag'] = $data['comment_tag']; 81 $dataa['comment_tag'] = $data['comment_tag'];
71 $dataa['comment'] = $data['comment']; 82 $dataa['comment'] = $data['comment'];