From 75ad2eb9984bac7705b337706efaf6e5dd7091ce Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 22 八月 2025 11:32:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
packages/utils/location.ts | 2 +-
apps/cMiniApp/project.config.json | 4 ++--
apps/cMiniApp/src/components/Layout/PageLayout.vue | 10 ----------
apps/bMiniApp/src/components/Layout/PageLayout.vue | 10 ----------
4 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/apps/bMiniApp/src/components/Layout/PageLayout.vue b/apps/bMiniApp/src/components/Layout/PageLayout.vue
index 7149940..53b0ee6 100644
--- a/apps/bMiniApp/src/components/Layout/PageLayout.vue
+++ b/apps/bMiniApp/src/components/Layout/PageLayout.vue
@@ -103,16 +103,6 @@
pageHeight = pageHeight + (props.showNavigationBar ? 0 : navigationBarHeight.value);
return pageHeight + 'px';
});
-
-Taro.getSetting({
- success: function (res) {
- if (!res.authSetting['scope.userLocation']) {
- Taro.authorize({
- scope: 'scope.userLocation',
- });
- }
- },
-});
</script>
<style lang="scss">
diff --git a/apps/cMiniApp/project.config.json b/apps/cMiniApp/project.config.json
index 1d057ff..cc53dd5 100644
--- a/apps/cMiniApp/project.config.json
+++ b/apps/cMiniApp/project.config.json
@@ -3,8 +3,8 @@
"description": "",
"setting": {
"urlCheck": false,
- "es6": true,
- "enhance": true,
+ "es6": false,
+ "enhance": false,
"postcss": false,
"preloadBackgroundData": false,
"minified": false,
diff --git a/apps/cMiniApp/src/components/Layout/PageLayout.vue b/apps/cMiniApp/src/components/Layout/PageLayout.vue
index 7149940..53b0ee6 100644
--- a/apps/cMiniApp/src/components/Layout/PageLayout.vue
+++ b/apps/cMiniApp/src/components/Layout/PageLayout.vue
@@ -103,16 +103,6 @@
pageHeight = pageHeight + (props.showNavigationBar ? 0 : navigationBarHeight.value);
return pageHeight + 'px';
});
-
-Taro.getSetting({
- success: function (res) {
- if (!res.authSetting['scope.userLocation']) {
- Taro.authorize({
- scope: 'scope.userLocation',
- });
- }
- },
-});
</script>
<style lang="scss">
diff --git a/packages/utils/location.ts b/packages/utils/location.ts
index dec2f88..b261689 100644
--- a/packages/utils/location.ts
+++ b/packages/utils/location.ts
@@ -45,7 +45,7 @@
}
static async getLocationImp() {
- let geocoderRes = await this.getLocationByIp().catch(() => this.getLocationByIp());
+ let geocoderRes = await this.getLocationByGeocoder().catch(() => this.getLocationByIp());
console.log('geocoderRes: ', geocoderRes);
return geocoderRes;
--
Gitblit v1.9.1