郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 5a231e62b6bda3121acc8a5c904d4ddef43f0372 1 个父辈 9b2e8c65
1 个管道 的构建 通过 耗费 1 秒

修改家政服务评价

内嵌 并排对比
正在显示 2 个修改的文件 包含 198 行增加 和 120 行删除
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" afterPath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />  
7 </list> 6 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 8 <option name="TRACKING_ENABLED" value="true" />
@@ -25,11 +24,11 @@ @@ -25,11 +24,11 @@
25 </component> 24 </component>
26 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 27 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
29 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 28 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
30 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="359">  
32 - <caret line="1206" column="5" lean-forward="true" selection-start-line="1206" selection-start-column="5" selection-end-line="1206" selection-end-column="5" /> 30 + <state relative-caret-position="409">
  31 + <caret line="1208" column="0" lean-forward="true" selection-start-line="1208" selection-start-column="0" selection-end-line="1208" selection-end-column="0" />
33 <folding> 32 <folding>
34 <element signature="e#366#715#0#PHP" expanded="false" /> 33 <element signature="e#366#715#0#PHP" expanded="false" />
35 <element signature="e#720#1485#0#PHP" expanded="false" /> 34 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -87,14 +86,93 @@ @@ -87,14 +86,93 @@
87 <element signature="e#33790#34754#0#PHP" expanded="false" /> 86 <element signature="e#33790#34754#0#PHP" expanded="false" />
88 <element signature="e#34760#35427#0#PHP" expanded="false" /> 87 <element signature="e#34760#35427#0#PHP" expanded="false" />
89 <element signature="e#35432#36473#0#PHP" expanded="false" /> 88 <element signature="e#35432#36473#0#PHP" expanded="false" />
90 - <element signature="e#36479#37136#0#PHP" expanded="false" />  
91 - <element signature="e#37141#38158#0#PHP" expanded="false" />  
92 - <element signature="e#38165#38596#0#PHP" expanded="false" />  
93 - <element signature="e#38601#39219#0#PHP" expanded="false" />  
94 - <element signature="e#39225#39654#0#PHP" expanded="false" />  
95 - <element signature="e#39659#40261#0#PHP" expanded="false" />  
96 - <element signature="e#40267#40688#0#PHP" expanded="false" />  
97 - <element signature="e#40693#41249#0#PHP" expanded="false" /> 89 + <element signature="e#36479#37142#0#PHP" expanded="false" />
  90 + <element signature="e#37147#38174#0#PHP" expanded="false" />
  91 + <element signature="e#38181#38612#0#PHP" expanded="false" />
  92 + <element signature="e#38617#39235#0#PHP" expanded="false" />
  93 + <element signature="e#39241#39670#0#PHP" expanded="false" />
  94 + <element signature="e#39675#40277#0#PHP" expanded="false" />
  95 + <element signature="e#40283#40710#0#PHP" expanded="false" />
  96 + <element signature="e#40715#41281#0#PHP" expanded="false" />
  97 + </folding>
  98 + </state>
  99 + </provider>
  100 + </entry>
  101 + </file>
  102 + <file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">
  103 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  104 + <provider selected="true" editor-type-id="text-editor">
  105 + <state relative-caret-position="163">
  106 + <caret line="291" column="5" lean-forward="true" selection-start-line="291" selection-start-column="5" selection-end-line="291" selection-end-column="5" />
  107 + <folding>
  108 + <element signature="e#342#596#0#PHP" expanded="false" />
  109 + <element signature="e#601#886#0#PHP" expanded="false" />
  110 + <element signature="e#892#1227#0#PHP" expanded="false" />
  111 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  112 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  113 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  114 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  115 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  116 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  117 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  118 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  119 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  120 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  121 + <element signature="e#4658#4915#0#PHP" expanded="false" />
  122 + <element signature="e#4921#5117#0#PHP" expanded="false" />
  123 + <element signature="e#5122#5384#0#PHP" expanded="false" />
  124 + <element signature="e#5390#5845#0#PHP" expanded="false" />
  125 + <element signature="e#5850#6416#0#PHP" expanded="false" />
  126 + <element signature="e#6422#6765#0#PHP" expanded="false" />
  127 + <element signature="e#6770#7251#0#PHP" expanded="false" />
  128 + <element signature="e#7257#7548#0#PHP" expanded="false" />
  129 + <element signature="e#7553#7904#0#PHP" expanded="false" />
  130 + <element signature="e#7910#8263#0#PHP" expanded="false" />
  131 + <element signature="e#8268#8673#0#PHP" expanded="false" />
  132 + <element signature="e#8679#9062#0#PHP" expanded="false" />
  133 + <element signature="e#9067#9734#0#PHP" expanded="false" />
  134 + <element signature="e#9740#10184#0#PHP" expanded="false" />
  135 + <element signature="e#10189#11036#0#PHP" expanded="false" />
  136 + <element signature="e#11042#11310#0#PHP" expanded="false" />
  137 + <element signature="e#11315#11787#0#PHP" expanded="false" />
  138 + <element signature="e#11793#12099#0#PHP" expanded="false" />
  139 + <element signature="e#12104#13747#0#PHP" expanded="false" />
  140 + <element signature="e#13768#14087#0#PHP" expanded="false" />
  141 + </folding>
  142 + </state>
  143 + </provider>
  144 + </entry>
  145 + </file>
  146 + <file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
  147 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  148 + <provider selected="true" editor-type-id="text-editor">
  149 + <state relative-caret-position="214">
  150 + <caret line="240" column="0" lean-forward="true" selection-start-line="240" selection-start-column="0" selection-end-line="240" selection-end-column="0" />
  151 + <folding>
  152 + <element signature="e#411#604#0#PHP" expanded="false" />
  153 + <element signature="e#609#825#0#PHP" expanded="false" />
  154 + <element signature="e#831#1329#0#PHP" expanded="false" />
  155 + <element signature="e#1334#2102#0#PHP" expanded="false" />
  156 + <element signature="e#2108#2326#0#PHP" expanded="false" />
  157 + <element signature="e#2331#2539#0#PHP" expanded="false" />
  158 + <element signature="e#2545#3052#0#PHP" expanded="false" />
  159 + <element signature="e#3057#3575#0#PHP" expanded="false" />
  160 + <element signature="e#3581#4093#0#PHP" expanded="false" />
  161 + <element signature="e#4098#4661#0#PHP" expanded="false" />
  162 + <element signature="e#4667#5257#0#PHP" expanded="false" />
  163 + <element signature="e#5262#6260#0#PHP" expanded="false" />
  164 + <element signature="e#6266#6584#0#PHP" expanded="false" />
  165 + <element signature="e#6589#6965#0#PHP" expanded="false" />
  166 + <element signature="e#6971#7326#0#PHP" expanded="false" />
  167 + <element signature="e#7331#7740#0#PHP" expanded="false" />
  168 + <element signature="e#7746#8131#0#PHP" expanded="false" />
  169 + <element signature="e#8136#8807#0#PHP" expanded="false" />
  170 + <element signature="e#8813#9259#0#PHP" expanded="false" />
  171 + <element signature="e#9264#10115#0#PHP" expanded="false" />
  172 + <element signature="e#10121#10391#0#PHP" expanded="false" />
  173 + <element signature="e#10396#10872#0#PHP" expanded="false" />
  174 + <element signature="e#10878#11508#0#PHP" expanded="false" />
  175 + <element signature="e#11513#12865#0#PHP" expanded="false" />
