fix:冲突解决

manifest.json

@@ -60,16 +60,13 @@
         "optimization": {
             "subPackages": true
         },
-        "lazyCodeLoading": "requiredComponents",
-        "requiredPrivateInfos": [
-            "getLocation",
-            "chooseLocation"
-          ],
-         "permission": {
-            "scope.userLocation": {
-              "desc": "你的位置信息将用于警情上报"
+        "lazyCodeLoading" : "requiredComponents",
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于警情上报"
             }
-          }
+        }
     },
     "mp-alipay": {
         "usingComponents": true

pages.json

@@ -335,10 +335,6 @@
 			"version": "1.0.2",
 			"provider": "wx63ffb7b7894e99ae"
 		}
-		// "chooseLocation": {
-		// 	"version": "1.1.1",
-		// 	"provider": "wx76a9a06e5b4e693e"
-		// }
 	},
 	"permission": {
 		"scope.userFuzzyLocation": {