郭盛 / scrap · 提交

转到一个项目

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

写商城有关接口

内嵌 并排对比
正在显示 8 个修改的文件 包含 662 行增加 和 163 行删除
@@ -2,7 +2,14 @@ @@ -2,7 +2,14 @@
2 <project version="4"> 2 <project version="4">
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$/simplewind/cmf/controller/WeChatBaseController.php" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" /> 5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/ProjectController.php" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
  7 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
  8 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
  9 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/model/ShoppicModel.php" />
  10 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" />
  11 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  12 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" afterPath="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
6 </list> 13 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 14 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 15 <option name="TRACKING_ENABLED" value="true" />
@@ -24,70 +31,34 @@ @@ -24,70 +31,34 @@
24 </component> 31 </component>
25 <component name="FileEditorManager"> 32 <component name="FileEditorManager">
26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 33 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
27 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">  
28 - <entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php"> 34 + <file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="true">
  35 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
29 <provider selected="true" editor-type-id="text-editor"> 36 <provider selected="true" editor-type-id="text-editor">
30 - <state relative-caret-position="350">  
31 - <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" /> 37 + <state relative-caret-position="306">
  38 + <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
32 <folding> 39 <folding>
33 - <element signature="e#130#170#0#PHP" expanded="true" />  
34 - <element signature="e#739#805#0#PHP" expanded="false" /> 40 + <element signature="e#131#169#0#PHP" expanded="true" />
  41 + <element signature="e#875#1547#0#PHP" expanded="false" />
35 </folding> 42 </folding>
36 </state> 43 </state>
37 </provider> 44 </provider>
38 </entry> 45 </entry>
39 </file> 46 </file>
40 - <file leaf-file-name="WeChatBaseController.php" pinned="false" current-in-tab="true">  
41 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php"> 47 + <file leaf-file-name="Doc.php" pinned="false" current-in-tab="false">
  48 + <entry file="file://$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php">
42 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
43 - <state relative-caret-position="235">  
44 - <caret line="201" column="15" lean-forward="true" selection-start-line="201" selection-start-column="15" selection-end-line="201" selection-end-column="15" />  
45 - <folding />  
46 - </state>  
47 - </provider>  
48 - </entry>  
49 - </file>  
50 - <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">  
51 - <entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">  
52 - <provider selected="true" editor-type-id="text-editor">  
53 - <state relative-caret-position="-465">  
54 - <caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" /> 50 + <state relative-caret-position="325">
  51 + <caret line="13" column="56" lean-forward="true" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />
55 <folding> 52 <folding>
56 - <element signature="e#1924#2026#0#PHP" expanded="false" />  
57 - <element signature="e#2031#3227#0#PHP" expanded="false" />  
58 - <element signature="e#3233#3328#0#PHP" expanded="false" />  
59 - <element signature="e#3333#4931#0#PHP" expanded="false" />  
60 - <element signature="e#4937#4966#0#PHP" expanded="false" />  
61 - <element signature="e#4971#5333#0#PHP" expanded="false" />  
62 - <element signature="e#5339#5375#0#PHP" expanded="false" />  
63 - <element signature="e#5380#5584#0#PHP" expanded="false" />  
64 - <element signature="e#5590#5612#0#PHP" expanded="false" />  
65 - <element signature="e#5617#5749#0#PHP" expanded="false" /> 53 + <marker date="1573554256791" expanded="true" signature="9523:9529" ph=" " />
  54 + <marker date="1573554256791" expanded="true" signature="9529:9535" ph=" " />
  55 + <marker date="1573554256791" expanded="true" signature="10013:10019" ph=" " />
  56 + <marker date="1573554256791" expanded="true" signature="10019:10025" ph=" " />
