郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 a2791802ae4027dc8160860ae46a675e6b1e7284 1 个父辈 c965992a
1 个管道 的构建 通过 耗费 7 秒

编写前端接口

内嵌 并排对比
正在显示 10 个修改的文件 包含 811 行增加 和 229 行删除
... ... @@ -2,13 +2,15 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<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="NEW" beforePath="" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/admin/controller/BuildController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" afterPath="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" afterPath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/cmf/common.php" afterPath="$PROJECT_DIR$/simplewind/cmf/common.php" />
<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" />
... ... @@ -31,34 +33,85 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="383">
<caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding>
<element signature="e#131#165#0#PHP" expanded="true" />
<element signature="e#377#570#0#PHP" expanded="false" />
<element signature="e#575#791#0#PHP" expanded="false" />
<element signature="e#797#1266#0#PHP" expanded="false" />
<element signature="e#1271#2039#0#PHP" expanded="false" />
<element signature="e#2045#2263#0#PHP" expanded="false" />
<element signature="e#2268#2476#0#PHP" expanded="false" />
<element signature="e#2482#2814#0#PHP" expanded="false" />
<element signature="e#2819#3199#0#PHP" expanded="false" />
<element signature="e#3205#3717#0#PHP" expanded="false" />
<element signature="e#3722#4285#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">
<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" />
<state relative-caret-position="722">
<caret line="308" column="33" lean-forward="false" selection-start-line="308" selection-start-column="33" selection-end-line="308" selection-end-column="33" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#875#1547#0#PHP" expanded="false" />
<element signature="e#301#555#0#PHP" expanded="false" />
<element signature="e#560#845#0#PHP" expanded="false" />
<element signature="e#851#1186#0#PHP" expanded="false" />
<element signature="e#1191#1688#0#PHP" expanded="false" />
<element signature="e#1694#1954#0#PHP" expanded="false" />
<element signature="e#1959#2248#0#PHP" expanded="false" />
<element signature="e#2254#2593#0#PHP" expanded="false" />
<element signature="e#2598#3101#0#PHP" expanded="false" />
<element signature="e#3107#3323#0#PHP" expanded="false" />
<element signature="e#3328#3697#0#PHP" expanded="false" />
<element signature="e#3703#4005#0#PHP" expanded="false" />
<element signature="e#4010#4409#0#PHP" expanded="false" />
<element signature="e#4415#4612#0#PHP" expanded="false" />
<element signature="e#4617#4874#0#PHP" expanded="false" />
<element signature="e#4880#5307#0#PHP" expanded="false" />
<element signature="e#5312#5869#0#PHP" expanded="false" />
<element signature="e#5875#6218#0#PHP" expanded="false" />
<element signature="e#6223#6704#0#PHP" expanded="false" />
<element signature="e#6710#7043#0#PHP" expanded="false" />
<element signature="e#7048#7403#0#PHP" expanded="false" />
<element signature="e#7705#8239#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<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">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.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" />
<state relative-caret-position="215">
<caret line="21" column="20" lean-forward="false" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="20" />
<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=" " />
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#1465#1690#0#PHP" expanded="false" />
<element signature="e#1695#3320#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Redis.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/cache/driver/Redis.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<caret line="40" column="20" lean-forward="false" selection-start-line="40" selection-start-column="20" selection-end-line="40" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -68,16 +121,17 @@
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>验证码</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<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" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/recycle/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/no_recycle/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/NoRecycleController.php" />
... ... @@ -120,11 +174,15 @@
<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$/app/admin/controller/BuildController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
<option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.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" />
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
</list>
</option>
</component>
... ... @@ -143,10 +201,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="260" />
<option name="y" value="62" />
<option name="x" value="-103" />
<option name="y" value="46" />
<option name="width" value="1678" />
<option name="height" value="1093" />
<option name="height" value="1077" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -163,6 +221,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -191,32 +250,13 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" 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="index" 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="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" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="model" 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="cmf" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -252,7 +292,6 @@
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
... ... @@ -320,18 +359,19 @@
<workItem from="1573450754427" duration="9613000" />
<workItem from="1573463816109" duration="4867000" />
<workItem from="1573517804403" duration="18784000" />
<workItem from="1573542205740" duration="11597000" />
<workItem from="1573542205740" duration="11653000" />
<workItem from="1573604588269" duration="25212000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="214224000" />
<option name="totallyTimeSpent" value="239492000" />
</component>
<component name="ToolWindowManager">
<frame x="260" y="62" width="1678" height="1093" extended-state="1" />
<frame x="-103" y="46" width="1678" height="1077" 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" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18541409" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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" />
<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" />
<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" />
... ... @@ -377,97 +417,15 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="6" />
<option name="time" value="7" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/portal/controller/WechatController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-476">
<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/user/validate/UserArticlesValidate.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/user/validate/FavoriteValidate.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/user/controller/VerificationCodeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1401">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/UeditorController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3000">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/RegisterController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-951">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/PublicController.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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2925">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="22" column="27" lean-forward="true" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" />
<folding>
<element signature="e#1318#3631#0#PHP" expanded="false" />
<element signature="e#3665#3754#0#PHP" expanded="false" />
<element signature="e#3790#5900#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/FavoriteController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-225">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-226">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -475,7 +433,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2250">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -483,7 +440,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1875">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -491,7 +447,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-840">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -499,7 +454,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
... ... @@ -507,7 +461,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
... ... @@ -554,19 +507,10 @@
</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">
<caret line="72" column="1" lean-forward="true" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/TestController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
... ... @@ -636,7 +580,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="39" column="42" lean-forward="false" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
... ... @@ -644,7 +587,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
... ... @@ -652,7 +594,6 @@
<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>
... ... @@ -676,18 +617,6 @@
<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" />
<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" />
</folding>
</state>
</provider>
</entry>
... ... @@ -726,16 +655,6 @@
</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">
... ... @@ -744,20 +663,12 @@
</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#130#165#0#PHP" expanded="false" />
<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" />
... ... @@ -781,54 +692,187 @@
</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" />
<state relative-caret-position="25">
<caret line="53" column="30" lean-forward="true" selection-start-line="53" selection-start-column="30" selection-end-line="53" selection-end-column="30" />
<folding>
<element signature="e#130#168#0#PHP" expanded="true" />
<element signature="e#130#168#0#PHP" expanded="false" />
<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">
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1017">
<caret line="223" column="1" lean-forward="true" selection-start-line="223" selection-start-column="1" selection-end-line="223" selection-end-column="1" />
<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="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" />
<state relative-caret-position="275">
<caret line="16" column="40" lean-forward="false" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/AboutController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="28">
<caret line="17" column="4" lean-forward="false" selection-start-line="17" selection-start-column="4" selection-end-line="45" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="46" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="129" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home_pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="22" column="12" lean-forward="false" selection-start-line="22" selection-start-column="12" selection-end-line="42" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/BuildController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="800">
<caret line="37" column="35" lean-forward="false" selection-start-line="37" selection-start-column="35" selection-end-line="37" selection-end-column="35" />
<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" />
<element signature="e#131#170#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html">
<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" />
<state relative-caret-position="358">
<caret line="69" column="9" lean-forward="true" selection-start-line="69" selection-start-column="9" selection-end-line="69" selection-end-column="9" />
<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="125">
<caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<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=" " />
<element signature="e#418#678#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Request.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310">
<caret line="269" column="20" lean-forward="false" selection-start-line="269" selection-start-column="20" selection-end-line="269" selection-end-column="20" />
<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" />
<state relative-caret-position="722">
<caret line="308" column="33" lean-forward="false" selection-start-line="308" selection-start-column="33" selection-end-line="308" selection-end-column="33" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#301#555#0#PHP" expanded="false" />
<element signature="e#560#845#0#PHP" expanded="false" />
<element signature="e#851#1186#0#PHP" expanded="false" />
<element signature="e#1191#1688#0#PHP" expanded="false" />
<element signature="e#1694#1954#0#PHP" expanded="false" />
<element signature="e#1959#2248#0#PHP" expanded="false" />
<element signature="e#2254#2593#0#PHP" expanded="false" />
<element signature="e#2598#3101#0#PHP" expanded="false" />
<element signature="e#3107#3323#0#PHP" expanded="false" />
<element signature="e#3328#3697#0#PHP" expanded="false" />
<element signature="e#3703#4005#0#PHP" expanded="false" />
<element signature="e#4010#4409#0#PHP" expanded="false" />
<element signature="e#4415#4612#0#PHP" expanded="false" />
<element signature="e#4617#4874#0#PHP" expanded="false" />
<element signature="e#4880#5307#0#PHP" expanded="false" />
<element signature="e#5312#5869#0#PHP" expanded="false" />
<element signature="e#5875#6218#0#PHP" expanded="false" />
<element signature="e#6223#6704#0#PHP" expanded="false" />
<element signature="e#6710#7043#0#PHP" expanded="false" />
<element signature="e#7048#7403#0#PHP" expanded="false" />
<element signature="e#7705#8239#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/session/driver/Redis.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="31" column="20" lean-forward="false" selection-start-line="31" selection-start-column="20" selection-end-line="31" selection-end-column="20" />
<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="552">
<caret line="1826" column="10" lean-forward="true" selection-start-line="1826" selection-start-column="10" selection-end-line="1826" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/cache/driver/Redis.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<caret line="40" column="20" lean-forward="false" selection-start-line="40" selection-start-column="20" selection-end-line="40" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="215">
<caret line="21" column="20" lean-forward="false" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="20" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#875#1547#0#PHP" expanded="false" />
<element signature="e#1465#1690#0#PHP" expanded="false" />
<element signature="e#1695#3320#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="400">
<caret line="16" column="53" lean-forward="false" selection-start-line="16" selection-start-column="53" selection-end-line="16" selection-end-column="53" />
<folding>
<marker date="1573641534816" expanded="true" signature="9576:9582" ph=" " />
<marker date="1573641534816" expanded="true" signature="9582:9588" ph=" " />
<marker date="1573641534816" expanded="true" signature="10066:10072" ph=" " />
<marker date="1573641534816" expanded="true" signature="10072:10078" ph=" " />
</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="383">
<caret line="22" column="0" lean-forward="true" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding>
<element signature="e#131#165#0#PHP" expanded="true" />
<element signature="e#377#570#0#PHP" expanded="false" />
<element signature="e#575#791#0#PHP" expanded="false" />
<element signature="e#797#1266#0#PHP" expanded="false" />
<element signature="e#1271#2039#0#PHP" expanded="false" />
<element signature="e#2045#2263#0#PHP" expanded="false" />
<element signature="e#2268#2476#0#PHP" expanded="false" />
<element signature="e#2482#2814#0#PHP" expanded="false" />
<element signature="e#2819#3199#0#PHP" expanded="false" />
<element signature="e#3205#3717#0#PHP" expanded="false" />
<element signature="e#3722#4285#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -11,10 +11,11 @@ namespace api\index\controller;
use cmf\controller\RestBaseController;
use think\Db;
use think\Request;
/**
* @title 回收分类
* @title 回收首页
* @description
*/
class RecycleController extends RestBaseController
... ... @@ -37,31 +38,288 @@ class RecycleController extends RestBaseController
$data = Db::name('recycletype')
->where($where)
->field('id,recycle_name,thumbnail,price')
->order('id desc')
->select()
->toArray();
$this->success('SUCCESS',$data);
}
//不可回收物
/**
* @title 可回收物品
* @description
* @author GuoSheng
* @url /index/Recycle/rgoods
* @method GET
*
* @param name:recycletype_id type:int require:0 other: desc:所属分类ID
*
* @return id:可回收物品id
* @return recycletype_id:所属分类id
* @return name:名称
* @return thumbnail:图片
*
*/
public function rgoods(){
$recycletype_id = $this->request->param('recycletype_id');
if(empty($recycletype_id)){
$data = Db::name('recyclegoods')
->where('recycletype_id',1)
->select();
$this->success('SUCCESS',$data);
}else{
$data = Db::name('recyclegoods')
->where('recycletype_id',$recycletype_id)
->select();
$this->success('SUCCESS',$data);
}
}
/**
* @title 不可回收物类型
* @description
* @author GuoSheng
* @url /index/Recycle/noRecycle
* @method GET
*
* @return id:不可回收物分类ID
* @return recycle_name:类型名称
* @return thumbnail:图片
* @return price:价格
*
*/
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();
$data = Db::name('norecycletype')
->where($where)
->field('id,recycle_name,thumbnail')
->select()
->toArray();
$this->success('SUCCESS',$data);
}
/**
* @title 不可回收物品
* @description
* @author GuoSheng
* @url /index/Recycle/norgoods
* @method GET
*
* @param name:recycletype_id type:int require:0 other: desc:所属分类ID
*
* @return id:不可回收物品id
* @return recycletype_id:所属分类id
* @return name:名称
* @return thumbnail:图片
*
*/
public function norgoods(){
$recycletype_id = $this->request->param('recycletype_id');
if(empty($recycletype_id)){
$data = Db::name('norecyclegoods')
->where('recycletype_id',1)
->select();
$this->success('SUCCESS',$data);
}else{
$data = Db::name('norecyclegoods')
->where('recycletype_id',$recycletype_id)
->select();
$this->success('SUCCESS',$data);
}
}
/**
* @title 回收首页轮播图
* @description
* @author GuoSheng
* @url /index/Recycle/photo
* @method GET
*
* @return id:ID
* @return thumbnail:图片
* @return url:链接地址
*
*/
public function photo(){
$where['delete_time'] = ['eq',0];
$data = Db::name('pic')
->where($where)
->field('id,thumbnail,url')
->select()
->toArray();
foreach ($data as &$v){
$v['thumbnail'] = cmf_get_image_url($v['thumbnail']);
}
$this->success('SUCCESS',$data);
}
/**
* @title 回收站点列表
* @description
* @author GuoSheng
* @url /index/Recycle/point
* @method GET
*
* @return id:ID
* @return point_name:站点名称
* @return thumbnail:图片
* @return address:详细地址
* @return lng:站点所在经度
* @return lat:站点所在纬度
*
*/
public function point()
{
$where['delete_time'] = ['eq',0];
$data = Db::name('point')
->where($where)
->field('id,point_name,address,thumbnail,lng,lat')
->select()
->toArray();
foreach ($data as &$v){
$v['norecyclegoods'] = [];
foreach ($res as $key=>$val){
if($val['recycletype_id'] == $v['id']){
array_push($v['norecyclegoods'],$val);
}
$v['thumbnail'] = cmf_get_image_url($v['thumbnail']);
}
$this->success('SUCCESS',$data);
}
/**
* @title 回收首页装修材料logo
* @description
* @author GuoSheng
* @url /index/Recycle/build
* @method GET
*
* @return id:ID
* @return thumbnail:图片
*
*/
public function build(){
$data = Db::name('pic')
->where('id',1)
->field('id,thumbnail')
->find();
$data['thumbnail'] = cmf_get_image_url($data['thumbnail']);
$this->success('SUCCESS',$data);
}
/**
* @title 回收首页服务评价列表
* @description
* @author GuoSheng
* @url /index/Recycle/rgoods
* @method GET
*
* @param name:page type:int require:0 other: desc:当前页（默认1）
* @param name:pageNum type:int require:0 other: desc:每页显示数据个数（默认10）
*
* @return id:评价id
* @return user_id:用户ID
* @return user_nickname:用户名
* @return num:评价星数
* @return content:评价内容
*
*/
public function comment()
{
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$res = Db::name('recyclecomment')
->alias('a')
->join('user b','a.user_id = b.id')
->field('a.*,b.user_nickname')
->page($page,$pageNum)
->select()
->toArray();
foreach ($res as &$v){
$v['num'] = ceil(($v['speed']+$v['service']+$v['recycle'])/3);
}
$this->success('SUCCESS',$res);
}
/**
* @title 回收首页我的积分
* @description
* @author GuoSheng
* @url /index/Recycle/integral
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @return status:状态 (1没有注册过 2注册过)
* @return after_wallet:当前积分
* @return num:参与次数
* @return add_total:累计积分
*
*/
public function integral()
{
$user_id = $this->getUserId();
$data = Db::name('integral')
->where('user_id',$user_id)
->find();
if(empty($data)){
$res['status'] = 1;
}else{
$res['status'] = 2;
$res['after_wallet'] = $data['after_wallet'];
$res['num'] = $data['num'];
$res['add_total'] = $data['add_total'];
}
$this->success('SUCCESS',$res);
}
/**
* @title 上门回收地址列表
* @description
* @author GuoSheng
* @url /index/Recycle/recycleList
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @return status:是否选中 (0不选中 1选中)
* @return name:姓名
* @return phone:电话
* @return address:详细地址
*
*/
public function recycleList()
{
$user_id = $this->getUserId();
$where['user_id'] = ['eq',$user_id];
$where['delete_time'] = ['eq',0];
$data = Db::name('recycle')
->where($where)
->order('status desc')
->select()
->toArray();
$this->success('SUCCESS',$data);
}
/**
* @title 上传文件
* @description 接口说明
* @author 开发者
* @url /index/Resource/uploadFile
* @method POST
* @header name:XX-Token require:1 default: desc:token
* @param name:image type:file require:1 default: other: desc:文件
* @return image_url:图片路径
*/
public function uploadFile(){
$files = request()->file('image');
if (empty($files)) {
$this->error('未检出文件上传');
}
if($files){
$info = $files->move(ROOT_PATH . 'public' . DS . 'uploads');
if($info){
$request = Request::instance();
$a = $request->domain().'/'.'uploads/'.$info->getSaveName();
$this->success('SUCCESS',$a);
}else{
$this->error($files->getError());
}
}
$this->assign('data',$data);
return $this->fetch();
}
}
\ No newline at end of file
... ...
... ... @@ -48,6 +48,8 @@ class ShopgoodsController extends RestBaseController
* @method GET
*
* @param name:shoptype_id type:int require:0 other: desc:商品类型ID
* @param name:page type:int require:0 other: desc:当前页（默认1）
* @param name:pageNum type:int require:0 other: desc:每页显示数据个数（默认10）
*
* @return id:商品ID
* @return shoptype_id:所属类型ID
... ... @@ -57,16 +59,18 @@ class ShopgoodsController extends RestBaseController
*/
public function goods(){
$shoptype_id = $this->request->param('shoptype_id');
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
if(empty($shoptype_id)){
$shopGoodsModel = new ShopgoodsModel();
$where['delete_time'] = ['eq',0];
$data['goods'] = $shopGoodsModel->selectData($where);
$data['goods'] = $shopGoodsModel->selectData($where,$page,$pageNum);
$this->success('SUCCESS',$data);
}else{
$shopGoodsModel = new ShopgoodsModel();
$where['delete_time'] = ['eq',0];
$where['shoptype_id'] = ['eq',$shoptype_id];
$data = $shopGoodsModel->selectData($where);
$data = $shopGoodsModel->selectData($where,$page,$pageNum);
$this->success('SUCCESS',$data);
}
}
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/13
* Time: 17:04
*/
namespace api\index\controller;
use cmf\controller\RestBaseController;
use think\Cache;
use think\cache\driver\Redis;
use think\Validate;
use think\Db;
/**
* @title 个人中心
* @description
*/
class UserController extends RestBaseController
{
/**
* @title 上传文件
* @description 接口说明
* @author 开发者
* @url /index/User/login
* @method POST
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:phone type:int require:1 default: other: desc:手机号
* @param name:code type:string require:1 default: other: desc:验证码
*
*/
public function login()
{
$user_id = $this->getUserId();
$param = $this->request->param();
$param['create_time'] = time();
$param['user_id'] = $user_id;
$validate = new Validate([
'phone' => 'require|max:11',
'code'=>'require'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$code = Cache::get($param['phone']);
if($code == $param['code']){
$data = Db::name('integral')
->insert($param);
if($data){
$this->success('SUCCESS');
}
}else{
$this->error(['code'=>40002,'msg'=>'验证码错误或者失效，请重新发送']);
}
}
/**
* @title 获取验证码
* @description
* @author anyu
* @url /index/User/getcode
* @method POST
*
* @param name:phone type:string require:1 other: desc:手机号码
*
* @return code:验证码
*/
public function getcode()
{
$phone = $this->request->param('phone');
if (empty($phone)) {
$this->error(['code' => 40005, 'msg' => '缺少必要参数']);
}
if (!preg_match('/^1[0-9]{10}$/', $phone)) {
$this->error(['code' => 40005, 'msg' => "请输入正确的手机格式!"]);
}
//生成验证码
$number = generateCode();
//发送验证码
$data = array(
'content' => "您的验证码是：" . $number."十分钟之内有效",//短信内容
'mobile' => $phone,//手机号码
'productid' => '676767',//产品id
'xh' => ''//小号
);
$result = send_sms($data);
if (substr($result, 0, strpos($result, ',')) != "1") {
$this->error(['code' => 42001, 'msg' => $result]);
}
Cache::set($phone,$number,600);
// $code = Db::name('code')
// ->where('phone',$phone)
// ->find();
// if (empty($code)) {
// $arr['phone'] = $phone;
// $arr['create_time'] = time();
// $arr['expire_time'] = time() + 60;
// $arr['code'] = $number;
// $result = Db::name('code')
// ->insertGetId($arr);
// } else {
// $arr['code'] = $number;
// $arr['update_time'] = time();
// $arr['expire_time'] = time() + 60;
// $result = Db::name('code')
// ->where('phone',$phone)
// ->update($arr);
// }
// if (empty($result)) {
// $this->error(['code' => 40006, 'msg' => 'sql执行失败']);
// }
$this->success('SUCCESS', ['code' => $number]);
}
}
\ No newline at end of file
... ...
... ... @@ -31,11 +31,12 @@ class ShopgoodsModel extends Model
}
}
public function selectData($where){
public function selectData($where,$page,$pageNum){
$data = $this
->where($where)
->field('id,shoptype_id,goods_name,price')
->order('id desc')
->page($page,$pageNum)
->select();
return $data;
}
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/13
* Time: 10:29
*/
namespace app\admin\controller;
use cmf\controller\AdminBaseController;
use think\Db;
use think\Validate;
class BuildController extends AdminBaseController
{
public function index()
{
$id = $this->request->param('id', 1, 'intval');
if ($this->request->isPost()) {
$param = $this->request->param();
$validate = new Validate([
'thumbnail' => 'require',
]);
$validate->message([
'thumbnail' => '缩略图不能为空',
]);
if (!$validate->check($param)) {
$this->error($validate->getError());
}
$param['update_time'] = time();
Db::name('build')
->where('id', $id)
->update($param);
$this->success('更新成功');
} else {
$data = Db::name('build')
->where('id', $id)
->find();
$this->assign([
'data' => $data,
]);
return $this->fetch();
}
}
}
\ No newline at end of file
... ...
... ... @@ -2,6 +2,7 @@
return array (
'ADMIN_ABOUT_INDEX' => '公司介绍',
'ADMIN_ATTR_INDEX' => '回收商品属性列表',
'ADMIN_BUILD_INDEX' => '建筑材料logo图',
'ADMIN_FEE_INDEX' => '服务费配置',
'ADMIN_HOME_INDEX' => '家政公司列表',
'ADMIN_HOMEPIC_INDEX' => '家政轮播图列表',
... ...
<include file="public@header"/>
</head>
<body>
<!--<script type="text/html" id="photos-item-tpl">-->
<!--<li id="saved-image{id}">-->
<!--<input id="photo-{id}" type="hidden" name="environment[]" value="{filepath}">-->
<!--<img id="photo-{id}-preview" src="{url}" style="height:36px;width: 36px;"-->
<!--onclick="imagePreviewDialog(this.src);">-->
<!--<a href="javascript:uploadOneImage('图片上传','#photo-{id}');">替换</a>-->
<!--<a href="javascript:(function(){$('#saved-image{id}').remove();})();">移除</a>-->
<!--</li>-->
<!--</script>-->
<script type="text/html" id="photos-item-tpl">
<li id="saved-image{id}">
<input id="photo-{id}" type="hidden" name="images[]" value="{filepath}">
<img id="photo-{id}-preview" src="{url}" style="height:36px;width: 36px;"
onclick="imagePreviewDialog(this.src);">
<a href="javascript:uploadOneImage('图片上传','#photo-{id}');">替换</a>
<a href="javascript:(function(){$('#saved-image{id}').remove();})();">移除</a>
</li>
</script>
<!--<script type="text/html" id="video-item-tpl">-->
<!--<li id="saved-video{id}">-->
<!--<input id="video-{id}" type="hidden" name="video" value="{filepath}">-->
<!--<a id="video-{id}-preview" href="{:cmf_get_image_url('')}{filepath}" target="_blank">查看</a>-->
<!--<a href="javascript:uploadOne('视频上传','#video-{id}','video');">替换</a>-->
<!--<a href="javascript:(function(){$('#saved-video{id}').remove();})();">移除</a>-->
<!--</li>-->
<!--</script>-->
<div class="wrap js-check-wrap">
<form action="{:url('build/index')}" method="post" class="form-horizontal js-ajax-form margin-top-20">
<div class="row">
<div class="col-md-9">
<table class="table table-bordered">
<tr>
<td>缩略图</td>
<td>
<input type="hidden" name="id" value="{$data.id}">
<input type="hidden" name="thumbnail" id="thumbnail"
value="{$data.thumbnail|default=''}">
<a href="javascript:uploadOneImage('image upload','#thumbnail');">
<if condition="empty($data['thumbnail'])">
<img src="__TMPL__/public/assets/images/default-thumbnail.png"
id="thumbnail-preview"
width="135" style="cursor: pointer"/>
<else/>
<img src="{:cmf_get_image_url($data.thumbnail)}"
id="thumbnail-preview"
width="135" style="cursor: pointer"/>
</if>
</a>
<input type="button" class="btn btn-sm btn-cancel-thumbnail"
value="取消图片">
</td>
</tr>
</table>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-primary js-ajax-submit">更新</button>
</div>
</div>
</div>
</div>
</form>
</div>
<script type="text/javascript" src="__STATIC__/js/admin.js"></script>
<script type="text/javascript">
//编辑器路径定义
var editorURL = GV.WEB_ROOT;
</script>
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.config.js"></script>
<script type="text/javascript" src="__STATIC__/js/ueditor/ueditor.all.min.js"></script>
<script type="text/javascript">
$(function () {
editorcontent = new baidu.editor.ui.Editor();
editorcontent.render('content');
try {
editorcontent.sync();
} catch (err) {
}
$('.btn-cancel-thumbnail').click(function () {
$('#thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
$('#thumbnail').val('');
});
$('.btn-cancel-video_thumbnail').click(function () {
$('#video_thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
$('#video_thumbnail').val('');
});
});
</script>
</body>
</html>
... ...
... ... @@ -1823,3 +1823,13 @@ function getAccessToken(){
return $jssdk->getAccessToken();
}
/**
* 生成n位随机数
* @param int $length
* @return int
*/
function generateCode($length = 6) {
$min = pow(10 , ($length - 1));
$max = pow(10, $length) - 1;
return rand($min, $max);
}
... ...
... ... @@ -14,7 +14,7 @@ class Doc
'api\\index\\controller\\ProjectController',
'api\\index\\controller\\ShopgoodsController',
'api\\index\\controller\\RecycleController',
'api\\index\\controller\\UserController',
],
'password'=>'',
'static_path'=>'',
... ...