From 46f21d4e8194af39c8d291f4e14449ae39c69a3f Mon Sep 17 00:00:00 2001 From: DCloud_LXH <283700113@qq.com> Date: Thu, 28 Jul 2022 11:37:33 +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 --- .../service/api/device/open-app-authorize-setting.js | 2 +- .../app-plus/service/api/location/choose-location-weex.js | 6 +++++- .../app-plus/service/api/location/open-location-weex.js | 6 +++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/platforms/app-plus/service/api/device/open-app-authorize-setting.js b/src/platforms/app-plus/service/api/device/open-app-authorize-setting.js index 2734a57d2..da6856fed 100644 --- a/src/platforms/app-plus/service/api/device/open-app-authorize-setting.js +++ b/src/platforms/app-plus/service/api/device/open-app-authorize-setting.js @@ -2,7 +2,7 @@ import { invoke } from '../../bridge' -export function openAppAuthorizeSetting(options, callbackId) { +export function openAppAuthorizeSetting (options, callbackId) { const { openAppAuthorizeSetting } = weex.requireModule('plus') openAppAuthorizeSetting(ret => { if (ret.type === 'success') { diff --git a/src/platforms/app-plus/service/api/location/choose-location-weex.js b/src/platforms/app-plus/service/api/location/choose-location-weex.js index 4251773fc..ce641f0ae 100644 --- a/src/platforms/app-plus/service/api/location/choose-location-weex.js +++ b/src/platforms/app-plus/service/api/location/choose-location-weex.js @@ -6,6 +6,8 @@ import { showPage } from '../../../helpers/page.js' +import { getLocale } from 'uni-core/helpers/i18n' + function getStatusBarStyle () { let style = plus.navigator.getStatusBarStyle() if (style === 'UIStatusBarStyleBlackTranslucent' || style === 'UIStatusBarStyleBlackOpaque' || style === 'null') { @@ -23,7 +25,9 @@ export function chooseLocation (options, callbackId) { let result const page = showPage({ url: '__uniappchooselocation', - data: options, + data: Object.assign({}, options, { + locale: getLocale() + }), style: { animationType: options.animationType || 'slide-in-bottom', titleNView: false, diff --git a/src/platforms/app-plus/service/api/location/open-location-weex.js b/src/platforms/app-plus/service/api/location/open-location-weex.js index 4a4151631..c5ab5adca 100644 --- a/src/platforms/app-plus/service/api/location/open-location-weex.js +++ b/src/platforms/app-plus/service/api/location/open-location-weex.js @@ -6,10 +6,14 @@ import { showPage } from '../../../helpers/page.js' +import { getLocale } from 'uni-core/helpers/i18n' + export function openLocation (data, callbackId) { showPage({ url: '__uniappopenlocation', - data, + data: Object.assign({}, data, { + locale: getLocale() + }), style: { titleNView: { type: 'transparent' -- GitLab