郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 c02c971ff15e46bed9cabae4e0181418bf6364ea 1 个父辈 5145ba31
1 个管道 的构建 通过 耗费 6 秒

修改回收首页评价

内嵌 并排对比
正在显示 4 个修改的文件 包含 610 行增加 和 219 行删除
... ... @@ -3,7 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" afterPath="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
<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/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -28,35 +29,141 @@
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1343">
<caret line="134" column="43" lean-forward="true" selection-start-line="134" selection-start-column="43" selection-end-line="134" selection-end-column="43" />
<state relative-caret-position="519">
<caret line="350" column="5" lean-forward="true" selection-start-line="350" selection-start-column="5" selection-end-line="350" selection-end-column="5" />
<folding>
<element signature="e#131#161#0#PHP" expanded="true" />
<element signature="e#309#524#0#PHP" expanded="false" />
<element signature="e#529#870#0#PHP" expanded="false" />
<element signature="e#876#1092#0#PHP" expanded="false" />
<element signature="e#1097#1480#0#PHP" expanded="false" />
<element signature="e#1486#1968#0#PHP" expanded="false" />
<element signature="e#1973#2478#0#PHP" expanded="false" />
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1988#0#PHP" expanded="false" />
<element signature="e#1993#2498#0#PHP" expanded="false" />
<element signature="e#2504#3005#0#PHP" expanded="false" />
<element signature="e#3010#3839#0#PHP" expanded="false" />
<element signature="e#3845#4158#0#PHP" expanded="false" />
<element signature="e#4163#4538#0#PHP" expanded="false" />
<element signature="e#4544#4901#0#PHP" expanded="false" />
<element signature="e#4906#5314#0#PHP" expanded="false" />
<element signature="e#5320#5702#0#PHP" expanded="false" />
<element signature="e#5707#6377#0#PHP" expanded="false" />
<element signature="e#6383#6826#0#PHP" expanded="false" />
<element signature="e#6831#7681#0#PHP" expanded="false" />
<element signature="e#7687#7954#0#PHP" expanded="false" />
<element signature="e#7959#8434#0#PHP" expanded="false" />
<element signature="e#8440#8940#0#PHP" expanded="false" />
<element signature="e#8945#9734#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PublicController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="58" column="0" lean-forward="true" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
<state relative-caret-position="618">
<caret line="204" column="5" lean-forward="true" selection-start-line="204" selection-start-column="5" selection-end-line="204" selection-end-column="5" />
<folding>
<element signature="e#602#906#0#PHP" expanded="false" />
<element signature="e#911#1805#0#PHP" expanded="false" />
<element signature="e#1811#2278#0#PHP" expanded="false" />
<element signature="e#2283#5971#0#PHP" expanded="false" />
<element signature="e#5977#6278#0#PHP" expanded="false" />
<element signature="e#6283#7591#0#PHP" expanded="false" />
<element signature="e#7598#8002#0#PHP" expanded="false" />
<element signature="e#8007#8590#0#PHP" expanded="false" />
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1300#0#PHP" expanded="false" />
<element signature="e#1305#2073#0#PHP" expanded="false" />
<element signature="e#2079#2297#0#PHP" expanded="false" />
<element signature="e#2302#2510#0#PHP" expanded="false" />
<element signature="e#2516#2992#0#PHP" expanded="false" />
<element signature="e#2997#3515#0#PHP" expanded="false" />
<element signature="e#3521#4033#0#PHP" expanded="false" />
<element signature="e#4038#4601#0#PHP" expanded="false" />
<element signature="e#4607#5104#0#PHP" expanded="false" />
<element signature="e#5109#5949#0#PHP" expanded="false" />
<element signature="e#5955#6273#0#PHP" expanded="false" />
<element signature="e#6278#6654#0#PHP" expanded="false" />
<element signature="e#6660#7015#0#PHP" expanded="false" />
<element signature="e#7020#7429#0#PHP" expanded="false" />
<element signature="e#7435#7820#0#PHP" expanded="false" />
<element signature="e#7825#8496#0#PHP" expanded="false" />
<element signature="e#8502#8948#0#PHP" expanded="false" />
<element signature="e#8953#9804#0#PHP" expanded="false" />
<element signature="e#9810#10080#0#PHP" expanded="false" />
<element signature="e#10085#10561#0#PHP" expanded="false" />
<element signature="e#10567#11127#0#PHP" expanded="false" />
<element signature="e#11132#11959#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<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="743">
<caret line="486" column="32" lean-forward="false" selection-start-line="486" selection-start-column="32" selection-end-line="486" selection-end-column="32" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#1704#3329#0#PHP" expanded="false" />
<element signature="e#3335#3682#0#PHP" expanded="false" />
<element signature="e#3687#4133#0#PHP" expanded="false" />
<element signature="e#4139#4399#0#PHP" expanded="false" />
<element signature="e#4404#4605#0#PHP" expanded="false" />
<element signature="e#4611#4873#0#PHP" expanded="false" />
<element signature="e#4878#5083#0#PHP" expanded="false" />
<element signature="e#5089#5531#0#PHP" expanded="false" />
<element signature="e#5536#6764#0#PHP" expanded="false" />
<element signature="e#6787#7332#0#PHP" expanded="false" />
<element signature="e#7338#7619#0#PHP" expanded="false" />
<element signature="e#7624#8016#0#PHP" expanded="false" />
<element signature="e#8022#8574#0#PHP" expanded="false" />
<element signature="e#8579#9937#0#PHP" expanded="false" />
<element signature="e#9943#10400#0#PHP" expanded="false" />
<element signature="e#10405#11668#0#PHP" expanded="false" />
<element signature="e#11691#12043#0#PHP" expanded="false" />
<element signature="e#12049#12733#0#PHP" expanded="false" />
<element signature="e#12738#13997#0#PHP" expanded="false" />
<element signature="e#14454#15687#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<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="542">
<caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
<element signature="e#7553#7904#0#PHP" expanded="false" />
<element signature="e#7910#8263#0#PHP" expanded="false" />
<element signature="e#8268#8673#0#PHP" expanded="false" />
<element signature="e#8679#9062#0#PHP" expanded="false" />
<element signature="e#9067#9734#0#PHP" expanded="false" />
<element signature="e#9740#10184#0#PHP" expanded="false" />
<element signature="e#10189#11036#0#PHP" expanded="false" />
<element signature="e#11042#11310#0#PHP" expanded="false" />
<element signature="e#11315#11787#0#PHP" expanded="false" />
<element signature="e#11793#12099#0#PHP" expanded="false" />
<element signature="e#12104#13747#0#PHP" expanded="false" />
<element signature="e#13768#14087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -123,16 +230,16 @@
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/model/HomeModel.php" />
<option value="$PROJECT_DIR$/api/config.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
</list>
</option>
</component>
... ... @@ -150,9 +257,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="86" />
<option name="y" value="62" />
<component name="ProjectFrameBounds">
<option name="x" value="377" />
<option name="y" value="65" />
<option name="width" value="1582" />
<option name="height" value="930" />
</component>
... ... @@ -187,13 +294,13 @@
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="wxapp" 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="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
... ... @@ -288,18 +395,18 @@
<workItem from="1574763377500" duration="4019000" />
<workItem from="1574815992559" duration="11623000" />
<workItem from="1574837405404" duration="1203000" />
<workItem from="1574903328460" duration="7264000" />
<workItem from="1574903328460" duration="15512000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="339744000" />
<option name="totallyTimeSpent" value="347992000" />
</component>
<component name="ToolWindowManager">
<frame x="86" y="62" width="1582" height="930" extended-state="1" />
<frame x="377" y="65" width="1582" height="930" extended-state="0" />
<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.20367937" 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.18068331" 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" />
... ... @@ -507,13 +614,6 @@
</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="81">
<caret line="99" column="8" lean-forward="false" selection-start-line="99" selection-start-column="8" selection-end-line="117" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="235">
... ... @@ -558,43 +658,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281">
<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#861#925#0#PHP" expanded="false" />
<element signature="e#930#1766#0#PHP" expanded="false" />
<element signature="e#1772#1853#0#PHP" expanded="false" />
<element signature="e#1858#3932#0#PHP" expanded="false" />
<element signature="e#3939#3962#0#PHP" expanded="false" />
<element signature="e#3967#4226#0#PHP" expanded="false" />
<element signature="e#4233#4282#0#PHP" expanded="false" />
<element signature="e#4287#4715#0#PHP" expanded="false" />
<element signature="e#4721#4785#0#PHP" expanded="false" />
<element signature="e#4790#5664#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="530">
<caret line="138" column="4" lean-forward="false" selection-start-line="138" selection-start-column="4" selection-end-line="177" selection-end-column="5" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4680#0#PHP" expanded="false" />
</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="275">
... ... @@ -603,79 +666,6 @@
</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="614">
<caret line="401" column="0" lean-forward="true" selection-start-line="401" selection-start-column="0" selection-end-line="401" selection-end-column="0" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#1704#3329#0#PHP" expanded="false" />
<element signature="e#3335#3682#0#PHP" expanded="false" />
<element signature="e#3687#4133#0#PHP" expanded="false" />
<element signature="e#4139#4399#0#PHP" expanded="false" />
<element signature="e#4404#4605#0#PHP" expanded="false" />
<element signature="e#4611#4873#0#PHP" expanded="false" />
<element signature="e#4878#5083#0#PHP" expanded="false" />
<element signature="e#5089#5531#0#PHP" expanded="false" />
<element signature="e#5536#6764#0#PHP" expanded="false" />
<element signature="e#6787#7332#0#PHP" expanded="false" />
<element signature="e#7338#7619#0#PHP" expanded="false" />
<element signature="e#7624#8016#0#PHP" expanded="false" />
<element signature="e#8023#8575#0#PHP" expanded="false" />
<element signature="e#8580#9938#0#PHP" expanded="false" />
<element signature="e#9944#10401#0#PHP" expanded="false" />
<element signature="e#10406#11669#0#PHP" expanded="false" />
<element signature="e#11692#12044#0#PHP" expanded="false" />
<element signature="e#12050#12734#0#PHP" expanded="false" />
<element signature="e#12739#13998#0#PHP" expanded="false" />
</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="614">
<caret line="523" column="5" lean-forward="false" selection-start-line="523" selection-start-column="5" selection-end-line="523" selection-end-column="5" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#5390#5818#0#PHP" expanded="false" />
<element signature="e#5823#6380#0#PHP" expanded="false" />
<element signature="e#6386#6729#0#PHP" expanded="false" />
<element signature="e#6734#7215#0#PHP" expanded="false" />
<element signature="e#7221#7512#0#PHP" expanded="false" />
<element signature="e#7517#7868#0#PHP" expanded="false" />
<element signature="e#7874#8227#0#PHP" expanded="false" />
<element signature="e#8232#8637#0#PHP" expanded="false" />
<element signature="e#8643#9026#0#PHP" expanded="false" />
<element signature="e#9031#9698#0#PHP" expanded="false" />
<element signature="e#9704#10148#0#PHP" expanded="false" />
<element signature="e#10153#11000#0#PHP" expanded="false" />
<element signature="e#11006#11274#0#PHP" expanded="false" />
<element signature="e#11279#11751#0#PHP" expanded="false" />
<element signature="e#11757#12063#0#PHP" expanded="false" />
<element signature="e#12068#13711#0#PHP" expanded="false" />
<element signature="e#13732#14051#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="500">
... ... @@ -683,24 +673,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="463">
<caret line="41" column="5" lean-forward="false" selection-start-line="41" selection-start-column="5" selection-end-line="43" selection-end-column="61" />
<folding>
<element signature="e#330#602#0#PHP" expanded="false" />
<element signature="e#975#1863#0#PHP" expanded="false" />
<element signature="e#1869#2106#0#PHP" expanded="false" />
<element signature="e#2111#2809#0#PHP" expanded="false" />
<element signature="e#2815#3057#0#PHP" expanded="false" />
<element signature="e#3063#3300#0#PHP" expanded="false" />
<element signature="e#3305#3377#0#PHP" expanded="false" />
<element signature="e#3383#3830#0#PHP" expanded="false" />
<element signature="e#3835#4378#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/home/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1300">
... ... @@ -775,10 +747,155 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="258" column="11" lean-forward="true" selection-start-line="258" selection-start-column="11" selection-end-line="258" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2200">
<caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="103" column="5" lean-forward="true" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="543">
<caret line="253" column="0" lean-forward="true" selection-start-line="253" selection-start-column="0" selection-end-line="253" selection-end-column="0" />
<folding>
<element signature="e#602#906#0#PHP" expanded="false" />
<element signature="e#911#1805#0#PHP" expanded="false" />
<element signature="e#1811#2278#0#PHP" expanded="false" />
<element signature="e#2283#5971#0#PHP" expanded="false" />
<element signature="e#5977#6278#0#PHP" expanded="false" />
<element signature="e#6283#7591#0#PHP" expanded="false" />
<element signature="e#7598#8002#0#PHP" expanded="false" />
<element signature="e#8007#8590#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="138" column="4" lean-forward="true" selection-start-line="138" selection-start-column="4" selection-end-line="177" selection-end-column="5" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4680#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="34" column="7" lean-forward="false" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />
<folding>
<element signature="e#330#602#0#PHP" expanded="false" />
<element signature="e#608#970#0#PHP" expanded="false" />
<element signature="e#975#1863#0#PHP" expanded="false" />
<element signature="e#1869#2106#0#PHP" expanded="false" />
<element signature="e#2111#2809#0#PHP" expanded="false" />
<element signature="e#2815#3057#0#PHP" expanded="false" />
<element signature="e#3063#3300#0#PHP" expanded="false" />
<element signature="e#3305#3377#0#PHP" expanded="false" />
<element signature="e#3383#3830#0#PHP" expanded="false" />
<element signature="e#3835#4378#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<caret line="18" column="26" lean-forward="false" selection-start-line="18" selection-start-column="26" selection-end-line="18" selection-end-column="26" />
<folding>
<element signature="e#324#855#0#PHP" expanded="false" />
<element signature="e#861#925#0#PHP" expanded="false" />
<element signature="e#930#1766#0#PHP" expanded="false" />
<element signature="e#1772#1853#0#PHP" expanded="false" />
<element signature="e#1858#3932#0#PHP" expanded="false" />
<element signature="e#3939#3962#0#PHP" expanded="false" />
<element signature="e#3967#4226#0#PHP" expanded="false" />
<element signature="e#4233#4282#0#PHP" expanded="false" />
<element signature="e#4287#4715#0#PHP" expanded="false" />
<element signature="e#4721#4785#0#PHP" expanded="false" />
<element signature="e#4790#5664#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="118">
<caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding>
<element signature="e#300#521#0#PHP" expanded="false" />
<element signature="e#526#900#0#PHP" expanded="false" />
<element signature="e#906#1097#0#PHP" expanded="false" />
<element signature="e#1102#1395#0#PHP" expanded="false" />
<element signature="e#1401#1589#0#PHP" expanded="false" />
<element signature="e#1594#1885#0#PHP" expanded="false" />
<element signature="e#1891#2348#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/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="519">
<caret line="350" column="5" lean-forward="true" selection-start-line="350" selection-start-column="5" selection-end-line="350" selection-end-column="5" />
<folding>
<element signature="e#131#161#0#PHP" expanded="true" />
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1988#0#PHP" expanded="false" />
<element signature="e#1993#2498#0#PHP" expanded="false" />
<element signature="e#2504#3005#0#PHP" expanded="false" />
<element signature="e#3010#3839#0#PHP" expanded="false" />
<element signature="e#3845#4158#0#PHP" expanded="false" />
<element signature="e#4163#4538#0#PHP" expanded="false" />
<element signature="e#4544#4901#0#PHP" expanded="false" />
<element signature="e#4906#5314#0#PHP" expanded="false" />
<element signature="e#5320#5702#0#PHP" expanded="false" />
<element signature="e#5707#6377#0#PHP" expanded="false" />
<element signature="e#6383#6826#0#PHP" expanded="false" />
<element signature="e#6831#7681#0#PHP" expanded="false" />
<element signature="e#7687#7954#0#PHP" expanded="false" />
<element signature="e#7959#8434#0#PHP" expanded="false" />
<element signature="e#8440#8940#0#PHP" expanded="false" />
<element signature="e#8945#9734#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="368">
<caret line="165" column="4" lean-forward="false" selection-start-line="165" selection-start-column="4" selection-end-line="204" selection-end-column="5" />
<state relative-caret-position="618">
<caret line="204" column="5" lean-forward="true" selection-start-line="204" selection-start-column="5" selection-end-line="204" selection-end-column="5" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
... ... @@ -808,59 +925,74 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1343">
<caret line="134" column="43" lean-forward="true" selection-start-line="134" selection-start-column="43" selection-end-line="134" selection-end-column="43" />
<state relative-caret-position="743">
<caret line="486" column="32" lean-forward="false" selection-start-line="486" selection-start-column="32" selection-end-line="486" selection-end-column="32" />
<folding>
<element signature="e#131#161#0#PHP" expanded="true" />
<element signature="e#309#524#0#PHP" expanded="false" />
<element signature="e#529#870#0#PHP" expanded="false" />
<element signature="e#876#1092#0#PHP" expanded="false" />
<element signature="e#1097#1480#0#PHP" expanded="false" />
<element signature="e#1486#1968#0#PHP" expanded="false" />
<element signature="e#1973#2478#0#PHP" expanded="false" />
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#1704#3329#0#PHP" expanded="false" />
<element signature="e#3335#3682#0#PHP" expanded="false" />
<element signature="e#3687#4133#0#PHP" expanded="false" />
<element signature="e#4139#4399#0#PHP" expanded="false" />
<element signature="e#4404#4605#0#PHP" expanded="false" />
<element signature="e#4611#4873#0#PHP" expanded="false" />
<element signature="e#4878#5083#0#PHP" expanded="false" />
<element signature="e#5089#5531#0#PHP" expanded="false" />
<element signature="e#5536#6764#0#PHP" expanded="false" />
<element signature="e#6787#7332#0#PHP" expanded="false" />
<element signature="e#7338#7619#0#PHP" expanded="false" />
<element signature="e#7624#8016#0#PHP" expanded="false" />
<element signature="e#8022#8574#0#PHP" expanded="false" />
<element signature="e#8579#9937#0#PHP" expanded="false" />
<element signature="e#9943#10400#0#PHP" expanded="false" />
<element signature="e#10405#11668#0#PHP" expanded="false" />
<element signature="e#11691#12043#0#PHP" expanded="false" />
<element signature="e#12049#12733#0#PHP" expanded="false" />
<element signature="e#12738#13997#0#PHP" expanded="false" />
<element signature="e#14454#15687#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="258" column="11" lean-forward="true" selection-start-line="258" selection-start-column="11" selection-end-line="258" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2200">
<caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="280">
<caret line="103" column="5" lean-forward="true" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="293">
<caret line="58" column="0" lean-forward="true" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
<state relative-caret-position="542">
<caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />
<folding>
<element signature="e#602#906#0#PHP" expanded="false" />
<element signature="e#911#1805#0#PHP" expanded="false" />
<element signature="e#1811#2278#0#PHP" expanded="false" />
<element signature="e#2283#5971#0#PHP" expanded="false" />
<element signature="e#5977#6278#0#PHP" expanded="false" />
<element signature="e#6283#7591#0#PHP" expanded="false" />
<element signature="e#7598#8002#0#PHP" expanded="false" />
<element signature="e#8007#8590#0#PHP" expanded="false" />
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
<element signature="e#7553#7904#0#PHP" expanded="false" />
<element signature="e#7910#8263#0#PHP" expanded="false" />
<element signature="e#8268#8673#0#PHP" expanded="false" />
<element signature="e#8679#9062#0#PHP" expanded="false" />
<element signature="e#9067#9734#0#PHP" expanded="false" />
<element signature="e#9740#10184#0#PHP" expanded="false" />
<element signature="e#10189#11036#0#PHP" expanded="false" />
<element signature="e#11042#11310#0#PHP" expanded="false" />
<element signature="e#11315#11787#0#PHP" expanded="false" />
<element signature="e#11793#12099#0#PHP" expanded="false" />
<element signature="e#12104#13747#0#PHP" expanded="false" />
<element signature="e#13768#14087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -12,6 +12,7 @@ namespace api\index\controller;
use api\index\model\HomeModel;
use cmf\controller\RestBaseController;
use think\Db;
use think\Validate;
/**
* @title 家政服务
... ... @@ -128,11 +129,11 @@ class HomeController extends RestBaseController
}
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$res = Db::name('shopcomment')
$res = Db::name('homecomment')
->alias('a')
->join('user b','a.user_id = b.id')
->field('a.*,b.user_nickname')
->where('shopgood_id',$home_id)
->where('home_id',$home_id)
->page($page,$pageNum)
->select()
->toArray();
... ... @@ -143,5 +144,211 @@ class HomeController extends RestBaseController
$this->success('SUCCESS',$res);
}
/**
* @title 预约家政服务地址列表
* @description
* @author GuoSheng
* @url /index/Home/recycleList
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @return id:地址ID
* @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('homeadress')
->field('id,name,phone,address')
->where($where)
->order('id desc')
->select();
$this->success('SUCCESS',$data);
}
/**
* @title 预约家政服务地址详情
* @description
* @author GuoSheng
* @url /index/Shopgoods/recycleDetail
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:id require:1 default: desc:回收地址ID
*
* @return name:姓名
* @return phone:电话
* @return address:详细地址
*
*/
public function recycleDetail()
{
$user_id = $this->getUserId();
$id = $this->request->param('id',0,'intval');
if(empty($id)){
$this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
}
$data = Db::name('homeadress')
->where('id',$id)
->field('id,name,phone,address')
->find();
$this->success('SUCCESS',$data);
}
/**
* @title 添加预约家政服务地址
* @description
* @author GuoSheng
* @url /index/Home/addrecycle
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:name require:1 default: desc:联系人姓名
* @param name:phone require:1 default: desc:联系人电话
* @param name:address require:1 default: desc:联系人详细地址
*
*/
public function addrecycle()
{
$user_id = $this->getUserId();
$param = $this->request->param();
$param['user_id'] = $user_id;
$param['create_time'] = time();
$validate = new Validate([
'name' => 'require',
'phone' => 'require',
'address'=>'require',
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$data = Db::name('homeadress')
->insert($param);
if(empty($data)){
$this->error(['code'=>40006,'msg'=>'sql执行失败']);
}
$this->success('SUCCESS');
}
/**
* @title 修改预约家政服务地址
* @description
* @author GuoSheng
* @url /index/Home/editrecycle
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:id require:1 default: desc:回收地址ID
*
* @param name:name require:1 default: desc:联系人姓名
* @param name:phone require:1 default: desc:联系人电话
* @param name:address require:1 default: desc:联系人详细地址
*
*/
public function editrecycle()
{
$user_id = $this->getUserId();
$id = $this->request->param('id',0,'intval');
if(empty($id)){
$this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
}
$param = $this->request->param();
$param['user_id'] = $user_id;
$param['update_time'] = time();
$validate = new Validate([
'name' => 'require',
'phone' => 'require',
'address'=>'require',
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$data = Db::name('homeadress')
->where('id',$id)
->update($param);
if(empty($data)){
$this->error(['code'=>40006,'msg'=>'sql执行失败']);
}
$this->success('SUCCESS');
}
/**
* @title 删除预约家政服务地址
* @description
* @author GuoSheng
* @url /index/Home/delrecycle
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:id require:1 default: desc:回收地址ID
*
*/
public function delrecycle()
{
$user_id = $this->getUserId();
$id = $this->request->param('id',0,'intval');
if(empty($id)){
$this -> error(['code'=>40005,'msg'=>'缺少必要参数']);
}
$data = Db::name('homeadress')
->where('id',$id)
->update(['delete_time'=>time()]);
if(empty($data)){
$this->error(['code'=>40006,'msg'=>'sql执行失败']);
}
$this->success('SUCCESS');
}
/**
* @title 家政服务预约订单
* @description
* @author GuoSheng
* @url /index/Home/subscribe
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:address_id require:1 other: desc: 预约家政服务地址ID
* @param name:home_id require:1 other: desc: 家政公司ID
* @param name:service_id require:1 other desc: 服务类目ID
* @param name:sub_time require:1 other desc: 预约时间
* @param name:content require:1 other desc: 留言备注
*
*/
public function subscribe()
{
$user_id = $this->getUserId();
$param = $this->request->param();
$param['user_id'] = $user_id;
$param['create_time'] = time();
$validate = new Validate([
'address_id' => 'require',
'home_id' => 'require',
'service_id'=>'require',
'sub_time'=>'require',
'content'=>'require'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
$param['num'] = cmf_get_order_sn();
$data = Db::name('subhome')
->insert($param);
if(empty($data)){
$this->error(['code'=>40006,'msg'=>'sql执行失败']);
}
$this->success('SUCCESS');
}
}
\ No newline at end of file
... ...
... ... @@ -237,6 +237,7 @@ class RecycleController extends RestBaseController
* @return id:评价id
* @return user_id:用户ID
* @return user_nickname:用户名
* @return avatar:用户头像
* @return num:评价星数
* @return content:评价内容
*
... ... @@ -248,7 +249,7 @@ class RecycleController extends RestBaseController
$res = Db::name('recyclecomment')
->alias('a')
->join('user b','a.user_id = b.id')
->field('a.*,b.user_nickname')
->field('a.*,b.user_nickname,b.avatar')
->page($page,$pageNum)
->select()
->toArray();
... ...
... ... @@ -290,7 +290,6 @@ class UserController extends RestBaseController
}
}
/**
* @title 回收订单详情
* @description
... ... @@ -467,6 +466,58 @@ class UserController extends RestBaseController
$this->success('SUCCESS',$data);
}
/**
* @title 我的家政预约订单
* @description 我的家政预约订单
* @author Guosheng
* @url /index/User/subhomeorder
* @method POST
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:status require:1 other desc: 订单状态(不传或者为0是 已预约，1已接单，2已完成)
*
* @return id:订单ID
* @return num:订单号
* @return rgoods_name:商品名称
* @return create_time:创建时间
* @return sub_time:预约时间
*
*/
public function subhomeorder()
{
$user_id = $this->getUserId();
$status = $this->request->param('status',0,'intval');
if(empty($status) || $status == 0){
//已预约的回收订单
$data = Db::name('subscribe')
->where('user_id',$user_id)
->where('status',0)
->field('id,num,create_time,sub_time,attr_id')
->select();
$res = $this->r_foreach($data);
$this->success('SUCCESS',$res);
}elseif ($status == 1){
//已接单的回收订单
$data = Db::name('subscribe')
->where('user_id',$user_id)
->where('status',1)
->field('id,num,create_time,sub_time,attr_id')
->select();
$res = $this->r_foreach($data);
$this->success('SUCCESS',$res);
}elseif ($status == 2){
//已完成的回收订单
$data = Db::name('subscribe')
->where('user_id',$user_id)
->where('status',2)
->field('id,num,create_time,sub_time,attr_id')
->select();
$res = $this->r_foreach($data);
$this->success('SUCCESS',$res);
}
}
... ...