郭盛 / resource · 提交

转到一个项目

作者 郭盛
提交 2cc38d40743c896b7d081f0fa02b999f4df2ce85 1 个父辈 f3be7bd0
1 个管道 的构建 通过 耗费 8 秒

修改地区统计模块

内嵌 并排对比
正在显示 2 个修改的文件 包含 232 行增加 和 217 行删除
... ... @@ -3,7 +3,7 @@
<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/ReleaseController.php" afterPath="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/AreaController.php" afterPath="$PROJECT_DIR$/app/admin/controller/AreaController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -13,7 +13,39 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AreaController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/AreaController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="59" column="9" lean-forward="false" selection-start-line="59" selection-start-column="9" selection-end-line="59" selection-end-column="9" />
<folding>
<element signature="e#2995#3546#0#PHP" expanded="false" />
<element signature="e#3924#4475#0#PHP" expanded="false" />
<element signature="e#4853#5404#0#PHP" expanded="false" />
<element signature="e#11385#11564#0#PHP" expanded="false" />
<element signature="e#11591#11843#0#PHP" expanded="false" />
<element signature="e#11856#12107#0#PHP" expanded="false" />
<element signature="e#12120#12371#0#PHP" expanded="false" />
<element signature="e#12384#12636#0#PHP" expanded="false" />
<element signature="e#14194#28404#0#PHP" expanded="false" />
<element signature="e#28421#30917#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/area/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5000">
<caret line="200" column="17" lean-forward="false" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
... ... @@ -66,7 +98,6 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/active/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/provide/comment.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProvideController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/AreaController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html" />
<option value="$PROJECT_DIR$/api/index/controller/ActiveController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/edit.html" />
... ... @@ -78,6 +109,7 @@
<option value="$PROJECT_DIR$/api/index/controller/FinanceController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OtherController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ReleaseController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/AreaController.php" />
</list>
</option>
</component>
... ... @@ -95,11 +127,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="446" />
<option name="y" value="55" />
<option name="width" value="1868" />
<option name="height" value="1086" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="185" />
<option name="y" value="67" />
<option name="width" value="1704" />
<option name="height" value="1065" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -116,6 +148,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -126,27 +160,60 @@
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" 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="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" 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="resource" type="b2602c69:ProjectViewProjectNode" />
<item name="resource" 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="area" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -230,17 +297,26 @@
<workItem from="1570493724514" duration="1402000" />
<workItem from="1570498610111" duration="50000" />
<workItem from="1570523418252" duration="1729000" />
<workItem from="1570588094186" duration="15254000" />
<workItem from="1570588094186" duration="16540000" />
<workItem from="1571013715973" duration="249000" />
<workItem from="1571029656805" duration="640000" />
<workItem from="1571044430285" duration="3542000" />
<workItem from="1571107530160" duration="2759000" />
<workItem from="1571111965451" duration="1218000" />
<workItem from="1571120047201" duration="74000" />
<workItem from="1571126130237" duration="622000" />
<workItem from="1571128588622" duration="2923000" />
<workItem from="1571131859095" duration="65000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="463781000" />
<option name="totallyTimeSpent" value="477159000" />
</component>
<component name="ToolWindowManager">
<frame x="446" y="55" width="1868" height="1086" extended-state="0" />
<frame x="185" y="67" width="1704" height="1065" extended-state="1" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1465708" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17761557" 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" />
... ... @@ -272,83 +348,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/picture/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1316">
<caret line="73" column="23" lean-forward="false" selection-start-line="73" selection-start-column="23" selection-end-line="73" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/CommonController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="12" column="1" lean-forward="true" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/doc.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750">
<caret line="30" column="2" lean-forward="true" selection-start-line="30" selection-start-column="2" selection-end-line="30" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/finance/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1320">
<caret line="61" column="25" lean-forward="true" selection-start-line="61" selection-start-column="25" selection-end-line="61" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/FinanceController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="84" column="42" lean-forward="false" selection-start-line="84" selection-start-column="42" selection-end-line="84" selection-end-column="42" />
</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">
<caret line="104" column="87" lean-forward="false" selection-start-line="104" selection-start-column="87" selection-end-line="104" selection-end-column="87" />
</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">
<caret line="53" column="31" lean-forward="false" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
</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">
<caret line="693" column="13" lean-forward="true" selection-start-line="693" selection-start-column="13" selection-end-line="693" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/DemandController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="111">
<caret line="17" column="28" lean-forward="false" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1425">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3300">
<caret line="132" column="21" lean-forward="false" selection-start-line="132" selection-start-column="21" selection-end-line="132" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Validate.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
... ... @@ -363,34 +362,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1057">
<caret line="200" column="17" lean-forward="true" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
</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">
... ... @@ -402,7 +373,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -427,7 +397,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="106" column="9" lean-forward="false" selection-start-line="106" selection-start-column="9" selection-end-line="106" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
... ... @@ -450,7 +419,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10231">
<caret line="706" column="34" lean-forward="false" selection-start-line="706" selection-start-column="34" selection-end-line="706" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
... ... @@ -473,9 +441,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="480" column="6" lean-forward="true" selection-start-line="480" selection-start-column="6" selection-end-line="480" selection-end-column="6" />
<folding>
<element signature="e#616#660#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -490,17 +455,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-181">
<caret line="222" column="28" lean-forward="true" selection-start-line="222" selection-start-column="28" selection-end-line="222" selection-end-column="28" />
<folding>
<element signature="e#296#1102#0#PHP" expanded="false" />
<element signature="e#1108#2740#0#PHP" expanded="false" />
<element signature="e#2746#2930#0#PHP" expanded="false" />
<element signature="e#2935#3427#0#PHP" expanded="false" />
<element signature="e#3433#4607#0#PHP" expanded="false" />
<element signature="e#4612#6545#0#PHP" expanded="false" />
<element signature="e#6551#7483#0#PHP" expanded="false" />
<element signature="e#9137#9946#0#PHP" expanded="false" />
<element signature="e#9951#11545#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -508,9 +462,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
<folding>
<element signature="e#282#1940#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -518,20 +469,11 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_10_22.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/upload/poster/poster_14_22.png" />
<entry file="file://$PROJECT_DIR$/public/upload/qrcode/code_10_22.jpg" />
<entry file="file://$PROJECT_DIR$/public/upload/poster/poster_11_22.png">
<provider selected="true" editor-type-id="images">
<state />
... ... @@ -572,16 +514,11 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/yuan1.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/yuan1.png" />
<entry file="file://$PROJECT_DIR$/api/index/controller/ActiveController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5073">
<caret line="633" column="0" lean-forward="true" selection-start-line="633" selection-start-column="0" selection-end-line="633" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -589,10 +526,6 @@
<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#1183#0#PHP" expanded="false" />
<element signature="e#1188#2489#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -600,68 +533,150 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<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>
<element signature="e#299#762#0#PHP" expanded="false" />
<element signature="e#767#1496#0#PHP" expanded="false" />
<element signature="e#1502#2191#0#PHP" expanded="false" />
<element signature="e#2196#4102#0#PHP" expanded="false" />
<element signature="e#4108#4373#0#PHP" expanded="false" />
<element signature="e#4378#4728#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-55">
<caret line="538" column="35" lean-forward="false" selection-start-line="538" selection-start-column="35" selection-end-line="538" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/conf/route.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<state relative-caret-position="599">
<caret line="300" column="32" lean-forward="false" selection-start-line="300" selection-start-column="32" selection-end-line="300" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/convention.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-154">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/base.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" 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="190">
<caret line="42" column="21" lean-forward="false" selection-start-line="42" selection-start-column="21" selection-end-line="42" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="146" column="25" lean-forward="false" selection-start-line="146" selection-start-column="25" selection-end-line="146" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/demand/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="6" lean-forward="false" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="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="835">
<caret line="104" column="14" lean-forward="false" selection-start-line="104" selection-start-column="14" selection-end-line="104" selection-end-column="14" />
<folding>
<element signature="e#129#158#0#PHP" expanded="true" />
<element signature="e#344#512#0#PHP" expanded="false" />
<element signature="e#517#826#0#PHP" expanded="false" />
<element signature="e#832#998#0#PHP" expanded="false" />
<element signature="e#1003#1306#0#PHP" expanded="false" />
<element signature="e#1312#1953#0#PHP" expanded="false" />
<element signature="e#1958#3042#0#PHP" expanded="false" />
<element signature="e#3048#3412#0#PHP" expanded="false" />
<element signature="e#3417#3891#0#PHP" expanded="false" />
<element signature="e#3897#4168#0#PHP" expanded="false" />
<element signature="e#4173#5106#0#PHP" expanded="false" />
<element signature="e#5112#5421#0#PHP" expanded="false" />
<element signature="e#5426#5726#0#PHP" expanded="false" />
<element signature="e#5736#6015#0#PHP" expanded="false" />
<element signature="e#6020#6946#0#PHP" expanded="false" />
<element signature="e#6952#7256#0#PHP" expanded="false" />
<element signature="e#7261#7650#0#PHP" expanded="false" />
<element signature="e#7656#8029#0#PHP" expanded="false" />
<element signature="e#8034#10467#0#PHP" expanded="false" />
<element signature="e#10473#10901#0#PHP" expanded="false" />
<element signature="e#10906#11717#0#PHP" expanded="false" />
<element signature="e#11737#12601#0#PHP" expanded="false" />
<element signature="e#12628#13028#0#PHP" expanded="false" />
<element signature="e#13052#13625#0#PHP" expanded="false" />
<element signature="e#13648#14458#0#PHP" expanded="false" />
<element signature="e#4078#4931#0#PHP" expanded="false" />
<element signature="e#4946#5282#0#PHP" expanded="false" />
<element signature="e#5297#5738#0#PHP" expanded="false" />
<element signature="e#5753#6664#0#PHP" expanded="false" />
<element signature="e#6669#6969#0#PHP" expanded="false" />
<element signature="e#6986#8411#0#PHP" expanded="false" />
<element signature="e#8428#9159#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ReleaseController.php">
<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="-55">
<caret line="538" column="35" lean-forward="false" selection-start-line="538" selection-start-column="35" selection-end-line="538" selection-end-column="35" />
<state relative-caret-position="835">
<caret line="70" column="7" lean-forward="false" selection-start-line="70" selection-start-column="7" selection-end-line="70" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/DemandController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="835">
<caret line="53" column="84" lean-forward="true" selection-start-line="53" selection-start-column="8" selection-end-line="53" selection-end-column="84" />
<folding>
<element signature="e#1934#4707#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/AttractController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/conf/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/area/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5000">
<caret line="200" column="17" lean-forward="false" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
<folding />
</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="1250">
<caret line="59" column="9" lean-forward="false" selection-start-line="59" selection-start-column="9" selection-end-line="59" selection-end-column="9" />
<folding>
<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#2995#3546#0#PHP" expanded="false" />
<element signature="e#3924#4475#0#PHP" expanded="false" />
<element signature="e#4853#5404#0#PHP" expanded="false" />
<element signature="e#11385#11564#0#PHP" expanded="false" />
<element signature="e#11591#11843#0#PHP" expanded="false" />
<element signature="e#11856#12107#0#PHP" expanded="false" />
<element signature="e#12120#12371#0#PHP" expanded="false" />
<element signature="e#12384#12636#0#PHP" expanded="false" />
<element signature="e#14194#28404#0#PHP" expanded="false" />
<element signature="e#28421#30917#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -24,7 +24,7 @@ class AreaController extends AdminBaseController
//查出省份信息
$area_name = Db::name('area')
->where('level',1)
->field('id,name')
->field('id,name,sign_id')
->paginate(10,false,['query'=>request()->param()]);
$area = $area_name->toArray();
//查出市信息
... ... @@ -52,13 +52,12 @@ class AreaController extends AdminBaseController
foreach ($area['data'] as &$v){
$k=0;
foreach ($city_name as $c_value){
if($v['id'] == $c_value['pid']){
if($v['sign_id'] == $c_value['pid']){
$v['city_id'][$k] = $c_value['id'];
$k++;
}
}
}
//查出当天发布全部信息
$job = Db::name('job')
->where($where)
... ... @@ -218,6 +217,7 @@ class AreaController extends AdminBaseController
}
$j_value['province_id'] = array_unique($j_value['province_id']);
}
//查出当天供给在线全部信息
$zai1 = Db::name('job')
->where($t)
... ...