98 </folding> 176 </folding>
99 </state> 177 </state>
100 </provider> 178 </provider>
@@ -188,11 +266,11 @@ @@ -188,11 +266,11 @@
188 <sorting>DEFINITION_ORDER</sorting> 266 <sorting>DEFINITION_ORDER</sorting>
189 </component> 267 </component>
190 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 268 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
191 - <component name="ProjectFrameBounds">  
192 - <option name="x" value="377" />  
193 - <option name="y" value="55" /> 269 + <component name="ProjectFrameBounds" extendedState="1">
  270 + <option name="x" value="381" />
  271 + <option name="y" value="74" />
194 <option name="width" value="1582" /> 272 <option name="width" value="1582" />
195 - <option name="height" value="1021" /> 273 + <option name="height" value="1022" />
196 </component> 274 </component>
197 <component name="ProjectView"> 275 <component name="ProjectView">
198 <navigator currentView="ProjectPane" proportions="" version="1"> 276 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -362,15 +440,15 @@ @@ -362,15 +440,15 @@
362 <workItem from="1575419186725" duration="599000" /> 440 <workItem from="1575419186725" duration="599000" />
363 <workItem from="1575420787741" duration="2879000" /> 441 <workItem from="1575420787741" duration="2879000" />
364 <workItem from="1575431441427" duration="8414000" /> 442 <workItem from="1575431441427" duration="8414000" />
365 - <workItem from="1575444399653" duration="10706000" /> 443 + <workItem from="1575444399653" duration="11123000" />
366 </task> 444 </task>
367 <servers /> 445 <servers />
368 </component> 446 </component>
369 <component name="TimeTrackingManager"> 447 <component name="TimeTrackingManager">
370 - <option name="totallyTimeSpent" value="464355000" /> 448 + <option name="totallyTimeSpent" value="464772000" />
371 </component> 449 </component>
372 <component name="ToolWindowManager"> 450 <component name="ToolWindowManager">
373 - <frame x="377" y="55" width="1582" height="1021" extended-state="0" /> 451 + <frame x="381" y="74" width="1582" height="1022" extended-state="1" />
374 <editor active="true" /> 452 <editor active="true" />
375 <layout> 453 <layout>
376 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 454 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -732,39 +810,6 @@ @@ -732,39 +810,6 @@
732 <state /> 810 <state />
733 </provider> 811 </provider>
734 </entry> 812 </entry>
735 - <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">  
736 - <provider selected="true" editor-type-id="text-editor">  
737 - <state relative-caret-position="225">  
738 - <caret line="167" column="4" lean-forward="false" selection-start-line="167" selection-start-column="4" selection-end-line="211" selection-end-column="5" />  
739 - <folding>  
740 - <element signature="e#411#604#0#PHP" expanded="false" />  
741 - <element signature="e#609#825#0#PHP" expanded="false" />  
742 - <element signature="e#831#1329#0#PHP" expanded="false" />  
743 - <element signature="e#1334#2102#0#PHP" expanded="false" />  
744 - <element signature="e#2108#2326#0#PHP" expanded="false" />  
745 - <element signature="e#2331#2539#0#PHP" expanded="false" />  
746 - <element signature="e#2545#3052#0#PHP" expanded="false" />  
747 - <element signature="e#3057#3575#0#PHP" expanded="false" />  
748 - <element signature="e#3581#4093#0#PHP" expanded="false" />  
749 - <element signature="e#4098#4661#0#PHP" expanded="false" />  
750 - <element signature="e#4667#5257#0#PHP" expanded="false" />  
751 - <element signature="e#5262#6260#0#PHP" expanded="false" />  
752 - <element signature="e#6266#6584#0#PHP" expanded="false" />  
753 - <element signature="e#6589#6965#0#PHP" expanded="false" />  
754 - <element signature="e#6971#7326#0#PHP" expanded="false" />  
755 - <element signature="e#7331#7740#0#PHP" expanded="false" />  
756 - <element signature="e#7746#8131#0#PHP" expanded="false" />  
757 - <element signature="e#8136#8807#0#PHP" expanded="false" />  
758 - <element signature="e#8813#9259#0#PHP" expanded="false" />  
759 - <element signature="e#9264#10115#0#PHP" expanded="false" />  
760 - <element signature="e#10121#10391#0#PHP" expanded="false" />  
761 - <element signature="e#10396#10872#0#PHP" expanded="false" />  
762 - <element signature="e#10878#11508#0#PHP" expanded="false" />  
763 - <element signature="e#11513#12865#0#PHP" expanded="false" />  
764 - </folding>  
765 - </state>  
766 - </provider>  
767 - </entry>  
768 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 813 <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
769 <provider selected="true" editor-type-id="text-editor"> 814 <provider selected="true" editor-type-id="text-editor">
770 <state relative-caret-position="175"> 815 <state relative-caret-position="175">
@@ -782,10 +827,18 @@ @@ -782,10 +827,18 @@
782 </state> 827 </state>
783 </provider> 828 </provider>
784 </entry> 829 </entry>
  830 + <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
  831 + <provider selected="true" editor-type-id="text-editor">
  832 + <state relative-caret-position="158">
  833 + <caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />
  834 + <folding />
  835 + </state>
  836 + </provider>
  837 + </entry>