66 </folding> 57 </folding>
67 </state> 58 </state>
68 </provider> 59 </provider>
69 </entry> 60 </entry>
70 </file> 61 </file>
71 - <file leaf-file-name="config.php" pinned="false" current-in-tab="false">  
72 - <entry file="file://$PROJECT_DIR$/app/config.php">  
73 - <provider selected="true" editor-type-id="text-editor">  
74 - <state relative-caret-position="1160">  
75 - <caret line="237" column="51" lean-forward="false" selection-start-line="237" selection-start-column="19" selection-end-line="237" selection-end-column="51" />  
76 - <folding />  
77 - </state>  
78 - </provider>  
79 - </entry>  
80 - </file>  
81 - <file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">  
82 - <entry file="file://$PROJECT_DIR$/app/extra/wechat.php">  
83 - <provider selected="true" editor-type-id="text-editor">  
84 - <state relative-caret-position="200">  
85 - <caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />  
86 - <folding />  
87 - </state>  
88 - </provider>  
89 - </entry>  
90 - </file>  
91 </leaf> 62 </leaf>
92 </component> 63 </component>
93 <component name="FileTemplateManagerImpl"> 64 <component name="FileTemplateManagerImpl">
@@ -103,13 +74,6 @@ @@ -103,13 +74,6 @@
103 <component name="IdeDocumentHistory"> 74 <component name="IdeDocumentHistory">
104 <option name="CHANGED_PATHS"> 75 <option name="CHANGED_PATHS">
105 <list> 76 <list>
106 - <option value="$USER_HOME$/Desktop/Index.php" />  
107 - <option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" />  
108 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html" />  
109 - <option value="$PROJECT_DIR$/app/index/model/RecycletypeModel.php" />  
110 - <option value="$PROJECT_DIR$/app/index/model/RecyclegoodsModel.php" />  
111 - <option value="$PROJECT_DIR$/app/index/model/NorecyclegoodsModel.php" />  
112 - <option value="$PROJECT_DIR$/app/index/model/NorecycletypeModel.php" />  
113 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/recycle/edit.html" /> 77 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/recycle/edit.html" />
114 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/recycle/showgoods.html" /> 78 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/recycle/showgoods.html" />
115 <option value="$PROJECT_DIR$/app/admin/controller/RecycleController.php" /> 79 <option value="$PROJECT_DIR$/app/admin/controller/RecycleController.php" />
@@ -154,6 +118,13 @@ @@ -154,6 +118,13 @@
154 <option value="$PROJECT_DIR$/app/config.php" /> 118 <option value="$PROJECT_DIR$/app/config.php" />
155 <option value="$PROJECT_DIR$/app/extra/wechat.php" /> 119 <option value="$PROJECT_DIR$/app/extra/wechat.php" />
156 <option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" /> 120 <option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" />
  121 + <option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" />
  122 + <option value="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" />
  123 + <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
  124 + <option value="$PROJECT_DIR$/api/index/model/ShoppicModel.php" />
  125 + <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
  126 + <option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
  127 + <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
157 </list> 128 </list>
158 </option> 129 </option>
159 </component> 130 </component>
@@ -171,11 +142,11 @@ @@ -171,11 +142,11 @@
171 <sorting>DEFINITION_ORDER</sorting> 142 <sorting>DEFINITION_ORDER</sorting>
172 </component> 143 </component>
173 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 144 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
174 - <component name="ProjectFrameBounds">  
175 - <option name="x" value="485" />  
176 - <option name="y" value="24" /> 145 + <component name="ProjectFrameBounds" extendedState="1">
  146 + <option name="x" value="260" />
  147 + <option name="y" value="62" />
177 <option name="width" value="1678" /> 148 <option name="width" value="1678" />
178 - <option name="height" value="1097" /> 149 + <option name="height" value="1093" />
179 </component> 150 </component>
180 <component name="ProjectView"> 151 <component name="ProjectView">
181 <navigator currentView="ProjectPane" proportions="" version="1"> 152 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -202,6 +173,24 @@ @@ -202,6 +173,24 @@
202 <path> 173 <path>
203 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 174 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
204 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 175 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  176 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  177 + </path>
  178 + <path>
  179 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  180 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  181 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  182 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  183 + </path>
  184 + <path>
  185 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  186 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  187 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  188 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  189 + <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
  190 + </path>
  191 + <path>
  192 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  193 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
205 <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> 194 <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
206 </path> 195 </path>
207 <path> 196 <path>
@@ -221,19 +210,43 @@ @@ -221,19 +210,43 @@
221 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 210 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
222 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 211 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
223 <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> 212 <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
224 - <item name="user" type="2a2b976b:PhpTreeStructureProvider$1" /> 213 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
  214 + <item name="model" type="2a2b976b:PhpTreeStructureProvider$1" />
225 </path> 215 </path>
226 <path> 216 <path>
227 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 217 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
228 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 218 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
229 - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />  
230 - <item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />  
231 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 219 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  220 + </path>
  221 + <path>
  222 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  223 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  224 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  225 + <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
232 </path> 226 </path>
233 <path> 227 <path>
234 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 228 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
235 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 229 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
236 - <item name="config" type="2a2b976b:PhpTreeStructureProvider$1" /> 230 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  231 + <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
  232 + <item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />
  233 + </path>
  234 + <path>
  235 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  236 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  237 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  238 + <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
  239 + <item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />
  240 + <item name="api-doc" type="2a2b976b:PhpTreeStructureProvider$1" />
  241 + </path>
  242 + <path>
  243 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  244 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  245 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  246 + <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
  247 + <item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />
  248 + <item name="api-doc" type="2a2b976b:PhpTreeStructureProvider$1" />
  249 + <item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
