郭盛 / scrap · 提交

转到一个项目

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

查看评价接口

内嵌 并排对比
正在显示 3 个修改的文件 包含 204 行增加 和 153 行删除
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
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" />
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" />
@@ -24,46 +25,11 @@ @@ -24,46 +25,11 @@
24 </component> 25 </component>
25 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
27 - <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">  
28 - <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">  
29 - <provider selected="true" editor-type-id="text-editor">  
30 - <state relative-caret-position="160">  
31 - <caret line="132" column="7" lean-forward="false" selection-start-line="132" selection-start-column="7" selection-end-line="132" selection-end-column="7" />  
32 - <folding>  
33 - <element signature="e#329#544#0#PHP" expanded="false" />  
34 - <element signature="e#549#890#0#PHP" expanded="false" />  
35 - <element signature="e#896#1112#0#PHP" expanded="false" />  
36 - <element signature="e#1117#1500#0#PHP" expanded="false" />  
37 - <element signature="e#1506#1726#0#PHP" expanded="false" />  
38 - <element signature="e#1731#2119#0#PHP" expanded="false" />  
39 - <element signature="e#2126#2643#0#PHP" expanded="false" />  
40 - <element signature="e#2648#3163#0#PHP" expanded="false" />  
41 - <element signature="e#3169#3697#0#PHP" expanded="false" />  
42 - <element signature="e#3702#4540#0#PHP" expanded="false" />  
43 - <element signature="e#4546#4859#0#PHP" expanded="false" />  
44 - <element signature="e#4864#5239#0#PHP" expanded="false" />  
45 - <element signature="e#5245#5597#0#PHP" expanded="false" />  
46 - <element signature="e#5602#6010#0#PHP" expanded="false" />  
47 - <element signature="e#6016#6398#0#PHP" expanded="false" />  
48 - <element signature="e#6403#7073#0#PHP" expanded="false" />  
49 - <element signature="e#7079#7522#0#PHP" expanded="false" />  
50 - <element signature="e#7527#8377#0#PHP" expanded="false" />  
51 - <element signature="e#8383#8650#0#PHP" expanded="false" />  
52 - <element signature="e#8655#9130#0#PHP" expanded="false" />  
53 - <element signature="e#9136#9635#0#PHP" expanded="false" />  
54 - <element signature="e#9640#10661#0#PHP" expanded="false" />  
55 - <element signature="e#10667#11034#0#PHP" expanded="false" />  
56 - <element signature="e#11039#11479#0#PHP" expanded="false" />  
57 - </folding>  
58 - </state>  
59 - </provider>  
60 - </entry>  
61 - </file>  
62 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 28 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
63 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 29 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
64 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
65 - <state relative-caret-position="158">  
66 - <caret line="856" column="5" lean-forward="true" selection-start-line="856" selection-start-column="5" selection-end-line="856" selection-end-column="5" /> 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" />
67 <folding> 33 <folding>
68 <element signature="e#366#715#0#PHP" expanded="false" /> 34 <element signature="e#366#715#0#PHP" expanded="false" />
69 <element signature="e#720#1485#0#PHP" expanded="false" /> 35 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -107,6 +73,7 @@ @@ -107,6 +73,7 @@
107 <element signature="e#25338#25762#0#PHP" expanded="false" /> 73 <element signature="e#25338#25762#0#PHP" expanded="false" />
108 <element signature="e#25767#26378#0#PHP" expanded="false" /> 74 <element signature="e#25767#26378#0#PHP" expanded="false" />
109 <element signature="e#26384#26880#0#PHP" expanded="false" /> 75 <element signature="e#26384#26880#0#PHP" expanded="false" />
  76 + <element signature="e#26885#27992#0#PHP" expanded="false" />
