郭盛 / scrap · 提交

转到一个项目

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

家政预约订单修改

内嵌 并排对比
正在显示 4 个修改的文件 包含 177 行增加 和 208 行删除
... ... @@ -2,7 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -24,46 +27,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ShoporderController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="58" column="40" lean-forward="false" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#2662#3553#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1450">
<caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2300">
<caret line="92" column="20" lean-forward="false" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" />
<folding>
<element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="553">
<caret line="164" column="34" lean-forward="true" selection-start-line="164" selection-start-column="34" selection-end-line="164" selection-end-column="34" />
<state relative-caret-position="278">
<caret line="266" column="5" lean-forward="true" selection-start-line="266" selection-start-column="5" selection-end-line="266" selection-end-column="5" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
... ... @@ -73,6 +41,8 @@
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2126#2643#0#PHP" expanded="false" />
<element signature="e#2648#3163#0#PHP" expanded="false" />
<element signature="e#3169#3697#0#PHP" expanded="false" />
<element signature="e#3702#4540#0#PHP" expanded="false" />
<element signature="e#4546#4859#0#PHP" expanded="false" />
<element signature="e#4864#5239#0#PHP" expanded="false" />
<element signature="e#5245#5602#0#PHP" expanded="false" />
... ... @@ -84,7 +54,9 @@
<element signature="e#8388#8655#0#PHP" expanded="false" />
<element signature="e#8660#9135#0#PHP" expanded="false" />
<element signature="e#9141#9641#0#PHP" expanded="false" />
<element signature="e#9646#10435#0#PHP" expanded="false" />
<element signature="e#9646#10659#0#PHP" expanded="false" />
<element signature="e#10665#11032#0#PHP" expanded="false" />
<element signature="e#11037#11477#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -154,12 +126,12 @@
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
</list>
</option>
... ... @@ -179,8 +151,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="342" />
<option name="y" value="48" />
<option name="x" value="404" />
<option name="y" value="87" />
<option name="width" value="1582" />
<option name="height" value="965" />
</component>
... ... @@ -224,50 +196,6 @@
<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="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="sever" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="shopgoods" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -367,15 +295,15 @@
<workItem from="1575246616478" duration="21722000" />
<workItem from="1575278769037" duration="7395000" />
<workItem from="1575332430854" duration="21245000" />
<workItem from="1575359408189" duration="480000" />
<workItem from="1575359408189" duration="3289000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="432183000" />
<option name="totallyTimeSpent" value="434992000" />
</component>
<component name="ToolWindowManager">
<frame x="342" y="48" width="1582" height="965" extended-state="0" />
<frame x="404" y="87" width="1582" height="965" 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.1977661" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -640,32 +568,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="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 />
</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="407">
<caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" 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#4897#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="525">
... ... @@ -699,14 +601,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="-2045">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/lib/Storage.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
... ... @@ -761,78 +655,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="59">
<caret line="792" column="7" lean-forward="true" selection-start-line="792" selection-start-column="7" selection-end-line="792" selection-end-column="7" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#1725#3358#0#PHP" expanded="false" />
<element signature="e#3364#3604#0#PHP" expanded="false" />
<element signature="e#3609#3857#0#PHP" expanded="false" />
<element signature="e#3863#4210#0#PHP" expanded="false" />
<element signature="e#4215#4661#0#PHP" expanded="false" />
<element signature="e#4667#4927#0#PHP" expanded="false" />
<element signature="e#4932#5133#0#PHP" expanded="false" />
<element signature="e#5139#5401#0#PHP" expanded="false" />
<element signature="e#5406#5611#0#PHP" expanded="false" />
<element signature="e#5617#6059#0#PHP" expanded="false" />
<element signature="e#6064#7292#0#PHP" expanded="false" />
<element signature="e#7315#7860#0#PHP" expanded="false" />
<element signature="e#7866#8147#0#PHP" expanded="false" />
<element signature="e#8152#8544#0#PHP" expanded="false" />
<element signature="e#8550#9099#0#PHP" expanded="false" />
<element signature="e#9104#10303#0#PHP" expanded="false" />
<element signature="e#10309#10766#0#PHP" expanded="false" />
<element signature="e#10771#12034#0#PHP" expanded="false" />
<element signature="e#12057#12409#0#PHP" expanded="false" />
<element signature="e#12415#13099#0#PHP" expanded="false" />
<element signature="e#13104#14363#0#PHP" expanded="false" />
<element signature="e#14369#14831#0#PHP" expanded="false" />
<element signature="e#14836#17041#0#PHP" expanded="false" />
<element signature="e#17047#17656#0#PHP" expanded="false" />
<element signature="e#17661#18994#0#PHP" expanded="false" />
<element signature="e#19000#19357#0#PHP" expanded="false" />
<element signature="e#19362#20243#0#PHP" expanded="false" />
<element signature="e#20249#20601#0#PHP" expanded="false" />
<element signature="e#20606#21683#0#PHP" expanded="false" />
<element signature="e#21689#22044#0#PHP" expanded="false" />
<element signature="e#22049#23129#0#PHP" expanded="false" />
<element signature="e#23135#23559#0#PHP" expanded="false" />
<element signature="e#23564#24175#0#PHP" expanded="false" />
<element signature="e#25069#25388#0#PHP" expanded="false" />
<element signature="e#25394#25802#0#PHP" expanded="false" />
<element signature="e#25808#26567#0#PHP" expanded="false" />
<element signature="e#26587#27451#0#PHP" expanded="false" />
<element signature="e#27478#27878#0#PHP" expanded="false" />
<element signature="e#27902#28475#0#PHP" expanded="false" />
<element signature="e#28498#29308#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1450">
<caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="58" column="40" lean-forward="false" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#2662#3553#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rgoods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450">
... ... @@ -891,18 +713,126 @@
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2300">
<caret line="92" column="20" lean-forward="false" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" />
<state relative-caret-position="1200">
<caret line="142" column="7" lean-forward="true" selection-start-line="142" selection-start-column="7" selection-end-line="142" selection-end-column="7" />
<folding>
<element signature="n#style#0;n#tr#10;n#table#0;n#form#0;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
<folding>
<element signature="e#265#1638#0#PHP" expanded="false" />
<element signature="e#1655#3478#0#PHP" expanded="false" />
<element signature="e#2581#3472#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
<caret line="58" column="138" lean-forward="false" selection-start-line="58" selection-start-column="138" selection-end-line="58" selection-end-column="138" />
<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="-783">
<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 />
</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="575">
<caret line="89" column="5" lean-forward="false" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="58" />
<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="353">
<caret line="792" column="7" lean-forward="true" selection-start-line="792" selection-start-column="7" selection-end-line="792" selection-end-column="7" />
<folding>
<element signature="e#131#169#0#PHP" expanded="true" />
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#1725#3358#0#PHP" expanded="false" />
<element signature="e#3364#3604#0#PHP" expanded="false" />
<element signature="e#3609#3857#0#PHP" expanded="false" />
<element signature="e#3863#4210#0#PHP" expanded="false" />
<element signature="e#4215#4661#0#PHP" expanded="false" />
<element signature="e#4667#4927#0#PHP" expanded="false" />
<element signature="e#4932#5133#0#PHP" expanded="false" />
<element signature="e#5139#5401#0#PHP" expanded="false" />
<element signature="e#5406#5611#0#PHP" expanded="false" />
<element signature="e#5617#6059#0#PHP" expanded="false" />
<element signature="e#6064#7292#0#PHP" expanded="false" />
<element signature="e#7315#7860#0#PHP" expanded="false" />
<element signature="e#7866#8147#0#PHP" expanded="false" />
<element signature="e#8152#8544#0#PHP" expanded="false" />
<element signature="e#8550#9099#0#PHP" expanded="false" />
<element signature="e#9104#10303#0#PHP" expanded="false" />
<element signature="e#10309#10766#0#PHP" expanded="false" />
<element signature="e#10771#12034#0#PHP" expanded="false" />
<element signature="e#12057#12409#0#PHP" expanded="false" />
<element signature="e#12415#13099#0#PHP" expanded="false" />
<element signature="e#13104#14363#0#PHP" expanded="false" />
<element signature="e#14369#14831#0#PHP" expanded="false" />
<element signature="e#14836#17041#0#PHP" expanded="false" />
<element signature="e#17047#17656#0#PHP" expanded="false" />
<element signature="e#17661#18994#0#PHP" expanded="false" />
<element signature="e#19000#19357#0#PHP" expanded="false" />
<element signature="e#19362#20243#0#PHP" expanded="false" />
<element signature="e#20249#20601#0#PHP" expanded="false" />
<element signature="e#20606#21683#0#PHP" expanded="false" />
<element signature="e#21689#22044#0#PHP" expanded="false" />
<element signature="e#22049#23129#0#PHP" expanded="false" />
<element signature="e#23135#23559#0#PHP" expanded="false" />
<element signature="e#23564#24175#0#PHP" expanded="false" />
<element signature="e#24181#24465#0#PHP" expanded="false" />
<element signature="e#24470#25048#0#PHP" expanded="false" />
<element signature="e#25069#25388#0#PHP" expanded="false" />
<element signature="e#25394#25802#0#PHP" expanded="false" />
<element signature="e#25808#26567#0#PHP" expanded="false" />
<element signature="e#26587#27451#0#PHP" expanded="false" />
<element signature="e#27478#27878#0#PHP" expanded="false" />
<element signature="e#27902#28475#0#PHP" expanded="false" />
<element signature="e#28498#29308#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="407">
<caret line="167" column="8" lean-forward="false" selection-start-line="167" selection-start-column="8" selection-end-line="173" selection-end-column="11" />
<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" />
</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="553">
<caret line="164" column="34" lean-forward="true" selection-start-line="164" selection-start-column="34" selection-end-line="164" selection-end-column="34" />
<state relative-caret-position="278">
<caret line="266" column="5" lean-forward="true" selection-start-line="266" selection-start-column="5" selection-end-line="266" selection-end-column="5" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
... ... @@ -912,6 +842,8 @@
<element signature="e#1731#2119#0#PHP" expanded="false" />
<element signature="e#2126#2643#0#PHP" expanded="false" />
<element signature="e#2648#3163#0#PHP" expanded="false" />
<element signature="e#3169#3697#0#PHP" expanded="false" />
<element signature="e#3702#4540#0#PHP" expanded="false" />
<element signature="e#4546#4859#0#PHP" expanded="false" />
<element signature="e#4864#5239#0#PHP" expanded="false" />
<element signature="e#5245#5602#0#PHP" expanded="false" />
... ... @@ -923,7 +855,9 @@
<element signature="e#8388#8655#0#PHP" expanded="false" />
<element signature="e#8660#9135#0#PHP" expanded="false" />
<element signature="e#9141#9641#0#PHP" expanded="false" />
<element signature="e#9646#10435#0#PHP" expanded="false" />
<element signature="e#9646#10659#0#PHP" expanded="false" />
<element signature="e#10665#11032#0#PHP" expanded="false" />
<element signature="e#11037#11477#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -366,6 +366,13 @@ class HomeController extends RestBaseController
'sub_time'=>'require',
'content'=>'require'
]);
$validate->message([
'address_id'=>'预约家政地址不能为空',
'home_id'=>'家政公司不能为空',
'service_id'=>'服务类目不能为空',
'sub_time'=>'预约时间不能为空',
'content'=>'留言备注不能为空'
]);
if (!$validate->check($param)) {
$this->error(['code'=>40005,'msg'=>$validate->getError()]);
}
... ... @@ -378,5 +385,35 @@ class HomeController extends RestBaseController
$this->success('SUCCESS');
}
/**
* @title 通过家政公司获取其服务列表
* @description 通过家政公司获取其服务列表
* @author GuoSheng
* @url /index/Home/getsever
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:id require:1 default: desc:家政公司ID
*
* @return id:ID
* @return sever_name:服务名称
* @return price:所需积分
*
*/
public function getsever()
{
$user_id = $this->getUserId();
$home_id = $this->request->param('id');
if(empty($home_id)){
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('service')
->where('home_id',$home_id)
->where('delete_time',0)
->field('id,sever_name,price')
->select();
$this->success('SUCCESS',$data);
}
}
\ No newline at end of file
... ...
... ... @@ -55,15 +55,13 @@ class ShoporderController extends AdminBaseController
$id = $this->request->param('id');
if($this->request->isPost()){
$param = $this->request->param();
if($param['status'] == 1){
$this->success('更新成功!');
}
if($param['status'] == 2 && empty($param['express_num'])){
$this->error('请填写快递单号');
}
if(!empty($param['express_num'])){
if(empty($param['status'] == 1)){
$this->error('请正确填写发货状态');
}
}
if($param['status'] == 2 && empty($param['express_num'])){
if($param['status'] == 2 && !empty($param['express_num'])){
Db::name('shoporder')
->where('id',$id)
->update($param);
... ...
... ... @@ -99,7 +99,7 @@
/>已发货 </label>
</td>
</tr>
<tr class="status" style="<if condition='$data.status neq 1'>display: none;</if>">
<tr class="is_status" style="<if condition='$data.status neq 2'>display: none;</if>">
<th width="100">快递单号<span class="form-required">*</span></th>
<td>
<input class="form-control" type="text" name="express_num"
... ... @@ -145,9 +145,9 @@
function status() {
var status = $('.status:radio:checked').val();
if (status == '2') {
$('.status').show();
$('.is_status').show();
} else {
$('.status').hide();
$('.is_status').hide();
}
}
... ...