郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 54fc4765a4ca3a980bda56647578464717089819 1 个父辈 bf2597cd
1 个管道 的构建 通过 耗费 10 秒

添加家政订单管理，以及判断用户身份接口

内嵌 并排对比
正在显示 5 个修改的文件 包含 346 行增加 和 96 行删除
@@ -2,12 +2,11 @@ @@ -2,12 +2,11 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" /> 5 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
  6 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />  
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html" />  
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" />  
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" /> 8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" afterPath="$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php" />
11 </list> 10 </list>
12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
13 <option name="TRACKING_ENABLED" value="true" /> 12 <option name="TRACKING_ENABLED" value="true" />
@@ -28,7 +27,47 @@ @@ -28,7 +27,47 @@
28 <select /> 27 <select />
29 </component> 28 </component>
30 <component name="FileEditorManager"> 29 <component name="FileEditorManager">
31 - <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" /> 30 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  31 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
  32 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  33 + <provider selected="true" editor-type-id="text-editor">
  34 + <state relative-caret-position="258">
  35 + <caret line="140" column="0" lean-forward="true" selection-start-line="140" selection-start-column="0" selection-end-line="140" selection-end-column="0" />
  36 + <folding>
  37 + <element signature="e#345#694#0#PHP" expanded="false" />
  38 + <element signature="e#699#1464#0#PHP" expanded="false" />
  39 + <element signature="e#1470#1699#0#PHP" expanded="false" />
  40 + <element signature="e#1704#3337#0#PHP" expanded="false" />
  41 + <element signature="e#3343#3576#0#PHP" expanded="false" />
  42 + <element signature="e#3581#3829#0#PHP" expanded="false" />
  43 + <element signature="e#3835#4182#0#PHP" expanded="false" />
  44 + <element signature="e#4187#4633#0#PHP" expanded="false" />
  45 + <element signature="e#4639#4899#0#PHP" expanded="false" />
  46 + <element signature="e#4904#5105#0#PHP" expanded="false" />
  47 + <element signature="e#5111#5373#0#PHP" expanded="false" />
  48 + <element signature="e#5378#5583#0#PHP" expanded="false" />
  49 + <element signature="e#5589#6031#0#PHP" expanded="false" />
  50 + <element signature="e#6036#7264#0#PHP" expanded="false" />
  51 + <element signature="e#7287#7832#0#PHP" expanded="false" />
  52 + <element signature="e#7838#8119#0#PHP" expanded="false" />
  53 + <element signature="e#8124#8516#0#PHP" expanded="false" />
  54 + <element signature="e#8522#9074#0#PHP" expanded="false" />
  55 + <element signature="e#9079#10437#0#PHP" expanded="false" />
  56 + <element signature="e#10443#10900#0#PHP" expanded="false" />
  57 + <element signature="e#10905#12168#0#PHP" expanded="false" />
  58 + <element signature="e#12191#12543#0#PHP" expanded="false" />
  59 + <element signature="e#12549#13233#0#PHP" expanded="false" />
  60 + <element signature="e#13238#14497#0#PHP" expanded="false" />
  61 + <element signature="e#14503#14965#0#PHP" expanded="false" />
  62 + <element signature="e#14970#17175#0#PHP" expanded="false" />
  63 + <element signature="e#17181#17790#0#PHP" expanded="false" />
  64 + <element signature="e#17795#19128#0#PHP" expanded="false" />
  65 + </folding>
  66 + </state>
  67 + </provider>
  68 + </entry>
  69 + </file>
  70 + </leaf>
32 </component> 71 </component>
33 <component name="FileTemplateManagerImpl"> 72 <component name="FileTemplateManagerImpl">
34 <option name="RECENT_TEMPLATES"> 73 <option name="RECENT_TEMPLATES">
@@ -48,8 +87,6 @@ @@ -48,8 +87,6 @@
48 <component name="IdeDocumentHistory"> 87 <component name="IdeDocumentHistory">
49 <option name="CHANGED_PATHS"> 88 <option name="CHANGED_PATHS">
50 <list> 89 <list>
51 - <option value="$PROJECT_DIR$/app/index/controller/RecycleController.php" />  
52 - <option value="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />  
53 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html" /> 90 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html" />
54 <option value="$PROJECT_DIR$/app/index/controller/UserController.php" /> 91 <option value="$PROJECT_DIR$/app/index/controller/UserController.php" />
55 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" /> 92 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
@@ -88,7 +125,6 @@ @@ -88,7 +125,6 @@
88 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 125 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
89 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" /> 126 <option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
90 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" /> 127 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
91 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
92 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" /> 128 <option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
93 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" /> 129 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
94 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" /> 130 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
@@ -99,6 +135,9 @@ @@ -99,6 +135,9 @@
99 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" /> 135 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
100 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" /> 136 <option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
101 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" /> 137 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/detail.html" />
  138 + <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
  139 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
  140 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