237 </path> 250 </path>
238 </expand> 251 </expand>
239 <select /> 252 <select />
@@ -245,7 +258,7 @@ @@ -245,7 +258,7 @@
245 </component> 258 </component>
246 <component name="PropertiesComponent"> 259 <component name="PropertiesComponent">
247 <property name="WebServerToolWindowFactoryState" value="false" /> 260 <property name="WebServerToolWindowFactoryState" value="false" />
248 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" /> 261 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project1/resource" />
249 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 262 <property name="DefaultHtmlFileTemplate" value="HTML File" />
250 </component> 263 </component>
251 <component name="RecentsManager"> 264 <component name="RecentsManager">
@@ -307,15 +320,15 @@ @@ -307,15 +320,15 @@
307 <workItem from="1573450754427" duration="9613000" /> 320 <workItem from="1573450754427" duration="9613000" />
308 <workItem from="1573463816109" duration="4867000" /> 321 <workItem from="1573463816109" duration="4867000" />
309 <workItem from="1573517804403" duration="18784000" /> 322 <workItem from="1573517804403" duration="18784000" />
310 - <workItem from="1573542205740" duration="2464000" /> 323 + <workItem from="1573542205740" duration="11597000" />
311 </task> 324 </task>
312 <servers /> 325 <servers />
313 </component> 326 </component>
314 <component name="TimeTrackingManager"> 327 <component name="TimeTrackingManager">
315 - <option name="totallyTimeSpent" value="205091000" /> 328 + <option name="totallyTimeSpent" value="214224000" />
316 </component> 329 </component>
317 <component name="ToolWindowManager"> 330 <component name="ToolWindowManager">
318 - <frame x="485" y="24" width="1678" height="1097" extended-state="0" /> 331 + <frame x="260" y="62" width="1678" height="1093" extended-state="1" />
319 <editor active="true" /> 332 <editor active="true" />
320 <layout> 333 <layout>
321 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19839308" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 334 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19839308" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -369,71 +382,6 @@ @@ -369,71 +382,6 @@
369 <watches-manager /> 382 <watches-manager />
370 </component> 383 </component>
371 <component name="editorHistoryManager"> 384 <component name="editorHistoryManager">
372 - <entry file="file://$PROJECT_DIR$/app/portal/controller/SearchController.php">  
373 - <provider selected="true" editor-type-id="text-editor">  
374 - <state relative-caret-position="0">  
375 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
376 - </state>  
377 - </provider>  
378 - </entry>  
379 - <entry file="file://$PROJECT_DIR$/app/portal/api/CategoryApi.php">  
380 - <provider selected="true" editor-type-id="text-editor">  
381 - <state relative-caret-position="-562">  
382 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
383 - </state>  
384 - </provider>  
385 - </entry>  
386 - <entry file="file://$PROJECT_DIR$/public/static/swiper3/swiper.min.js">  
387 - <provider selected="true" editor-type-id="text-editor">  
388 - <state relative-caret-position="0">  
389 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
390 - </state>  
391 - </provider>  
392 - </entry>  
393 - <entry file="file://$PROJECT_DIR$/public/static/style/base.css">  
394 - <provider selected="true" editor-type-id="text-editor">  
395 - <state relative-caret-position="299">  
396 - <caret line="354" column="19" lean-forward="true" selection-start-line="354" selection-start-column="19" selection-end-line="354" selection-end-column="19" />  
397 - </state>  
398 - </provider>  
399 - </entry>  
400 - <entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html">  
401 - <provider selected="true" editor-type-id="text-editor">  
402 - <state relative-caret-position="0">  
403 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
404 - </state>  
405 - </provider>  
406 - </entry>  
407 - <entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html">  
408 - <provider selected="true" editor-type-id="text-editor">  
409 - <state relative-caret-position="425">  
410 - <caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" />  
411 - </state>  
412 - </provider>  
413 - </entry>  
414 - <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />  
415 - <entry file="file://$PROJECT_DIR$/api/home/controller/IndexController.php">  
416 - <provider selected="true" editor-type-id="text-editor">  
417 - <state relative-caret-position="0">  
418 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
419 - </state>  
420 - </provider>  
421 - </entry>  
422 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">  
423 - <provider selected="true" editor-type-id="text-editor">  
424 - <state relative-caret-position="-675">  
425 - <caret line="17" column="6" lean-forward="false" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />  
426 - <folding />  
427 - </state>  
428 - </provider>  
429 - </entry>  
430 - <entry file="file://$PROJECT_DIR$/app/install/controller/IndexController.php">  
431 - <provider selected="true" editor-type-id="text-editor">  
432 - <state relative-caret-position="-150">  
433 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
434 - </state>  
435 - </provider>  
436 - </entry>  
437 <entry file="file://$PROJECT_DIR$/app/portal/controller/WechatController.php"> 385 <entry file="file://$PROJECT_DIR$/app/portal/controller/WechatController.php">
438 <provider selected="true" editor-type-id="text-editor"> 386 <provider selected="true" editor-type-id="text-editor">
439 <state relative-caret-position="-476"> 387 <state relative-caret-position="-476">
@@ -606,14 +554,6 @@ @@ -606,14 +554,6 @@
606 </state> 554 </state>
607 </provider> 555 </provider>
608 </entry> 556 </entry>
609 - <entry file="file://$PROJECT_DIR$/app/index/controller/RecycleController.php">  
610 - <provider selected="true" editor-type-id="text-editor">  
611 - <state relative-caret-position="300">  
612 - <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />  
613 - <folding />  
614 - </state>  
615 - </provider>  
616 - </entry>  
617 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php"> 557 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
618 <provider selected="true" editor-type-id="text-editor"> 558 <provider selected="true" editor-type-id="text-editor">
619 <state relative-caret-position="332"> 559 <state relative-caret-position="332">
@@ -630,21 +570,6 @@ @@ -630,21 +570,6 @@
630 </state> 570 </state>
631 </provider> 571 </provider>
632 </entry> 572 </entry>
633 - <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">  
634 - <provider selected="true" editor-type-id="text-editor">  
635 - <state relative-caret-position="300">  
636 - <caret line="26" column="12" lean-forward="true" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />  
637 - <folding>  
638 - <element signature="e#391#495#0#PHP" expanded="false" />  
639 - <element signature="e#514#722#0#PHP" expanded="false" />  
640 - <element signature="e#739#1625#0#PHP" expanded="false" />  
641 - <element signature="e#1643#1843#0#PHP" expanded="false" />  
642 - <element signature="e#1861#2257#0#PHP" expanded="false" />  
643 - <element signature="e#2275#2663#0#PHP" expanded="false" />  
644 - </folding>  
645 - </state>  
646 - </provider>  
647 - </entry>  
648 <entry file="file://$USER_HOME$/Desktop/garbageCollect/register.html"> 573 <entry file="file://$USER_HOME$/Desktop/garbageCollect/register.html">
649 <provider selected="true" editor-type-id="text-editor"> 574 <provider selected="true" editor-type-id="text-editor">
650 <state relative-caret-position="400"> 575 <state relative-caret-position="400">
@@ -731,6 +656,14 @@ @@ -731,6 +656,14 @@
731 </state> 656 </state>
732 </provider> 657 </provider>
733 </entry> 658 </entry>
  659 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php">
  660 + <provider selected="true" editor-type-id="text-editor">
  661 + <state relative-caret-position="235">
  662 + <caret line="201" column="15" lean-forward="true" selection-start-line="201" selection-start-column="15" selection-end-line="201" selection-end-column="15" />
  663 + <folding />
  664 + </state>
  665 + </provider>
  666 + </entry>
