郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 cd79a669101adf1c6c88aba43522eece24d21efe 1 个父辈 c02c971f
1 个管道 的构建 通过 耗费 11 秒

家政模块

内嵌 并排对比
正在显示 2 个修改的文件 包含 186 行增加 和 190 行删除
... ... @@ -2,8 +2,7 @@
<project version="4">
<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/index/controller/RecycleController.php" afterPath="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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" />
... ... @@ -29,8 +28,8 @@
<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="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" />
<state relative-caret-position="170">
<caret line="160" column="7" lean-forward="true" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />
<folding>
<element signature="e#131#161#0#PHP" expanded="true" />
<element signature="e#329#544#0#PHP" expanded="false" />
... ... @@ -61,8 +60,8 @@
<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="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" />
<state relative-caret-position="775">
<caret line="204" column="5" lean-forward="false" 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" />
... ... @@ -93,16 +92,15 @@
</provider>
</entry>
</file>
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<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" />
<state relative-caret-position="624">
<caret line="581" column="40" lean-forward="true" selection-start-line="581" selection-start-column="40" selection-end-line="581" selection-end-column="40" />
<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" />
... ... @@ -121,49 +119,8 @@
<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" />
<element signature="e#14003#14465#0#PHP" expanded="false" />
<element signature="e#14470#16675#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -238,8 +195,8 @@
<option value="$PROJECT_DIR$/api/config.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" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
</option>
</component>
... ... @@ -258,10 +215,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="377" />
<option name="y" value="65" />
<option name="x" value="417" />
<option name="y" value="82" />
<option name="width" value="1582" />
<option name="height" value="930" />
<option name="height" value="982" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -278,6 +235,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -307,8 +266,6 @@
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -396,17 +353,18 @@
<workItem from="1574815992559" duration="11623000" />
<workItem from="1574837405404" duration="1203000" />
<workItem from="1574903328460" duration="15512000" />
<workItem from="1574930017327" duration="7063000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="347992000" />
<option name="totallyTimeSpent" value="355055000" />
</component>
<component name="ToolWindowManager">
<frame x="377" y="65" width="1582" height="930" extended-state="0" />
<frame x="417" y="82" width="1582" height="982" 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.18068331" 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.1826544" 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" />
... ... @@ -457,13 +415,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="25" column="17" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
... ... @@ -496,7 +447,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
... ... @@ -614,14 +564,6 @@
</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">
<caret line="1144" column="9" lean-forward="false" selection-start-line="1144" selection-start-column="9" selection-end-line="1144" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
... ... @@ -662,7 +604,6 @@
<provider selected="true" editor-type-id="text-editor">
<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>
... ... @@ -677,7 +618,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1300">
<caret line="52" column="21" lean-forward="false" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
... ... @@ -685,7 +625,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-600">
<caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="52" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
... ... @@ -693,7 +632,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="52" column="16" lean-forward="true" selection-start-line="52" selection-start-column="16" selection-end-line="52" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
... ... @@ -701,7 +639,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="686">
<caret line="75" column="17" lean-forward="false" selection-start-line="75" selection-start-column="17" selection-end-line="75" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
... ... @@ -709,10 +646,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="69" column="61" lean-forward="true" selection-start-line="69" selection-start-column="12" selection-end-line="69" selection-end-column="61" />
<folding>
<element signature="e#266#1001#0#PHP" expanded="false" />
<element signature="e#2186#3928#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -720,12 +653,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="326">
<caret line="75" column="27" lean-forward="false" selection-start-line="75" selection-start-column="27" selection-end-line="75" selection-end-column="27" />
<folding>
<element signature="e#259#862#0#PHP" expanded="false" />
<element signature="e#877#2030#0#PHP" expanded="false" />
<element signature="e#2045#3651#0#PHP" expanded="false" />
<element signature="e#3666#4131#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -733,9 +660,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
<folding>
<element signature="e#963#1070#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -775,16 +699,6 @@
<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>
... ... @@ -862,40 +776,10 @@
</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="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" />
<state relative-caret-position="775">
<caret line="204" column="5" lean-forward="false" 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" />
... ... @@ -925,41 +809,9 @@
</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="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>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="542">
<state relative-caret-position="842">
<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" />
... ... @@ -997,5 +849,85 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
<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="423">
<caret line="1781" column="23" lean-forward="false" selection-start-line="1781" selection-start-column="23" selection-end-line="1781" selection-end-column="23" />
<folding>
<element signature="n#generateCode#0;n#!!top" 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="170">
<caret line="160" column="7" lean-forward="true" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />
<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/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="624">
<caret line="581" column="40" lean-forward="true" selection-start-line="581" selection-start-column="40" selection-end-line="581" selection-end-column="40" />
<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#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#14003#14465#0#PHP" expanded="false" />
<element signature="e#14470#16675#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -475,12 +475,13 @@ class UserController extends RestBaseController
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:status require:1 other desc: 订单状态(不传或者为0是 已预约，1已接单，2已完成)
* @param name:status require:1 other desc: 订单状态(1已预约，2已接单，3已完成)
*
* @return id:订单ID
* @return num:订单号
* @return rgoods_name:商品名称
* @return create_time:创建时间
* @return home_id:家政公司名称
* @return service_id:服务项目名称
* @return price:价格
* @return sub_time:预约时间
*
*/
... ... @@ -488,36 +489,99 @@ class UserController extends RestBaseController
{
$user_id = $this->getUserId();
$status = $this->request->param('status',0,'intval');
if(empty($status) || $status == 0){
if(empty($status) || $status == 1){
//已预约的回收订单
$data = Db::name('subscribe')
$data = Db::name('subhome')
->where('user_id',$user_id)
->where('status',0)
->field('id,num,create_time,sub_time,attr_id')
->where('status',1)
->field('id,num,create_time,sub_time,home_id,service_id')
->select();
$res = $this->r_foreach($data);
$this->success('SUCCESS',$res);
$home = Db::name('home')->where('id',$data['home_id'])->column('home_name');
$service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find();
$data['service_id'] = $service['sever_name'];
$data['price'] = $service['price'];
$data['home_id'] = $home['home_name'];
$this->success('SUCCESS',$data);
}elseif ($status == 1){
//已接单的回收订单
$data = Db::name('subscribe')
$data = Db::name('subhome')
->where('user_id',$user_id)
->where('status',1)
->field('id,num,create_time,sub_time,attr_id')
->where('status',2)
->field('id,num,create_time,sub_time,home_id,service_id')
->select();
$res = $this->r_foreach($data);
$this->success('SUCCESS',$res);
$home = Db::name('home')->where('id',$data['home_id'])->column('home_name');
$service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find();
$data['service_id'] = $service['sever_name'];
$data['price'] = $service['price'];
$data['home_id'] = $home['home_name'];
$this->success('SUCCESS',$data);
}elseif ($status == 2){
//已完成的回收订单
$data = Db::name('subscribe')
$data = Db::name('subhome')
->where('user_id',$user_id)
->where('status',2)
->field('id,num,create_time,sub_time,attr_id')
->where('status',3)
->field('id,num,create_time,sub_time,home_id,service_id')
->select();
$res = $this->r_foreach($data);
$this->success('SUCCESS',$res);
$home = Db::name('home')->where('id',$data['home_id'])->column('home_name');
$service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find();
$data['service_id'] = $service['sever_name'];
$data['price'] = $service['price'];
$data['home_id'] = $home['home_name'];
$this->success('SUCCESS',$data);
}
}
/**
* @title 家政预约订单详情
* @description 家政预约订单详情
* @author GuoSheng
* @url /index/User/homeOrderDetail
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:order_id type:int require:1 default: desc:家政预约订单ID
*
* @return status:状态(1已预约，2已接单，3已完成)
* @return num:订单号
* @return create_time:下单时间
* @return sub_time:预约时间
* @return homeaddress_id:预约地址
* @return home_id:家政公司名称
* @return thumbnail:家政公司缩略图
* @return price:价格
* @return service_id:服务名称
* @return content:留言备注
*
*/
public function homeOrderDetail()
{
$user_id = $this->getUserId();
//接收订单ID
$id = $this->request->param('order_id');
if(empty($id)){
$this->error(['code'=>41006,'msg'=>'缺少必要参数']);
}
$res = Db::name('subhome')
->where('id',$id)
->find();
$data['status'] = $res['status'];
$data['num'] = $res['num'];
$data['create_time'] = date('Y-m-d H:i:s',$res['create_time']);
$data['sub_time'] = date('Y-m-d H:i:s',$res['sub_time']);
$homeaddress_id = Db::name('homeadress')->where('id',$res['homeaddress_id'])->column('name');
$data['homeaddress_id'] = $homeaddress_id['name'];
$home = Db::name('home')->where('id',$data['home_id'])->field('id,home_name,thumbnail')->find();
$service = Db::name('service')->where('id',$data['service_id'])->field('sever_name,price')->find();
$data['thumbnail'] = $home['thumbnail'];
$data['service_id'] = $service['sever_name'];
$data['price'] = $service['price'];
$data['home_id'] = $home['home_name'];
$data['content'] = cmf_replace_content_file_url(htmlspecialchars_decode($res['content']));
$data['serve'] = Db::name('recyclefee')->where('id',1)->column('fee');
$this->success('SUCCESS',$data);
}
... ...