郭盛 / scrap · 提交

转到一个项目

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

后台修改腾讯地图

内嵌 并排对比
正在显示 2 个修改的文件 包含 185 行增加 和 231 行删除
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/PointController.php" afterPath="$PROJECT_DIR$/app/admin/controller/PointController.php" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -25,140 +25,26 @@ @@ -25,140 +25,26 @@
25 </component> 25 </component>
26 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php"> 28 + <file leaf-file-name="PointController.php" pinned="false" current-in-tab="true">
  29 + <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
30 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="-89">  
32 - <caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" /> 31 + <state relative-caret-position="275">
  32 + <caret line="62" column="31" lean-forward="true" selection-start-line="62" selection-start-column="31" selection-end-line="62" selection-end-column="31" />
33 <folding> 33 <folding>
34 - <element signature="e#342#596#0#PHP" expanded="false" />  
35 - <element signature="e#601#886#0#PHP" expanded="false" />  
36 - <element signature="e#892#1227#0#PHP" expanded="false" />  
37 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
38 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
39 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
40 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
41 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
42 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
43 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
44 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
45 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
46 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
47 - <element signature="e#4658#4849#0#PHP" expanded="false" />  
48 - <element signature="e#4855#5051#0#PHP" expanded="false" />  
49 - <element signature="e#5056#5318#0#PHP" expanded="false" />  
50 - <element signature="e#5324#5779#0#PHP" expanded="false" />  
51 - <element signature="e#5784#6448#0#PHP" expanded="false" />  
52 - <element signature="e#6454#6797#0#PHP" expanded="false" />  
53 - <element signature="e#6802#7283#0#PHP" expanded="false" />  
54 - <element signature="e#7289#7580#0#PHP" expanded="false" />  
55 - <element signature="e#7585#7936#0#PHP" expanded="false" />  
56 - <element signature="e#7942#8295#0#PHP" expanded="false" />  
57 - <element signature="e#8300#8705#0#PHP" expanded="false" />  
58 - <element signature="e#8711#9094#0#PHP" expanded="false" />  
59 - <element signature="e#9099#9766#0#PHP" expanded="false" />  
60 - <element signature="e#9772#10216#0#PHP" expanded="false" />  
61 - <element signature="e#10221#11068#0#PHP" expanded="false" />  
62 - <element signature="e#11074#11342#0#PHP" expanded="false" />  
63 - <element signature="e#11347#11819#0#PHP" expanded="false" />  
64 - <element signature="e#11825#12131#0#PHP" expanded="false" />  
65 - <element signature="e#12136#13779#0#PHP" expanded="false" />  
66 - <element signature="e#13800#14119#0#PHP" expanded="false" /> 34 + <element signature="e#262#867#0#PHP" expanded="false" />
  35 + <element signature="e#2477#4124#0#PHP" expanded="false" />
  36 + <element signature="e#4139#4605#0#PHP" expanded="false" />
67 </folding> 37 </folding>
68 </state> 38 </state>
69 </provider> 39 </provider>
70 </entry> 40 </entry>
71 </file> 41 </file>
72 - <file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">  
73 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php"> 42 + <file leaf-file-name="add.html" pinned="false" current-in-tab="false">
  43 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html">