110 <element signature="e#27998#28282#0#PHP" expanded="false" /> 77 <element signature="e#27998#28282#0#PHP" expanded="false" />
111 <element signature="e#28287#28923#0#PHP" expanded="false" /> 78 <element signature="e#28287#28923#0#PHP" expanded="false" />
112 <element signature="e#28944#29263#0#PHP" expanded="false" /> 79 <element signature="e#28944#29263#0#PHP" expanded="false" />
@@ -122,50 +89,12 @@ @@ -122,50 +89,12 @@
122 <element signature="e#35432#36473#0#PHP" expanded="false" /> 89 <element signature="e#35432#36473#0#PHP" expanded="false" />
123 <element signature="e#36479#37136#0#PHP" expanded="false" /> 90 <element signature="e#36479#37136#0#PHP" expanded="false" />
124 <element signature="e#37141#38158#0#PHP" expanded="false" /> 91 <element signature="e#37141#38158#0#PHP" expanded="false" />
125 - </folding>  
126 - </state>  
127 - </provider>  
128 - </entry>  
129 - </file>  
130 - <file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">  
131 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
132 - <provider selected="true" editor-type-id="text-editor">  
133 - <state relative-caret-position="759">  
134 - <caret line="511" column="0" lean-forward="true" selection-start-line="511" selection-start-column="0" selection-end-line="511" selection-end-column="0" />  
135 - <folding>  
136 - <element signature="e#342#596#0#PHP" expanded="false" />  
137 - <element signature="e#601#886#0#PHP" expanded="false" />  
138 - <element signature="e#892#1227#0#PHP" expanded="false" />  
139 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
140 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
141 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
142 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
143 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
144 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
145 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
146 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
147 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
148 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
149 - <element signature="e#4658#4915#0#PHP" expanded="false" />  
150 - <element signature="e#4921#5117#0#PHP" expanded="false" />  
151 - <element signature="e#5122#5384#0#PHP" expanded="false" />  
152 - <element signature="e#5390#5845#0#PHP" expanded="false" />  
153 - <element signature="e#5850#6416#0#PHP" expanded="false" />  
154 - <element signature="e#6422#6765#0#PHP" expanded="false" />  
155 - <element signature="e#6770#7251#0#PHP" expanded="false" />  
156 - <element signature="e#7257#7548#0#PHP" expanded="false" />  
157 - <element signature="e#7553#7904#0#PHP" expanded="false" />  
158 - <element signature="e#7910#8263#0#PHP" expanded="false" />  
159 - <element signature="e#8268#8673#0#PHP" expanded="false" />  
160 - <element signature="e#8679#9062#0#PHP" expanded="false" />  
161 - <element signature="e#9067#9734#0#PHP" expanded="false" />  
162 - <element signature="e#9740#10184#0#PHP" expanded="false" />  
163 - <element signature="e#10189#11036#0#PHP" expanded="false" />  
164 - <element signature="e#11042#11310#0#PHP" expanded="false" />  
165 - <element signature="e#11315#11787#0#PHP" expanded="false" />  
166 - <element signature="e#11793#12099#0#PHP" expanded="false" />  
167 - <element signature="e#12104#13747#0#PHP" expanded="false" />  
168 - <element signature="e#13768#14087#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" />
169 </folding> 98 </folding>
170 </state> 99 </state>
171 </provider> 100 </provider>
@@ -228,7 +157,6 @@ @@ -228,7 +157,6 @@
228 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" /> 157 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" />
229 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" /> 158 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
230 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> 159 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
231 - <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />  
232 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 160 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
233 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" /> 161 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
234 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" /> 162 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
@@ -241,6 +169,7 @@ @@ -241,6 +169,7 @@
241 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" /> 169 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
242 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" /> 170 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
243 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 171 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
  172 + <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
244 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 173 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
245 </list> 174 </list>
246 </option> 175 </option>
@@ -260,8 +189,8 @@ @@ -260,8 +189,8 @@
260 </component> 189 </component>
261 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 190 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
262 <component name="ProjectFrameBounds"> 191 <component name="ProjectFrameBounds">
263 - <option name="x" value="574" />  
264 - <option name="y" value="77" /> 192 + <option name="x" value="377" />
  193 + <option name="y" value="55" />
265 <option name="width" value="1582" /> 194 <option name="width" value="1582" />
266 <option name="height" value="1021" /> 195 <option name="height" value="1021" />
267 </component> 196 </component>
@@ -308,6 +237,13 @@ @@ -308,6 +237,13 @@
308 <path> 237 <path>
309 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 238 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
310 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 239 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  240 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  241 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  242 + <item name="model" type="2a2b976b:PhpTreeStructureProvider$1" />
  243 + </path>
  244 + <path>
  245 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  246 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