102 </list> 141 </list>
103 </option> 142 </option>
104 </component> 143 </component>
@@ -117,10 +156,10 @@ @@ -117,10 +156,10 @@
117 </component> 156 </component>
118 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 157 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
119 <component name="ProjectFrameBounds"> 158 <component name="ProjectFrameBounds">
120 - <option name="x" value="374" />  
121 - <option name="y" value="105" /> 159 + <option name="x" value="344" />
  160 + <option name="y" value="130" />
122 <option name="width" value="1582" /> 161 <option name="width" value="1582" />
123 - <option name="height" value="972" /> 162 + <option name="height" value="969" />
124 </component> 163 </component>
125 <component name="ProjectView"> 164 <component name="ProjectView">
126 <navigator currentView="ProjectPane" proportions="" version="1"> 165 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -149,47 +188,21 @@ @@ -149,47 +188,21 @@
149 <path> 188 <path>
150 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 189 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
151 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 190 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
152 - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" /> 191 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
153 </path> 192 </path>
154 <path> 193 <path>
155 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 194 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
156 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 195 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
157 - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />  
158 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> 196 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  197 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
159 </path> 198 </path>
160 <path> 199 <path>
161 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 200 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
162 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 201 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
163 - <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />  
164 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" /> 202 + <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
  203 + <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
165 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 204 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
166 </path> 205 </path>
167 - <path>  
168 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
169 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
170 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
171 - </path>  
172 - <path>  
173 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
174 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
175 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
176 - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />  
177 - </path>  
178 - <path>  
179 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
180 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
181 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
182 - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />  
183 - <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />  
184 - </path>  
185 - <path>  
186 - <item name="scrap" type="b2602c69:ProjectViewProjectNode" />  
187 - <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />  
188 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />  
189 - <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />  
190 - <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />  
191 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />  
192 - </path>  
193 </expand> 206 </expand>
194 <select /> 207 <select />
195 </subPane> 208 </subPane>
@@ -284,17 +297,18 @@ @@ -284,17 +297,18 @@
284 <workItem from="1574930017327" duration="7716000" /> 297 <workItem from="1574930017327" duration="7716000" />
285 <workItem from="1574986868818" duration="22318000" /> 298 <workItem from="1574986868818" duration="22318000" />
286 <workItem from="1575016153150" duration="3315000" /> 299 <workItem from="1575016153150" duration="3315000" />
287 - <workItem from="1575246616478" duration="12412000" /> 300 + <workItem from="1575246616478" duration="17099000" />
288 </task> 301 </task>
289 <servers /> 302 <servers />
290 </component> 303 </component>
291 <component name="TimeTrackingManager"> 304 <component name="TimeTrackingManager">
292 - <option name="totallyTimeSpent" value="393753000" /> 305 + <option name="totallyTimeSpent" value="398440000" />
293 </component> 306 </component>
294 <component name="ToolWindowManager"> 307 <component name="ToolWindowManager">
295 - <frame x="374" y="105" width="1582" height="972" extended-state="0" /> 308 + <frame x="344" y="130" width="1582" height="969" extended-state="0" />
  309 + <editor active="true" />