74 <provider selected="true" editor-type-id="text-editor"> 44 <provider selected="true" editor-type-id="text-editor">
75 - <state relative-caret-position="661">  
76 - <caret line="154" column="31" lean-forward="false" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />  
77 - <folding>  
78 - <element signature="e#305#577#0#PHP" expanded="false" />  
79 - <element signature="e#859#1113#0#PHP" expanded="false" />  
80 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
81 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
82 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
83 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
84 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
85 - <element signature="e#3894#4897#0#PHP" expanded="false" />  
86 - </folding>  
87 - </state>  
88 - </provider>  
89 - </entry>  
90 - </file>  
91 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">  
92 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
93 - <provider selected="true" editor-type-id="text-editor">  
94 - <state relative-caret-position="957">  
95 - <caret line="1035" column="38" lean-forward="true" selection-start-line="1035" selection-start-column="38" selection-end-line="1035" selection-end-column="38" />  
96 - <folding>  
97 - <element signature="e#366#791#0#PHP" expanded="false" />  
98 - <element signature="e#796#1608#0#PHP" expanded="false" />  
99 - <element signature="e#1614#1872#0#PHP" expanded="false" />  
100 - <element signature="e#1877#2260#0#PHP" expanded="false" />  
101 - <element signature="e#2266#2495#0#PHP" expanded="false" />  
102 - <element signature="e#2500#4135#0#PHP" expanded="false" />  
103 - <element signature="e#4141#4381#0#PHP" expanded="false" />  
104 - <element signature="e#4386#4621#0#PHP" expanded="false" />  
105 - <element signature="e#4627#4974#0#PHP" expanded="false" />  
106 - <element signature="e#4979#5425#0#PHP" expanded="false" />  
107 - <element signature="e#5431#5691#0#PHP" expanded="false" />  
108 - <element signature="e#5696#5897#0#PHP" expanded="false" />  
109 - <element signature="e#5903#6165#0#PHP" expanded="false" />  
110 - <element signature="e#6170#6375#0#PHP" expanded="false" />  
111 - <element signature="e#6381#6860#0#PHP" expanded="false" />  
112 - <element signature="e#6865#8984#0#PHP" expanded="false" />  
113 - <element signature="e#9007#9538#0#PHP" expanded="false" />  
114 - <element signature="e#9544#9824#0#PHP" expanded="false" />  
115 - <element signature="e#9829#10221#0#PHP" expanded="false" />  
116 - <element signature="e#10227#10511#0#PHP" expanded="false" />  
117 - <element signature="e#10516#11555#0#PHP" expanded="false" />  
118 - <element signature="e#11561#11849#0#PHP" expanded="false" />  
119 - <element signature="e#11854#12889#0#PHP" expanded="false" />  
120 - <element signature="e#12895#13476#0#PHP" expanded="false" />  
121 - <element signature="e#13481#14869#0#PHP" expanded="false" />  
122 - <element signature="e#14875#15331#0#PHP" expanded="false" />  
123 - <element signature="e#15336#17299#0#PHP" expanded="false" />  
124 - <element signature="e#17322#17677#0#PHP" expanded="false" />  
125 - <element signature="e#17683#18396#0#PHP" expanded="false" />  
126 - <element signature="e#18401#19858#0#PHP" expanded="false" />  
127 - <element signature="e#19864#20325#0#PHP" expanded="false" />  
128 - <element signature="e#20330#23352#0#PHP" expanded="false" />  
129 - <element signature="e#23358#23967#0#PHP" expanded="false" />  
130 - <element signature="e#23972#25257#0#PHP" expanded="false" />  
131 - <element signature="e#25263#25620#0#PHP" expanded="false" />  
132 - <element signature="e#25625#26506#0#PHP" expanded="false" />  
133 - <element signature="e#26512#26864#0#PHP" expanded="false" />  
134 - <element signature="e#26869#27947#0#PHP" expanded="false" />  
135 - <element signature="e#27953#28308#0#PHP" expanded="false" />  
136 - <element signature="e#28313#29407#0#PHP" expanded="false" />  
137 - <element signature="e#29413#29837#0#PHP" expanded="false" />  
138 - <element signature="e#29842#30453#0#PHP" expanded="false" />  
139 - <element signature="e#30459#30955#0#PHP" expanded="false" />  
140 - <element signature="e#33769#34053#0#PHP" expanded="false" />  
141 - <element signature="e#34058#34694#0#PHP" expanded="false" />  
142 - <element signature="e#34715#35034#0#PHP" expanded="false" />  
143 - <element signature="e#35040#35448#0#PHP" expanded="false" />  
144 - <element signature="e#35454#36213#0#PHP" expanded="false" />  
145 - <element signature="e#36232#37096#0#PHP" expanded="false" />  
146 - <element signature="e#37122#37522#0#PHP" expanded="false" />  
147 - <element signature="e#37545#38118#0#PHP" expanded="false" />  
148 - <element signature="e#38141#38951#0#PHP" expanded="false" />  
149 - <element signature="e#38957#39556#0#PHP" expanded="false" />  
150 - <element signature="e#39561#40525#0#PHP" expanded="false" />  
151 - <element signature="e#40531#41198#0#PHP" expanded="false" />  
152 - <element signature="e#41203#42244#0#PHP" expanded="false" />  
153 - <element signature="e#42250#42913#0#PHP" expanded="false" />  
154 - <element signature="e#42918#43945#0#PHP" expanded="false" />  
155 - <element signature="e#43952#44383#0#PHP" expanded="false" />  
156 - <element signature="e#44388#44966#0#PHP" expanded="false" />  
157 - <element signature="e#44972#45401#0#PHP" expanded="false" />  
158 - <element signature="e#45406#46008#0#PHP" expanded="false" />  
159 - <element signature="e#46014#46441#0#PHP" expanded="false" />  
160 - <element signature="e#46446#47012#0#PHP" expanded="false" />  
161 - </folding> 45 + <state relative-caret-position="50">
  46 + <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="13" selection-end-column="16" />
  47 + <folding />
