From c9c9c365ddbf232383fc1928dd9db7772f72e723 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 28 Apr 2026 20:36:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=BE=E5=A4=87=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pay/payComplete.vue                 |  10 +-
 src/pages/root/login.vue                      |   6 +-
 src/pages/tabbar/integrated.vue               |   2 +-
 src/pages/tabbar/my.vue                       |   7 +
 src/pages/wallet/recharge.vue                 |   3 +-
 src/sheep/api/user.ts                         |   6 +-
 .../base-just-flot-nav/base-just-flot-nav.vue |   9 +-
 .../components/base/base-nav/base-nav.vue     |  15 +-
 .../base-safe-height/base-safe-height.vue     |   3 +
 .../crud/crud-layout/crud-layout.vue          |  12 +-
 .../components/verify-device-imp-model.vue    |   9 +-
 src/sheep/constant/service-image.ts           |   2 +
 src/sheep/utils/app.ts                        |  16 ++
 src/sheep/utils/mini-tool.ts                  |  11 +-
 src/sheep/utils/request.ts                    |  23 ++-
 src/static/logo/jgsw.jpeg                     | Bin 8070 -> 0 bytes
 .../tm-ui/components/tm-tabbar/tm-tabbar.vue  |   2 +-
 src/uni_modules/tm-ui/local/i18n.ts           | 194 +++++++++---------
 src/uni_modules/tm-ui/local/i18nStore.ts      |   4 +-
 19 files changed, 196 insertions(+), 138 deletions(-)
 delete mode 100644 src/static/logo/jgsw.jpeg

diff --git a/src/pages/pay/payComplete.vue b/src/pages/pay/payComplete.vue
index 06a7d6c..9a460f8 100644
--- a/src/pages/pay/payComplete.vue
+++ b/src/pages/pay/payComplete.vue
@@ -1,5 +1,5 @@
 <template>
-	<view title="支付成功" class="w-full h-full">
+	<crud-layout title="支付成功" :bg="filePath(SERVICE_IMAGE.blueBg)" ref="crudLayoutRef">
 		<view class="flex-col-center p-30rpx">
 			<view class="flex-col-center m-y-50rpx">
 				<svg t="1742978804614" class="icon" viewBox="0 0 1024 1024" version="1.1"
@@ -31,7 +31,7 @@
 		<view class="p-40rpx fixed bottom-30rpx left-0 right-0 font-bold">
 			<tm-button :block="true" @click="goBack">完成</tm-button>
 		</view>
-	</view>
+	</crud-layout>
 </template>
 
 <script setup lang="ts">
@@ -39,6 +39,9 @@ import { ref } from "vue"
 import { onShow } from "@dcloudio/uni-app"
 import { usePayStore } from "@/sheep/stores/pay"
 
