diff --git a/androidPrivacy.json b/androidPrivacy.json
index 6536bf4..c8a650f 100644
--- a/androidPrivacy.json
+++ b/androidPrivacy.json
@@ -1,17 +1,17 @@
{
"version" : "1",
"prompt" : "template",
- "title" : "服务协议和隐私政策",
- "message" : " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
- "buttonAccept" : "同意并接受",
- "buttonRefuse" : "暂不同意",
+ "title" : "Service Agreement and Privacy Policy",
+ "message" : " Please carefully read and fully understand the terms of the 'Service Agreement' and 'Privacy Policy', including but not limited to: In order to better provide services to you, we need to collect information such as your device identifier and operation logs for analyzing and optimizing application performance.
You can read the 《Service Agreement》 and 《Privacy Policy》 to learn detailed information. If you agree, please click the button below to start accepting our services.",
+ "buttonAccept" : "Agree and accept",
+ "buttonRefuse" : "Disagree",
"hrefLoader" : "system",
"backToExit" : "false",
"second" : {
- "title" : "确认提示",
- "message" : " 进入应用前,你需先同意《服务协议》和《隐私政策》,否则将退出应用。",
- "buttonAccept" : "同意并继续",
- "buttonRefuse" : "退出应用"
+ "title" : "confirmation prompt",
+ "message" : " Before entering the application, you need to agree to the 《Service Agreement》and《Privacy Policy》, otherwise you will be logged out of the application.",
+ "buttonAccept" : "Agree and continue",
+ "buttonRefuse" : "Exit the application"
},
"disagreeMode" : {
"support" : false,
diff --git a/common/config.js b/common/config.js
index d2213ab..218a181 100644
--- a/common/config.js
+++ b/common/config.js
@@ -22,5 +22,5 @@ const config = {
}
// 设置后台接口服务的基础地址
-config.baseUrl = "https://zetatech.zzkj-cloud.com/api"
+config.baseUrl = "https://zzkj-cloud.com/api"
export default config
\ No newline at end of file
diff --git a/components/Search/index.vue b/components/Search/index.vue
index 391f8ef..682c77c 100644
--- a/components/Search/index.vue
+++ b/components/Search/index.vue
@@ -1,6 +1,6 @@
-
+
{{ $t('homePage.alarm.sift') }}
diff --git a/components/history-modal/index.vue b/components/history-modal/index.vue
index cad1fa6..4037df7 100644
--- a/components/history-modal/index.vue
+++ b/components/history-modal/index.vue
@@ -16,7 +16,7 @@
- {{this.$t('homePage.home.noData')}}
+ {{$t('homePage.home.noData')}}
@@ -123,7 +123,7 @@ export default {
resolve();
})
.catch((err) => {
- reject("错误");
+ reject("error");
});
});
},
diff --git a/components/new-search/index.vue b/components/new-search/index.vue
index 051620a..4095f2f 100644
--- a/components/new-search/index.vue
+++ b/components/new-search/index.vue
@@ -1,10 +1,10 @@
-
+
-
+
- {{this.$t('homePage.device.query')}}
+ {{$t('homePage.device.query')}}
-
+
diff --git a/pages/home-page/device-detail/components/yx.vue b/pages/home-page/device-detail/components/yx.vue
index 5fc1fed..f5530a3 100644
--- a/pages/home-page/device-detail/components/yx.vue
+++ b/pages/home-page/device-detail/components/yx.vue
@@ -22,7 +22,7 @@
-
+
diff --git a/pages/home-page/earnings/index.vue b/pages/home-page/earnings/index.vue
index 555e77e..13edc90 100644
--- a/pages/home-page/earnings/index.vue
+++ b/pages/home-page/earnings/index.vue
@@ -97,7 +97,7 @@
- {{ this.$t('homePage.earning.chargeVol') }}
+ {{ $t('homePage.earning.chargeVol') }}
{{ totalData.totalCharge | isNull }}
@@ -111,7 +111,7 @@
- {{ this.$t('homePage.earning.dischargeVol') }}
+ {{ $t('homePage.earning.dischargeVol') }}
{{ totalData.totalDischarge | isNull }}
@@ -198,7 +198,7 @@
- {{this.$t('homePage.earning.charge')}}
+ {{$t('homePage.earning.charge')}}
@@ -234,7 +234,7 @@
- {{this.$t('homePage.earning.disCharge')}}
+ {{$t('homePage.earning.disCharge')}}
diff --git a/pages/home-page/policy-management/index.vue b/pages/home-page/policy-management/index.vue
index 213a464..38c9d1a 100644
--- a/pages/home-page/policy-management/index.vue
+++ b/pages/home-page/policy-management/index.vue
@@ -36,9 +36,9 @@
-
-
-
+