162 </state> 48 </state>
163 </provider> 49 </provider>
164 </entry> 50 </entry>
@@ -222,8 +108,6 @@ @@ -222,8 +108,6 @@
222 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 108 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
223 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" /> 109 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
224 <option value="$PROJECT_DIR$/api/config.php" /> 110 <option value="$PROJECT_DIR$/api/config.php" />
225 - <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />  
226 - <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />  
227 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" /> 111 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
228 <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" /> 112 <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />
229 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 113 <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
@@ -234,6 +118,8 @@ @@ -234,6 +118,8 @@
234 <option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" /> 118 <option value="$PROJECT_DIR$/app/admin/controller/BountyController.php" />
235 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" /> 119 <option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
236 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 120 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
  121 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
  122 + <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
237 </list> 123 </list>
238 </option> 124 </option>
239 </component> 125 </component>
@@ -251,9 +137,9 @@ @@ -251,9 +137,9 @@
251 <sorting>DEFINITION_ORDER</sorting> 137 <sorting>DEFINITION_ORDER</sorting>
252 </component> 138 </component>
253 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 139 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
254 - <component name="ProjectFrameBounds" extendedState="1">  
255 - <option name="x" value="142" />  
256 - <option name="y" value="99" /> 140 + <component name="ProjectFrameBounds">
  141 + <option name="x" value="221" />
  142 + <option name="y" value="103" />
257 <option name="width" value="1618" /> 143 <option name="width" value="1618" />
258 <option name="height" value="1008" /> 144 <option name="height" value="1008" />
259 </component> 145 </component>
@@ -283,21 +169,56 @@ @@ -283,21 +169,56 @@
283 <path> 169 <path>
284 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 170 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
285 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 171 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
286 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 172 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
287 </path> 173 </path>
288 <path> 174 <path>
289 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 175 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
290 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 176 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
291 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
292 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 177 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  178 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
293 </path> 179 </path>
294 <path> 180 <path>
295 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 181 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
296 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 182 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
297 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
298 - <item name="index" type="2a2b976b:PhpTreeStructureProvider$1" /> 183 + <item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
  184 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
299 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 185 <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
300 </path> 186 </path>
  187 + <path>
  188 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  189 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  190 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  191 + </path>
  192 + <path>
  193 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  194 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  195 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  196 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  197 + </path>
  198 + <path>
  199 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  200 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  201 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  202 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  203 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  204 + </path>
  205 + <path>
  206 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  207 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  208 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  209 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  210 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  211 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  212 + </path>
  213 + <path>
  214 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  215 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  216 + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
  217 + <item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
  218 + <item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
  219 + <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
  220 + <item name="point" type="2a2b976b:PhpTreeStructureProvider$1" />
  221 + </path>
