diff --git a/config/http.js b/config/http.js
index 02168af..eb0073e 100644
--- a/config/http.js
+++ b/config/http.js
@@ -3,13 +3,23 @@ import {
appid
} from './url'
+// 获取多语言翻译文本
+const getLoadingText = () => {
+ try {
+ const lang = uni.getStorageSync('language') || 'zh-CN'
+ return lang === 'en-US' ? 'Loading...' : '加载中...'
+ } catch (e) {
+ return '加载中...'
+ }
+}
+
const request = (option) => {
return new Promise((resolve, reject) => {
// 默认不显示加载中提示
if (!option.hideLoading) {
uni.showLoading({
- title: option.loadingText || '加载中...',
+ title: option.loadingText || getLoadingText(),
mask: true
})
}
diff --git a/config/url.js b/config/url.js
index cb4e171..fe70554 100644
--- a/config/url.js
+++ b/config/url.js
@@ -1,5 +1,5 @@
-export const URL = "https://my.gxfs123.com/api" //正式服务器
-// export const URL = "https://fansdev.gxfs123.com/api" //测试服务器
+// export const URL = "https://my.gxfs123.com/api" //正式服务器
+export const URL = "https://fansdev.gxfs123.com/api" //测试服务器
// export const URL = "http://192.168.5.149:8080" //本地调试
// export const URL = "http://127.0.0.1:8080" //本地调试
diff --git a/locale/en-US.js b/locale/en-US.js
index bafdeb5..068e68d 100644
--- a/locale/en-US.js
+++ b/locale/en-US.js
@@ -6,6 +6,9 @@ export default {
submit: 'Submit',
processing: 'Processing',
submitting: 'Submitting',
+ uploading: 'Uploading...',
+ getting: 'Getting...',
+ filling: 'Filling...',
save: 'Save',
loadFailed: 'Load failed',
statusCode: 'Status Code',
diff --git a/locale/zh-CN.js b/locale/zh-CN.js
index 5e8d9b1..29f28ac 100644
--- a/locale/zh-CN.js
+++ b/locale/zh-CN.js
@@ -6,6 +6,9 @@ export default {
submit: '提交',
processing: '处理中',
submitting: '提交中',
+ uploading: '上传中...',
+ getting: '获取中...',
+ filling: '补填中',
save: '保存',
loadFailed: '加载失败',
statusCode: '状态码',
diff --git a/pages.json b/pages.json
index 4ca68e6..80a26be 100644
--- a/pages.json
+++ b/pages.json
@@ -31,6 +31,22 @@
"navigationBarTextStyle": "black"
}
},
+ {
+ "path": "pages/legal/agreement-zh",
+ "style": {
+ "navigationBarTitleText": "用户协议",
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "pages/legal/agreement-en",
+ "style": {
+ "navigationBarTitleText": "User Agreement",
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
+ }
+ },
{
"path": "pages/legal/privacy",
"style": {
@@ -39,6 +55,22 @@
"navigationBarTextStyle": "black"
}
},
+ {
+ "path": "pages/legal/privacy-zh",
+ "style": {
+ "navigationBarTitleText": "隐私政策",
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "pages/legal/privacy-en",
+ "style": {
+ "navigationBarTitleText": "Privacy Policy",
+ "navigationBarBackgroundColor": "#ffffff",
+ "navigationBarTextStyle": "black"
+ }
+ },
{
"path": "pages/my/index",
"style": {
diff --git a/pages/expressReturn/addExpressReturn.vue b/pages/expressReturn/addExpressReturn.vue
index bff990f..3c3a50d 100644
--- a/pages/expressReturn/addExpressReturn.vue
+++ b/pages/expressReturn/addExpressReturn.vue
@@ -221,7 +221,7 @@
submitting.value = true
try {
uni.showLoading({
- title: isFillMode.value ? '补填中' : '提交中'
+ title: isFillMode.value ? $t('common.filling') : $t('common.submitting')
})
let res
if (isFillMode.value) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b104397..c626327 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -661,7 +661,7 @@ const activityPopup = ref(null)
isRelocating.value = true
uni.showLoading({
- title: '重新定位中...',
+ title: $t('home.relocating'),
mask: true
})
diff --git a/pages/legal/agreement-en.vue b/pages/legal/agreement-en.vue
new file mode 100644
index 0000000..6f04523
--- /dev/null
+++ b/pages/legal/agreement-en.vue
@@ -0,0 +1,138 @@
+
+
+
+
+
+ I. Introduction
+ Welcome to {{ brandName }} shared fan products and related services. This User Agreement (hereinafter referred to as "this Agreement") is entered into between you and {{ companyName }} ("we") regarding your use of {{ brandName }} mini program and shared fan rental services.
+ Before using {{ brandName }}, please carefully read and fully understand all contents of this Agreement, especially the terms highlighted in bold (including but not limited to liability limitations, dispute resolution, applicable law, protection of minors, etc.). By clicking "Login/Use" or actually using the service, you are deemed to have read and agreed to be bound by this Agreement.
+
+ II. Account and Login
+ 2.1 You can log in and use this service through WeChat authorization. To complete deposit-free rental and order settlement, you agree that we conduct credit assessment and post-order settlement based on WeChat Payment Score.
+ 2.2 You should ensure that the information provided is true, accurate, and complete, and update it in a timely manner. Any service restrictions, order abnormalities, or losses caused by untrue information or failure to update in time shall be borne by you.
+ 2.3 You shall be responsible for all activities under the account, properly keep the device and account credentials, and shall not lend, rent, or otherwise provide them to others.
+
+ III. Rental and Usage Specifications
+ 3.1 Rental process: Initiate rental in {{ brandName }} mini program → Pick up the fan at the device → Return it at the return point according to the instructions or through "Express Return" after use.
+ 3.2 Usage specifications: Please use the device properly, avoid water ingress, dropping, unauthorized disassembly or modification; do not approach open flames and high-temperature environments; avoid outdoor use in rainy days; children should use under supervision.
+ 3.3 Prohibited behaviors: Using the device for illegal or improper purposes; affecting the normal operation of the device or system in any way; circumventing billing or return processes through abnormal means.
+
+ IV. Billing and Settlement (Including WeChat Payment Score)
+ 4.1 Billing rules: Subject to the real-time billing rules displayed in the mini program, which may include duration billing, capped prices, service fees, etc. Charges will be based on this after order generation.
+ 4.2 WeChat Payment Score deposit-free: If you activate and pass the credit assessment, you can enjoy deposit-free rental; if the assessment fails, pre-authorization or deposit may be required. Please refer to the page prompts for details.
+ 4.3 Settlement and deduction: After the order ends, we will complete the settlement based on actual usage and platform rules, and deduct through WeChat Payment Score/WeChat Pay.
+ 4.4 Exceptions and disputes: If you have any objection to billing or settlement, please submit it through "My-Customer Service" within 48 hours after order completion; overdue submissions may affect processing results.
+
+ V. Device Return and Overdue Handling
+ 5.1 Return method: Return at designated outlets according to mini program instructions, or send back through the "Express Return" function. Non-designated methods may lead to order abnormalities and additional fees.
+ 5.2 Overdue handling: If not returned within the specified time, the system will continue billing or charge overdue fees according to rules. Long-term failure to return may result in compensation handling according to the agreement.
+ 5.3 Acceptance and order completion: After return, the platform will conduct integrity inspection. The order can only be completed after inspection and fee settlement.
+
+ VI. Violation, Damage and Compensation
+ 6.1 Device damage and loss: If device damage or loss is caused by improper use, intentional damage, or failure to keep in accordance with specifications, you need to bear compensation liability according to the platform's published standards or actual repair/depreciation costs.
+ 6.2 Cleaning and parts: Additional costs caused by human contamination, missing accessories, etc., will be charged to you based on actual costs.
+ 6.3 Risk control: In case of suspected malicious arrears, fraud, etc., the platform may take measures such as freezing services, pursuing compensation, and protecting rights according to law.
+
+ VII. User Behavior Standards
+ 7.1 You promise to abide by laws, regulations and public order and good customs, not to publish or spread illegal or improper content, and not to interfere with or disrupt the normal operation of the platform and devices.
+ 7.2 You shall not conduct reverse engineering, scraping, or unauthorized automated access to this mini program.
+
+ VIII. Intellectual Property
+ 8.1 {{ companyName }} and its affiliates enjoy corresponding intellectual property rights or legal authorization for trademarks, logos, interfaces, texts, images, codes, etc. in this mini program and services.
+ 8.2 Without written permission, no one may use, copy, disseminate or adapt the above content in any way.
+
+ IX. Disclaimer and Limitation of Liability
+ 9.1 Due to force majeure, network failures, third-party service stability and other reasons leading to service interruption or restriction, {{ companyName }} shall not be liable within the scope permitted by law, but will try to restore services.
+ 9.2 You should be responsible for your own use. Any losses caused by your violation of this Agreement or improper storage and use of equipment shall be borne by you or compensated to relevant parties.
+
+ X. Privacy and Personal Information Protection
+ 10.1 We strictly handle your personal information in accordance with the Privacy Policy, including WeChat login information, mobile phone number (obtained after your authorization), device and order information, location and outlet information, etc.
+ 10.2 For details, please refer to the Privacy Policy in this mini program.
+
+ XI. Service Changes and Termination
+ 11.1 We may make changes or terminate service content, functions or rules based on business adjustments, legal compliance or user experience optimization. Important changes will be notified through mini program announcements or in-app messages.
+ 11.2 If you do not agree with the changes, you can stop using and apply for cancellation of relevant accounts/information (subject to laws, regulations and account settlement restrictions).
+
+ XII. Protection of Minors
+ 12.1 Guardians of minors should guide them to correctly understand and abide by this Agreement. Minors should use the service under supervision and avoid using equipment in dangerous environments.
+
+ XIII. Notices and Contact
+ 13.1 Contact method: Please contact us through "Support" in the mini program, and we will handle your questions or disputes as soon as possible.
+
+ XIV. Applicable Law and Dispute Resolution
+ 14.1 The conclusion, effectiveness, performance, interpretation and dispute resolution of this Agreement shall be governed by the laws of the People's Republic of China (excluding conflict of laws rules).
+ 14.2 Disputes arising from this Agreement shall be resolved through friendly negotiation first; if negotiation fails, they shall be submitted to the people's court with jurisdiction in {{ disputeVenue }} for litigation settlement.
+
+ XV. Supplementary Provisions
+ 15.1 This Agreement shall take effect from {{ effectiveDate }} and remain valid for a long term, unless we publish another version update.
+ 15.2 If any provision of the Agreement is deemed invalid or unenforceable, it shall not affect the validity and enforcement of other provisions.
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/legal/agreement-zh.vue b/pages/legal/agreement-zh.vue
new file mode 100644
index 0000000..ba6167c
--- /dev/null
+++ b/pages/legal/agreement-zh.vue
@@ -0,0 +1,138 @@
+
+
+
+
+
+ 一、导言
+ 欢迎您使用{{ brandName }}共享风扇产品与相关服务。本《用户协议》（下称"本协议"）由您与{{ companyName }}（"我们"）就您使用{{ brandName }}小程序及租借共享风扇服务所订立。
+ 在使用{{ brandName }}前，请您务必仔细阅读并充分理解本协议全部内容，尤其是以加粗方式提示的条款（包括但不限于责任限制、争议解决、适用法律、未成年人保护等）。您点击"登录/使用"或实际使用服务即视为您已阅读并同意受本协议约束。
+
+ 二、账号与登录
+ 2.1 您可通过微信授权登录使用本服务。为完成免押租借与订单结算，您同意我们基于微信支付分进行信用评估及订单后结等必要处理。
+ 2.2 您应保证提供信息真实、准确、完整，并及时更新。因您提供的信息不真实或未及时更新导致的服务受限、订单异常或损失，由您自行承担。
+ 2.3 您应对账户下的全部行为负责，妥善保管设备与账户凭证，不得转借、出租或以其他方式提供给他人使用。
+
+ 三、租借与使用规范
+ 3.1 租借流程：在{{ brandName }}小程序中发起租借 → 在设备端取用风扇 → 使用完毕后按指引在归还点归还或通过"快递归还"。
+ 3.2 使用规范：请合理使用设备，避免进水、摔落、私自拆卸或改装；请勿靠近明火与高温环境；室外雨天请避免使用；儿童应在监护下使用。
+ 3.3 禁止行为：将设备用于违法或不当用途；以任何方式影响设备或系统的正常运行；通过非正常手段规避计费或归还流程。
+
+ 四、计费与结算（含微信支付分）
+ 4.1 计费规则：以小程序展示的实时计费规则为准，可能包含时长计费、封顶价、服务费等。订单生成后将据此计费。
+ 4.2 微信支付分免押：若您开通并通过信用评估，可享受免押租借；如评估未通过，可能需预授权或押金。具体以页面提示为准。
+ 4.3 结算与扣款：订单结束后，我们将基于实际使用情况与平台规则完成结算并通过微信支付分/微信支付进行扣款。
+ 4.4 异常与争议：如对计费或结算有异议，请在订单完成后48小时内通过"我的-客服"提交；逾期可能影响处理结果。
+
+ 五、设备归还与逾期处理
+ 5.1 归还方式：按照小程序指引在指定网点归还，或通过"快递归还"功能寄回。非指定方式可能导致订单异常与额外费用。
+ 5.2 逾期处理：未在规定时间内归还的，系统将持续计费或按规则收取逾期费用。长时间未归还的，可能依约进行赔偿处理。
+ 5.3 验收与结单：归还后平台将进行完好性验收，验收完成且费用结清后，订单方可完结。
+
+ 六、违规、损坏与赔偿
+ 6.1 设备损坏丢失：若因不当使用、故意破坏或未按规范保管导致设备损坏、丢失，您需按平台公示标准或实际维修/折损成本承担赔偿责任。
+ 6.2 清洁与部件：因人为污损、缺失附件等造成的额外成本，将据实向您收取。
+ 6.3 风险控制：如出现涉嫌恶意拖欠、欺诈等，平台可采取冻结服务、追偿、依法维权等措施。
+
+ 七、用户行为规范
+ 7.1 您承诺遵守法律法规与公序良俗，不发表、不传播违法违规或不当内容，不干扰或破坏平台与设备的正常运行。
+ 7.2 您不得对本小程序进行反向工程、抓取或未经授权的自动化访问。
+
+ 八、知识产权
+ 8.1 {{ companyName }}及关联方对本小程序与服务中的商标、标识、界面、文字、图片、代码等享有相应知识产权或合法授权。
+ 8.2 未经书面许可，任何人不得以任何方式使用、复制、传播或改作上述内容。
+
+ 九、免责声明与责任限制
+ 9.1 由于不可抗力、网络故障、第三方服务稳定性等原因导致的服务中断或受限，{{ companyName }}在法律允许范围内不承担责任，但将尽力恢复服务。
+ 9.2 您应对自身使用行为负责。因您违反本协议或不当保管使用设备造成的损失，由您自行承担或向相关方赔偿。
+
+ 十、隐私与个人信息保护
+ 10.1 我们严格按照《隐私政策》处理您的个人信息，包括微信登录信息、手机号（经您授权后获取）、设备与订单信息、位置与网点信息等。
+ 10.2 详情请查阅本小程序内的《隐私政策》。
+
+ 十一、服务变更与终止
+ 11.1 我们可能基于业务调整、法律合规或用户体验优化，对服务内容、功能或规则进行变更或终止。重要变更将通过小程序公告或站内消息提示。
+ 11.2 如您不同意变更，可停止使用并申请注销相关账户/信息（受法律法规与账务结算限制）。
+
+ 十二、未成年人保护
+ 12.1 未成年人的监护人应指导其正确理解并遵守本协议。未成年人使用服务应在监护下进行，避免在危险环境中使用设备。
+
+ 十三、通知与联系
+ 13.1 联系方式：请通过小程序"我的-客服"与我们联系，我们将尽快处理您的问题或争议。
+
+ 十四、法律适用与争议解决
+ 14.1 本协议的订立、生效、履行、解释与争议解决，适用中华人民共和国法律（不含冲突规范）。
+ 14.2 因本协议产生的争议，优先友好协商；协商不成的，提交{{ disputeVenue }}有管辖权的人民法院诉讼解决。
+
+ 十五、附则
+ 15.1 本协议自{{ effectiveDate }}起生效并长期有效，除非我们另行发布版本更新。
+ 15.2 协议条款如被认定无效或不可执行，不影响其他条款的效力与执行。
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/legal/agreement.vue b/pages/legal/agreement.vue
index 0502fb2..9f5b849 100644
--- a/pages/legal/agreement.vue
+++ b/pages/legal/agreement.vue
@@ -1,99 +1,78 @@
-
-
+
diff --git a/pages/legal/privacy-zh.vue b/pages/legal/privacy-zh.vue
new file mode 100644
index 0000000..39ba6ed
--- /dev/null
+++ b/pages/legal/privacy-zh.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+ 我们深知个人信息对您的重要性，并会尽全力保护您的个人信息安全。请您在使用{{ brandName }}服务前，仔细阅读并理解本《隐私政策》。
+
+
+
+ 一、适用范围
+
+ 本政策由{{ companyName }}制定并发布，适用于{{ brandName }}小程序及其提供的共享风扇租借服务。"我们"在本文特指{{ companyName }}，并将按照合法、正当、必要的原则处理您的个人信息。
+
+
+ 二、我们收集的信息
+ 2.1 账号信息：微信登录标识（如openId/unionId）、昵称头像（经您授权）、手机号（经您授权后通过微信获取）。
+ 2.2 订单与设备信息：租借记录、使用时长、费用、归还点位、设备状态、异常记录等。
+ 2.3 位置与网点信息：在您授权后用于查找附近网点与导航，不会在未授权情况下获取。
+ 2.4 日志信息：为保障服务安全与稳定，我们可能记录操作日志、网络请求与错误信息。
+
+ 三、信息使用目的
+ 3.1 提供核心功能：身份验证、免押租借（微信支付分评估）、订单计费结算、客服与售后。
+ 3.2 安全风控：防范欺诈、违规与风险控制；保障系统与设备安全。
+ 3.3 产品优化：统计与分析以改进体验（在去标识化/匿名化后进行）。
+
+ 四、微信支付分与支付
+ 4.1 为实现免押租借，我们将与微信支付分进行必要的数据交互（如信用评估结果、订单结算）。相关数据处理遵循微信支付与微信支付分的规则。
+ 4.2 如您未通过评估，可能需进行预授权或押金处理，以页面提示为准。
+
+ 五、共享、转移与公开披露
+ 5.1 我们不会向第三方出售您的个人信息。
+ 5.2 在实现必要功能时，我们可能与合作方共享必要信息（如支付与物流服务商），并要求其按不低于本政策的标准保护您的信息。
+ 5.3 因合并、分立、重组或破产清算导致的转移，我们将要求新持有方继续受本政策约束，否则将重新征得您的同意。
+ 5.4 仅在法律法规或监管要求、诉讼争议处理、保护人身财产安全等情形下，可能依法进行披露。
+
+ 六、信息存储与安全
+ 6.1 存储地点：您的个人信息原则上存储于中华人民共和国境内。如需跨境传输，将遵循法律法规并征得您的同意。
+ 6.2 存储期限：为实现目的所必需的最短期限，超期将删除或匿名化处理，法律法规另有规定的除外。
+ 6.3 安全措施：我们采取加密传输、访问控制、最小化授权、监控审计等措施保护您的信息安全。
+
+ 七、您的权利
+ 7.1 访问与更正：您可通过"我的-个人信息/客服"访问或更正部分信息。
+ 7.2 删除与撤回同意：在符合法律与账务结算、纠纷处理等必要条件时，您可申请删除或撤回授权；撤回后部分功能可能无法提供。
+ 7.3 账号注销：在符合条件并完成费用结清、设备归还、争议处理后，您可申请注销账号。
+
+ 八、未成年人保护
+ 8.1 未成年人使用服务应在监护下进行。我们不会在明知的情况下收集未成年人不必要的个人信息。
+
+ 九、政策更新与通知
+ 9.1 我们可能因功能迭代、法律监管变化而更新本政策。重要变更将通过小程序公告或站内消息提示，更新后继续使用即视为您同意。
+
+ 十、联系我们
+ 10.1 您可通过"我的-客服"与我们联系以行使前述权利或就本政策提出疑问。
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/legal/privacy.vue b/pages/legal/privacy.vue
index 567d86a..18e4571 100644
--- a/pages/legal/privacy.vue
+++ b/pages/legal/privacy.vue
@@ -1,86 +1,78 @@
-
-