311 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 247 <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
312 </path> 248 </path>
313 <path> 249 <path>
@@ -426,18 +362,18 @@ @@ -426,18 +362,18 @@
426 <workItem from="1575419186725" duration="599000" /> 362 <workItem from="1575419186725" duration="599000" />
427 <workItem from="1575420787741" duration="2879000" /> 363 <workItem from="1575420787741" duration="2879000" />
428 <workItem from="1575431441427" duration="8414000" /> 364 <workItem from="1575431441427" duration="8414000" />
429 - <workItem from="1575444399653" duration="8515000" /> 365 + <workItem from="1575444399653" duration="10706000" />
430 </task> 366 </task>
431 <servers /> 367 <servers />
432 </component> 368 </component>
433 <component name="TimeTrackingManager"> 369 <component name="TimeTrackingManager">
434 - <option name="totallyTimeSpent" value="462164000" /> 370 + <option name="totallyTimeSpent" value="464355000" />
435 </component> 371 </component>
436 <component name="ToolWindowManager"> 372 <component name="ToolWindowManager">
437 - <frame x="574" y="77" width="1582" height="1021" extended-state="0" /> 373 + <frame x="377" y="55" width="1582" height="1021" extended-state="0" />
438 <editor active="true" /> 374 <editor active="true" />
439 <layout> 375 <layout>
440 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.174113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 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" />
441 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 377 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
442 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 378 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
443 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 379 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -665,13 +601,6 @@ @@ -665,13 +601,6 @@
665 </state> 601 </state>
666 </provider> 602 </provider>
667 </entry> 603 </entry>
668 - <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">  
669 - <provider selected="true" editor-type-id="text-editor">  
670 - <state relative-caret-position="556">  
671 - <caret line="43" column="37" lean-forward="true" selection-start-line="43" selection-start-column="37" selection-end-line="43" selection-end-column="37" />  
672 - </state>  
673 - </provider>  
674 - </entry>  
675 <entry file="file://$PROJECT_DIR$/public/uploads/20191129/e4893ecf9ae4fb70b9485ae0a5732120.jpg"> 604 <entry file="file://$PROJECT_DIR$/public/uploads/20191129/e4893ecf9ae4fb70b9485ae0a5732120.jpg">
676 <provider selected="true" editor-type-id="images"> 605 <provider selected="true" editor-type-id="images">
677 <state /> 606 <state />
@@ -798,48 +727,6 @@ @@ -798,48 +727,6 @@
798 </state> 727 </state>
799 </provider> 728 </provider>
800 </entry> 729 </entry>
801 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
802 - <provider selected="true" editor-type-id="text-editor">  
803 - <state relative-caret-position="759">  
804 - <caret line="511" column="0" lean-forward="true" selection-start-line="511" selection-start-column="0" selection-end-line="511" selection-end-column="0" />  
805 - <folding>  
806 - <element signature="e#342#596#0#PHP" expanded="false" />  
807 - <element signature="e#601#886#0#PHP" expanded="false" />  
808 - <element signature="e#892#1227#0#PHP" expanded="false" />  
809 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
810 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
811 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
812 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
813 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
814 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
815 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
816 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
817 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
818 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
819 - <element signature="e#4658#4915#0#PHP" expanded="false" />  
820 - <element signature="e#4921#5117#0#PHP" expanded="false" />  
821 - <element signature="e#5122#5384#0#PHP" expanded="false" />  
822 - <element signature="e#5390#5845#0#PHP" expanded="false" />  
823 - <element signature="e#5850#6416#0#PHP" expanded="false" />  
824 - <element signature="e#6422#6765#0#PHP" expanded="false" />  
825 - <element signature="e#6770#7251#0#PHP" expanded="false" />  
826 - <element signature="e#7257#7548#0#PHP" expanded="false" />  
827 - <element signature="e#7553#7904#0#PHP" expanded="false" />  
828 - <element signature="e#7910#8263#0#PHP" expanded="false" />  
829 - <element signature="e#8268#8673#0#PHP" expanded="false" />  
830 - <element signature="e#8679#9062#0#PHP" expanded="false" />  
831 - <element signature="e#9067#9734#0#PHP" expanded="false" />  
832 - <element signature="e#9740#10184#0#PHP" expanded="false" />  
833 - <element signature="e#10189#11036#0#PHP" expanded="false" />  
834 - <element signature="e#11042#11310#0#PHP" expanded="false" />  
835 - <element signature="e#11315#11787#0#PHP" expanded="false" />  
836 - <element signature="e#11793#12099#0#PHP" expanded="false" />  
837 - <element signature="e#12104#13747#0#PHP" expanded="false" />  
838 - <element signature="e#13768#14087#0#PHP" expanded="false" />  
839 - </folding>  
840 - </state>  
841 - </provider>  
842 - </entry>  
843 <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_9.jpg"> 730 <entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_9.jpg">
844 <provider selected="true" editor-type-id="images"> 731 <provider selected="true" editor-type-id="images">
845 <state /> 732 <state />
@@ -878,10 +765,27 @@ @@ -878,10 +765,27 @@
878 </state> 765 </state>
879 </provider> 766 </provider>
880 </entry> 767 </entry>
  768 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
  769 + <provider selected="true" editor-type-id="text-editor">
  770 + <state relative-caret-position="175">
  771 + <caret line="156" column="8" lean-forward="false" selection-start-line="156" selection-start-column="8" selection-end-line="183" selection-end-column="34" />
  772 + <folding>
  773 + <element signature="e#305#577#0#PHP" expanded="false" />
  774 + <element signature="e#583#854#0#PHP" expanded="false" />
  775 + <element signature="e#859#1113#0#PHP" expanded="false" />
  776 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  777 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  778 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  779 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  780 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  781 + </folding>
  782 + </state>
  783 + </provider>
  784 + </entry>