785 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 838 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
786 <provider selected="true" editor-type-id="text-editor"> 839 <provider selected="true" editor-type-id="text-editor">
787 - <state relative-caret-position="584">  
788 - <caret line="386" column="0" lean-forward="true" selection-start-line="386" selection-start-column="0" selection-end-line="386" selection-end-column="0" /> 840 + <state relative-caret-position="185">
  841 + <caret line="188" column="7" lean-forward="true" selection-start-line="188" selection-start-column="7" selection-end-line="188" selection-end-column="7" />
789 <folding> 842 <folding>
790 <element signature="e#329#544#0#PHP" expanded="false" /> 843 <element signature="e#329#544#0#PHP" expanded="false" />
791 <element signature="e#549#890#0#PHP" expanded="false" /> 844 <element signature="e#549#890#0#PHP" expanded="false" />
@@ -815,60 +868,10 @@ @@ -815,60 +868,10 @@
815 </state> 868 </state>
816 </provider> 869 </provider>
817 </entry> 870 </entry>
818 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
819 - <provider selected="true" editor-type-id="text-editor">  
820 - <state relative-caret-position="38">  
821 - <caret line="226" column="7" lean-forward="false" selection-start-line="226" selection-start-column="7" selection-end-line="226" selection-end-column="7" />  
822 - <folding>  
823 - <element signature="e#342#596#0#PHP" expanded="false" />  
824 - <element signature="e#601#886#0#PHP" expanded="false" />  
825 - <element signature="e#892#1227#0#PHP" expanded="false" />  
826 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
827 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
828 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
829 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
830 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
831 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
832 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
833 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
834 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
835 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
836 - <element signature="e#4658#4915#0#PHP" expanded="false" />  
837 - <element signature="e#4921#5117#0#PHP" expanded="false" />  
838 - <element signature="e#5122#5384#0#PHP" expanded="false" />  
839 - <element signature="e#5390#5845#0#PHP" expanded="false" />  
840 - <element signature="e#5850#6416#0#PHP" expanded="false" />  
841 - <element signature="e#6422#6765#0#PHP" expanded="false" />  
842 - <element signature="e#6770#7251#0#PHP" expanded="false" />  
843 - <element signature="e#7257#7548#0#PHP" expanded="false" />  
844 - <element signature="e#7553#7904#0#PHP" expanded="false" />  
845 - <element signature="e#7910#8263#0#PHP" expanded="false" />  
846 - <element signature="e#8268#8673#0#PHP" expanded="false" />  
847 - <element signature="e#8679#9062#0#PHP" expanded="false" />  
848 - <element signature="e#9067#9734#0#PHP" expanded="false" />  
849 - <element signature="e#9740#10184#0#PHP" expanded="false" />  
850 - <element signature="e#10189#11036#0#PHP" expanded="false" />  
851 - <element signature="e#11042#11310#0#PHP" expanded="false" />  
852 - <element signature="e#11315#11787#0#PHP" expanded="false" />  
853 - <element signature="e#11793#12099#0#PHP" expanded="false" />  
854 - <element signature="e#12104#13747#0#PHP" expanded="false" />  
855 - <element signature="e#13768#14087#0#PHP" expanded="false" />  
856 - </folding>  
857 - </state>  
858 - </provider>  
859 - </entry>  
860 - <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">  
861 - <provider selected="true" editor-type-id="text-editor">  
862 - <state relative-caret-position="158">  
863 - <caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />  
864 - <folding />  
865 - </state>  
866 - </provider>  
867 - </entry>  
868 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 871 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
869 <provider selected="true" editor-type-id="text-editor"> 872 <provider selected="true" editor-type-id="text-editor">
870 - <state relative-caret-position="359">  
871 - <caret line="1206" column="5" lean-forward="true" selection-start-line="1206" selection-start-column="5" selection-end-line="1206" selection-end-column="5" /> 873 + <state relative-caret-position="409">
  874 + <caret line="1208" column="0" lean-forward="true" selection-start-line="1208" selection-start-column="0" selection-end-line="1208" selection-end-column="0" />
