郭盛 / scrap · 提交

转到一个项目

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

写商城有关接口

内嵌 并排对比
正在显示 8 个修改的文件 包含 662 行增加 和 163 行删除
... ... @@ -2,7 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/ProjectController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/model/ShoppicModel.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -24,70 +31,34 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
<state relative-caret-position="306">
<caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
<folding>
<element signature="e#130#170#0#PHP" expanded="true" />
<element signature="e#739#805#0#PHP" expanded="false" />
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#875#1547#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WeChatBaseController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php">
<file leaf-file-name="Doc.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
<caret line="201" column="15" lean-forward="true" selection-start-line="201" selection-start-column="15" selection-end-line="201" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-465">
<caret line="20" column="31" lean-forward="true" selection-start-line="20" selection-start-column="31" selection-end-line="20" selection-end-column="31" />
<state relative-caret-position="325">
<caret line="13" column="56" lean-forward="true" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />
<folding>
<element signature="e#1924#2026#0#PHP" expanded="false" />
<element signature="e#2031#3227#0#PHP" expanded="false" />
<element signature="e#3233#3328#0#PHP" expanded="false" />
<element signature="e#3333#4931#0#PHP" expanded="false" />
<element signature="e#4937#4966#0#PHP" expanded="false" />
<element signature="e#4971#5333#0#PHP" expanded="false" />
<element signature="e#5339#5375#0#PHP" expanded="false" />
<element signature="e#5380#5584#0#PHP" expanded="false" />
<element signature="e#5590#5612#0#PHP" expanded="false" />
<element signature="e#5617#5749#0#PHP" expanded="false" />
<marker date="1573554256791" expanded="true" signature="9523:9529" ph=" " />
<marker date="1573554256791" expanded="true" signature="9529:9535" ph=" " />
<marker date="1573554256791" expanded="true" signature="10013:10019" ph=" " />
<marker date="1573554256791" expanded="true" signature="10019:10025" ph=" " />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="config.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1160">
<caret line="237" column="51" lean-forward="false" selection-start-line="237" selection-start-column="19" selection-end-line="237" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="14" column="7" lean-forward="true" selection-start-line="14" selection-start-column="7" selection-end-line="14" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -103,13 +74,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$USER_HOME$/Desktop/Index.php" />
<option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html" />
<option value="$PROJECT_DIR$/app/index/model/RecycletypeModel.php" />
<option value="$PROJECT_DIR$/app/index/model/RecyclegoodsModel.php" />
<option value="$PROJECT_DIR$/app/index/model/NorecyclegoodsModel.php" />
<option value="$PROJECT_DIR$/app/index/model/NorecycletypeModel.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/recycle/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/recycle/showgoods.html" />
<option value="$PROJECT_DIR$/app/admin/controller/RecycleController.php" />
... ... @@ -154,6 +118,13 @@
<option value="$PROJECT_DIR$/app/config.php" />
<option value="$PROJECT_DIR$/app/extra/wechat.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ProjectController.php" />
<option value="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" />
<option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
<option value="$PROJECT_DIR$/api/index/model/ShoppicModel.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
</list>
</option>
</component>
... ... @@ -171,11 +142,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="485" />
<option name="y" value="24" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="260" />
<option name="y" value="62" />
<option name="width" value="1678" />
<option name="height" value="1097" />
<option name="height" value="1093" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -202,6 +173,24 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
... ... @@ -221,19 +210,43 @@
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="model" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="config" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api-doc" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="weiwei" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api-doc" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="src" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -245,7 +258,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project1/resource" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -307,15 +320,15 @@
<workItem from="1573450754427" duration="9613000" />
<workItem from="1573463816109" duration="4867000" />
<workItem from="1573517804403" duration="18784000" />
<workItem from="1573542205740" duration="2464000" />
<workItem from="1573542205740" duration="11597000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="205091000" />
<option name="totallyTimeSpent" value="214224000" />
</component>
<component name="ToolWindowManager">
<frame x="485" y="24" width="1678" height="1097" extended-state="0" />
<frame x="260" y="62" width="1678" height="1093" extended-state="1" />
<editor active="true" />
<layout>
<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 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/portal/controller/SearchController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/api/CategoryApi.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-562">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/static/swiper3/swiper.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/static/style/base.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="354" column="19" lean-forward="true" selection-start-line="354" selection-start-column="19" selection-end-line="354" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
<entry file="file://$PROJECT_DIR$/api/home/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-675">
<caret line="17" column="6" lean-forward="false" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/install/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/WechatController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-476">
... ... @@ -606,14 +554,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332">
... ... @@ -630,21 +570,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="26" column="12" lean-forward="true" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />
<folding>
<element signature="e#391#495#0#PHP" expanded="false" />
<element signature="e#514#722#0#PHP" expanded="false" />
<element signature="e#739#1625#0#PHP" expanded="false" />
<element signature="e#1643#1843#0#PHP" expanded="false" />
<element signature="e#1861#2257#0#PHP" expanded="false" />
<element signature="e#2275#2663#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/garbageCollect/register.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
... ... @@ -731,6 +656,14 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
<caret line="201" column="15" lean-forward="true" selection-start-line="201" selection-start-column="15" selection-end-line="201" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1160">
... ... @@ -763,19 +696,142 @@
<state relative-caret-position="350">
<caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
<folding>
<element signature="e#130#170#0#PHP" expanded="true" />
<element signature="e#130#170#0#PHP" expanded="false" />
<element signature="e#739#805#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/WeChatBaseController.php">
<entry file="file://$PROJECT_DIR$/app/index/model/ShoptypeModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
<caret line="201" column="15" lean-forward="true" selection-start-line="201" selection-start-column="15" selection-end-line="201" selection-end-column="15" />
<state relative-caret-position="250">
<caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="20" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="15" column="4" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="45" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShoptypeModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="16" column="33" lean-forward="false" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShopgoodsModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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" />
<folding>
<element signature="e#418#678#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/model/ShoppicModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="25" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<folding>
<element signature="e#130#165#0#PHP" expanded="true" />
<element signature="e#391#495#0#PHP" expanded="false" />
<element signature="e#514#722#0#PHP" expanded="false" />
<element signature="e#739#1625#0#PHP" expanded="false" />
<element signature="e#1643#1843#0#PHP" expanded="false" />
<element signature="e#1861#2257#0#PHP" expanded="false" />
<element signature="e#2275#2663#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="58" selection-end-column="5" />
<folding>
<element signature="e#396#1051#0#PHP" expanded="false" />
<element signature="e#1069#1741#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="17" selection-end-column="3" />
<folding>
<element signature="e#130#168#0#PHP" expanded="true" />
<element signature="e#526#900#0#PHP" expanded="false" />
<element signature="e#1102#1395#0#PHP" expanded="false" />
<element signature="e#1594#1885#0#PHP" expanded="false" />
<element signature="e#2353#3050#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="23" column="4" lean-forward="false" selection-start-line="23" selection-start-column="4" selection-end-line="33" selection-end-column="7" />
<folding>
<element signature="e#131#165#0#PHP" expanded="true" />
<element signature="e#575#791#0#PHP" expanded="false" />
<element signature="e#797#1129#0#PHP" expanded="false" />
<element signature="e#1134#1749#0#PHP" expanded="false" />
<element signature="e#1755#1973#0#PHP" expanded="false" />
<element signature="e#1978#2186#0#PHP" expanded="false" />
<element signature="e#2192#2524#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="56" lean-forward="true" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />
<folding>
<marker date="1573554256791" expanded="true" signature="9523:9529" ph=" " />
<marker date="1573554256791" expanded="true" signature="9529:9535" ph=" " />
<marker date="1573554256791" expanded="true" signature="10013:10019" ph=" " />
<marker date="1573554256791" expanded="true" signature="10019:10025" ph=" " />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="29" column="32" lean-forward="true" selection-start-line="29" selection-start-column="32" selection-end-line="29" selection-end-column="32" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#875#1547#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/12
* Time: 16:25
*/
namespace api\index\controller;
use cmf\controller\RestBaseController;
use think\Db;
use think\Validate;
/**
* @title 关于我们
* @description
*/
class ProjectController extends RestBaseController
{
/**
* @title 公司介绍
* @description
* @author GuoSheng
* @url /index/Project/index
* @method GET
*
* @return id:ID
* @return content:公司介绍
* @return create_time:创建时间
*
*/
public function index(){
$data = Db::name('about')
->where('id',1)
->field('id,content,create_time')
->find();
$data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
$data['create_time'] = date('Y-m-d H:i:s',$data['create_time']);
$this->success('SUCCESS',$data);
}
/**
* @title 产品方案
* @description
* @author GuoSheng
* @url /index/Project/project
* @method GET
*
* @return id:ID
* @return content:产品方案
*
*/
public function project(){
$data = Db::name('project')
->where('id',1)
->field('id,content')
->find();
$data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
$this->success('SUCCESS',$data);
}
/**
* @title 加入我们
* @description
* @author GuoSheng
* @url /index/Project/joinUs
* @method GET
*
* @return id:ID
* @return content:内容
*
*/
public function joinUs(){
$data = Db::name('joinus')
->where('id',1)
->field('id,content')
->find();
$data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($data['content']));
$this->success('SUCCESS',$data);
}
/**
* @title 加入我们信息填写
* @description
* @author GuoSheng
* @url /index/Project/join
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:name type:string require:1 other: desc:姓名
* @param name:phone type:int require:1 other: desc:电话
* @param name:email type:string require:1 other: desc:邮箱
* @param name:content type:string require:1 other: desc:加盟信息
*
*/
public function join()
{
$user_id = $this->getUserId();
$param = $this->request->param();
$param['user_id'] = $user_id;
$param['create_time'] = time();
$validate = new Validate([
'name' => 'require',
'phone' => 'require|max:11',
'email'=>'require',
'content'=>'require',
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$data = Db::name('join')
->insert($param);
if(empty($data)){
$this->error(['code'=>40006,'msg'=>'sql执行失败']);
}
$this->success('SUCCESS');
}
}
\ No newline at end of file
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/12
* Time: 18:21
*/
namespace api\index\controller;
use cmf\controller\RestBaseController;
use think\Db;
/**
* @title 回收分类
* @description
*/
class RecycleController extends RestBaseController
{
/**
* @title 可回收物类型
* @description
* @author GuoSheng
* @url /index/Recycle/index
* @method GET
*
* @return id:可回收物分类ID
* @return recycle_name:类型名称
* @return thumbnail:图片
* @return price:价格
*
*/
public function index(){
$where['delete_time'] = ['eq',0];
$data = Db::name('recycletype')
->where($where)
->field('id,recycle_name,thumbnail,price')
->order('id desc')
->select()
->toArray();
$this->success('SUCCESS',$data);
}
//不可回收物
public function noRecycle()
{
$where['delete_time'] = ['eq',0];
$recycleModel = new NorecycletypeModel();
$data = $recycleModel->selectData($where)->toArray();
$recycleGoodsModel = new NorecyclegoodsModel();
$tiao = [];
$res = $recycleGoodsModel->selectData($tiao)->toArray();
foreach ($data as &$v){
$v['norecyclegoods'] = [];
foreach ($res as $key=>$val){
if($val['recycletype_id'] == $v['id']){
array_push($v['norecyclegoods'],$val);
}
}
}
$this->assign('data',$data);
return $this->fetch();
}
}
\ No newline at end of file
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/12
* Time: 17:17
*/
namespace api\index\controller;
use api\index\model\ShoptypeModel;
use api\index\model\ShopgoodsModel;
use api\index\model\ShoppicModel;
use cmf\controller\RestBaseController;
/**
* @title 积分商城首页
* @description
*/
class ShopgoodsController extends RestBaseController
{
/**
* @title 商品类型
* @description
* @author GuoSheng
* @url /index/Shopgoods/index
* @method GET
*
* @return id:ID
* @return type_name:类型名称
*
*/
public function index()
{
$where['delete_time'] = ['eq',0];
$shopTypeModel = new ShoptypeModel();
$data = $shopTypeModel->selectData($where);
$this->success('SUCCESS',$data);
}
/**
* @title 商品列表
* @description
* @author GuoSheng
* @url /index/Shopgoods/goods
* @method GET
*
* @param name:shoptype_id type:int require:0 other: desc:商品类型ID
*
* @return id:商品ID
* @return shoptype_id:所属类型ID
* @return goods_name:商品名称
* @return price:所需积分
*
*/
public function goods(){
$shoptype_id = $this->request->param('shoptype_id');
if(empty($shoptype_id)){
$shopGoodsModel = new ShopgoodsModel();
$where['delete_time'] = ['eq',0];
$data['goods'] = $shopGoodsModel->selectData($where);
$this->success('SUCCESS',$data);
}else{
$shopGoodsModel = new ShopgoodsModel();
$where['delete_time'] = ['eq',0];
$where['shoptype_id'] = ['eq',$shoptype_id];
$data = $shopGoodsModel->selectData($where);
$this->success('SUCCESS',$data);
}
}
/**
* @title 商城首页轮播图
* @description
* @author GuoSheng
* @url /index/Shopgoods/photo
* @method GET
*
* @return id:ID
* @return thumbnail:图片
* @return url:链接地址
*
*/
public function photo(){
$where['delete_time'] = ['eq',0];
$shopPicModel = new ShoppicModel();
$data = $shopPicModel->selectData($where);
$this->success('SUCCESS',$data);
}
/**
* @title 商品搜索页
* @description
* @author GuoSheng
* @url /index/Shopgoods/search
* @method GET
*
* @param name:keyword type:string require:1 other: desc:商品关键字
*
* @return id:商品ID
* @return shoptype_id:所属类型ID
* @return goods_name:商品名称
* @return price:所需积分
*
*/
public function search(){
$keyword = $this->request->param('keyword');
if(empty($keyword)){
$this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
}
$where['goods_name'] = ['like',"%$keyword%"];
$shopGoodsModel = new ShopgoodsModel();
$data = $shopGoodsModel->selectData($where);
$this->success('SUCCESS',$data);
}
/**
* @title 商品详情页
* @description
* @author GuoSheng
* @url /index/Shopgoods/goodsDetail
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:id type:int require:0 other: desc:商品ID
*
* @return id:商品ID
* @return shoptype_id:所属类型ID
* @return goods_name:商品名称
* @return price:所需积分
* @return thumbnail:商品缩略图
* @return images:商品轮播图
* @return freight:运费
* @return content:详情
*
*
*/
public function goodsDetail(){
$user_id = $this->getUserId();
$goods_id = $this->request->param('id',0,'intval');
if(empty($goods_id)){
$this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
}
$where['id'] = ['eq',$goods_id];
$shopGoodsModel = new ShopgoodsModel();
$data = $shopGoodsModel->findData($where);
$data['create_time'] = date('Y-m-d H:i:s',$data['create_time']);
$data['update_time'] = date('Y-m-d H:i:s',$data['update_time']);
$this->success('SUCCESS',$data);
}
}
\ No newline at end of file
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/12
* Time: 17:32
*/
namespace api\index\model;
use think\Model;
class ShopgoodsModel extends Model
{
public function getContentAttr($value){
return cmf_replace_content_file_url(htmlspecialchars_decode($value));;
}
public function getThumbnailAttr($value){
return cmf_get_image_preview_url($value);
}
public function getImagesAttr($value){
if(!empty($value)){
$data = explode(',',$value);
foreach($data as $key => $vo){
$data[$key] = cmf_get_image_url($vo);
}
return $data;
}
}
public function selectData($where){
$data = $this
->where($where)
->field('id,shoptype_id,goods_name,price')
->order('id desc')
->select();
return $data;
}
public function findData($where){
$data = $this->where($where)->find();
return $data;
}
}
\ No newline at end of file
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/12
* Time: 17:50
*/
namespace api\index\model;
use think\Model;
class ShoppicModel extends Model
{
public function getThumbnailAttr($value){
return cmf_get_image_preview_url($value);
}
public function selectData($where){
$data = $this
->where($where)
->field('id,thumbnail,url')
->order('id desc')
->select();
return $data;
}
}
\ No newline at end of file
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/12
* Time: 17:21
*/
namespace api\index\model;
use think\Model;
class ShoptypeModel extends Model
{
public function selectData($where){
$data = $this
->where($where)
->field('id,type_name')
->select();
return $data;
}
}
\ No newline at end of file
... ...
... ... @@ -10,6 +10,11 @@ class Doc
'controller' => [
'api\\home\\controller\\IndexController',
'api\\wxapp\\controller\\PublicController',
'api\\index\\controller\\ProjectController',
'api\\index\\controller\\ShopgoodsController',
'api\\index\\controller\\RecycleController',
],
'password'=>'',
'static_path'=>'',
... ...