881 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 785 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
882 <provider selected="true" editor-type-id="text-editor"> 786 <provider selected="true" editor-type-id="text-editor">
883 - <state relative-caret-position="160">  
884 - <caret line="132" column="7" lean-forward="false" selection-start-line="132" selection-start-column="7" selection-end-line="132" selection-end-column="7" /> 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" />
885 <folding> 789 <folding>
886 <element signature="e#329#544#0#PHP" expanded="false" /> 790 <element signature="e#329#544#0#PHP" expanded="false" />
887 <element signature="e#549#890#0#PHP" expanded="false" /> 791 <element signature="e#549#890#0#PHP" expanded="false" />
@@ -911,27 +815,60 @@ @@ -911,27 +815,60 @@
911 </state> 815 </state>
912 </provider> 816 </provider>
913 </entry> 817 </entry>
914 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 818 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
915 <provider selected="true" editor-type-id="text-editor"> 819 <provider selected="true" editor-type-id="text-editor">
916 - <state relative-caret-position="175">  
917 - <caret line="156" column="8" lean-forward="false" selection-start-line="156" selection-start-column="8" selection-end-line="183" selection-end-column="34" /> 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" />
918 <folding> 822 <folding>
919 - <element signature="e#305#577#0#PHP" expanded="false" />  
920 - <element signature="e#583#854#0#PHP" expanded="false" />  
921 - <element signature="e#859#1113#0#PHP" expanded="false" />  
922 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
923 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
924 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
925 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
926 - <element signature="e#3393#3889#0#PHP" expanded="false" /> 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" />
927 </folding> 856 </folding>
928 </state> 857 </state>
929 </provider> 858 </provider>
930 </entry> 859 </entry>
931 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 860 + <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
932 <provider selected="true" editor-type-id="text-editor"> 861 <provider selected="true" editor-type-id="text-editor">
933 <state relative-caret-position="158"> 862 <state relative-caret-position="158">
934 - <caret line="856" column="5" lean-forward="true" selection-start-line="856" selection-start-column="5" selection-end-line="856" selection-end-column="5" /> 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">
  869 + <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" />
935 <folding> 872 <folding>
936 <element signature="e#366#715#0#PHP" expanded="false" /> 873 <element signature="e#366#715#0#PHP" expanded="false" />
937 <element signature="e#720#1485#0#PHP" expanded="false" /> 874 <element signature="e#720#1485#0#PHP" expanded="false" />
@@ -975,6 +912,7 @@ @@ -975,6 +912,7 @@
975 <element signature="e#25338#25762#0#PHP" expanded="false" /> 912 <element signature="e#25338#25762#0#PHP" expanded="false" />
976 <element signature="e#25767#26378#0#PHP" expanded="false" /> 913 <element signature="e#25767#26378#0#PHP" expanded="false" />
977 <element signature="e#26384#26880#0#PHP" expanded="false" /> 914 <element signature="e#26384#26880#0#PHP" expanded="false" />
  915 + <element signature="e#26885#27992#0#PHP" expanded="false" />