734 <entry file="file://$PROJECT_DIR$/app/config.php"> 667 <entry file="file://$PROJECT_DIR$/app/config.php">
735 <provider selected="true" editor-type-id="text-editor"> 668 <provider selected="true" editor-type-id="text-editor">
736 <state relative-caret-position="1160"> 669 <state relative-caret-position="1160">
@@ -763,19 +696,142 @@ @@ -763,19 +696,142 @@
763 <state relative-caret-position="350"> 696 <state relative-caret-position="350">
764 <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" /> 697 <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
765 <folding> 698 <folding>
766 - <element signature="e#130#170#0#PHP" expanded="true" /> 699 + <element signature="e#130#170#0#PHP" expanded="false" />
767 <element signature="e#739#805#0#PHP" expanded="false" /> 700 <element signature="e#739#805#0#PHP" expanded="false" />
768 </folding> 701 </folding>
769 </state> 702 </state>
770 </provider> 703 </provider>
771 </entry> 704 </entry>
772 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php"> 705 + <entry file="file://$PROJECT_DIR$/app/index/model/ShoptypeModel.php">
773 <provider selected="true" editor-type-id="text-editor"> 706 <provider selected="true" editor-type-id="text-editor">
774 - <state relative-caret-position="235">  
775 - <caret line="201" column="15" lean-forward="true" selection-start-line="201" selection-start-column="15" selection-end-line="201" selection-end-column="15" /> 707 + <state relative-caret-position="250">
  708 + <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="20" selection-end-column="5" />
  709 + <folding />
  710 + </state>
  711 + </provider>
  712 + </entry>
  713 + <entry file="file://$PROJECT_DIR$/app/index/model/ShopgoodsModel.php">
  714 + <provider selected="true" editor-type-id="text-editor">
  715 + <state relative-caret-position="125">
  716 + <caret line="15" column="4" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="45" selection-end-column="5" />
  717 + <folding />
  718 + </state>
  719 + </provider>
  720 + </entry>
  721 + <entry file="file://$PROJECT_DIR$/api/index/model/ShoptypeModel.php">
  722 + <provider selected="true" editor-type-id="text-editor">
  723 + <state relative-caret-position="275">
  724 + <caret line="16" column="33" lean-forward="false" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
