From ac9884089096af6b1055324a04e707ae9b7806b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= <email@sample.com>
Date: Wed, 9 Apr 2025 11:11:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9D=83=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/locales/en.js                                |  2 +-
 common/locales/ru.js                                |  2 +-
 common/locales/zh.js                                |  2 +-
 pages/login/index.vue                               | 13 +++++++++++++
 .../z-paging/components/z-paging/js/modules/i18n.js |  4 ++--
 5 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/common/locales/en.js b/common/locales/en.js
index e86ab63..7871ace 100644
--- a/common/locales/en.js
+++ b/common/locales/en.js
@@ -86,7 +86,7 @@ export default {
 		Versionup:'Version Update',
 		Privacy:'Privacy Policy',
 		UserAgreement:'User Agreement',
-		copyright:'© Henan Xinyouhe Technology Co., Ltd. All rights reserved',
+		copyright:'© 2024 powered by Henan Jinhai Technology Environmental Protection Co., Ltd',
 		logoff:'Account cancellation',
 		logoffmsg:'The following information will be cleared and cannot be retrieved',
 		logoffts1:'Ldentity and account information',
diff --git a/common/locales/ru.js b/common/locales/ru.js
index 3e33587..cb2c037 100644
--- a/common/locales/ru.js
+++ b/common/locales/ru.js
@@ -84,7 +84,7 @@ export default {
 		Versionup: "Обновление версии",
 		Privacy: "Политика конфиденциальности",
 		UserAgreement: "Пользовательское соглашение",
-		copyright: "© Henan Xinyouhe Technology Co., Ltd. Все права защищены",
+		copyright:'© 2024 powered by Henan Jinhai Technology Environmental Protection Co., Ltd',
 		logoff:'Списание счетов',
 		logoffmsg: "Следующая информация будет удалена без возможности восстановления",
 		logoffts1: "Идентификационные и учетные данные",
diff --git a/common/locales/zh.js b/common/locales/zh.js
index b6db8a3..8ce8cd3 100644
--- a/common/locales/zh.js
+++ b/common/locales/zh.js
@@ -84,7 +84,7 @@ export default {
 		Versionup:'版本更新',
 		Privacy:'隐私政策',
 		UserAgreement:'用户协议',
-		copyright:'©河南新友合科技有限公司 版权所有',
+		copyright:'© 2024 powered by 河南晋海科技环保有限公司',
 		logoff:'账户注销',
 		logoffmsg:'以下信息将被清空无法找回',
 		logoffts1:'身份、账号信息',
diff --git a/pages/login/index.vue b/pages/login/index.vue
index b59b922..057165b 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -61,6 +61,9 @@
 				borderColor="#3264ed" color="#fff" @click="pactChange" />
 			<view>{{$t('agreeMsg')}}<text @click="navigateToAgreement">{{$t('UserAgreement')}}</text>{{$t('and')}}<text @click="navigateToPrivacy">{{$t('Privacy')}}</text></view>
 		</view>
+		<view class="footer">
+			<text class="copyright">© 2024 powered by 河南晋海科技环保有限公司</text>
+		</view>
 		<u-picker closeOnClickOverlay :cancel-text="$t('cancel')" :confirm-text="$t('confirm')"  @close="close" :show="showlang" :columns="columns"
 			@cancel="cancellang" @confirm="confirmlang" :title="$t('home.langbtn')" keyName="label"></u-picker>
 	</view>
@@ -334,4 +337,14 @@
 			}
 		}
 	}
+	.footer {
+		width: 100%;
+		text-align: center;
+		position: fixed;
+		bottom: 15px;
+		.copyright {
+			font-size: 12px;
+			color:#3471FF;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/uni_modules/z-paging/components/z-paging/js/modules/i18n.js b/uni_modules/z-paging/components/z-paging/js/modules/i18n.js
index 9a8fa1c..3c782d7 100644
--- a/uni_modules/z-paging/components/z-paging/js/modules/i18n.js
+++ b/uni_modules/z-paging/components/z-paging/js/modules/i18n.js
@@ -7,7 +7,7 @@ import u from '.././z-paging-utils'
 import c from '.././z-paging-constant'
 import interceptor from '../z-paging-interceptor'
 
-const language = uni.getSystemInfoSync().language;
+const language = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale();
 console.log(uni.getLocale())
 export default {
 	data() {
@@ -18,7 +18,7 @@ export default {
 	computed: {
 		finalLanguage() {
 			try {
-				const local = uni.getLocale();
+				const local = uni.getStorageSync('i18locale')?uni.getStorageSync('i18locale'):uni.getLocale();
 				const language = this.language;
 				return local === 'auto' ? interceptor._handleLanguage2Local(language, this._language2Local(language)) : local;
 			} catch (e) {