978 <element signature="e#27998#28282#0#PHP" expanded="false" /> 916 <element signature="e#27998#28282#0#PHP" expanded="false" />
979 <element signature="e#28287#28923#0#PHP" expanded="false" /> 917 <element signature="e#28287#28923#0#PHP" expanded="false" />
980 <element signature="e#28944#29263#0#PHP" expanded="false" /> 918 <element signature="e#28944#29263#0#PHP" expanded="false" />
@@ -990,6 +928,12 @@ @@ -990,6 +928,12 @@
990 <element signature="e#35432#36473#0#PHP" expanded="false" /> 928 <element signature="e#35432#36473#0#PHP" expanded="false" />
991 <element signature="e#36479#37136#0#PHP" expanded="false" /> 929 <element signature="e#36479#37136#0#PHP" expanded="false" />
992 <element signature="e#37141#38158#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" />
993 </folding> 937 </folding>
994 </state> 938 </state>
995 </provider> 939 </provider>
@@ -1207,4 +1207,111 @@ class UserController extends RestBaseController @@ -1207,4 +1207,111 @@ class UserController extends RestBaseController
1207 } 1207 }
1208 1208
1209 1209
  1210 + /**
  1211 + * @title 查看回收订单评价
  1212 + * @description
  1213 + * @author GuoSheng
  1214 + * @url /index/User/selectcomment
  1215 + * @method GET
  1216 + *
  1217 + * @header name:XX-Token require:1 default: desc:token
  1218 + *
  1219 + * @param name:recycleorder_id type:int require:1 other: desc:订单id
  1220 + *
  1221 + * @return speed:上门速度
  1222 + * @return service:服务态度
  1223 + * @return recycle:回收体验
  1224 + * @return content:评价内容
  1225 + * @return thumbnail:图片
  1226 + *
  1227 + */
  1228 + public function selectcomment()
  1229 + {
  1230 + $user_id = $this->getUserId();
  1231 + $recycleorder_id = $this->request->param('recycleorder_id');
  1232 + if(empty($recycleorder_id)){
  1233 + $this->error(['code'=>2,'msg'=>'缺少必要参数']);
  1234 + }
  1235 + $data = Db::name('recyclecomment')
  1236 + ->where('user_id',$user_id)
  1237 + ->where('recycleorder_id',$recycleorder_id)
  1238 + ->find();
  1239 + $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
  1240 + $data['thumbnail'] = explode(',',$data['thumbnail']);
  1241 + $this->success('SUCCESS',$data);
  1242 +
  1243 + }
  1244 +
  1245 + /**
  1246 + * @title 查看商城订单评价
  1247 + * @description
  1248 + * @author GuoSheng
  1249 + * @url /index/User/selshopcomment
  1250 + * @method GET
  1251 + *
  1252 + * @header name:XX-Token require:1 default: desc:token
  1253 + *
  1254 + * @param name:shoporder_id type:int require:1 other: desc:订单id
  1255 + *
  1256 + * @return speed:上门速度
  1257 + * @return service:服务态度
  1258 + * @return recycle:回收体验
  1259 + * @return content:评价内容
  1260 + * @return thumbnail:图片
  1261 + *
  1262 + */
  1263 + public function selshopcomment()
  1264 + {
  1265 + $user_id = $this->getUserId();
  1266 + $shoporder_id = $this->request->param('shoporder_id');
  1267 + if(empty($shoporder_id)){
  1268 + $this->error(['code'=>2,'msg'=>'缺少必要参数']);
  1269 + }
  1270 +
  1271 + $data = Db::name('shopcomment')
  1272 + ->where('user_id',$user_id)
  1273 + ->where('shoporder_id',$shoporder_id)
  1274 + ->find();
  1275 + $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
  1276 + $data['thumbnail'] = explode(',',$data['thumbnail']);
  1277 + $this->success('SUCCESS',$data);
  1278 +
  1279 + }
  1280 +
  1281 + /**
  1282 + * @title 查看家政预约订单评价
  1283 + * @description
  1284 + * @author GuoSheng
  1285 + * @url /index/User/selhomecomment
  1286 + * @method GET
  1287 + *
  1288 + * @header name:XX-Token require:1 default: desc:token
  1289 + *
  1290 + * @param name:num type:int require:1 other: desc:订单号
  1291 + *
  1292 + * @return speed:服务质量
  1293 + * @return service:服务态度
  1294 + * @return recycle:服务体验
  1295 + * @return content:评价内容
  1296 + * @return thumbnail:图片
  1297 + *
  1298 + */
  1299 + public function selhomecomment()
  1300 + {
  1301 + $user_id = $this->getUserId();
  1302 + $num = $this->request->param('num');
  1303 + if(empty($num)){
  1304 + $this->error(['code'=>2,'msg'=>'缺少必要参数']);
  1305 + }
  1306 + $data = Db::name('homecomment')
  1307 + ->where('user_id',$user_id)
  1308 + ->where('num',$num)
  1309 + ->find();
  1310 + $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
  1311 + $data['thumbnail'] = explode(',',$data['thumbnail']);
  1312 + $this->success('SUCCESS',$data);
  1313 +
  1314 + }
  1315 +
  1316 +
1210 } 1317 }
@@ -14,7 +14,7 @@ use think\Model; @@ -14,7 +14,7 @@ use think\Model;
14 class ShopgoodsModel extends Model 14 class ShopgoodsModel extends Model
15 { 15 {
16 public function getContentAttr($value){ 16 public function getContentAttr($value){
17 - return cmf_replace_content_file_url(htmlspecialchars_decode($value));; 17 + return cmf_replace_content_file_url(htmlspecialchars_decode($value));
18 } 18 }
19 19
20 public function getThumbnailAttr($value){ 20 public function getThumbnailAttr($value){