301 </expand> 222 </expand>
302 <select /> 223 <select />
303 </subPane> 224 </subPane>
@@ -407,15 +328,15 @@ @@ -407,15 +328,15 @@
407 <workItem from="1575527294268" duration="10705000" /> 328 <workItem from="1575527294268" duration="10705000" />
408 <workItem from="1575543830603" duration="2980000" /> 329 <workItem from="1575543830603" duration="2980000" />
409 <workItem from="1575592067577" duration="15900000" /> 330 <workItem from="1575592067577" duration="15900000" />
410 - <workItem from="1575615529386" duration="13480000" /> 331 + <workItem from="1575615529386" duration="15578000" />
411 </task> 332 </task>
412 <servers /> 333 <servers />
413 </component> 334 </component>
414 <component name="TimeTrackingManager"> 335 <component name="TimeTrackingManager">
415 - <option name="totallyTimeSpent" value="524877000" /> 336 + <option name="totallyTimeSpent" value="526975000" />
416 </component> 337 </component>
417 <component name="ToolWindowManager"> 338 <component name="ToolWindowManager">
418 - <frame x="142" y="99" width="1618" height="1008" extended-state="1" /> 339 + <frame x="221" y="103" width="1618" height="1008" extended-state="0" />
419 <editor active="true" /> 340 <editor active="true" />
420 <layout> 341 <layout>
421 <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" /> 342 <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 @@ @@ -469,21 +390,6 @@
469 <watches-manager /> 390 <watches-manager />
470 </component> 391 </component>
471 <component name="editorHistoryManager"> 392 <component name="editorHistoryManager">
472 - <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/index.html" />  
473 - <entry file="file://$PROJECT_DIR$/app/admin/controller/AttrController.php">  
474 - <provider selected="true" editor-type-id="text-editor">  
475 - <state relative-caret-position="200">  
476 - <caret line="51" column="12" lean-forward="false" selection-start-line="51" selection-start-column="12" selection-end-line="54" selection-end-column="15" />  
477 - </state>  
478 - </provider>  
479 - </entry>  
480 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">  
481 - <provider selected="true" editor-type-id="text-editor">  
482 - <state relative-caret-position="210">  
483 - <caret line="93" column="57" lean-forward="false" selection-start-line="93" selection-start-column="57" selection-end-line="93" selection-end-column="57" />  
484 - </state>  
485 - </provider>  
486 - </entry>  
487 <entry file="file://$PROJECT_DIR$/public/uploads/20191129/e4893ecf9ae4fb70b9485ae0a5732120.jpg"> 393 <entry file="file://$PROJECT_DIR$/public/uploads/20191129/e4893ecf9ae4fb70b9485ae0a5732120.jpg">
488 <provider selected="true" editor-type-id="images"> 394 <provider selected="true" editor-type-id="images">
489 <state /> 395 <state />
@@ -663,20 +569,6 @@ @@ -663,20 +569,6 @@
663 </state> 569 </state>
664 </provider> 570 </provider>
665 </entry> 571 </entry>
666 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html">  
667 - <provider selected="true" editor-type-id="text-editor">  
668 - <state relative-caret-position="75">  
669 - <caret line="52" column="36" lean-forward="true" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />  
670 - </state>  
671 - </provider>  
672 - </entry>  
673 - <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">  
674 - <provider selected="true" editor-type-id="text-editor">  
675 - <state relative-caret-position="400">  
676 - <caret line="76" column="0" lean-forward="false" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />  
677 - </state>  
678 - </provider>  
679 - </entry>  
680 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Payment/API.php"> 572 <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Payment/API.php">
681 <provider selected="true" editor-type-id="text-editor"> 573 <provider selected="true" editor-type-id="text-editor">
682 <state relative-caret-position="216"> 574 <state relative-caret-position="216">
@@ -896,69 +788,10 @@ @@ -896,69 +788,10 @@
896 </state> 788 </state>
897 </provider> 789 </provider>
898 </entry> 790 </entry>
899 - <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">  
900 - <provider selected="true" editor-type-id="text-editor">  
901 - <state relative-caret-position="-89">  
902 - <caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" />  
903 - <folding>  
904 - <element signature="e#342#596#0#PHP" expanded="false" />  
905 - <element signature="e#601#886#0#PHP" expanded="false" />  
906 - <element signature="e#892#1227#0#PHP" expanded="false" />  
907 - <element signature="e#1232#1729#0#PHP" expanded="false" />  
908 - <element signature="e#1735#1995#0#PHP" expanded="false" />  
909 - <element signature="e#2000#2289#0#PHP" expanded="false" />  
910 - <element signature="e#2295#2634#0#PHP" expanded="false" />  
911 - <element signature="e#2639#3142#0#PHP" expanded="false" />  
912 - <element signature="e#3148#3364#0#PHP" expanded="false" />  
913 - <element signature="e#3369#3738#0#PHP" expanded="false" />  
914 - <element signature="e#3744#4046#0#PHP" expanded="false" />  
915 - <element signature="e#4051#4450#0#PHP" expanded="false" />  
916 - <element signature="e#4456#4653#0#PHP" expanded="false" />  
917 - <element signature="e#4658#4849#0#PHP" expanded="false" />  
918 - <element signature="e#4855#5051#0#PHP" expanded="false" />  
919 - <element signature="e#5056#5318#0#PHP" expanded="false" />  
920 - <element signature="e#5324#5779#0#PHP" expanded="false" />  
921 - <element signature="e#5784#6448#0#PHP" expanded="false" />  
922 - <element signature="e#6454#6797#0#PHP" expanded="false" />  
923 - <element signature="e#6802#7283#0#PHP" expanded="false" />  
924 - <element signature="e#7289#7580#0#PHP" expanded="false" />  
925 - <element signature="e#7585#7936#0#PHP" expanded="false" />  
926 - <element signature="e#7942#8295#0#PHP" expanded="false" />  
927 - <element signature="e#8300#8705#0#PHP" expanded="false" />  
928 - <element signature="e#8711#9094#0#PHP" expanded="false" />  
929 - <element signature="e#9099#9766#0#PHP" expanded="false" />  
930 - <element signature="e#9772#10216#0#PHP" expanded="false" />  
931 - <element signature="e#10221#11068#0#PHP" expanded="false" />  
932 - <element signature="e#11074#11342#0#PHP" expanded="false" />  
933 - <element signature="e#11347#11819#0#PHP" expanded="false" />  
934 - <element signature="e#11825#12131#0#PHP" expanded="false" />  
935 - <element signature="e#12136#13779#0#PHP" expanded="false" />  
936 - <element signature="e#13800#14119#0#PHP" expanded="false" />  
937 - </folding>  
938 - </state>  
939 - </provider>  
940 - </entry>  
941 - <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">  
942 - <provider selected="true" editor-type-id="text-editor">  
943 - <state relative-caret-position="661">  
944 - <caret line="154" column="31" lean-forward="false" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />  
945 - <folding>  
946 - <element signature="e#305#577#0#PHP" expanded="false" />  
947 - <element signature="e#859#1113#0#PHP" expanded="false" />  
948 - <element signature="e#1119#1594#0#PHP" expanded="false" />  
949 - <element signature="e#1599#2490#0#PHP" expanded="false" />  
950 - <element signature="e#2497#2911#0#PHP" expanded="false" />  
951 - <element signature="e#2916#3386#0#PHP" expanded="false" />  
952 - <element signature="e#3393#3889#0#PHP" expanded="false" />  
953 - <element signature="e#3894#4897#0#PHP" expanded="false" />  
954 - </folding>  
955 - </state>  
956 - </provider>  
957 - </entry>  
958 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 791 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
959 <provider selected="true" editor-type-id="text-editor"> 792 <provider selected="true" editor-type-id="text-editor">
960 - <state relative-caret-position="957">  
961 - <caret line="1035" column="38" lean-forward="true" selection-start-line="1035" selection-start-column="38" selection-end-line="1035" selection-end-column="38" /> 793 + <state relative-caret-position="57">
  794 + <caret line="999" column="28" lean-forward="true" selection-start-line="999" selection-start-column="28" selection-end-line="999" selection-end-column="28" />