872 <folding> 875 <folding>
873 <element signature="e#366#715#0#PHP" expanded="false" /> 876 <element signature="e#366#715#0#PHP" expanded="false" />
874 <element signature="e#720#1485#0#PHP" expanded="false" /> 877 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -926,14 +929,89 @@ @@ -926,14 +929,89 @@
926 <element signature="e#33790#34754#0#PHP" expanded="false" /> 929 <element signature="e#33790#34754#0#PHP" expanded="false" />
927 <element signature="e#34760#35427#0#PHP" expanded="false" /> 930 <element signature="e#34760#35427#0#PHP" expanded="false" />
928 <element signature="e#35432#36473#0#PHP" expanded="false" /> 931 <element signature="e#35432#36473#0#PHP" expanded="false" />
929 - <element signature="e#36479#37136#0#PHP" expanded="false" />  
930 - <element signature="e#37141#38158#0#PHP" expanded="false" />  
931 - <element signature="e#38165#38596#0#PHP" expanded="false" />  
932 - <element signature="e#38601#39219#0#PHP" expanded="false" />  
933 - <element signature="e#39225#39654#0#PHP" expanded="false" />  
934 - <element signature="e#39659#40261#0#PHP" expanded="false" />  
935 - <element signature="e#40267#40688#0#PHP" expanded="false" />  
936 - <element signature="e#40693#41249#0#PHP" expanded="false" /> 932 + <element signature="e#36479#37142#0#PHP" expanded="false" />
  933 + <element signature="e#37147#38174#0#PHP" expanded="false" />
  934 + <element signature="e#38181#38612#0#PHP" expanded="false" />
  935 + <element signature="e#38617#39235#0#PHP" expanded="false" />
  936 + <element signature="e#39241#39670#0#PHP" expanded="false" />
  937 + <element signature="e#39675#40277#0#PHP" expanded="false" />
  938 + <element signature="e#40283#40710#0#PHP" expanded="false" />
  939 + <element signature="e#40715#41281#0#PHP" expanded="false" />
  940 + </folding>
  941 + </state>
  942 + </provider>
  943 + </entry>
  944 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  945 + <provider selected="true" editor-type-id="text-editor">
  946 + <state relative-caret-position="163">
  947 + <caret line="291" column="5" lean-forward="true" selection-start-line="291" selection-start-column="5" selection-end-line="291" selection-end-column="5" />
  948 + <folding>
  949 + <element signature="e#342#596#0#PHP" expanded="false" />
  950 + <element signature="e#601#886#0#PHP" expanded="false" />
  951 + <element signature="e#892#1227#0#PHP" expanded="false" />
  952 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  953 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  954 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  955 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  956 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  957 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  958 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  959 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  960 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  961 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  962 + <element signature="e#4658#4915#0#PHP" expanded="false" />
  963 + <element signature="e#4921#5117#0#PHP" expanded="false" />
  964 + <element signature="e#5122#5384#0#PHP" expanded="false" />
  965 + <element signature="e#5390#5845#0#PHP" expanded="false" />
  966 + <element signature="e#5850#6416#0#PHP" expanded="false" />
  967 + <element signature="e#6422#6765#0#PHP" expanded="false" />
  968 + <element signature="e#6770#7251#0#PHP" expanded="false" />
  969 + <element signature="e#7257#7548#0#PHP" expanded="false" />
  970 + <element signature="e#7553#7904#0#PHP" expanded="false" />
  971 + <element signature="e#7910#8263#0#PHP" expanded="false" />
  972 + <element signature="e#8268#8673#0#PHP" expanded="false" />
  973 + <element signature="e#8679#9062#0#PHP" expanded="false" />
  974 + <element signature="e#9067#9734#0#PHP" expanded="false" />
  975 + <element signature="e#9740#10184#0#PHP" expanded="false" />
  976 + <element signature="e#10189#11036#0#PHP" expanded="false" />
  977 + <element signature="e#11042#11310#0#PHP" expanded="false" />
  978 + <element signature="e#11315#11787#0#PHP" expanded="false" />
  979 + <element signature="e#11793#12099#0#PHP" expanded="false" />
  980 + <element signature="e#12104#13747#0#PHP" expanded="false" />
  981 + <element signature="e#13768#14087#0#PHP" expanded="false" />
  982 + </folding>
  983 + </state>
  984 + </provider>
  985 + </entry>
  986 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  987 + <provider selected="true" editor-type-id="text-editor">
  988 + <state relative-caret-position="214">
  989 + <caret line="240" column="0" lean-forward="true" selection-start-line="240" selection-start-column="0" selection-end-line="240" selection-end-column="0" />
  990 + <folding>
  991 + <element signature="e#411#604#0#PHP" expanded="false" />
  992 + <element signature="e#609#825#0#PHP" expanded="false" />
  993 + <element signature="e#831#1329#0#PHP" expanded="false" />
  994 + <element signature="e#1334#2102#0#PHP" expanded="false" />
  995 + <element signature="e#2108#2326#0#PHP" expanded="false" />
  996 + <element signature="e#2331#2539#0#PHP" expanded="false" />
  997 + <element signature="e#2545#3052#0#PHP" expanded="false" />
  998 + <element signature="e#3057#3575#0#PHP" expanded="false" />
  999 + <element signature="e#3581#4093#0#PHP" expanded="false" />
  1000 + <element signature="e#4098#4661#0#PHP" expanded="false" />
  1001 + <element signature="e#4667#5257#0#PHP" expanded="false" />
  1002 + <element signature="e#5262#6260#0#PHP" expanded="false" />
  1003 + <element signature="e#6266#6584#0#PHP" expanded="false" />
  1004 + <element signature="e#6589#6965#0#PHP" expanded="false" />
  1005 + <element signature="e#6971#7326#0#PHP" expanded="false" />
  1006 + <element signature="e#7331#7740#0#PHP" expanded="false" />
  1007 + <element signature="e#7746#8131#0#PHP" expanded="false" />
  1008 + <element signature="e#8136#8807#0#PHP" expanded="false" />
  1009 + <element signature="e#8813#9259#0#PHP" expanded="false" />
  1010 + <element signature="e#9264#10115#0#PHP" expanded="false" />
  1011 + <element signature="e#10121#10391#0#PHP" expanded="false" />
  1012 + <element signature="e#10396#10872#0#PHP" expanded="false" />
  1013 + <element signature="e#10878#11508#0#PHP" expanded="false" />
  1014 + <element signature="e#11513#12865#0#PHP" expanded="false" />