296 <layout> 310 <layout>
297 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19250986" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 311 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19250986" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
298 <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" /> 312 <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" />
299 <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" /> 313 <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" />
300 <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" /> 314 <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" />
@@ -340,26 +354,11 @@ @@ -340,26 +354,11 @@
340 </component> 354 </component>
341 <component name="XDebuggerManager"> 355 <component name="XDebuggerManager">
342 <breakpoint-manager> 356 <breakpoint-manager>
343 - <option name="time" value="9" /> 357 + <option name="time" value="10" />
344 </breakpoint-manager> 358 </breakpoint-manager>
345 <watches-manager /> 359 <watches-manager />
346 </component> 360 </component>
347 <component name="editorHistoryManager"> 361 <component name="editorHistoryManager">
348 - <entry file="file://$PROJECT_DIR$/public/index.php">  
349 - <provider selected="true" editor-type-id="text-editor">  
350 - <state relative-caret-position="0">  
351 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
352 - </state>  
353 - </provider>  
354 - </entry>  
355 - <entry file="file://$PROJECT_DIR$/public/info.php" />  
356 - <entry file="file://$PROJECT_DIR$/public/plugins/qiniu/QiniuPlugin.php">  
357 - <provider selected="true" editor-type-id="text-editor">  
358 - <state relative-caret-position="-234">  
359 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
360 - </state>  
361 - </provider>  
362 - </entry>  
363 <entry file="file://$PROJECT_DIR$/public/plugins/qiniu/lib/Qiniu.php"> 362 <entry file="file://$PROJECT_DIR$/public/plugins/qiniu/lib/Qiniu.php">
364 <provider selected="true" editor-type-id="text-editor"> 363 <provider selected="true" editor-type-id="text-editor">
365 <state relative-caret-position="0"> 364 <state relative-caret-position="0">
@@ -500,13 +499,6 @@ @@ -500,13 +499,6 @@
500 </state> 499 </state>
501 </provider> 500 </provider>
502 </entry> 501 </entry>
503 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
504 - <provider selected="true" editor-type-id="text-editor">  
505 - <state relative-caret-position="242">  
506 - <caret line="34" column="7" lean-forward="false" selection-start-line="34" selection-start-column="7" selection-end-line="34" selection-end-column="7" />  
507 - </state>  
508 - </provider>  
509 - </entry>  
510 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php"> 502 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
511 <provider selected="true" editor-type-id="text-editor"> 503 <provider selected="true" editor-type-id="text-editor">
512 <state relative-caret-position="117"> 504 <state relative-caret-position="117">
@@ -632,13 +624,6 @@ @@ -632,13 +624,6 @@
632 </state> 624 </state>
633 </provider> 625 </provider>
634 </entry> 626 </entry>
635 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
636 - <provider selected="true" editor-type-id="text-editor">  
637 - <state relative-caret-position="450">  
638 - <caret line="84" column="0" lean-forward="false" selection-start-line="84" selection-start-column="0" selection-end-line="85" selection-end-column="0" />  
639 - </state>  
640 - </provider>  
641 - </entry>  
642 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php"> 627 <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
643 <provider selected="true" editor-type-id="text-editor"> 628 <provider selected="true" editor-type-id="text-editor">
644 <state relative-caret-position="579"> 629 <state relative-caret-position="579">
@@ -686,25 +671,6 @@ @@ -686,25 +671,6 @@
686 </state> 671 </state>
687 </provider> 672 </provider>
688 </entry> 673 </entry>
689 - <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">  
690 - <provider selected="true" editor-type-id="text-editor">  
691 - <state relative-caret-position="325">  
692 - <caret line="99" column="5" lean-forward="true" selection-start-line="99" selection-start-column="5" selection-end-line="99" selection-end-column="5" />  
693 - <folding>  
694 - <element signature="e#265#1638#0#PHP" expanded="false" />  
695 - <element signature="e#1655#3595#0#PHP" expanded="false" />  
696 - </folding>  
697 - </state>  
698 - </provider>  
699 - </entry>  
700 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">  
701 - <provider selected="true" editor-type-id="text-editor">  
702 - <state relative-caret-position="514">  
703 - <caret line="55" column="36" lean-forward="false" selection-start-line="55" selection-start-column="36" selection-end-line="55" selection-end-column="36" />  
704 - <folding />  
705 - </state>  
706 - </provider>  
707 - </entry>  
708 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html"> 674 <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html">
709 <provider selected="true" editor-type-id="text-editor"> 675 <provider selected="true" editor-type-id="text-editor">
710 <state relative-caret-position="639"> 676 <state relative-caret-position="639">
@@ -748,5 +714,96 @@ @@ -748,5 +714,96 @@
748 </state> 714 </state>
749 </provider> 715 </provider>
750 </entry> 716 </entry>
  717 + <entry file="file://$PROJECT_DIR$/app/admin/controller/HomePicController.php">
  718 + <provider selected="true" editor-type-id="text-editor">
  719 + <state relative-caret-position="0">
  720 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  721 + <folding />
  722 + </state>
  723 + </provider>
  724 + </entry>
  725 + <entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
  726 + <provider selected="true" editor-type-id="text-editor">
  727 + <state relative-caret-position="250">
  728 + <caret line="17" column="4" lean-forward="true" selection-start-line="17" selection-start-column="4" selection-end-line="99" selection-end-column="5" />
  729 + <folding>
  730 + <element signature="e#265#1638#0#PHP" expanded="false" />
  731 + <element signature="e#1655#3595#0#PHP" expanded="false" />
  732 + </folding>
  733 + </state>
  734 + </provider>
  735 + </entry>
  736 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/index.html">
  737 + <provider selected="true" editor-type-id="text-editor">
  738 + <state relative-caret-position="289">
  739 + <caret line="46" column="38" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="69" selection-end-column="7" />
  740 + <folding />
  741 + </state>
  742 + </provider>
  743 + </entry>
  744 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html">
  745 + <provider selected="true" editor-type-id="text-editor">
  746 + <state relative-caret-position="100">
  747 + <caret line="43" column="44" lean-forward="true" selection-start-line="43" selection-start-column="44" selection-end-line="43" selection-end-column="44" />
  748 + <folding />
  749 + </state>
  750 + </provider>
  751 + </entry>
  752 + <entry file="file://$PROJECT_DIR$/app/admin/controller/SubhomeController.php">
  753 + <provider selected="true" editor-type-id="text-editor">
  754 + <state relative-caret-position="332">
  755 + <caret line="37" column="49" lean-forward="false" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="49" />
  756 + <folding>
  757 + <element signature="e#130#169#0#PHP" expanded="true" />
  758 + <element signature="e#1669#3609#0#PHP" expanded="false" />
  759 + </folding>
  760 + </state>
  761 + </provider>
  762 + </entry>
  763 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  764 + <provider selected="true" editor-type-id="text-editor">
  765 + <state relative-caret-position="375">
  766 + <caret line="23" column="33" lean-forward="true" selection-start-line="23" selection-start-column="33" selection-end-line="23" selection-end-column="33" />
  767 + <folding />
  768 + </state>
  769 + </provider>
  770 + </entry>
  771 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  772 + <provider selected="true" editor-type-id="text-editor">
  773 + <state relative-caret-position="258">
  774 + <caret line="140" column="0" lean-forward="true" selection-start-line="140" selection-start-column="0" selection-end-line="140" selection-end-column="0" />
  775 + <folding>
  776 + <element signature="e#345#694#0#PHP" expanded="false" />
  777 + <element signature="e#699#1464#0#PHP" expanded="false" />
  778 + <element signature="e#1470#1699#0#PHP" expanded="false" />
  779 + <element signature="e#1704#3337#0#PHP" expanded="false" />
  780 + <element signature="e#3343#3576#0#PHP" expanded="false" />
  781 + <element signature="e#3581#3829#0#PHP" expanded="false" />
  782 + <element signature="e#3835#4182#0#PHP" expanded="false" />
  783 + <element signature="e#4187#4633#0#PHP" expanded="false" />
  784 + <element signature="e#4639#4899#0#PHP" expanded="false" />
  785 + <element signature="e#4904#5105#0#PHP" expanded="false" />
  786 + <element signature="e#5111#5373#0#PHP" expanded="false" />
  787 + <element signature="e#5378#5583#0#PHP" expanded="false" />
  788 + <element signature="e#5589#6031#0#PHP" expanded="false" />
  789 + <element signature="e#6036#7264#0#PHP" expanded="false" />
  790 + <element signature="e#7287#7832#0#PHP" expanded="false" />
  791 + <element signature="e#7838#8119#0#PHP" expanded="false" />
  792 + <element signature="e#8124#8516#0#PHP" expanded="false" />
  793 + <element signature="e#8522#9074#0#PHP" expanded="false" />
  794 + <element signature="e#9079#10437#0#PHP" expanded="false" />
  795 + <element signature="e#10443#10900#0#PHP" expanded="false" />
  796 + <element signature="e#10905#12168#0#PHP" expanded="false" />
  797 + <element signature="e#12191#12543#0#PHP" expanded="false" />
  798 + <element signature="e#12549#13233#0#PHP" expanded="false" />
  799 + <element signature="e#13238#14497#0#PHP" expanded="false" />
  800 + <element signature="e#14503#14965#0#PHP" expanded="false" />
  801 + <element signature="e#14970#17175#0#PHP" expanded="false" />
  802 + <element signature="e#17181#17790#0#PHP" expanded="false" />
  803 + <element signature="e#17795#19128#0#PHP" expanded="false" />
  804 + </folding>
  805 + </state>
  806 + </provider>
  807 + </entry>