962 <folding> 795 <folding>
963 <element signature="e#366#791#0#PHP" expanded="false" /> 796 <element signature="e#366#791#0#PHP" expanded="false" />
964 <element signature="e#796#1608#0#PHP" expanded="false" /> 797 <element signature="e#796#1608#0#PHP" expanded="false" />
@@ -1028,5 +861,112 @@ @@ -1028,5 +861,112 @@
1028 </state> 861 </state>
1029 </provider> 862 </provider>
1030 </entry> 863 </entry>
  864 + <entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
  865 + <provider selected="true" editor-type-id="text-editor">
  866 + <state relative-caret-position="661">
  867 + <caret line="154" column="31" lean-forward="false" selection-start-line="154" selection-start-column="31" selection-end-line="154" selection-end-column="31" />
  868 + <folding>
  869 + <element signature="e#305#577#0#PHP" expanded="false" />
  870 + <element signature="e#859#1113#0#PHP" expanded="false" />
  871 + <element signature="e#1119#1594#0#PHP" expanded="false" />
  872 + <element signature="e#1599#2490#0#PHP" expanded="false" />
  873 + <element signature="e#2497#2911#0#PHP" expanded="false" />
  874 + <element signature="e#2916#3386#0#PHP" expanded="false" />
  875 + <element signature="e#3393#3889#0#PHP" expanded="false" />
  876 + <element signature="e#3894#4897#0#PHP" expanded="false" />
  877 + </folding>
  878 + </state>
  879 + </provider>
  880 + </entry>
  881 + <entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
  882 + <provider selected="true" editor-type-id="text-editor">
  883 + <state relative-caret-position="-89">
  884 + <caret line="197" column="28" lean-forward="false" selection-start-line="197" selection-start-column="28" selection-end-line="197" selection-end-column="28" />
  885 + <folding>
  886 + <element signature="e#342#596#0#PHP" expanded="false" />
  887 + <element signature="e#601#886#0#PHP" expanded="false" />
  888 + <element signature="e#892#1227#0#PHP" expanded="false" />
  889 + <element signature="e#1232#1729#0#PHP" expanded="false" />
  890 + <element signature="e#1735#1995#0#PHP" expanded="false" />
  891 + <element signature="e#2000#2289#0#PHP" expanded="false" />
  892 + <element signature="e#2295#2634#0#PHP" expanded="false" />
  893 + <element signature="e#2639#3142#0#PHP" expanded="false" />
  894 + <element signature="e#3148#3364#0#PHP" expanded="false" />
  895 + <element signature="e#3369#3738#0#PHP" expanded="false" />
  896 + <element signature="e#3744#4046#0#PHP" expanded="false" />
  897 + <element signature="e#4051#4450#0#PHP" expanded="false" />
  898 + <element signature="e#4456#4653#0#PHP" expanded="false" />
  899 + <element signature="e#4658#4849#0#PHP" expanded="false" />
  900 + <element signature="e#4855#5051#0#PHP" expanded="false" />
  901 + <element signature="e#5056#5318#0#PHP" expanded="false" />
  902 + <element signature="e#5324#5779#0#PHP" expanded="false" />
  903 + <element signature="e#5784#6448#0#PHP" expanded="false" />
  904 + <element signature="e#6454#6797#0#PHP" expanded="false" />
  905 + <element signature="e#6802#7283#0#PHP" expanded="false" />
  906 + <element signature="e#7289#7580#0#PHP" expanded="false" />
  907 + <element signature="e#7585#7936#0#PHP" expanded="false" />
  908 + <element signature="e#7942#8295#0#PHP" expanded="false" />
  909 + <element signature="e#8300#8705#0#PHP" expanded="false" />
  910 + <element signature="e#8711#9094#0#PHP" expanded="false" />
  911 + <element signature="e#9099#9766#0#PHP" expanded="false" />
  912 + <element signature="e#9772#10216#0#PHP" expanded="false" />
  913 + <element signature="e#10221#11068#0#PHP" expanded="false" />
  914 + <element signature="e#11074#11342#0#PHP" expanded="false" />
  915 + <element signature="e#11347#11819#0#PHP" expanded="false" />
  916 + <element signature="e#11825#12131#0#PHP" expanded="false" />
  917 + <element signature="e#12136#13779#0#PHP" expanded="false" />
  918 + <element signature="e#13800#14119#0#PHP" expanded="false" />
  919 + </folding>
  920 + </state>
  921 + </provider>
  922 + </entry>
  923 + <entry file="file://$USER_HOME$/Desktop/腾讯地图/public/themes/admin_simpleboot3/admin/dialog/map2.html">
  924 + <provider selected="true" editor-type-id="text-editor">
  925 + <state relative-caret-position="-593">
  926 + <caret line="6" column="18" lean-forward="true" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="18" />
  927 + <folding>
  928 + <marker date="1536653205906" expanded="true" signature="3029:3053" ph="..." />
  929 + </folding>
  930 + </state>
  931 + </provider>
  932 + </entry>
  933 + <entry file="file://$USER_HOME$/Desktop/腾讯地图/app/admin/controller/DialogController.php">
  934 + <provider selected="true" editor-type-id="text-editor">
  935 + <state relative-caret-position="875">
  936 + <caret line="40" column="34" lean-forward="false" selection-start-line="40" selection-start-column="34" selection-end-line="40" selection-end-column="34" />
  937 + <folding>
  938 + <element signature="e#1252#1658#0#PHP" expanded="false" />
  939 + </folding>
  940 + </state>
  941 + </provider>
  942 + </entry>
  943 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html">
  944 + <provider selected="true" editor-type-id="text-editor">
  945 + <state relative-caret-position="50">
  946 + <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="13" selection-end-column="16" />
  947 + <folding />
  948 + </state>
  949 + </provider>
  950 + </entry>
  951 + <entry file="file://$USER_HOME$/Desktop/腾讯地图/public/themes/admin_simpleboot3/admin/dialog/map.html">
  952 + <provider selected="true" editor-type-id="text-editor">
  953 + <state relative-caret-position="250">
  954 + <caret line="42" column="0" lean-forward="false" selection-start-line="42" selection-start-column="0" selection-end-line="137" selection-end-column="9" />
  955 + <folding />
  956 + </state>
  957 + </provider>
  958 + </entry>
  959 + <entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
  960 + <provider selected="true" editor-type-id="text-editor">
  961 + <state relative-caret-position="275">
  962 + <caret line="62" column="31" lean-forward="true" selection-start-line="62" selection-start-column="31" selection-end-line="62" selection-end-column="31" />
  963 + <folding>
  964 + <element signature="e#262#867#0#PHP" expanded="false" />
  965 + <element signature="e#2477#4124#0#PHP" expanded="false" />
  966 + <element signature="e#4139#4605#0#PHP" expanded="false" />
  967 + </folding>
  968 + </state>
  969 + </provider>
  970 + </entry>