937 </folding> 1015 </folding>
938 </state> 1016 </state>
939 </provider> 1017 </provider>
@@ -1163,7 +1163,7 @@ class UserController extends RestBaseController @@ -1163,7 +1163,7 @@ class UserController extends RestBaseController
1163 * 1163 *
1164 * @header name:XX-Token require:1 default: desc:token 1164 * @header name:XX-Token require:1 default: desc:token
1165 * 1165 *
1166 - * @param name:num type:int require:1 other: desc:订单号 1166 + * @param name:order_id type:int require:1 other: desc:订单ID
1167 * @param name:home_id type:int require:1 other: desc:家政公司ID 1167 * @param name:home_id type:int require:1 other: desc:家政公司ID
1168 * @param name:speed type:int require:1 other: desc:服务质量 1168 * @param name:speed type:int require:1 other: desc:服务质量
1169 * @param name:service type:int require:1 other: desc:服务态度 1169 * @param name:service type:int require:1 other: desc:服务态度
@@ -1179,7 +1179,7 @@ class UserController extends RestBaseController @@ -1179,7 +1179,7 @@ class UserController extends RestBaseController
1179 $param['user_id'] = $user_id; 1179 $param['user_id'] = $user_id;
1180 $param['create_time'] = time(); 1180 $param['create_time'] = time();
1181 $validate = new Validate([ 1181 $validate = new Validate([
1182 - 'num' => 'require', 1182 + 'order_id' => 'require',
1183 'home_id'=>'require', 1183 'home_id'=>'require',
1184 'speed' => 'require', 1184 'speed' => 'require',
1185 'service'=>'require', 1185 'service'=>'require',
@@ -1187,7 +1187,7 @@ class UserController extends RestBaseController @@ -1187,7 +1187,7 @@ class UserController extends RestBaseController
1187 'content'=>'require' 1187 'content'=>'require'
1188 ]); 1188 ]);
1189 $validate->message([ 1189 $validate->message([
1190 - 'num'=>'订单ID不能为空', 1190 + 'order_id'=>'订单ID不能为空',
1191 'home_id'=>'家政公司ID不能为空', 1191 'home_id'=>'家政公司ID不能为空',
1192 'speed'=>'服务质量不能为空', 1192 'speed'=>'服务质量不能为空',
1193 'service'=>'服务态度不能为空', 1193 'service'=>'服务态度不能为空',
@@ -1287,7 +1287,7 @@ class UserController extends RestBaseController @@ -1287,7 +1287,7 @@ class UserController extends RestBaseController
1287 * 1287 *
1288 * @header name:XX-Token require:1 default: desc:token 1288 * @header name:XX-Token require:1 default: desc:token
1289 * 1289 *
1290 - * @param name:num type:int require:1 other: desc:订单号 1290 + * @param name:order_id type:int require:1 other: desc:订单ID
1291 * 1291 *
1292 * @return speed:服务质量 1292 * @return speed:服务质量
1293 * @return service:服务态度 1293 * @return service:服务态度
@@ -1299,13 +1299,13 @@ class UserController extends RestBaseController @@ -1299,13 +1299,13 @@ class UserController extends RestBaseController
1299 public function selhomecomment() 1299 public function selhomecomment()
1300 { 1300 {
1301 $user_id = $this->getUserId(); 1301 $user_id = $this->getUserId();
1302 - $num = $this->request->param('num'); 1302 + $num = $this->request->param('order_id');
1303 if(empty($num)){ 1303 if(empty($num)){
1304 $this->error(['code'=>2,'msg'=>'缺少必要参数']); 1304 $this->error(['code'=>2,'msg'=>'缺少必要参数']);
1305 } 1305 }
1306 $data = Db::name('homecomment') 1306 $data = Db::name('homecomment')
1307 ->where('user_id',$user_id) 1307 ->where('user_id',$user_id)
1308 - ->where('num',$num) 1308 + ->where('order_id',$num)
1309 ->find(); 1309 ->find();
1310 $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content'])); 1310 $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
1311 $data['thumbnail'] = explode(',',$data['thumbnail']); 1311 $data['thumbnail'] = explode(',',$data['thumbnail']);