From 9ed195e7ee109ec9fd20212e1ca1571cae141ee6 Mon Sep 17 00:00:00 2001 From: DCloud_LXH <283700113@qq.com> Date: Thu, 28 Jul 2022 11:37:22 +0800 Subject: [PATCH] =?UTF-8?q?fix(app):=20chooseLocation=E3=80=81openLocation?= =?UTF-8?q?=20i18n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../uni-app-plus/src/service/api/location/chooseLocation.ts | 6 +++++- .../uni-app-plus/src/service/api/location/openLocation.ts | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/uni-app-plus/src/service/api/location/chooseLocation.ts b/packages/uni-app-plus/src/service/api/location/chooseLocation.ts index 2bef0fdfa..1eddf3be5 100644 --- a/packages/uni-app-plus/src/service/api/location/chooseLocation.ts +++ b/packages/uni-app-plus/src/service/api/location/chooseLocation.ts @@ -3,9 +3,11 @@ import { API_TYPE_CHOOSE_LOCATION, defineAsyncApi, ChooseLocationProtocol, + getLocale, } from '@dcloudio/uni-api' import { showPage } from '@dcloudio/uni-core' import { getStatusBarStyle } from '../../../helpers/statusBar' +import { extend } from '@vue/shared' export const chooseLocation = defineAsyncApi( API_CHOOSE_LOCATION, @@ -16,7 +18,9 @@ export const chooseLocation = defineAsyncApi( let result: undefined | UniApp.ChooseLocationSuccess const page = showPage({ url: '__uniappchooselocation', - data: options, + data: extend({}, options, { + locale: getLocale(), + }), style: { // @ts-expect-error animationType: options.animationType || 'slide-in-bottom', diff --git a/packages/uni-app-plus/src/service/api/location/openLocation.ts b/packages/uni-app-plus/src/service/api/location/openLocation.ts index ce3a42834..79434c097 100644 --- a/packages/uni-app-plus/src/service/api/location/openLocation.ts +++ b/packages/uni-app-plus/src/service/api/location/openLocation.ts @@ -4,15 +4,19 @@ import { defineAsyncApi, OpenLocationProtocol, OpenLocationOptions, + getLocale, } from '@dcloudio/uni-api' import { showPage } from '@dcloudio/uni-core' +import { extend } from '@vue/shared' export const openLocation = defineAsyncApi( API_OPEN_LOCATION, (data, { resolve, reject }) => { showPage({ url: '__uniappopenlocation', - data, + data: extend({}, data, { + locale: getLocale(), + }), style: { titleNView: { type: 'transparent', -- GitLab