751 </component> 808 </component>
752 </project> 809 </project>
@@ -119,6 +119,27 @@ class UserController extends RestBaseController @@ -119,6 +119,27 @@ class UserController extends RestBaseController
119 } 119 }
120 120
121 /** 121 /**
  122 + * @title 判断用户身份
  123 + * @description 接口说明
  124 + * @author Guosheng
  125 + * @url /index/User/judge
  126 + * @method POST
  127 + *
  128 + * @header name:XX-Token require:1 default: desc:token
  129 + *
  130 + * @return is_set:0否 1是
  131 + */
  132 + public function judge()
  133 + {
  134 + $user_id = $this->getUserId();
  135 + $data = Db::name('user')
  136 + ->where('id',$user_id)
  137 + ->field('id,is_set')
  138 + ->find();
  139 + $this->success('success',$data['is_set']);
  140 + }
  141 +
  142 + /**
122 * @title 我的首页 143 * @title 我的首页
123 * @description 接口说明 144 * @description 接口说明
124 * @author Guosheng 145 * @author Guosheng
@@ -585,4 +606,6 @@ class UserController extends RestBaseController @@ -585,4 +606,6 @@ class UserController extends RestBaseController
585 606
586 607
587 608
  609 +
  610 +
588 } 611 }
  1 +<?php
  2 +/**
  3 + * Created by PhpStorm.
  4 + * User: Administrator
  5 + * Date: 2019/12/2
  6 + * Time: 14:58
  7 + */
  8 +
  9 +namespace app\admin\controller;
  10 +
  11 +
  12 +use cmf\controller\AdminBaseController;
  13 +use think\Db;
  14 +
  15 +class SubhomeController extends AdminBaseController
  16 +{
  17 + public function index()
  18 + {
  19 + $where['a.delete_time'] = ['eq',0];
  20 + $param = $this->request->param();
  21 + $startTime = empty($param['start_time']) ? '' : strtotime($param['start_time']);
  22 + $endTime = empty($param['end_time']) ? '' : (strtotime($param['end_time']));
  23 + if (!empty($startTime) && !empty($endTime)) {
  24 + $where['a.create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
  25 + } else {
  26 + if (!empty($startTime)) {
  27 + $where['a.create_time'] = ['>= time', $startTime];
  28 + }
  29 + if (!empty($endTime)) {
  30 + $where['a.create_time'] = ['<= time', $endTime];
  31 + }
  32 + }
  33 + $data = Db::name('subhome')
  34 + ->alias('a')
  35 + ->join('home r','a.home_id = r.id')
  36 + ->join('user u','a.user_id = u.id')
  37 + ->join('service s','a.service_id = s.id')
  38 + ->field('a.*,r.home_name,s.sever_name,u.user_nickname')
  39 + ->where($where)
  40 + ->order('a.id desc')
  41 + ->paginate(10);
  42 + $list=$data->items();
  43 + $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
  44 + $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
  45 + $this->assign([
  46 + 'data'=>$list,
  47 + 'page'=>$data->render(),
  48 + ]);
  49 + return $this->fetch();
  50 + }
  51 +
  52 + //订单详情
  53 + public function edit()
  54 + {
  55 + $id = $this->request->param('id');
  56 + if($this->request->isPost()){
  57 + $param = $this->request->param();
  58 + if($param['status'] == 2){
  59 + if(empty($param['express_num'])){
  60 + $this->error('请填写快递单号');
  61 + }
  62 + }
  63 + if(!empty($param['express_num'])){
  64 + if(empty($param['status'] == 1)){
  65 + $this->error('请正确填写发货状态');
  66 + }
  67 + }
  68 + if($param['status'] == 2 && empty($param['express_num'])){
  69 + Db::name('shoporder')
  70 + ->where('id',$id)
  71 + ->update($param);
  72 + Db::name('shoporder')
  73 + ->where('id',$id)
  74 + ->update(['orderstatus'=>2]);
  75 + $this->success('更新成功!');
  76 + }else{
  77 + Db::name('shoporder')
  78 + ->where('id',$id)
  79 + ->update($param);
  80 + $this->success('更新成功!');
  81 + }
  82 + }else{
  83 + $param = $this->request->param();
  84 + $data = Db::name('shoporder')
  85 + ->alias('a')
  86 + ->join('shopgoods r','a.shopgoods_id = r.id')
  87 + ->join('user u','a.user_id = u.id')
  88 + ->field('a.*,r.goods_name,r.price,r.freight,u.user_nickname')
  89 + ->where('a.id',$id)
  90 + ->find();
  91 + $address = Db::name('shoprecycle')->where('id',$data['recycle_id'])->find();
  92 + $data['name'] = $address['name'];
  93 + $data['phone'] = $address['phone'];
  94 + $data['address'] = $address['address'];
  95 + $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
  96 + $this->assign('end_time', isset($param['end_time']) ? $param['end_time'] : '');
  97 + $this->assign('data',$data);
  98 + return $this->fetch();
  99 + }
  100 + }
  101 +}
@@ -116,6 +116,7 @@ return array ( @@ -116,6 +116,7 @@ return array (
116 'ADMIN_SLIDEITEM_LISTORDER' => '幻灯片页面排序', 116 'ADMIN_SLIDEITEM_LISTORDER' => '幻灯片页面排序',
117 'ADMIN_STORAGE_INDEX' => '文件存储', 117 'ADMIN_STORAGE_INDEX' => '文件存储',
118 'ADMIN_STORAGE_SETTINGPOST' => '文件存储设置提交', 118 'ADMIN_STORAGE_SETTINGPOST' => '文件存储设置提交',
  119 + 'ADMIN_SUBHOME_INDEX' => '家政预约订单列表',
119 'ADMIN_SUBSCRIBE_INDEX' => '回收预约订单列表', 120 'ADMIN_SUBSCRIBE_INDEX' => '回收预约订单列表',
120 'ADMIN_THEME_ACTIVE' => '启用模板', 121 'ADMIN_THEME_ACTIVE' => '启用模板',
121 'ADMIN_THEME_DATASOURCE' => '模板文件设置数据源', 122 'ADMIN_THEME_DATASOURCE' => '模板文件设置数据源',
  1 +<include file="public@header" />
  2 +</head>
  3 +<style>
  4 + th,td{
  5 + text-align: center;
  6 + }
  7 +</style>
  8 +<body>
  9 +<div class="wrap js-check-wrap">
  10 + <ul class="nav nav-tabs">
  11 + <li class="active"><a href="{:url('subhome/index')}">家政预约订单列表</a></li>
  12 + </ul>
  13 + <form class="well form-inline margin-top-20" method="post" action="{:url('subhome/index')}">
  14 + 时间:
  15 + <input type="text" class="form-control js-bootstrap-date" name="start_time"
  16 + value="{$start_time|default=''}"
  17 + style="width: 140px;" autocomplete="off">-
  18 + <input type="text" class="form-control js-bootstrap-date" name="end_time"
  19 + value="{$end_time|default=''}"
  20 + style="width: 140px;" autocomplete="off"> &nbsp; &nbsp;
  21 + <input type="submit" class="btn btn-primary" value="搜索" />
  22 + <a class="btn btn-danger" href="{:url('subhome/index')}">清空</a>
  23 + </form>
  24 + <form class="js-ajax-form" action="" method="post">
  25 + <table class="table table-hover table-bordered">
  26 + <thead>
  27 + <tr>
  28 + <th>ID</th>
  29 + <th>下单人</th>
  30 + <th>订单号</th>
  31 + <th>家政公司名称</th>
  32 + <th>预约的服务类目名称</th>
  33 + <th>预约时间</th>
  34 + <th>订单状态</th>
  35 + <!--<th>操作</th>-->
  36 + </tr>
  37 + </thead>
  38 + <tbody>
  39 + <foreach name="data" item="vo">
  40 + <tr>
  41 + <td>{$vo.id}</td>
  42 + <td>{$vo.user_nickname}</td>
  43 + <td>{$vo.num}</td>
  44 + <td>{$vo.home_name}</td>
  45 + <td>{$vo.sever_name}</td>
  46 + <td>{$vo.sub_time}</td>
  47 + <if condition="$vo.status eq 1">
  48 + <td>已下单</td>
  49 + <elseif condition="$vo.status eq 2"/>
  50 + <td>订单进行中</td>
  51 + <elseif condition="$vo.status eq 3"/>
  52 + <td>已完成</td>
  53 + <else />
  54 + <td>已取消</td>
  55 + </if>
  56 + <!--<td>-->
  57 + <!--<a href='{:url("subhome/edit",array("id"=>$vo["id"],"start_time"=>$start_time,"end_time"=>$end_time))}'>查看详情</a>-->
  58 + <!--</td>-->
  59 + </tr>
  60 + </foreach>
  61 + </tbody>
  62 + </table>
  63 + <div class="pagination">{$page}</div>
  64 + </form>
  65 +</div>
  66 +<script src="__STATIC__/js/admin.js"></script>
  67 +</body>
  68 +</html>