1031 </component> 971 </component>
1032 </project> 972 </project>
@@ -56,9 +56,11 @@ class PointController extends AdminBaseController @@ -56,9 +56,11 @@ class PointController extends AdminBaseController
56 $this->error($validate->getError()); 56 $this->error($validate->getError());
57 } 57 }
58 //获取经纬度 58 //获取经纬度
59 - $url='http://api.map.baidu.com/geocoder/v2/?address='.$param['address'].'&output=json&ak=cIGo3zYrN4WOEnMDSbxynUi9M20i9IgY'; 59 + $url = 'https://apis.map.qq.com/ws/geocoder/v1/?address='.$param['address'].'&key=LQNBZ-F3L34-EQMUR-DILMD-LBR4Q-GDFOH';
  60 +
60 $result=file_get_contents($url); 61 $result=file_get_contents($url);
61 $res=json_decode($result,true); 62 $res=json_decode($result,true);
  63 + print_r($res);exit;
62 //经度 64 //经度
63 $param['lng']= $res['result']['location']['lng']; 65 $param['lng']= $res['result']['location']['lng'];
64 //纬度 66 //纬度
@@ -73,6 +75,18 @@ class PointController extends AdminBaseController @@ -73,6 +75,18 @@ class PointController extends AdminBaseController
73 } 75 }
74 } 76 }
75 77
  78 +
  79 + public function map()
  80 + {
  81 + $location = $this->request->param('location');
  82 + $location = explode(',', $location);
  83 + $lng = empty($location[0]) ? 116.424966 : $location[0];
  84 + $lat = empty($location[1]) ? 39.907851 : $location[1];
  85 +
  86 + $this->assign(['lng' => $lng, 'lat' => $lat]);
  87 + return $this->fetch();
  88 + }
  89 +
76 //修改 90 //修改
77 public function edit(){ 91 public function edit(){
78 $id=$this->request->param('id', 0, 'intval'); 92 $id=$this->request->param('id', 0, 'intval');