776 <folding /> 725 <folding />
777 </state> 726 </state>
778 </provider> 727 </provider>
779 </entry> 728 </entry>
  729 + <entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
  730 + <provider selected="true" editor-type-id="text-editor">
  731 + <state relative-caret-position="732">
  732 + <caret line="45" column="5" lean-forward="false" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
  733 + <folding>
  734 + <element signature="e#418#678#0#PHP" expanded="false" />
  735 + </folding>
  736 + </state>
  737 + </provider>
  738 + </entry>
  739 + <entry file="file://$PROJECT_DIR$/app/index/model/ShoppicModel.php">
  740 + <provider selected="true" editor-type-id="text-editor">
  741 + <state relative-caret-position="250">
  742 + <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="25" selection-end-column="5" />
  743 + <folding />
  744 + </state>
  745 + </provider>
  746 + </entry>
  747 + <entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php">
  748 + <provider selected="true" editor-type-id="text-editor">
  749 + <state relative-caret-position="450">
  750 + <caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
  751 + <folding />
  752 + </state>
  753 + </provider>
  754 + </entry>
  755 + <entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
  756 + <provider selected="true" editor-type-id="text-editor">
  757 + <state relative-caret-position="100">
  758 + <caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
  759 + <folding>
  760 + <element signature="e#130#165#0#PHP" expanded="true" />
  761 + <element signature="e#391#495#0#PHP" expanded="false" />
  762 + <element signature="e#514#722#0#PHP" expanded="false" />
  763 + <element signature="e#739#1625#0#PHP" expanded="false" />
  764 + <element signature="e#1643#1843#0#PHP" expanded="false" />
  765 + <element signature="e#1861#2257#0#PHP" expanded="false" />
  766 + <element signature="e#2275#2663#0#PHP" expanded="false" />
  767 + </folding>
  768 + </state>
  769 + </provider>
  770 + </entry>
  771 + <entry file="file://$PROJECT_DIR$/app/index/controller/RecycleController.php">
  772 + <provider selected="true" editor-type-id="text-editor">
  773 + <state relative-caret-position="250">
  774 + <caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="58" selection-end-column="5" />
  775 + <folding>
  776 + <element signature="e#396#1051#0#PHP" expanded="false" />
  777 + <element signature="e#1069#1741#0#PHP" expanded="false" />
  778 + </folding>
  779 + </state>
  780 + </provider>
  781 + </entry>
  782 + <entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
  783 + <provider selected="true" editor-type-id="text-editor">
  784 + <state relative-caret-position="225">
  785 + <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="17" selection-end-column="3" />
  786 + <folding>
  787 + <element signature="e#130#168#0#PHP" expanded="true" />
  788 + <element signature="e#526#900#0#PHP" expanded="false" />
  789 + <element signature="e#1102#1395#0#PHP" expanded="false" />
  790 + <element signature="e#1594#1885#0#PHP" expanded="false" />
  791 + <element signature="e#2353#3050#0#PHP" expanded="false" />
  792 + </folding>
  793 + </state>
  794 + </provider>
  795 + </entry>
  796 + <entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
  797 + <provider selected="true" editor-type-id="text-editor">
  798 + <state relative-caret-position="231">
  799 + <caret line="23" column="4" lean-forward="false" selection-start-line="23" selection-start-column="4" selection-end-line="33" selection-end-column="7" />
  800 + <folding>
  801 + <element signature="e#131#165#0#PHP" expanded="true" />
  802 + <element signature="e#575#791#0#PHP" expanded="false" />
  803 + <element signature="e#797#1129#0#PHP" expanded="false" />
  804 + <element signature="e#1134#1749#0#PHP" expanded="false" />
  805 + <element signature="e#1755#1973#0#PHP" expanded="false" />
  806 + <element signature="e#1978#2186#0#PHP" expanded="false" />
  807 + <element signature="e#2192#2524#0#PHP" expanded="false" />
  808 + </folding>
  809 + </state>
  810 + </provider>
  811 + </entry>
  812 + <entry file="file://$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php">
  813 + <provider selected="true" editor-type-id="text-editor">
  814 + <state relative-caret-position="325">
  815 + <caret line="13" column="56" lean-forward="true" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />
  816 + <folding>
  817 + <marker date="1573554256791" expanded="true" signature="9523:9529" ph=" " />
  818 + <marker date="1573554256791" expanded="true" signature="9529:9535" ph=" " />
  819 + <marker date="1573554256791" expanded="true" signature="10013:10019" ph=" " />
  820 + <marker date="1573554256791" expanded="true" signature="10019:10025" ph=" " />
  821 + </folding>
  822 + </state>
  823 + </provider>
  824 + </entry>
  825 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  826 + <provider selected="true" editor-type-id="text-editor">
  827 + <state relative-caret-position="306">
  828 + <caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
  829 + <folding>
  830 + <element signature="e#131#169#0#PHP" expanded="true" />
  831 + <element signature="e#875#1547#0#PHP" expanded="false" />
  832 + </folding>
  833 + </state>
  834 + </provider>
  835 + </entry>
