郭盛 / resource · 提交

转到一个项目

作者 郭盛
提交 fc0176fa924ec931ac0313d566ae4a0779317e49 1 个父辈 4cb708b6
1 个管道 的构建 通过 耗费 8 秒

修改首页地区选择

内嵌 并排对比
正在显示 3 个修改的文件 包含 178 行增加 和 153 行删除
... ... @@ -3,6 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" 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/ResourceController.php" afterPath="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/SendController.php" afterPath="$PROJECT_DIR$/api/index/controller/SendController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -13,11 +15,52 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="SendController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="ResourceController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="137" column="26" lean-forward="true" selection-start-line="137" selection-start-column="26" selection-end-line="137" selection-end-column="26" />
<folding>
<element signature="e#346#543#0#PHP" expanded="false" />
<element signature="e#548#956#0#PHP" expanded="false" />
<element signature="e#962#1253#0#PHP" expanded="false" />
<element signature="e#1258#2915#0#PHP" expanded="false" />
<element signature="e#2921#3205#0#PHP" expanded="false" />
<element signature="e#4071#4545#0#PHP" expanded="false" />
<element signature="e#4552#5551#0#PHP" expanded="false" />
<element signature="e#5557#6210#0#PHP" expanded="false" />
<element signature="e#6215#7372#0#PHP" expanded="false" />
<element signature="e#7378#8081#0#PHP" expanded="false" />
<element signature="e#8086#9723#0#PHP" expanded="false" />
<element signature="e#9729#10587#0#PHP" expanded="false" />
<element signature="e#10592#12530#0#PHP" expanded="false" />
<element signature="e#12536#13376#0#PHP" expanded="false" />
<element signature="e#13381#15486#0#PHP" expanded="false" />
<element signature="e#15492#16139#0#PHP" expanded="false" />
<element signature="e#16144#17759#0#PHP" expanded="false" />
<element signature="e#17765#18181#0#PHP" expanded="false" />
<element signature="e#18186#19005#0#PHP" expanded="false" />
<element signature="e#19010#19688#0#PHP" expanded="false" />
<element signature="e#19694#20148#0#PHP" expanded="false" />
<element signature="e#20153#21011#0#PHP" expanded="false" />
<element signature="e#21017#21523#0#PHP" expanded="false" />
<element signature="e#21528#22959#0#PHP" expanded="false" />
<element signature="e#22965#23244#0#PHP" expanded="false" />
<element signature="e#23249#23691#0#PHP" expanded="false" />
<element signature="e#23697#23931#0#PHP" expanded="false" />
<element signature="e#23936#24329#0#PHP" expanded="false" />
<element signature="e#24335#24566#0#PHP" expanded="false" />
<element signature="e#24571#24929#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SendController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1092">
<caret line="326" column="9" lean-forward="false" selection-start-line="326" selection-start-column="9" selection-end-line="326" selection-end-column="9" />
<state relative-caret-position="125">
<caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
<folding>
<element signature="e#296#1102#0#PHP" expanded="false" />
<element signature="e#1108#2740#0#PHP" expanded="false" />
... ... @@ -26,8 +69,9 @@
<element signature="e#3135#4309#0#PHP" expanded="false" />
<element signature="e#4314#6247#0#PHP" expanded="false" />
<element signature="e#6253#7185#0#PHP" expanded="false" />
<element signature="e#7190#8878#0#PHP" expanded="false" />
<element signature="e#8884#9693#0#PHP" expanded="false" />
<element signature="e#7190#8833#0#PHP" expanded="false" />
<element signature="e#8839#9648#0#PHP" expanded="false" />
<element signature="e#9653#11247#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -91,10 +135,10 @@
<option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html" />
<option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
<option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
<option value="$PROJECT_DIR$/api/index/controller/SendController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ResourceController.php" />
</list>
</option>
</component>
... ... @@ -113,10 +157,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-102" />
<option name="y" value="72" />
<option name="width" value="1935" />
<option name="height" value="979" />
<option name="x" value="253" />
<option name="y" value="55" />
<option name="width" value="1661" />
<option name="height" value="940" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -133,6 +177,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -163,12 +208,11 @@
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -229,27 +273,32 @@
<workItem from="1569315557660" duration="58000" />
<workItem from="1569389764200" duration="1390000" />
<workItem from="1569391173899" duration="1945000" />
<workItem from="1569397269236" duration="5125000" />
<workItem from="1569397269236" duration="6620000" />
<workItem from="1569457291766" duration="2094000" />
<workItem from="1569484124771" duration="560000" />
<workItem from="1569486627319" duration="2740000" />
<workItem from="1569494185536" duration="1054000" />
<workItem from="1569544728303" duration="6999000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="365944000" />
<option name="totallyTimeSpent" value="380886000" />
</component>
<component name="ToolWindowManager">
<frame x="-102" y="72" width="1935" height="979" extended-state="1" />
<frame x="253" y="55" width="1661" height="940" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1664" 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.20424734" 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.34076828" sideWeight="0.50296295" 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.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" 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="false" content_ui="tabs" />
<window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" 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="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2992383" sideWeight="0.49703702" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
... ... @@ -267,12 +316,11 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="4" />
<option name="time" value="5" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/uploads/20190917/8911c360625ca427833d1297921b2f1a.png" />
<entry file="file://$PROJECT_DIR$/public/uploads/20190917/039879fe0b83499ad11ea5bdbe89e755.png" />
<entry file="file://$PROJECT_DIR$/public/uploads/20190917/be1562958a2c53342707fdab5df02092.png" />
<entry file="file://$PROJECT_DIR$/app/database.php">
... ... @@ -429,13 +477,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="100" column="13" lean-forward="false" selection-start-line="100" selection-start-column="13" selection-end-line="100" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/doc.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750">
... ... @@ -471,13 +512,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="132" column="87" lean-forward="false" selection-start-line="132" selection-start-column="87" selection-end-line="132" selection-end-column="87" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/attract/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
... ... @@ -485,13 +519,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-550">
<caret line="56" column="25" lean-forward="true" selection-start-line="56" selection-start-column="25" selection-end-line="56" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="557">
... ... @@ -499,13 +526,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProvideController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="116" column="8" lean-forward="true" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/AreaController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="232">
... ... @@ -566,7 +586,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2335">
<caret line="22" column="7" lean-forward="false" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
... ... @@ -574,92 +593,55 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="665">
<caret line="431" column="5" lean-forward="true" selection-start-line="431" selection-start-column="5" selection-end-line="431" selection-end-column="5" />
<folding>
<element signature="e#330#805#0#PHP" expanded="false" />
<element signature="e#810#1537#0#PHP" expanded="false" />
<element signature="e#1543#2147#0#PHP" expanded="false" />
<element signature="e#2152#3064#0#PHP" expanded="false" />
<element signature="e#3070#3509#0#PHP" expanded="false" />
<element signature="e#3514#4196#0#PHP" expanded="false" />
<element signature="e#4202#4830#0#PHP" expanded="false" />
<element signature="e#4835#5942#0#PHP" expanded="false" />
<element signature="e#5948#6775#0#PHP" expanded="false" />
<element signature="e#6780#8040#0#PHP" expanded="false" />
<element signature="e#8046#8833#0#PHP" expanded="false" />
<element signature="e#8838#10199#0#PHP" expanded="false" />
<element signature="e#10205#11323#0#PHP" expanded="false" />
<element signature="e#11328#12859#0#PHP" expanded="false" />
<element signature="e#12865#13429#0#PHP" expanded="false" />
<element signature="e#13434#14516#0#PHP" expanded="false" />
<element signature="e#14522#15281#0#PHP" expanded="false" />
<element signature="e#15286#16494#0#PHP" expanded="false" />
<element signature="e#16500#17137#0#PHP" expanded="false" />
<element signature="e#17142#17660#0#PHP" expanded="false" />
<element signature="e#17666#18551#0#PHP" expanded="false" />
<element signature="e#18556#19654#0#PHP" expanded="false" />
<element signature="e#19660#20137#0#PHP" expanded="false" />
<element signature="e#20142#20873#0#PHP" expanded="false" />
<element signature="e#20879#21445#0#PHP" expanded="false" />
<element signature="e#21450#22287#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="240" column="5" lean-forward="true" selection-start-line="240" selection-start-column="5" selection-end-line="240" selection-end-column="5" />
<folding>
<element signature="e#346#543#0#PHP" expanded="false" />
<element signature="e#548#956#0#PHP" expanded="false" />
<element signature="e#962#1253#0#PHP" expanded="false" />
<element signature="e#1258#2915#0#PHP" expanded="false" />
<element signature="e#2921#3173#0#PHP" expanded="false" />
<element signature="e#3178#3633#0#PHP" expanded="false" />
<element signature="e#3639#4194#0#PHP" expanded="false" />
<element signature="e#4201#5476#0#PHP" expanded="false" />
<element signature="e#5482#6202#0#PHP" expanded="false" />
<element signature="e#6207#7625#0#PHP" expanded="false" />
<element signature="e#7631#8334#0#PHP" expanded="false" />
<element signature="e#8339#9976#0#PHP" expanded="false" />
<element signature="e#9982#10840#0#PHP" expanded="false" />
<element signature="e#10845#12783#0#PHP" expanded="false" />
<element signature="e#12789#13629#0#PHP" expanded="false" />
<element signature="e#13634#15739#0#PHP" expanded="false" />
<element signature="e#15745#16392#0#PHP" expanded="false" />
<element signature="e#16397#18012#0#PHP" expanded="false" />
<element signature="e#18018#18434#0#PHP" expanded="false" />
<element signature="e#18439#19258#0#PHP" expanded="false" />
<element signature="e#19263#19941#0#PHP" expanded="false" />
<element signature="e#19947#20401#0#PHP" expanded="false" />
<element signature="e#20406#21264#0#PHP" expanded="false" />
<element signature="e#21270#21776#0#PHP" expanded="false" />
<element signature="e#21781#23212#0#PHP" expanded="false" />
<element signature="e#23218#23497#0#PHP" expanded="false" />
<element signature="e#23502#23944#0#PHP" expanded="false" />
<element signature="e#23950#24184#0#PHP" expanded="false" />
<element signature="e#24189#24582#0#PHP" expanded="false" />
<element signature="e#24588#24819#0#PHP" expanded="false" />
<element signature="e#24824#25182#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="375">
<caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/FinanceController.php">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ActiveController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="43" column="27" lean-forward="false" selection-start-line="43" selection-start-column="27" selection-end-line="43" selection-end-column="27" />
<folding>
<element signature="e#300#1179#0#PHP" expanded="false" />
<element signature="e#1184#2485#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="325">
<caret line="105" column="14" lean-forward="true" selection-start-line="105" selection-start-column="14" selection-end-line="105" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/area.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="34" column="91" lean-forward="false" selection-start-line="34" selection-start-column="91" selection-end-line="34" selection-end-column="101" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProvideController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="690">
<caret line="170" column="5" lean-forward="true" selection-start-line="170" selection-start-column="5" selection-end-line="170" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="70" column="84" lean-forward="false" selection-start-line="70" selection-start-column="84" selection-end-line="70" selection-end-column="84" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SendController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1092">
<caret line="326" column="9" lean-forward="false" selection-start-line="326" selection-start-column="9" selection-end-line="326" selection-end-column="9" />
<state relative-caret-position="125">
<caret line="15" column="3" lean-forward="true" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
<folding>
<element signature="e#296#1102#0#PHP" expanded="false" />
<element signature="e#1108#2740#0#PHP" expanded="false" />
... ... @@ -668,8 +650,48 @@
<element signature="e#3135#4309#0#PHP" expanded="false" />
<element signature="e#4314#6247#0#PHP" expanded="false" />
<element signature="e#6253#7185#0#PHP" expanded="false" />
<element signature="e#7190#8878#0#PHP" expanded="false" />
<element signature="e#8884#9693#0#PHP" expanded="false" />
<element signature="e#7190#8833#0#PHP" expanded="false" />
<element signature="e#8839#9648#0#PHP" expanded="false" />
<element signature="e#9653#11247#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ResourceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="137" column="26" lean-forward="true" selection-start-line="137" selection-start-column="26" selection-end-line="137" selection-end-column="26" />
<folding>
<element signature="e#346#543#0#PHP" expanded="false" />
<element signature="e#548#956#0#PHP" expanded="false" />
<element signature="e#962#1253#0#PHP" expanded="false" />
<element signature="e#1258#2915#0#PHP" expanded="false" />
<element signature="e#2921#3205#0#PHP" expanded="false" />
<element signature="e#4071#4545#0#PHP" expanded="false" />
<element signature="e#4552#5551#0#PHP" expanded="false" />
<element signature="e#5557#6210#0#PHP" expanded="false" />
<element signature="e#6215#7372#0#PHP" expanded="false" />
<element signature="e#7378#8081#0#PHP" expanded="false" />
<element signature="e#8086#9723#0#PHP" expanded="false" />
<element signature="e#9729#10587#0#PHP" expanded="false" />
<element signature="e#10592#12530#0#PHP" expanded="false" />
<element signature="e#12536#13376#0#PHP" expanded="false" />
<element signature="e#13381#15486#0#PHP" expanded="false" />
<element signature="e#15492#16139#0#PHP" expanded="false" />
<element signature="e#16144#17759#0#PHP" expanded="false" />
<element signature="e#17765#18181#0#PHP" expanded="false" />
<element signature="e#18186#19005#0#PHP" expanded="false" />
<element signature="e#19010#19688#0#PHP" expanded="false" />
<element signature="e#19694#20148#0#PHP" expanded="false" />
<element signature="e#20153#21011#0#PHP" expanded="false" />
<element signature="e#21017#21523#0#PHP" expanded="false" />
<element signature="e#21528#22959#0#PHP" expanded="false" />
<element signature="e#22965#23244#0#PHP" expanded="false" />
<element signature="e#23249#23691#0#PHP" expanded="false" />
<element signature="e#23697#23931#0#PHP" expanded="false" />
<element signature="e#23936#24329#0#PHP" expanded="false" />
<element signature="e#24335#24566#0#PHP" expanded="false" />
<element signature="e#24571#24929#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -99,8 +99,8 @@ class ResourceController extends RestBaseController
}
/**
* @title 地区
* @description 全部地区信息
* @title 全部省份信息
* @description 全部省份信息
* @author GuoSheng
* @url /index/Resource/area
* @method GET
... ... @@ -109,21 +109,40 @@ class ResourceController extends RestBaseController
*
* @return id:城市ID
* @return name:城市名称
* @return sign_id:标识ID
*/
public function area()
{
$user_id = $this->getUserId();
$data = Db::name('area')
->field('id,name,sign_id')
->where('pid',0)
->select();
$this->success('SUCCESS',$data);
}
/**
* @title 市级信息
* @description 市级信息
* @author GuoSheng
* @url /index/Resource/city
* @method GET
*
* @header name:XX-Token require:1 default: desc:token
*
* @param name:sign_id type:int require:1 other:desc:省份的标识id
*
* @return id:城市ID
* @return name:城市名称
*/
public function city()
{
$user_id = $this->getUserId();
$id = $this->request->param('sign_id');
$data = Db::name('area')
->field('id,name')
->where('level',1)
->select()
->toArray();
foreach ($data as $k=>$v){
$data[$k]['child'] = Db::name('area')
->where('pid',$v['id'])
->field('id,name')
->select();
}
->where('pid',$id)
->select();
$this->success('SUCCESS',$data);
}
... ... @@ -137,7 +156,6 @@ class ResourceController extends RestBaseController
* @param name:page type:int require:0 other: desc:当前页（默认1）
* @param name:pageNum type:int require:0 other: desc:每页显示数据个数（默认10）
* @param name:city_id type:id require:0 other: desc:市级城市ID
* @param name:city_name type:string require:0 other: desc:首次进来通过经纬度获取到的城市名称
*
* @return id:信息ID
* @return job_type:信息标签类型
... ... @@ -150,13 +168,6 @@ class ResourceController extends RestBaseController
$param = $this->request->param();
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
if(!empty($param['city_name'])){
$city = Db::name('area')
->where('name',$param['city_name'])
->find();
$city_id = ','.$city['id'].',';
$where['city'] = ['like',"%$city_id%"];
}
if(!empty($param['city_id'])){
$city_id = ','.$param['city_id'].',';
$where['city'] = ['like',"%$city_id%"];
... ... @@ -192,7 +203,6 @@ class ResourceController extends RestBaseController
* @param name:city_id type:int require:0 other: desc:当前城市ID（默认为当前城市，如果不授权默认为全国）
* @param name:page type:int require:0 other: desc:当前页（默认1）
* @param name:pageNum type:int require:0 other: desc:每页显示数据个数（默认10）
* @param name:city_name type:string require:0 other:desc:城市名称
*
* @return id:信息ID
* @return job_type:信息标签类型
... ... @@ -207,13 +217,7 @@ class ResourceController extends RestBaseController
$pageNum = $this->request->param('pageNum',10,'intval');
$city_id = $this->request->param('city_id');
$job_type = $this->request->param('job_type');
if(!empty($param['city_name'])){
$city = Db::name('area')
->where('name',$param['city_name'])
->find();
$city_id = ','.$city['id'].',';
$where['city'] = ['like',"%$city_id%"];
}
if(!empty($city_id)){
$city_id = ','.$city_id.',';
$where['city'] = ['like',"%$city_id%"];
... ...
... ... @@ -202,7 +202,7 @@ class SendController extends RestBaseController
* @param name:linkman type:string require:1 desc:联系人
* @param name:linkman_tel type:string require:1 desc:手机号码
* @param name:needpeople type:int require:1 desc:需求人数
* @param name:payroll type:int require:1 desc:费用
* @param name:payroll type:int require:0 desc:费用
* @param name:city type:string require:1 desc: 城市(此处只能添加一个)
* @param name:adress type:string require:1 desc:详细地址
* @param name:company_name type:string require:1 desc:公司名称不能为空
... ... @@ -242,7 +242,6 @@ class SendController extends RestBaseController
'linkman' => 'require',
'linkman_tel'=>'require|number|max:11',
'needpeople' =>'require|number',
'payroll'=>'require|number',
'city'=>'require',
'adress'=>'require',
'company_name'=>'require',
... ...