diff --git a/acdr-ui/env/.env b/acdr-ui/env/.env index 762ad65e..1295350c 100644 --- a/acdr-ui/env/.env +++ b/acdr-ui/env/.env @@ -7,8 +7,8 @@ VITE_WX_APPID = 'wxf2c6d4b7361366b4' # h5部署网站的base,配置到 manifest.config.ts 里的 h5.router.base VITE_APP_PUBLIC_BASE=/acdr/ -VITE_SERVER_BASEURL = 'http://127.0.0.1:28184/api' -VITE_UPLOAD_BASEURL = 'http://127.0.0.1:28184' +VITE_SERVER_BASEURL = 'http://47.99.70.12:28184/api' +VITE_UPLOAD_BASEURL = 'http://47.99.70.12:28184' VITE_OSS_BASEURL = 'http://116.204.119.171:9000/linghe' # h5是否需要配置代理 diff --git a/acdr-ui/manifest.config.ts b/acdr-ui/manifest.config.ts index 33a643ea..a33502e7 100644 --- a/acdr-ui/manifest.config.ts +++ b/acdr-ui/manifest.config.ts @@ -123,7 +123,12 @@ export default defineManifestConfig({ setting: { urlCheck: false, }, - requiredPrivateInfos: ["getLocation"], + requiredPrivateInfos: ["getLocation","chooseLocation"], + permission: { + "scope.userLocation": { + "desc": "你的位置信息将用于定位效果展示" + } + }, usingComponents: true, lazyCodeLoading: 'requiredComponents', // __usePrivacyCheck__: true, diff --git a/acdr-ui/src/components/Map.vue b/acdr-ui/src/components/Map.vue index 0a380e1f..2c8adfbd 100644 --- a/acdr-ui/src/components/Map.vue +++ b/acdr-ui/src/components/Map.vue @@ -3,7 +3,7 @@ layout: "default", style: { navigationBarTitleText: "地图组件", - // 隐藏该组件的头部; + // 隐藏该组件的头部 navigationStyle: "custom", }, } @@ -18,56 +18,41 @@ - + - 刷新当前位置 + 刷新当前位置 - 返回定位位置 + 返回定位位置
- + + diff --git a/acdr-ui/src/manifest.json b/acdr-ui/src/manifest.json index 57cd5820..d2340f5e 100644 --- a/acdr-ui/src/manifest.json +++ b/acdr-ui/src/manifest.json @@ -89,8 +89,14 @@ }, "usingComponents": true, "requiredPrivateInfos": [ - "getLocation" + "getLocation", + "chooseLocation" ], + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于定位效果展示" + } + }, "lazyCodeLoading": "requiredComponents" }, "mp-alipay": { diff --git a/acdr-ui/src/pages/map/index.vue b/acdr-ui/src/pages/map/index.vue index 4c96af80..ba816722 100644 --- a/acdr-ui/src/pages/map/index.vue +++ b/acdr-ui/src/pages/map/index.vue @@ -17,4 +17,8 @@ import Map from '@/components/Map.vue'; - + diff --git a/acdr-ui/src/pages/my/index.vue b/acdr-ui/src/pages/my/index.vue index 8f70fa16..afdc891c 100644 --- a/acdr-ui/src/pages/my/index.vue +++ b/acdr-ui/src/pages/my/index.vue @@ -10,24 +10,14 @@