780 </component> 836 </component>
781 </project> 837 </project>
  1 +<?php
  2 +/**
  3 + * Created by PhpStorm.
  4 + * User: Administrator
  5 + * Date: 2019/11/12
  6 + * Time: 16:25
  7 + */
  8 +
  9 +namespace api\index\controller;
  10 +
  11 +use cmf\controller\RestBaseController;
  12 +use think\Db;
  13 +use think\Validate;
  14 +
  15 +/**
  16 + * @title 关于我们
  17 + * @description
  18 + */
  19 +class ProjectController extends RestBaseController
  20 +{
  21 + /**
  22 + * @title 公司介绍
  23 + * @description
  24 + * @author GuoSheng
  25 + * @url /index/Project/index
  26 + * @method GET
  27 + *
  28 + * @return id:ID
  29 + * @return content:公司介绍
  30 + * @return create_time:创建时间
  31 + *
  32 + */
  33 + public function index(){
  34 + $data = Db::name('about')
  35 + ->where('id',1)
  36 + ->field('id,content,create_time')
  37 + ->find();
  38 + $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
  39 + $data['create_time'] = date('Y-m-d H:i:s',$data['create_time']);
  40 + $this->success('SUCCESS',$data);
  41 + }
  42 +
  43 + /**
  44 + * @title 产品方案
  45 + * @description
  46 + * @author GuoSheng
  47 + * @url /index/Project/project
  48 + * @method GET
  49 + *
  50 + * @return id:ID
  51 + * @return content:产品方案
  52 + *
  53 + */
  54 + public function project(){
  55 + $data = Db::name('project')
  56 + ->where('id',1)
  57 + ->field('id,content')
  58 + ->find();
  59 + $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
  60 + $this->success('SUCCESS',$data);
  61 + }
  62 +
  63 + /**
  64 + * @title 加入我们
  65 + * @description
  66 + * @author GuoSheng
  67 + * @url /index/Project/joinUs
  68 + * @method GET
  69 + *
  70 + * @return id:ID
  71 + * @return content:内容
  72 + *
  73 + */
  74 + public function joinUs(){
  75 + $data = Db::name('joinus')
  76 + ->where('id',1)
  77 + ->field('id,content')
  78 + ->find();
  79 + $data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
  80 + $this->success('SUCCESS',$data);
  81 + }
  82 +
  83 + /**
  84 + * @title 加入我们信息填写
  85 + * @description
  86 + * @author GuoSheng
  87 + * @url /index/Project/join
  88 + * @method GET
  89 + *
  90 + * @header name:XX-Token require:1 default: desc:token
  91 + *
  92 + * @param name:name type:string require:1 other: desc:姓名
  93 + * @param name:phone type:int require:1 other: desc:电话
  94 + * @param name:email type:string require:1 other: desc:邮箱
  95 + * @param name:content type:string require:1 other: desc:加盟信息
  96 + *
  97 + */
  98 + public function join()
  99 + {
  100 + $user_id = $this->getUserId();
  101 + $param = $this->request->param();
  102 + $param['user_id'] = $user_id;
  103 + $param['create_time'] = time();
  104 + $validate = new Validate([
  105 + 'name' => 'require',
  106 + 'phone' => 'require|max:11',
  107 + 'email'=>'require',
  108 + 'content'=>'require',
  109 + ]);
  110 + if (!$validate->check($param)) {
  111 + $this->error(['code'=>40005,'msg'=>$validate->getError()]);
  112 + }
  113 + $data = Db::name('join')
  114 + ->insert($param);
  115 + if(empty($data)){
  116 + $this->error(['code'=>40006,'msg'=>'sql执行失败']);
  117 + }
  118 + $this->success('SUCCESS');
  119 + }
  120 +
  121 +}
  1 +<?php
  2 +/**
  3 + * Created by PhpStorm.
  4 + * User: Administrator
  5 + * Date: 2019/11/12
  6 + * Time: 18:21
  7 + */
  8 +
  9 +namespace api\index\controller;
  10 +
  11 +
  12 +use cmf\controller\RestBaseController;
  13 +use think\Db;
  14 +
  15 +
  16 +/**
  17 + * @title 回收分类
  18 + * @description
  19 + */
  20 +class RecycleController extends RestBaseController
  21 +{
  22 + /**
  23 + * @title 可回收物类型
  24 + * @description
  25 + * @author GuoSheng
  26 + * @url /index/Recycle/index
  27 + * @method GET
  28 + *
  29 + * @return id:可回收物分类ID
  30 + * @return recycle_name:类型名称
  31 + * @return thumbnail:图片
  32 + * @return price:价格
  33 + *
  34 + */
  35 + public function index(){
  36 + $where['delete_time'] = ['eq',0];
  37 + $data = Db::name('recycletype')
  38 + ->where($where)
  39 + ->field('id,recycle_name,thumbnail,price')
  40 + ->order('id desc')
  41 + ->select()
  42 + ->toArray();
  43 + $this->success('SUCCESS',$data);
  44 +
  45 + }
  46 +
  47 + //不可回收物
  48 + public function noRecycle()
  49 + {
  50 + $where['delete_time'] = ['eq',0];
  51 + $recycleModel = new NorecycletypeModel();
  52 + $data = $recycleModel->selectData($where)->toArray();
  53 + $recycleGoodsModel = new NorecyclegoodsModel();
  54 + $tiao = [];
  55 + $res = $recycleGoodsModel->selectData($tiao)->toArray();
  56 + foreach ($data as &$v){
  57 + $v['norecyclegoods'] = [];
  58 + foreach ($res as $key=>$val){
  59 + if($val['recycletype_id'] == $v['id']){
  60 + array_push($v['norecyclegoods'],$val);
  61 + }
  62 + }
  63 + }
  64 + $this->assign('data',$data);
  65 + return $this->fetch();
  66 + }
  67 +}
  1 +<?php
  2 +/**
  3 + * Created by PhpStorm.
  4 + * User: Administrator
  5 + * Date: 2019/11/12
  6 + * Time: 17:17
  7 + */
  8 +
  9 +namespace api\index\controller;
  10 +
  11 +
  12 +use api\index\model\ShoptypeModel;
  13 +use api\index\model\ShopgoodsModel;
  14 +use api\index\model\ShoppicModel;
  15 +use cmf\controller\RestBaseController;
  16 +
  17 +/**
  18 + * @title 积分商城首页
  19 + * @description
  20 + */
  21 +class ShopgoodsController extends RestBaseController
  22 +{
  23 +
  24 + /**
  25 + * @title 商品类型
  26 + * @description
  27 + * @author GuoSheng
  28 + * @url /index/Shopgoods/index
  29 + * @method GET
  30 + *
  31 + * @return id:ID
  32 + * @return type_name:类型名称
  33 + *
  34 + */
  35 + public function index()
  36 + {
  37 + $where['delete_time'] = ['eq',0];
  38 + $shopTypeModel = new ShoptypeModel();
  39 + $data = $shopTypeModel->selectData($where);
  40 + $this->success('SUCCESS',$data);
  41 + }
  42 +
  43 + /**
  44 + * @title 商品列表
  45 + * @description
  46 + * @author GuoSheng
  47 + * @url /index/Shopgoods/goods
  48 + * @method GET
  49 + *
  50 + * @param name:shoptype_id type:int require:0 other: desc:商品类型ID
  51 + *
  52 + * @return id:商品ID
  53 + * @return shoptype_id:所属类型ID
  54 + * @return goods_name:商品名称
  55 + * @return price:所需积分
  56 + *
  57 + */
  58 + public function goods(){
  59 + $shoptype_id = $this->request->param('shoptype_id');
  60 + if(empty($shoptype_id)){
  61 + $shopGoodsModel = new ShopgoodsModel();
  62 + $where['delete_time'] = ['eq',0];
  63 + $data['goods'] = $shopGoodsModel->selectData($where);
  64 + $this->success('SUCCESS',$data);
  65 + }else{
  66 + $shopGoodsModel = new ShopgoodsModel();
  67 + $where['delete_time'] = ['eq',0];
  68 + $where['shoptype_id'] = ['eq',$shoptype_id];
  69 + $data = $shopGoodsModel->selectData($where);
  70 + $this->success('SUCCESS',$data);
  71 + }
  72 + }
  73 +
  74 + /**
  75 + * @title 商城首页轮播图
  76 + * @description
  77 + * @author GuoSheng
  78 + * @url /index/Shopgoods/photo
  79 + * @method GET
  80 + *
  81 + * @return id:ID
  82 + * @return thumbnail:图片
  83 + * @return url:链接地址
  84 + *
  85 + */
  86 + public function photo(){
  87 + $where['delete_time'] = ['eq',0];
  88 + $shopPicModel = new ShoppicModel();
  89 + $data = $shopPicModel->selectData($where);
  90 + $this->success('SUCCESS',$data);
  91 + }
  92 +
  93 + /**
  94 + * @title 商品搜索页
  95 + * @description
  96 + * @author GuoSheng
  97 + * @url /index/Shopgoods/search
  98 + * @method GET
  99 + *
  100 + * @param name:keyword type:string require:1 other: desc:商品关键字
  101 + *
  102 + * @return id:商品ID
  103 + * @return shoptype_id:所属类型ID
  104 + * @return goods_name:商品名称
  105 + * @return price:所需积分
  106 + *
  107 + */
  108 + public function search(){
  109 + $keyword = $this->request->param('keyword');
  110 + if(empty($keyword)){
  111 + $this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
  112 + }
  113 + $where['goods_name'] = ['like',"%$keyword%"];
  114 + $shopGoodsModel = new ShopgoodsModel();
  115 + $data = $shopGoodsModel->selectData($where);
  116 + $this->success('SUCCESS',$data);
  117 + }
  118 +
  119 + /**
  120 + * @title 商品详情页
  121 + * @description
  122 + * @author GuoSheng
  123 + * @url /index/Shopgoods/goodsDetail
  124 + * @method GET
  125 + *
  126 + * @header name:XX-Token require:1 default: desc:token
  127 + *
  128 + * @param name:id type:int require:0 other: desc:商品ID
  129 + *
  130 + * @return id:商品ID
  131 + * @return shoptype_id:所属类型ID
  132 + * @return goods_name:商品名称
  133 + * @return price:所需积分
  134 + * @return thumbnail:商品缩略图
  135 + * @return images:商品轮播图
  136 + * @return freight:运费
  137 + * @return content:详情
  138 + *
  139 + *
  140 + */
  141 + public function goodsDetail(){
  142 + $user_id = $this->getUserId();
  143 + $goods_id = $this->request->param('id',0,'intval');
  144 + if(empty($goods_id)){
  145 + $this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
  146 + }
  147 + $where['id'] = ['eq',$goods_id];
  148 + $shopGoodsModel = new ShopgoodsModel();
  149 + $data = $shopGoodsModel->findData($where);
  150 + $data['create_time'] = date('Y-m-d H:i:s',$data['create_time']);
  151 + $data['update_time'] = date('Y-m-d H:i:s',$data['update_time']);
  152 + $this->success('SUCCESS',$data);
  153 + }
  154 +}
  1 +<?php
  2 +/**
  3 + * Created by PhpStorm.
  4 + * User: Administrator
  5 + * Date: 2019/11/12
  6 + * Time: 17:32
  7 + */
  8 +
  9 +namespace api\index\model;
  10 +
  11 +
  12 +use think\Model;
  13 +
  14 +class ShopgoodsModel extends Model
  15 +{
  16 + public function getContentAttr($value){
  17 + return cmf_replace_content_file_url(htmlspecialchars_decode($value));;
  18 + }
  19 +
  20 + public function getThumbnailAttr($value){
  21 + return cmf_get_image_preview_url($value);
  22 + }
  23 +
  24 + public function getImagesAttr($value){
  25 + if(!empty($value)){
  26 + $data = explode(',',$value);
  27 + foreach($data as $key => $vo){
  28 + $data[$key] = cmf_get_image_url($vo);
  29 + }
  30 + return $data;
  31 + }
  32 + }
  33 +
  34 + public function selectData($where){
  35 + $data = $this
  36 + ->where($where)
  37 + ->field('id,shoptype_id,goods_name,price')
  38 + ->order('id desc')
  39 + ->select();
  40 + return $data;
  41 + }
  42 +
  43 + public function findData($where){
  44 + $data = $this->where($where)->find();
  45 + return $data;
  46 + }
  47 +}
  1 +<?php
  2 +/**
  3 + * Created by PhpStorm.
  4 + * User: Administrator
  5 + * Date: 2019/11/12
  6 + * Time: 17:50
  7 + */
  8 +
  9 +namespace api\index\model;
  10 +
  11 +
  12 +use think\Model;
  13 +
  14 +class ShoppicModel extends Model
  15 +{
  16 + public function getThumbnailAttr($value){
  17 + return cmf_get_image_preview_url($value);
  18 + }
  19 +
  20 + public function selectData($where){
  21 + $data = $this
  22 + ->where($where)
  23 + ->field('id,thumbnail,url')
  24 + ->order('id desc')
  25 + ->select();
  26 + return $data;
  27 + }
  28 +}
  1 +<?php
  2 +/**
  3 + * Created by PhpStorm.
  4 + * User: Administrator
  5 + * Date: 2019/11/12
  6 + * Time: 17:21
  7 + */
  8 +namespace api\index\model;
  9 +
  10 +use think\Model;
  11 +
  12 +class ShoptypeModel extends Model
  13 +{
  14 + public function selectData($where){
  15 + $data = $this
  16 + ->where($where)
  17 + ->field('id,type_name')
  18 + ->select();
  19 + return $data;
  20 + }
  21 +}
@@ -10,6 +10,11 @@ class Doc @@ -10,6 +10,11 @@ class Doc
10 'controller' => [ 10 'controller' => [
11 'api\\home\\controller\\IndexController', 11 'api\\home\\controller\\IndexController',
12 'api\\wxapp\\controller\\PublicController', 12 'api\\wxapp\\controller\\PublicController',
  13 +
  14 + 'api\\index\\controller\\ProjectController',
  15 + 'api\\index\\controller\\ShopgoodsController',
  16 + 'api\\index\\controller\\RecycleController',
  17 +
13 ], 18 ],
14 'password'=>'', 19 'password'=>'',
15 'static_path'=>'', 20 'static_path'=>'',