+import { filePath } from "@/sheep/utils/file"
+import { SERVICE_IMAGE } from "@@/constant/index"
+
 const scanPayData = ref<any>({})
 
 onShow(() => {
@@ -47,7 +50,6 @@ onShow(() => {
 })
 
 const goBack = () => {
-	const url: string = window.location.href.split("h5")[0] + "h5/?launchParam=coopMerchant#/pages/tabbar/order"
-	window.location.replace(url)
+	uni.navigateBack()
 }
 </script>
diff --git a/src/pages/root/login.vue b/src/pages/root/login.vue
index 3155474..eda077c 100644
--- a/src/pages/root/login.vue
+++ b/src/pages/root/login.vue
@@ -35,7 +35,7 @@ const minAppGetphone = async (e) => {
     }
     try {
         uni.showLoading({ title: '登录中...', mask: true })
-        const { code: loginCode }: any = await uni.login({ provider: 'weixin' });
+        const { code: loginCode }: any = await uni.login({ provider: "weixin" });
         // 获取用户手机号
         const { data, code }: any = await miniPlatformApi.autoAdminLogin({
             miniPlatformType: await getAppInfo(),
@@ -97,14 +97,14 @@ const affirmConfirm = () => {
 
         <view class="flex-col-center m-t-160rpx">
             <view class="size-220rpx bg-white rounded-full flex-row-center">
-                <image class="size-200rpx rounded-full" src="/static/logo/jgsw.jpeg" mode="aspectFit" />
+                <image class="size-200rpx rounded-full" :src="filePath(SERVICE_IMAGE.logo)" mode="aspectFit" />
             </view>
             <view class="m-t-20rpx sub-text-28">浦江县机关事务智慧后勤一体化平台</view>
         </view>
 
         <view class="m-t-160rpx">
             <button v-if="!state.isAgree" class="bg-#0094ff color-white" @click="doLogin">
-                手机号一键登录
+                一键授权
             </button>
             <button v-else class="bg-#0094ff color-white" open-type="getPhoneNumber" @getphonenumber="minAppGetphone">
                 手机号一键登录
diff --git a/src/pages/tabbar/integrated.vue b/src/pages/tabbar/integrated.vue
index b603cdc..1ba65b4 100644
--- a/src/pages/tabbar/integrated.vue
+++ b/src/pages/tabbar/integrated.vue
@@ -19,7 +19,7 @@
             </div>
         </div>
         <view
-            class="position-absolute bottom-16rpx left-0 right-0 second-text-26 text-center flex items-center justify-center">
+            class="position-absolute bottom-30rpx left-0 right-0 second-text-26 text-center flex items-center justify-center">
             <view>联系热线：</view>
             <view @click="doPhone('18367908152')">18367908152</view>
             <view class="w-10rpx" />
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 203fafa..c8e04ff 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -326,6 +326,13 @@ const onTabMenu = async (item: any) => {
             case "扫一扫":
                 await appScanCode()
                 break
+            case "清除缓存":
+                uni.showLoading({ title: "清除中...", mask: true })
+                uni.clearStorageSync()
+                uni.hideLoading()
+                uni.showToast({ title: "清除缓存成功", icon: "success" })
+                uni.navigateTo({ url: "/pages/root/login" })
+                break
             default:
                 router.jump(item.path)
         }
diff --git a/src/pages/wallet/recharge.vue b/src/pages/wallet/recharge.vue
index 77a1a90..8e82005 100644
--- a/src/pages/wallet/recharge.vue
+++ b/src/pages/wallet/recharge.vue
@@ -139,7 +139,8 @@ const toRechargeRecord = () => {
 		<view class="p-30rpx p-b-40rpx bg-white rounded-20rpx m-t-20rpx shadow-main">
 			<tm-radio-group direction="column" gap="40" v-model="state.currentPayType">
 				<tm-radio :disabled="v.disabled" v-for="(v, i) in data.payType" :key="i" :value="v.type"
-					:label="v.text" />
+					:label="v.text">
+				</tm-radio>
 			</tm-radio-group>
 		</view>
 		<view class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
diff --git a/src/sheep/api/user.ts b/src/sheep/api/user.ts
index 0f3ac4c..d108239 100644
--- a/src/sheep/api/user.ts
+++ b/src/sheep/api/user.ts
@@ -112,15 +112,15 @@ export default {
 		}),
 
 	// 设备认证
-	verifyDevice: (data: { mobilePhone: string; code: string }) =>
+	verifyDevice: (data: { mobilePhone: string; code: string, uniqueCode?: string, deviceJson?: string }) =>
 		request({
-			url: "/thirdparty/thirdPartyOAth2/verify-device",
+			url: "/thirdparty/thirdPartyOAth2/mini-app/verify-device",
 			method: "POST",
 			data,
 		}),
 
 	// 判断该设备是否被验证
-	isVerifyDevice: (data: { mobile: string; userId: string }) =>
+	isVerifyDevice: (data: { mobile: string; userId: string, uniqueCode?: string, deviceJson?: string }) =>
 		request({
 			url: "/thirdparty/thirdPartyOAth2/is-verify-device",
 			method: "POST",
diff --git a/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue b/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue
index ff93608..95ed4f7 100644
--- a/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue
+++ b/src/sheep/components/base/base-just-flot-nav/base-just-flot-nav.vue
@@ -64,7 +64,7 @@ function doToDashboard() {
 .navbar {
 	position: absolute;
 	left: 20rpx;
-	height: 44px;
+	height: 56rpx;
 	display: flex;
 	justify-content: center;
 	align-items: center;
@@ -72,8 +72,8 @@ function doToDashboard() {
 	&_center {
 		display: flex;
 		align-items: center;
-		height: 56rpx;
-		border-radius: 28rpx;
+		height: 68rpx;
+		border-radius: 34rpx;
 		background: #fff;
 		box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
 		z-index: 100;
@@ -88,7 +88,8 @@ function doToDashboard() {
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			width: 56rpx;
+			font-size: 36rpx;
+			width: 68rpx;
 		}
 	}
 }
diff --git a/src/sheep/components/base/base-nav/base-nav.vue b/src/sheep/components/base/base-nav/base-nav.vue
index c014c6c..8abe551 100644
--- a/src/sheep/components/base/base-nav/base-nav.vue
+++ b/src/sheep/components/base/base-nav/base-nav.vue
@@ -67,7 +67,7 @@ function doToDashboard() {
 <style lang="scss" scoped>
 .navbar {
 	position: relative;
-	height: 44px;
+	height: 56rpx;
 	display: flex;
 	justify-content: center;
 	align-items: center;
@@ -77,8 +77,8 @@ function doToDashboard() {
 		left: 20rpx;
 		display: flex;
 		align-items: center;
-		height: 56rpx;
-		border-radius: 28rpx;
+		height: 68rpx;
+		border-radius: 34rpx;
 		background: #fff;
 		box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
 
@@ -92,7 +92,8 @@ function doToDashboard() {
 			display: flex;
 			justify-content: center;
 			align-items: center;
-			width: 56rpx;
+			font-size: 36rpx;
+			width: 68rpx;
 		}
 	}
 
@@ -101,9 +102,9 @@ function doToDashboard() {
 		right: 20rpx;
 		background: #fff;
 		box-shadow: 0px 0px 4rpx rgba(51, 51, 51, 0.08), 0px 4rpx 6rpx 2rpx rgba(102, 102, 102, 0.12);
-		border-radius: 28rpx;
-		width: 56rpx;
-		height: 56rpx;
+		border-radius: 34rpx;
+		width: 68rpx;
+		height: 68rpx;
 		display: flex;
 		justify-content: center;
 		align-items: center;
diff --git a/src/sheep/components/base/base-safe-height/base-safe-height.vue b/src/sheep/components/base/base-safe-height/base-safe-height.vue
index d93cce0..0d0fe5a 100644
--- a/src/sheep/components/base/base-safe-height/base-safe-height.vue
+++ b/src/sheep/components/base/base-safe-height/base-safe-height.vue
@@ -16,6 +16,9 @@ function getHeight() {
 		return bottom + "px"
 	}
 	if (props.type && props.type === "top") {
+		if (top < 22) {
+			return "22px"
+		}
 		return top + "px"
 	}
 	return 22 + "px"
diff --git a/src/sheep/components/crud/crud-layout/crud-layout.vue b/src/sheep/components/crud/crud-layout/crud-layout.vue
index 03986e2..3592fc7 100644
--- a/src/sheep/components/crud/crud-layout/crud-layout.vue
+++ b/src/sheep/components/crud/crud-layout/crud-layout.vue
@@ -7,6 +7,7 @@ import { jump } from "@/sheep/router";
 import { userApi } from "@@/api/index"
 
 import VerifyDeviceImpModel from "../../verify-device-imp-model.vue"
+import { getMiniUniqueCode, getDeviceKey } from "@@/utils/mini-tool"
 
 const tabbarStore = useTabbarStore()
 
@@ -99,9 +100,11 @@ async function checkVerifyDevice() {
 	const userInfo = uni.getStorageSync(constant.storageConstant.USERINFO)
 	if (!userInfo || !userInfo.sysUser || !userInfo.sysUser.userId) return
 	// 是否在白名单中
-	if (constant.DEVICE_VERIFY_WRITE_LIST.includes(userInfo.sysUser.phone)) {
-		return
-	}
+	// if (constant.DEVICE_VERIFY_WRITE_LIST.includes(userInfo.sysUser.phone)) {
+	// 	return
+	// }
+	const uniqueCode = await getMiniUniqueCode()
+	const deviceKey = await getDeviceKey()
 	const _params = {
 		mobile: userInfo.sysUser.phone,
 		userId: userInfo.sysUser.userId,
@@ -154,7 +157,8 @@ defineExpose({
 		<view v-if="tabbarStore.isTabbar" class="layout_foot">
 			<tm-tabbar class="layout_foot" :activeIndex="tabbarStore.activeIndex" :list="tabbarStore.pageTabbarList"
 				:outIndex="-1" fontSize="12px" iconSize="24px" bgColor="#F6F5FA" :zIndex="99999" darkBgColor="#F6F5FA"
-				borderColor="#DBDDDE" color="#8E8E8E" selected-color="#0094ff" position="fixed" @change="tabbarChange">
+				borderColor="#DBDDDE" color="#8E8E8E" selected-color="#0094ff" position="relative"
+				@change="tabbarChange">
 			</tm-tabbar>
 		</view>
 		<VerifyDeviceImpModel ref="verifyDeviceImpModelRef" :close="verifyDeviceImpModelClose" />
diff --git a/src/sheep/components/verify-device-imp-model.vue b/src/sheep/components/verify-device-imp-model.vue
index 1bff720..6976ba4 100644
--- a/src/sheep/components/verify-device-imp-model.vue
+++ b/src/sheep/components/verify-device-imp-model.vue
@@ -27,7 +27,10 @@
 
 <script setup lang="ts">
 import { ref, reactive, watch, onUnmounted } from "vue"
+
+import { constant } from "@@/index"
 import { userApi } from "@@/api"
+import { getMiniUniqueCode, getDeviceKey } from "@@/utils/mini-tool"
 
 const props = withDefaults(
     defineProps<{
@@ -106,7 +109,11 @@ const doSubmit = async () => {
     if (!isPass) return
 
     uni.showLoading({ title: "验证中...", mask: true })
-    const res: any = await userApi.verifyDevice({ mobilePhone: form.mobilePhone, code: form.code })
+    const params = {
+        mobilePhone: form.mobilePhone,
+        code: form.code,
+    }
+    const res: any = await userApi.verifyDevice(params)
     if (res.code != 0) {
         uni.showToast({ title: res.msg || "验证失败", icon: "none" })
         return
diff --git a/src/sheep/constant/service-image.ts b/src/sheep/constant/service-image.ts
index 2cfd9e5..6a3d58b 100644
--- a/src/sheep/constant/service-image.ts
+++ b/src/sheep/constant/service-image.ts
@@ -7,4 +7,6 @@ export const SERVICE_IMAGE = {
 	blueBg: "/admin/sys-file/oss/file?fileName=ab8823b0abb045a7b9ce7a52d91eea8f.png",
 	// 生日海报
 	birthdayCoupon: "/admin/sys-file/oss/file?fileName=d723089fccec4f598e86459e8899b0de.jpg",
+	// 小程序logo
+	logo: "/admin/sys-file/oss/file?fileName=df4f93c63f3b431ea661e9c0031e6450.jpeg",
 }
diff --git a/src/sheep/utils/app.ts b/src/sheep/utils/app.ts
index 2f0ad55..f645954 100644
--- a/src/sheep/utils/app.ts
+++ b/src/sheep/utils/app.ts
@@ -48,3 +48,19 @@ export const getUrlParamsObj = (url?: string): Record<string, any> => {
 	const params = getUrlParams(url)
 	return params
 }
+
+export const createCooldown = (cooldownMs: number = 300) => {
+	let locked = false
+	let timer: any = null
+
+	return (fn: () => void) => {
+		if (locked) return false
+		locked = true
+		clearTimeout(timer)
+		timer = setTimeout(() => {
+			locked = false
+		}, cooldownMs)
+		fn()
+		return true
+	}
+}
diff --git a/src/sheep/utils/mini-tool.ts b/src/sheep/utils/mini-tool.ts
index 4c80efb..d5387ef 100644
--- a/src/sheep/utils/mini-tool.ts
+++ b/src/sheep/utils/mini-tool.ts
@@ -11,9 +11,7 @@ export async function getMiniUniqueCode(forceGet = false) {
 	}
 	const appEnv = await getAppInfo()
 	try {
-		const res = await uni.login({
-			provider: "weixin",
-		})
+		const res = await uni.login({ provider: "weixin" });
 		if (!res?.code) {
 			throw new Error("登录失败")
 		}
@@ -36,3 +34,10 @@ export async function getMiniUniqueCode(forceGet = false) {
 		console.log("获取小程序唯一编码失败", error)
 	}
 }
+
+// 获取设备唯一编码
+export async function getDeviceKey() {
+	const sysInfo = await uni.getSystemInfo()
+	const sysKey = sysInfo.deviceId + "-" + sysInfo.brand + sysInfo.deviceModel + "-" + sysInfo.deviceType + "-" + sysInfo.platform
+	return sysKey
+}
\ No newline at end of file
diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts
index bb9ed5e..a2cc650 100644
--- a/src/sheep/utils/request.ts
+++ b/src/sheep/utils/request.ts
@@ -2,7 +2,7 @@ import Request from "luch-request"
 import { isEmpty } from "radash"
 
 import { router, constant } from "@@/index"
-import { getBaseApiUrl, getAppInfo, isDevEnv } from "@@/utils/app"
+import { createCooldown, getBaseApiUrl, getAppInfo, isDevEnv } from "@@/utils/app"
 
 import { userApi } from "../api"
 import { APPENV } from "../constant"
@@ -19,12 +19,13 @@ const SKIP_AUTH_URLS = [
 const SKIP_REFRESH_TOKEN = ["/sys/auth/refresh-token", "/auth/token/check_token"]
 
 let refreshTokenLock = true
+const runLoginRedirect = createCooldown(1500)
 
 console.log("getBaseApiUrl:", getBaseApiUrl())
 
 const https = new Request({
 	baseURL: getBaseApiUrl(),
-	timeout: 15000,
+	timeout: 10 * 1000,
 	method: "GET",
 	header: {
 		Accept: "*/*",
@@ -84,13 +85,21 @@ https.interceptors.response.use(
 		return Promise.resolve(response.data)
 	},
 	async (error) => {
+		uni.hideLoading()
 		// 处理 424 错误(token过期)
 		if (error.statusCode === 424) {
-			// 开发环境直接清除token并跳转登录
-			uni.removeStorageSync(TOKEN_KEY)
-			uni.removeStorageSync(USER_INFO_KEY)
-			uni.showToast({ title: "登录已过期，请重新登录", icon: "none" })
-			router.jump("/pages/root/login")
+			// 判断是否在登录页面
+			const currentPage = router.getCurrentPage()
+			const currentRoute = currentPage?.route
+			if (currentRoute === "pages/root/login" || currentRoute === "/pages/root/login") {
+				return
+			}
+			runLoginRedirect(() => {
+				uni.removeStorageSync(TOKEN_KEY)
+				uni.removeStorageSync(USER_INFO_KEY)
+				uni.showToast({ title: "登录已过期，请重新登录", icon: "none" })
+				uni.navigateTo({ url: "/pages/root/login" })
+			})
 		}
 		// 显示错误信息
 		else if (error?.data?.msg) {
diff --git a/src/static/logo/jgsw.jpeg b/src/static/logo/jgsw.jpeg
deleted file mode 100644
index 9e96c50cccdb52b6981e94a6e3068a3496eb97b3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8070
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

diff --git a/src/uni_modules/tm-ui/components/tm-tabbar/tm-tabbar.vue b/src/uni_modules/tm-ui/components/tm-tabbar/tm-tabbar.vue
index 81e73cb..3587192 100644
--- a/src/uni_modules/tm-ui/components/tm-tabbar/tm-tabbar.vue
+++ b/src/uni_modules/tm-ui/components/tm-tabbar/tm-tabbar.vue
@@ -352,7 +352,7 @@ onMounted(() => {
 </script>
 <template>
 	<!-- @vue-ignore -->
-	<view :style="[{ position: position, zIndex: zIndex }]" class="xTabbar">
+	<view :style="[{ position: position == 'relative' ? 'none' : 'fixed', zIndex: zIndex }]" class="xTabbar">
 		<!-- 凸起占位 -->
 		<view v-if="_outIndex != -1 && _nowOutItem"
 			:style="{ top: '-18px', height: (100) + 'px', zIndex: (zIndex + 1).toString(), width: (100 / _list.length) + '%', left: (100 / _list.length * _outIndex) + '%' }"
diff --git a/src/uni_modules/tm-ui/local/i18n.ts b/src/uni_modules/tm-ui/local/i18n.ts
index ac0070f..54be509 100644
--- a/src/uni_modules/tm-ui/local/i18n.ts
+++ b/src/uni_modules/tm-ui/local/i18n.ts
@@ -10,17 +10,17 @@ import { BasePluralRule, Tmui4xI18nTml, DateTimeFormatReal, I18nOptions, I18nOpt
 
 // 日期时间名称格式类型
 type DateTimeNames = {
-	long : string[],
-	short : string[],
-	narrow : string[]
+	long: string[],
+	short: string[],
+	narrow: string[]
 }
-type BestTimeTYpe = { unit : string, value : number }
-type timeUnitsTYpe = { unit : string, ms : number, threshold : number }
-export function mergeI18nOpts(args ?: I18nOptions) : I18nOptionsReally {
+type BestTimeTYpe = { unit: string, value: number }
+type timeUnitsTYpe = { unit: string, ms: number, threshold: number }
+export function mergeI18nOpts(args?: I18nOptions): I18nOptionsReally {
 	let localLang = uni.getStorageSync("language")
 	// 提供默认配置
 	const currentLan = localLang != null && localLang != '' && typeof localLang == 'string' ? (localLang! as string) : "zh-Hans"
-	const defaultOptions : I18nOptionsReally = {
+	const defaultOptions: I18nOptionsReally = {
 		locale: currentLan,
 		fallbackLocale: "en",
 		messages: {},
@@ -41,7 +41,7 @@ export function mergeI18nOpts(args ?: I18nOptions) : I18nOptionsReally {
 		warnHandler: (v, e) => {
 			console.warn(`[tmui4x]:${v}`, e || '');
 		},
-		pluralRule: (choice : number, choicesLength : number, orgRule ?: BasePluralRule | null) : number => {
+		pluralRule: (choice: number, choicesLength: number, orgRule?: BasePluralRule | null): number => {
 			// 默认英语复数规则实现
 			// 参考 Vue I18n 标准实现：https://vue-i18n.intlify.dev/guide/essentials/pluralization
 			// 如果提供了原始规则函数，优先使用
@@ -110,37 +110,37 @@ export function mergeI18nOpts(args ?: I18nOptions) : I18nOptionsReally {
 
 }
 export class Tmui4xI18n implements Tmui4xI18nTml {
-	ops : I18nOptionsReally;
-	private static instance : Tmui4xI18n;
-	constructor(args ?: I18nOptions) {
+	ops: I18nOptionsReally;
+	private static instance: Tmui4xI18n;
+	constructor(args?: I18nOptions) {
 		this.ops = mergeI18nOpts(args)
 	}
 	/**
 	 * 单例模式
 	 */
-	public static getInstance(args ?: I18nOptions) : Tmui4xI18n {
+	public static getInstance(args?: I18nOptions): Tmui4xI18n {
 		if (Tmui4xI18n.instance) {
 			return Tmui4xI18n.instance
 		}
 		return new Tmui4xI18n(args);
 	}
 	// 语言
-	setLocale(local : string) {
+	setLocale(local: string) {
 		uni.setStorageSync('language', local)
 		this.ops.locale = local
 	}
 	//设置语言
-	getLocale() : string {
+	getLocale(): string {
 		return this.ops.locale
 	}
-	getFallbackLocale() : string {
+	getFallbackLocale(): string {
 		return this.ops.fallbackLocale
 	}
 
-	setFallbackLocale(local : string) {
+	setFallbackLocale(local: string) {
 		this.ops.fallbackLocale = local
 	}
-	setOptions(args : I18nOptions) {
+	setOptions(args: I18nOptions) {
 		this.ops = mergeI18nOpts(args)
 	}
 	/**
@@ -150,14 +150,14 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param opts 可选的第二个参数当args为复数数字，key中函数 | 时，此opts起效且必须为utsjsonobject格式等同原vueI18n使用方式
 	 * @returns 翻译后的字符串
 	 */
-	t(key : string, ...argsopts : Array<any>) : string {
-		let repeatCount : NumberOrNull = null;
-		let values : UTSJSONObjectOrArray = {};
-		let locale : string = this.ops?.locale??'zh-Hans';
+	t(key: string, ...argsopts: Array<any>): string {
+		let repeatCount: NumberOrNull = null;
+		let values: UTSJSONObjectOrArray = {};
+		let locale: string = this.ops?.locale ?? 'zh-Hans';
 		if (argsopts.length > 0) {
 			// 严格的类型检查和参数解析
-			let args : AnyOrNull = argsopts[0]
-			let opts : AnyOrNull = null;
+			let args: AnyOrNull = argsopts[0]
+			let opts: AnyOrNull = null;
 			if (argsopts.length > 1) {
 				opts = argsopts[1]
 			}
@@ -165,33 +165,33 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 			if (args != null && opts == null) {
 				if (typeof args == 'number') {
 					// args 是数字类型
-					const numArgs : number = args;
+					const numArgs: number = args;
 					values = { count: numArgs, n: numArgs };
 					repeatCount = numArgs
 				} else if (typeof args == 'string') {
 					// args 是字符串类型（locale）
-					const strArgs : string = args;
+					const strArgs: string = args;
 					locale = strArgs;
 
 				} else if (args instanceof Object && args != null) {
-					const objArgs : Record<string, any> = args;
+					const objArgs: Record<string, any> = args;
 					values = objArgs;
 
 				} else if (Array.isArray(args)) {
-					const arrArgs : Array<any> = args;
+					const arrArgs: Array<any> = args;
 					values = arrArgs;
 				}
 			} else if (typeof args == 'number' && opts instanceof Object && opts != null) {
-				const objOpts : Record<string, any> = opts;
+				const objOpts: Record<string, any> = opts;
 				values = objOpts;
-				const numArgs : number = args;
+				const numArgs: number = args;
 				repeatCount = numArgs
 			}
 		}
 
 
 		// 类型安全的消息获取
-		let message : StringOrNull = this.getMessage(key, locale);
+		let message: StringOrNull = this.getMessage(key, locale);
 
 		// 如果没有找到消息，尝试回退语言
 		if (message == null && locale != this.ops.fallbackLocale) {
@@ -209,7 +209,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 
 		// 类型安全的复数处理
 		if (repeatCount != null && typeof message == 'string' && message.includes('|')) {
-			const safeCount : number = repeatCount;
+			const safeCount: number = repeatCount;
 			message = this.handlePlural(message, safeCount, locale);
 		}
 
@@ -220,7 +220,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 
 		// 类型安全的后处理
 		if (this.ops.postTranslation != null && typeof message == 'string') {
-			const processedMessage : string = this.ops.postTranslation(message, key);
+			const processedMessage: string = this.ops.postTranslation(message, key);
 			message = processedMessage;
 		}
 
@@ -235,9 +235,9 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param opts 格式化选项
 	 * @returns 格式化后的字符串
 	 */
-	n(val : number, formatName ?: StringOrNull, opts ?: NumberFormatOrNull) : string {
+	n(val: number, formatName?: StringOrNull, opts?: NumberFormatOrNull): string {
 		let currentLocale = (opts?.local ?? this.ops.locale)!;
-		let formatOptions : NumberFormatOpts = {
+		let formatOptions: NumberFormatOpts = {
 			style: 'decimal',
 			currency: 'CNY',
 			local: currentLocale,
@@ -304,9 +304,9 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param opts 格式化选项
 	 * @returns 格式化后的字符串
 	 */
-	d(val : DateOrNumberOrString, formatName ?: StringOrNull, opts ?: DateTimeFormatOrNull) : string {
+	d(val: DateOrNumberOrString, formatName?: StringOrNull, opts?: DateTimeFormatOrNull): string {
 		let currentLocale = (opts?.local ?? this.ops.locale)!;
-		let formatOptions : DateTimeFormatReal = {
+		let formatOptions: DateTimeFormatReal = {
 			localeMatcher: 'best fit',
 			local: currentLocale,
 			calendar: 'gregory',
@@ -407,13 +407,13 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param {string} local 语言
 	 * @param {Record<string,any>} newMessage 键值及字段。
 	 */
-	mergeLocaleMessage(local : string, newMessage : Record<string, any>) {
-		let nowmessage = this.ops.messages?.[local]??null;
+	mergeLocaleMessage(local: string, newMessage: Record<string, any>) {
+		let nowmessage = this.ops.messages?.[local] ?? null;
 		if (nowmessage != null) {
 			nowmessage = { ...nowmessage, ...newMessage }
-			this.ops.messages[local] = {...this.ops.messages.local,...newMessage}
+			this.ops.messages[local] = { ...this.ops.messages.local, ...newMessage }
 		} else {
-			this.ops.messages[local]  = newMessage
+			this.ops.messages[local] = newMessage
 		}
 	}
 	/**
@@ -422,7 +422,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param {string} locale 可选的语言代码，不提供则使用当前语言
 	 * @returns {boolean} 存在返回true，不存在返回false
 	 */
-	te(key : string, locale ?: string | null) : boolean {
+	te(key: string, locale?: string | null): boolean {
 		// 确定要检查的语言
 		const targetLocale = (locale != null ? locale : this.ops.locale);
 
@@ -449,7 +449,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param {string} locale 可选语言，不提供以默认创建的设置为准。
 	 * @returns {string} 格式化后的时间字符串
 	 */
-	rt(timeValues ?: number | Date | string | null, units ?: string | null, locale ?: string | null) : string {
+	rt(timeValues?: number | Date | string | null, units?: string | null, locale?: string | null): string {
 		const targetLocale = (locale != null ? locale : this.ops.locale)
 		const timeValue = (timeValues != null ? new Date() : timeValues!)
 		const unit = (units != null ? 'minute' : units!)
@@ -534,7 +534,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * 获取可用语言列表
 	 * @returns {string[]}
 	 */
-	availableLocales() : string[] {
+	availableLocales(): string[] {
 		return Object.keys(this.ops.messages)
 	}
 	/**
@@ -543,11 +543,11 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param preferredUnit 首选单位
 	 * @returns 包含最佳单位和数值的对象
 	 */
-	private getBestTimeUnit(timeDiff : number, preferredUnit : string) : BestTimeTYpe {
+	private getBestTimeUnit(timeDiff: number, preferredUnit: string): BestTimeTYpe {
 		const absTimeDiff = Math.abs(timeDiff);
 
 		// 定义时间单位的毫秒值和优先级
-		const timeUnits : timeUnitsTYpe[] = [
+		const timeUnits: timeUnitsTYpe[] = [
 			{ unit: 'second', ms: 1000, threshold: 60 },
 			{ unit: 'minute', ms: 1000 * 60, threshold: 60 },
 			{ unit: 'hour', ms: 1000 * 60 * 60, threshold: 24 },
@@ -589,7 +589,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 格式化后的相对时间字符串
 	 */
-	private formatRelativeTimeFallback(value : number, unit : string, locale : string) : string {
+	private formatRelativeTimeFallback(value: number, unit: string, locale: string): string {
 		const absValue = Math.abs(value);
 		const isPast = value < 0;
 		const isFuture = value > 0;
@@ -656,7 +656,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param langCode 语言代码
 	 * @returns 本地化的单位名称
 	 */
-	private getLocalizedUnitName(unit : string, value : number, langCode : string) : string {
+	private getLocalizedUnitName(unit: string, value: number, langCode: string): string {
 		const isPlural = value != 1;
 
 		switch (langCode) {
@@ -719,10 +719,10 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 格式化后的字符串
 	 */
-	private formatDateTime(value : DateOrNumberOrString, options : DateTimeFormatReal, locale : string) : string {
+	private formatDateTime(value: DateOrNumberOrString, options: DateTimeFormatReal, locale: string): string {
 		try {
 			// 转换输入值为Date对象
-			let dateObj : Date = new Date();
+			let dateObj: Date = new Date();
 			if (value instanceof Date) {
 				dateObj = value;
 			} else if (typeof value == 'number') {
@@ -758,7 +758,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 格式化后的字符串
 	 */
-	private formatWithPredefinedStyle(date : Date, options : DateTimeFormatReal, locale : string) : string {
+	private formatWithPredefinedStyle(date: Date, options: DateTimeFormatReal, locale: string): string {
 		let result = '';
 
 		// 处理日期样式
@@ -814,9 +814,9 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 格式化后的字符串
 	 */
-	private formatWithCustomOptions(date : Date, options : DateTimeFormatReal, locale : string) : string {
-		const dateParts : string[] = [];
-		const timeParts : string[] = [];
+	private formatWithCustomOptions(date: Date, options: DateTimeFormatReal, locale: string): string {
+		const dateParts: string[] = [];
+		const timeParts: string[] = [];
 
 		// 根据语言环境确定日期组件的排列顺序
 		const langCode = locale.split('-')[0].toLowerCase();
@@ -900,7 +900,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 		}
 
 		// 组合日期和时间
-		const result : string[] = [];
+		const result: string[] = [];
 		if (dateParts.length > 0) {
 			result.push(this.combineDateTimeParts(dateParts, locale, options.dateSeparator));
 		}
@@ -918,7 +918,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 格式化后的字符串
 	 */
-	private formatNumber(value : number, options : NumberFormatOpts, locale : string) : string {
+	private formatNumber(value: number, options: NumberFormatOpts, locale: string): string {
 		try {
 			// 基础格式化逻辑
 			let result = value.toString();
@@ -991,7 +991,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param options 格式化选项
 	 * @returns 格式化后的字符串
 	 */
-	private formatWithSignificantDigits(value : number, options : NumberFormatOpts) : string {
+	private formatWithSignificantDigits(value: number, options: NumberFormatOpts): string {
 		const minSigDigits = options.minimumSignificantDigits ?? 1;
 		const maxSigDigits = options.maximumSignificantDigits ?? 21;
 
@@ -1023,7 +1023,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param minIntegerDigits 最小整数位数
 	 * @returns 格式化后的字符串
 	 */
-	private formatWithMinimumIntegerDigits(numStr : string, minIntegerDigits : number) : string {
+	private formatWithMinimumIntegerDigits(numStr: string, minIntegerDigits: number): string {
 		const parts = numStr.split('.');
 		const integerPart = parts[0];
 		const decimalPart = parts.length > 1 ? parts[1] : '';
@@ -1039,7 +1039,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取完整日期格式
 	 */
-	private getFullDateFormat(date : Date, locale : string) : string {
+	private getFullDateFormat(date: Date, locale: string): string {
 		const langCode = locale.split('-')[0].toLowerCase();
 		const isUSFormat = langCode == 'en' && (locale.toLowerCase().includes('us') || locale.toLowerCase() == 'en');
 
@@ -1061,7 +1061,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取长日期格式
 	 */
-	private getLongDateFormat(date : Date, locale : string) : string {
+	private getLongDateFormat(date: Date, locale: string): string {
 		const langCode = locale.split('-')[0].toLowerCase();
 		const isUSFormat = langCode == 'en' && (locale.toLowerCase().includes('us') || locale.toLowerCase() == 'en');
 
@@ -1083,7 +1083,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取中等日期格式
 	 */
-	private getMediumDateFormat(date : Date, locale : string) : string {
+	private getMediumDateFormat(date: Date, locale: string): string {
 		const langCode = locale.split('-')[0].toLowerCase();
 		const isUSFormat = langCode == 'en' && (locale.toLowerCase().includes('us') || locale.toLowerCase() == 'en');
 
@@ -1102,7 +1102,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取短日期格式
 	 */
-	private getShortDateFormat(date : Date, locale : string) : string {
+	private getShortDateFormat(date: Date, locale: string): string {
 		const langCode = locale.split('-')[0].toLowerCase();
 		const isUSFormat = langCode == 'en' && (locale.toLowerCase().includes('us') || locale.toLowerCase() == 'en');
 		const year = date.getFullYear().toString().slice(-2);
@@ -1124,7 +1124,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取完整时间格式
 	 */
-	private getFullTimeFormat(date : Date, options : DateTimeFormatReal, locale : string) : string {
+	private getFullTimeFormat(date: Date, options: DateTimeFormatReal, locale: string): string {
 		const timeStr = this.getMediumTimeFormat(date, options, locale);
 		const timeZone = this.formatTimeZone(date, 'long', options.timeZone);
 		return `${timeStr} ${timeZone}`;
@@ -1133,7 +1133,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取长时间格式
 	 */
-	private getLongTimeFormat(date : Date, options : DateTimeFormatReal, locale : string) : string {
+	private getLongTimeFormat(date: Date, options: DateTimeFormatReal, locale: string): string {
 		const timeStr = this.getMediumTimeFormat(date, options, locale);
 		const timeZone = this.formatTimeZone(date, 'short', options.timeZone);
 		return `${timeStr} ${timeZone}`;
@@ -1142,7 +1142,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取中等时间格式
 	 */
-	private getMediumTimeFormat(date : Date, options : DateTimeFormatReal, locale : string) : string {
+	private getMediumTimeFormat(date: Date, options: DateTimeFormatReal, locale: string): string {
 		const hour = this.formatHour(date, 'numeric', options.hour12, options.hourCycle);
 		const minute = this.formatMinute(date, '2-digit');
 		const second = this.formatSecond(date, '2-digit', 0);
@@ -1153,7 +1153,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取短时间格式
 	 */
-	private getShortTimeFormat(date : Date, options : DateTimeFormatReal, locale : string) : string {
+	private getShortTimeFormat(date: Date, options: DateTimeFormatReal, locale: string): string {
 		const hour = this.formatHour(date, 'numeric', options.hour12, options.hourCycle);
 		const minute = this.formatMinute(date, '2-digit');
 		const dayPeriod = options.hour12 ? ` ${this.formatDayPeriod(date, 'short', locale)}` : '';
@@ -1163,7 +1163,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化星期
 	 */
-	private formatWeekday(date : Date, style : string, locale : string) : string {
+	private formatWeekday(date: Date, style: string, locale: string): string {
 		const weekdays = this.getWeekdayNames(locale);
 		const dayIndex = date.getDay();
 
@@ -1182,7 +1182,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化纪元
 	 */
-	private formatEra(date : Date, style : string, locale : string) : string {
+	private formatEra(date: Date, style: string, locale: string): string {
 		const year = date.getFullYear();
 		const langCode = locale.split('-')[0].toLowerCase();
 
@@ -1206,7 +1206,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param numberingSystem 数字系统
 	 * @returns 转换后的数字字符串
 	 */
-	private convertNumberingSystem(number : string, numberingSystem : string) : string {
+	private convertNumberingSystem(number: string, numberingSystem: string): string {
 		if (numberingSystem == 'latn' || numberingSystem == '') {
 			return number; // 拉丁数字（默认）
 		}
@@ -1243,7 +1243,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化年份
 	 */
-	private formatYear(date : Date, style : string, locale : string = '', numberingSystem : string = 'latn', dateSeparator : string = '') : string {
+	private formatYear(date: Date, style: string, locale: string = '', numberingSystem: string = 'latn', dateSeparator: string = ''): string {
 		const year = date.getFullYear();
 		const langCode = locale.split('-')[0].toLowerCase();
 
@@ -1266,7 +1266,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化月份
 	 */
-	private formatMonth(date : Date, style : string, locale : string, numberingSystem : string = 'latn', dateSeparator : string = '') : string {
+	private formatMonth(date: Date, style: string, locale: string, numberingSystem: string = 'latn', dateSeparator: string = ''): string {
 		const month = date.getMonth();
 		const monthNames = this.getMonthNames(locale);
 		const langCode = locale.split('-')[0].toLowerCase();
@@ -1295,7 +1295,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化日期
 	 */
-	private formatDay(date : Date, style : string, locale : string = '', numberingSystem : string = 'latn', dateSeparator : string = '') : string {
+	private formatDay(date: Date, style: string, locale: string = '', numberingSystem: string = 'latn', dateSeparator: string = ''): string {
 		const day = date.getDate();
 		const langCode = locale.split('-')[0].toLowerCase();
 
@@ -1317,7 +1317,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化小时
 	 */
-	private formatHour(date : Date, style : string, hour12 : boolean, hourCycle : string, numberingSystem : string = 'latn') : string {
+	private formatHour(date: Date, style: string, hour12: boolean, hourCycle: string, numberingSystem: string = 'latn'): string {
 		let hour = date.getHours();
 
 		if (hour12) {
@@ -1349,7 +1349,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化分钟
 	 */
-	private formatMinute(date : Date, style : string, numberingSystem : string = 'latn') : string {
+	private formatMinute(date: Date, style: string, numberingSystem: string = 'latn'): string {
 		const minute = date.getMinutes();
 		switch (style) {
 			case 'numeric':
@@ -1364,7 +1364,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化秒
 	 */
-	private formatSecond(date : Date, style : string, fractionalDigits : number, numberingSystem : string = 'latn') : string {
+	private formatSecond(date: Date, style: string, fractionalDigits: number, numberingSystem: string = 'latn'): string {
 		const second = date.getSeconds();
 		const millisecond = date.getMilliseconds();
 
@@ -1394,7 +1394,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化时段（AM/PM）
 	 */
-	private formatDayPeriod(date : Date, style : string, locale : string) : string {
+	private formatDayPeriod(date: Date, style: string, locale: string): string {
 		const hour = date.getHours();
 		const isAM = hour < 12;
 		const langCode = locale.split('-')[0].toLowerCase();
@@ -1423,7 +1423,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 格式化时区
 	 */
-	private formatTimeZone(date : Date, style : string, timeZone : string) : string {
+	private formatTimeZone(date: Date, style: string, timeZone: string): string {
 		// 简化实现，实际应用中可能需要更复杂的时区处理
 		switch (style) {
 			case 'long':
@@ -1437,7 +1437,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 组合日期时间各部分
 	 */
-	private combineDateTimeParts(parts : string[], locale : string, dateSeparator : string = '') : string {
+	private combineDateTimeParts(parts: string[], locale: string, dateSeparator: string = ''): string {
 		const langCode = locale.split('-')[0].toLowerCase();
 
 		// 如果设置了自定义分隔符，使用自定义分隔符连接
@@ -1457,7 +1457,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取星期名称
 	 */
-	private getWeekdayNames(locale : string) : DateTimeNames {
+	private getWeekdayNames(locale: string): DateTimeNames {
 		const langCode = locale.split('-')[0].toLowerCase();
 
 		if (langCode == 'zh') {
@@ -1478,7 +1478,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	/**
 	 * 获取月份名称
 	 */
-	private getMonthNames(locale : string) : DateTimeNames {
+	private getMonthNames(locale: string): DateTimeNames {
 		const langCode = locale.split('-')[0].toLowerCase();
 
 		if (langCode == 'zh') {
@@ -1502,7 +1502,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 带千分位分隔符的字符串
 	 */
-	private addThousandsSeparator(numStr : string, locale : string) : string {
+	private addThousandsSeparator(numStr: string, locale: string): string {
 		const parts = numStr.split('.');
 		const integerPart = parts[0];
 		const decimalPart = parts.length > 1 ? parts[1] : '';
@@ -1560,7 +1560,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 分隔符字符
 	 */
-	private getThousandsSeparator(locale : string) : string {
+	private getThousandsSeparator(locale: string): string {
 		// 提取语言代码前缀（如 'en-US' -> 'en'）
 		const langCode = locale.split('-')[0].toLowerCase();
 
@@ -1578,7 +1578,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 格式化后的货币字符串
 	 */
-	private formatCurrency(numStr : string, options : NumberFormatOpts, locale : string) : string {
+	private formatCurrency(numStr: string, options: NumberFormatOpts, locale: string): string {
 		const currency = options.currency ?? 'USD';
 		const currencyDisplay = options.currencyDisplay ?? 'symbol';
 
@@ -1688,7 +1688,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 格式化后的货币字符串
 	 */
-	private getCurrencyPosition(symbol : string, numStr : string, currency : string, locale : string) : string {
+	private getCurrencyPosition(symbol: string, numStr: string, currency: string, locale: string): string {
 		const currencyCode = currency.toUpperCase();
 
 		// 符号在前面的货币（无空格）
@@ -1720,7 +1720,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param originalValue 原始数值
 	 * @returns 格式化后的百分比字符串
 	 */
-	private formatPercent(numStr : string, originalValue : number) : string {
+	private formatPercent(numStr: string, originalValue: number): string {
 		// 将数值乘以100并添加百分号
 		const percentValue = originalValue * 100;
 		return `${percentValue}%`;
@@ -1731,7 +1731,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 翻译消息或null
 	 */
-	private getMessage(key : string, locale : string) : StringOrNull {
+	private getMessage(key: string, locale: string): StringOrNull {
 		const messages = this.ops.messages;
 		if (messages[locale] == null) {
 			return null;
@@ -1747,22 +1747,22 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param path 路径，如 'user.name'
 	 * @returns 值或null
 	 */
-	private getNestedValue(obj : UTSJSONObjectOrNull, path : string) : StringOrNull {
+	private getNestedValue(obj: UTSJSONObjectOrNull, path: string): StringOrNull {
 		const keys = path.split('.');
 
-		let getAny : GetAnyTypeOrNull = (objdata : AnyOrNull) : AnyOrNull => {
+		let getAny: GetAnyTypeOrNull = (objdata: AnyOrNull): AnyOrNull => {
 			let realGetAny = getAny!;
-			let path : StringOrNull = keys.shift() || null
+			let path: StringOrNull = keys.shift() || null
 			if (objdata == null) return null;
 			if (
 				typeof objdata == 'string' ||
 				typeof objdata == 'number'
 			) return objdata
 			if (path == null) return null;
-			return realGetAny((objdata! as Record<string, any>)?.[path]??null);
+			return realGetAny((objdata! as Record<string, any>)?.[path] ?? null);
 		}
 
-		let current : AnyOrNull = getAny(obj);
+		let current: AnyOrNull = getAny(obj);
 
 		if (typeof current == 'number') return current.toString()
 		return typeof current == 'string' ? current : null;
@@ -1775,8 +1775,8 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param locale 语言代码
 	 * @returns 选择的复数形式
 	 */
-	private handlePlural(message : string, count : number, locale : string) : string {
-		const choices = message.split('|').map((choice : string) : string => choice.trim());
+	private handlePlural(message: string, count: number, locale: string): string {
+		const choices = message.split('|').map((choice: string): string => choice.trim());
 		const choicesLength = choices.length;
 
 		// 获取复数规则
@@ -1811,12 +1811,12 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 	 * @param values 插值参数
 	 * @returns 插值后的字符串
 	 */
-	private interpolate(message : string, values : UTSJSONObjectOrArray) : string {
+	private interpolate(message: string, values: UTSJSONObjectOrArray): string {
 		let msg = message;
 		if (Array.isArray(values)) {
 			// 处理位置插值 {0}, {1}, {2}...
 			// #ifndef APP-ANDROID
-			msg = message.replace(/\{(\d+)\}/g, (match : string, key : string, index : number) : string => {
+			msg = message.replace(/\{(\d+)\}/g, (match: string, key: string, index: number): string => {
 				const value = values[parseInt(key)];
 
 				if (value != null) {
@@ -1827,7 +1827,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 			});
 			// #endif
 			// #ifdef APP-ANDROID
-			msg = message.replace(/\{(\d+)\}/g, (match : string, key : string, offset : number, str : string) : string => {
+			msg = message.replace(/\{(\d+)\}/g, (match: string, key: string, offset: number, str: string): string => {
 				const value = values[parseInt(key)];
 				if (value != null) {
 					let result = typeof value == 'number' ? value.toString() : value as string
@@ -1842,7 +1842,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 			}
 			// 处理命名插值 {name}比如{count},{n}等
 			// #ifndef APP-ANDROID
-			msg = message.replace(/\{([^}]+)\}/g, (match : string, key : string, index : number) : string => {
+			msg = message.replace(/\{([^}]+)\}/g, (match: string, key: string, index: number): string => {
 				const value = values[key];
 				if (value != null) {
 					return value as string;
@@ -1851,7 +1851,7 @@ export class Tmui4xI18n implements Tmui4xI18nTml {
 			});
 			// #endif
 			// #ifdef APP-ANDROID
-			msg = message.replace(/\{([^}]+)\}/g, (match : string, key : string, offset : number, str : string) : string => {
+			msg = message.replace(/\{([^}]+)\}/g, (match: string, key: string, offset: number, str: string): string => {
 				const value = values[key];
 				if (value != null) {
 					if (typeof value == 'string') return value;
diff --git a/src/uni_modules/tm-ui/local/i18nStore.ts b/src/uni_modules/tm-ui/local/i18nStore.ts
index 4f7acbb..affca26 100644
--- a/src/uni_modules/tm-ui/local/i18nStore.ts
+++ b/src/uni_modules/tm-ui/local/i18nStore.ts
@@ -44,8 +44,8 @@ export const i18n = (options?: I18nOptions) => {
             }
         });
     }
-	
-	
+
+
     return i18nInstance;
 }