郭盛 / scrap · 提交

转到一个项目

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

后台修改腾讯地图

内嵌 并排对比
正在显示 2 个修改的文件 包含 185 行增加 和 231 行删除
... ... @@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/PointController.php" afterPath="$PROJECT_DIR$/app/admin/controller/PointController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,140 +25,26 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<file leaf-file-name="PointController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-89">
<caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" />
<state relative-caret-position="275">
<caret line="62" column="31" lean-forward="true" selection-start-line="62" selection-start-column="31" selection-end-line="62" selection-end-column="31" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4849#0#PHP" expanded="false" />
<element signature="e#4855#5051#0#PHP" expanded="false" />
<element signature="e#5056#5318#0#PHP" expanded="false" />
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6448#0#PHP" expanded="false" />
<element signature="e#6454#6797#0#PHP" expanded="false" />
<element signature="e#6802#7283#0#PHP" expanded="false" />
<element signature="e#7289#7580#0#PHP" expanded="false" />
<element signature="e#7585#7936#0#PHP" expanded="false" />
<element signature="e#7942#8295#0#PHP" expanded="false" />
<element signature="e#8300#8705#0#PHP" expanded="false" />
<element signature="e#8711#9094#0#PHP" expanded="false" />
<element signature="e#9099#9766#0#PHP" expanded="false" />
<element signature="e#9772#10216#0#PHP" expanded="false" />
<element signature="e#10221#11068#0#PHP" expanded="false" />
<element signature="e#11074#11342#0#PHP" expanded="false" />
<element signature="e#11347#11819#0#PHP" expanded="false" />
<element signature="e#11825#12131#0#PHP" expanded="false" />
<element signature="e#12136#13779#0#PHP" expanded="false" />
<element signature="e#13800#14119#0#PHP" expanded="false" />
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#2477#4124#0#PHP" expanded="false" />
<element signature="e#4139#4605#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<file leaf-file-name="add.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="661">
<caret line="154" column="31" lean-forward="false" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="957">
<caret line="1035" column="38" lean-forward="true" selection-start-line="1035" selection-start-column="38" selection-end-line="1035" selection-end-column="38" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
<element signature="e#1614#1872#0#PHP" expanded="false" />
<element signature="e#1877#2260#0#PHP" expanded="false" />
<element signature="e#2266#2495#0#PHP" expanded="false" />
<element signature="e#2500#4135#0#PHP" expanded="false" />
<element signature="e#4141#4381#0#PHP" expanded="false" />
<element signature="e#4386#4621#0#PHP" expanded="false" />
<element signature="e#4627#4974#0#PHP" expanded="false" />
<element signature="e#4979#5425#0#PHP" expanded="false" />
<element signature="e#5431#5691#0#PHP" expanded="false" />
<element signature="e#5696#5897#0#PHP" expanded="false" />
<element signature="e#5903#6165#0#PHP" expanded="false" />
<element signature="e#6170#6375#0#PHP" expanded="false" />
<element signature="e#6381#6860#0#PHP" expanded="false" />
<element signature="e#6865#8984#0#PHP" expanded="false" />
<element signature="e#9007#9538#0#PHP" expanded="false" />
<element signature="e#9544#9824#0#PHP" expanded="false" />
<element signature="e#9829#10221#0#PHP" expanded="false" />
<element signature="e#10227#10511#0#PHP" expanded="false" />
<element signature="e#10516#11555#0#PHP" expanded="false" />
<element signature="e#11561#11849#0#PHP" expanded="false" />
<element signature="e#11854#12889#0#PHP" expanded="false" />
<element signature="e#12895#13476#0#PHP" expanded="false" />
<element signature="e#13481#14869#0#PHP" expanded="false" />
<element signature="e#14875#15331#0#PHP" expanded="false" />
<element signature="e#15336#17299#0#PHP" expanded="false" />
<element signature="e#17322#17677#0#PHP" expanded="false" />
<element signature="e#17683#18396#0#PHP" expanded="false" />
<element signature="e#18401#19858#0#PHP" expanded="false" />
<element signature="e#19864#20325#0#PHP" expanded="false" />
<element signature="e#20330#23352#0#PHP" expanded="false" />
<element signature="e#23358#23967#0#PHP" expanded="false" />
<element signature="e#23972#25257#0#PHP" expanded="false" />
<element signature="e#25263#25620#0#PHP" expanded="false" />
<element signature="e#25625#26506#0#PHP" expanded="false" />
<element signature="e#26512#26864#0#PHP" expanded="false" />
<element signature="e#26869#27947#0#PHP" expanded="false" />
<element signature="e#27953#28308#0#PHP" expanded="false" />
<element signature="e#28313#29407#0#PHP" expanded="false" />
<element signature="e#29413#29837#0#PHP" expanded="false" />
<element signature="e#29842#30453#0#PHP" expanded="false" />
<element signature="e#30459#30955#0#PHP" expanded="false" />
<element signature="e#33769#34053#0#PHP" expanded="false" />
<element signature="e#34058#34694#0#PHP" expanded="false" />
<element signature="e#34715#35034#0#PHP" expanded="false" />
<element signature="e#35040#35448#0#PHP" expanded="false" />
<element signature="e#35454#36213#0#PHP" expanded="false" />
<element signature="e#36232#37096#0#PHP" expanded="false" />
<element signature="e#37122#37522#0#PHP" expanded="false" />
<element signature="e#37545#38118#0#PHP" expanded="false" />
<element signature="e#38141#38951#0#PHP" expanded="false" />
<element signature="e#38957#39556#0#PHP" expanded="false" />
<element signature="e#39561#40525#0#PHP" expanded="false" />
<element signature="e#40531#41198#0#PHP" expanded="false" />
<element signature="e#41203#42244#0#PHP" expanded="false" />
<element signature="e#42250#42913#0#PHP" expanded="false" />
<element signature="e#42918#43945#0#PHP" expanded="false" />
<element signature="e#43952#44383#0#PHP" expanded="false" />
<element signature="e#44388#44966#0#PHP" expanded="false" />
<element signature="e#44972#45401#0#PHP" expanded="false" />
<element signature="e#45406#46008#0#PHP" expanded="false" />
<element signature="e#46014#46441#0#PHP" expanded="false" />
<element signature="e#46446#47012#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="50">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="13" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
... ... @@ -222,8 +108,6 @@
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
<option value="$PROJECT_DIR$/api/config.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
<option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
... ... @@ -234,6 +118,8 @@
<option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" />
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
<option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
</list>
</option>
</component>
... ... @@ -251,9 +137,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="142" />
<option name="y" value="99" />
<component name="ProjectFrameBounds">
<option name="x" value="221" />
<option name="y" value="103" />
<option name="width" value="1618" />
<option name="height" value="1008" />
</component>
... ... @@ -283,21 +169,56 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" 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="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" 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="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="point" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -407,15 +328,15 @@
<workItem from="1575527294268" duration="10705000" />
<workItem from="1575543830603" duration="2980000" />
<workItem from="1575592067577" duration="15900000" />
<workItem from="1575615529386" duration="13480000" />
<workItem from="1575615529386" duration="15578000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="524877000" />
<option name="totallyTimeSpent" value="526975000" />
</component>
<component name="ToolWindowManager">
<frame x="142" y="99" width="1618" height="1008" extended-state="1" />
<frame x="221" y="103" width="1618" height="1008" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22978178" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -469,21 +390,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" />
<entry file="file://$PROJECT_DIR$/app/admin/controller/AttrController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="51" column="12" lean-forward="false" selection-start-line="51" selection-start-column="12" selection-end-line="54" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="93" column="57" lean-forward="false" selection-start-line="93" selection-start-column="57" selection-end-line="93" selection-end-column="57" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20191129/e4893ecf9ae4fb70b9485ae0a5732120.jpg">
<provider selected="true" editor-type-id="images">
<state />
... ... @@ -663,20 +569,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="52" column="36" lean-forward="true" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="76" column="0" lean-forward="false" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Payment/API.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
... ... @@ -896,69 +788,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-89">
<caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4849#0#PHP" expanded="false" />
<element signature="e#4855#5051#0#PHP" expanded="false" />
<element signature="e#5056#5318#0#PHP" expanded="false" />
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6448#0#PHP" expanded="false" />
<element signature="e#6454#6797#0#PHP" expanded="false" />
<element signature="e#6802#7283#0#PHP" expanded="false" />
<element signature="e#7289#7580#0#PHP" expanded="false" />
<element signature="e#7585#7936#0#PHP" expanded="false" />
<element signature="e#7942#8295#0#PHP" expanded="false" />
<element signature="e#8300#8705#0#PHP" expanded="false" />
<element signature="e#8711#9094#0#PHP" expanded="false" />
<element signature="e#9099#9766#0#PHP" expanded="false" />
<element signature="e#9772#10216#0#PHP" expanded="false" />
<element signature="e#10221#11068#0#PHP" expanded="false" />
<element signature="e#11074#11342#0#PHP" expanded="false" />
<element signature="e#11347#11819#0#PHP" expanded="false" />
<element signature="e#11825#12131#0#PHP" expanded="false" />
<element signature="e#12136#13779#0#PHP" expanded="false" />
<element signature="e#13800#14119#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="661">
<caret line="154" column="31" lean-forward="false" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="957">
<caret line="1035" column="38" lean-forward="true" selection-start-line="1035" selection-start-column="38" selection-end-line="1035" selection-end-column="38" />
<state relative-caret-position="57">
<caret line="999" column="28" lean-forward="true" selection-start-line="999" selection-start-column="28" selection-end-line="999" selection-end-column="28" />
<folding>
<element signature="e#366#791#0#PHP" expanded="false" />
<element signature="e#796#1608#0#PHP" expanded="false" />
... ... @@ -1028,5 +861,112 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="661">
<caret line="154" column="31" lean-forward="false" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4897#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-89">
<caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4849#0#PHP" expanded="false" />
<element signature="e#4855#5051#0#PHP" expanded="false" />
<element signature="e#5056#5318#0#PHP" expanded="false" />
<element signature="e#5324#5779#0#PHP" expanded="false" />
<element signature="e#5784#6448#0#PHP" expanded="false" />
<element signature="e#6454#6797#0#PHP" expanded="false" />
<element signature="e#6802#7283#0#PHP" expanded="false" />
<element signature="e#7289#7580#0#PHP" expanded="false" />
<element signature="e#7585#7936#0#PHP" expanded="false" />
<element signature="e#7942#8295#0#PHP" expanded="false" />
<element signature="e#8300#8705#0#PHP" expanded="false" />
<element signature="e#8711#9094#0#PHP" expanded="false" />
<element signature="e#9099#9766#0#PHP" expanded="false" />
<element signature="e#9772#10216#0#PHP" expanded="false" />
<element signature="e#10221#11068#0#PHP" expanded="false" />
<element signature="e#11074#11342#0#PHP" expanded="false" />
<element signature="e#11347#11819#0#PHP" expanded="false" />
<element signature="e#11825#12131#0#PHP" expanded="false" />
<element signature="e#12136#13779#0#PHP" expanded="false" />
<element signature="e#13800#14119#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/腾讯地图/public/themes/admin_simpleboot3/admin/dialog/map2.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-593">
<caret line="6" column="18" lean-forward="true" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="18" />
<folding>
<marker date="1536653205906" expanded="true" signature="3029:3053" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/腾讯地图/app/admin/controller/DialogController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="875">
<caret line="40" column="34" lean-forward="false" selection-start-line="40" selection-start-column="34" selection-end-line="40" selection-end-column="34" />
<folding>
<element signature="e#1252#1658#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="13" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/腾讯地图/public/themes/admin_simpleboot3/admin/dialog/map.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="42" column="0" lean-forward="false" selection-start-line="42" selection-start-column="0" selection-end-line="137" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="62" column="31" lean-forward="true" selection-start-line="62" selection-start-column="31" selection-end-line="62" selection-end-column="31" />
<folding>
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#2477#4124#0#PHP" expanded="false" />
<element signature="e#4139#4605#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -56,9 +56,11 @@ class PointController extends AdminBaseController
$this->error($validate->getError());
}
//获取经纬度
$url='http://api.map.baidu.com/geocoder/v2/?address='.$param['address'].'&output=json&ak=cIGo3zYrN4WOEnMDSbxynUi9M20i9IgY';
$url = 'https://apis.map.qq.com/ws/geocoder/v1/?address='.$param['address'].'&key=LQNBZ-F3L34-EQMUR-DILMD-LBR4Q-GDFOH';
$result=file_get_contents($url);
$res=json_decode($result,true);
print_r($res);exit;
//经度
$param['lng']= $res['result']['location']['lng'];
//纬度
... ... @@ -73,6 +75,18 @@ class PointController extends AdminBaseController
}
}
public function map()
{
$location = $this->request->param('location');
$location = explode(',', $location);
$lng = empty($location[0]) ? 116.424966 : $location[0];
$lat = empty($location[1]) ? 39.907851 : $location[1];
$this->assign(['lng' => $lng, 'lat' => $lat]);
return $this->fetch();
}
//修改
public function edit(){
$id=$this->request->param('id', 0, 'intval');
... ...