Merge branch 'dev' of gitcode.net:dcloud/hello-uni-app-x into dev

pages.json

@@ -541,14 +541,14 @@
 		},
 		{
 			"path": "pages/API/request-animation-frame/request-animation-frame",
-			"group": "1,1,8,0",
+			"group": "1,4,9,0",
 			"style": {
 				"navigationBarTitleText": "requestAnimationFrame | 加入请求帧动画队列"
 			}
 		},
 		{
 			"path": "pages/API/cancel-animation-frame/cancel-animation-frame",
-			"group": "1,1,8,1",
+			"group": "1,4,9,1",
 			"style": {
 				"navigationBarTitleText": "cancelAnimationFrame | 取消已加入的帧动画队列"
 			}
@@ -2076,21 +2076,6 @@
 						{
 							"id": "api.base.provider",
 							"name": "provider"
-						},
-						null,
-						{
-							"id": "api.base.animationFrame",
-							"name": "animationFrame",
-							"children": [
-								{
-									"id": "api.base.requestAnimationFrame",
-									"name": "requestAnimationFrame"
-								},
-								{
-									"id": "api.base.cancelAnimationFrame",
-									"name": "cancelAnimationFrame"
-								}
-							]
 						}
 					]
 				},
@@ -2167,6 +2152,21 @@
 						{
 							"id": "api.ui.themeChange",
 							"name": "themeChange"
+						},
+						null,
+						{
+							"id": "api.base.animationFrame",
+							"name": "animationFrame",
+							"children": [
+								{
+									"id": "api.base.requestAnimationFrame",
+									"name": "requestAnimationFrame"
+								},
+								{
+									"id": "api.base.cancelAnimationFrame",
+									"name": "cancelAnimationFrame"
+								}
+							]
 						}
 					]
 				},

pages/API/get-location/get-location.uvue

@@ -159,16 +159,6 @@
         uni.showLoading({
           title: '定位中'
         })
-        console.log("provider", this.providerList[this.currentProvider].id)
-        let locationProvider = this.providerList[this.currentProvider]
-
-        if (locationProvider.provider?.isAppExist == false && 'tencent' == locationProvider.provider?.id) {
-          uni.showToast({
-            title: '需要打自定义基座',
-            icon: "error"
-          })
-          return
-        }
         uni.getLocation(({
           provider: this.providerList[this.currentProvider].id,
           type: this.items[this.current].value,