fix：修复bug

locale/en-US.js

@@ -49,6 +49,8 @@ export default {
     loginRequired: 'Please login first',
     operationSuccess: 'Operation successful',
     operationFailed: 'Operation failed',
+    sending: 'Sending...',
+    loggingIn: 'Logging in...',
     refresh: 'Refresh',
     pull: 'Pull to refresh',
     release: 'Release to refresh',
@@ -114,7 +116,8 @@ export default {
     businessHours: 'Business Hours: ',
     navigateHere: 'Navigate Here',
     coordinateError: 'Invalid location coordinates',
-    notExist: 'Location does not exist'
+    notExist: 'Location does not exist',
+    supportCouponOrMember: 'Coupons & Cards Available'
   },
 
   device: {
@@ -172,6 +175,8 @@ export default {
     deposit: 'Deposit',
     rentFee: 'Rent Fee',
     payNow: 'Pay Now',
+	myCoupons:'Coupons',
+	myCards:'Member Cards',
     cancelOrder: 'Cancel Order',
     quickReturn: 'Quick Return',
     returnDevice: 'Return Device',
@@ -246,6 +251,8 @@ export default {
     perHalfHour: 'per half hour',
     deviceNoEject: 'Not Ejected',
     returnReminder: 'Return Reminder',
+    canUsePromotion: 'Coupons & Cards Available',
+    usedPromotion: 'Promotion Applied',
     convertToOwn: 'Don\'t want to return? Convert to own',
     convertToOwnTitle: 'Convert to Own',
     convertToOwnConfirm: 'Only ¥99 to convert to own. The power bank will be yours. Confirm?',
@@ -261,7 +268,9 @@ export default {
     deviceNoEjectTitle: 'Device Not Ejected',
     deviceNoEjectConfirm: 'Your power bank didn\'t eject? We will handle it immediately, expected to resolve within 5 minutes.',
     deviceNoEjectSuccess: 'Feedback received, will be handled within 5 minutes',
-    deviceNoEjectFailed: 'Feedback submission failed, please try again'
+    deviceNoEjectFailed: 'Feedback submission failed, please try again',
+    returnProblemTip: 'After returning, if the order is still active, please go to ',
+    contactStaff: ' to contact staff.'
   },
 
   user: {
@@ -327,7 +336,22 @@ export default {
     phoneSuccess: 'Success',
     phoneError: 'Error',
     phoneGetFailed: 'Failed',
-    authCodeFailed: 'Auth failed'
+    authCodeFailed: 'Auth failed',
+    phoneLogin: 'Phone Login',
+    phonePlaceholder: 'Enter phone number',
+    codePlaceholder: 'Enter verification code',
+    getCode: 'Get Code',
+    resend: 'Resend',
+    loginBtn: 'Login',
+    phoneRequired: 'Phone required',
+    phoneInvalid: 'Invalid phone number',
+    codeRequired: 'Verification code required',
+    codeSent: 'Code sent',
+    sendCodeFailed: 'Send code failed',
+    regionNotSupported: 'Non-mainland China, Hong Kong, Macau users please login via platform phone authorization',
+    onlyMainlandSupported: 'Currently only Mainland China is supported',
+    getServicePhoneFailed: 'Failed to get service phone',
+    noAuthToken: 'Login successful but no credentials obtained'
   },
 
   permission: {
@@ -361,7 +385,9 @@ export default {
     package: 'Package',
     total: 'Total',
     paymentFailedRetry: 'Payment failed, retry?',
-    createPayOrderFailed: 'Failed'
+    createPayOrderFailed: 'Failed',
+    subscriptionSuccess: 'Subscription successful',
+    subscriptionFailed: 'Subscription failed, please try again'
   },
 
   feedback: {
@@ -421,6 +447,7 @@ export default {
     phone: 'Phone',
     email: 'Email',
     workingHours: 'Working Hours',
+    workingHoursValue: 'Mon-Sun 09:00-22:00',
     functionDeveloping: 'Feature in development',
     faq1Question: 'How to rent a fan?',
     faq1Answer: 'Click "Scan to Rent" on the homepage, scan the QR code on the device with WeChat, and complete payment as prompted.',
@@ -440,6 +467,7 @@ export default {
     languageSetting: 'Language Setting',
     chinese: '简体中文',
     english: 'English',
+    languageSwitched: 'Language switched, refreshing...',
     notification: 'Notification',
     privacy: 'Privacy',
     about: 'About',
@@ -664,6 +692,8 @@ export default {
     withdrawNotice2: 'Withdrawal expected to arrive within 0-7 business days',
     withdrawNotice3: 'If delayed, please contact customer service',
     depositRecord: 'Deposit Record',
+    payRecord: 'Payment Record',
+    refundRecord: 'Refund Record',
     orderNotReturned: 'Current order not returned, please return before withdraw',
     alreadyRefunded: 'Deposit already refunded',
     refundProcessing: 'Refund processing, please wait'
@@ -719,7 +749,7 @@ export default {
     type: 'Type',
     timesCard: 'Times Card',
     durationCard: 'Duration Card',
-    remainingTimes: 'Remaining Times',
+    remainingTimes: 'Remaining: ',
     remainingDuration: 'Remaining Duration',
     hours: 'Hours',
     validPeriod: 'Valid Period',
@@ -730,7 +760,23 @@ export default {
     price: 'Purchase Price',
     noCards: 'No cards',
     buyNow: 'Buy Now',
-    getListFailed: 'Failed to get card list'
+    getListFailed: 'Failed to get card list',
+    dailyLimit: 'Daily Limit',
+    singleTimeLimit: 'Single Use Limit',
+    unlimited: 'Unlimited',
+    times: 'Times',
+    minutes: 'Minutes',
+    validWithinDays: 'days valid',
+    validFromPurchase: 'Valid from purchase',
+    daysValid: 'days',
+    currentCycleUsed: 'Current Cycle Used',
+    totalCount: 'Total Count',
+    expire: 'Expire',
+    expiredOn: 'Expired on ',
+    renew: 'Renew',
+    toUse: 'Use Now',
+    onlyForRegionBefore: 'Only for ',
+    onlyForRegionAfter: ''
   },
 
   myCoupon: {
@@ -744,7 +790,9 @@ export default {
     noUsedCoupons: 'No used coupons',
     noExpiredCoupons: 'No expired coupons',
     buyNow: 'Buy Now',
-    getListFailed: 'Failed to get coupon list'
+    getListFailed: 'Failed to get coupon list',
+    onlyForRegionBefore: 'Only for ',
+    onlyForRegionAfter: ''
   }
 }
 

locale/zh-CN.js

@@ -49,6 +49,8 @@ export default {
     loginRequired: '请先登录',
     operationSuccess: '操作成功',
     operationFailed: '操作失败',
+    sending: '发送中...',
+    loggingIn: '登录中...',
     refresh: '刷新',
     pull: '下拉刷新',
     release: '释放刷新',
@@ -114,7 +116,8 @@ export default {
     businessHours: '营业时间：',
     navigateHere: '导航去这',
     coordinateError: '该场地坐标信息异常',
-    notExist: '场地不存在'
+    notExist: '场地不存在',
+    supportCouponOrMember: '可使用优惠券、会员卡'
   },
 
   device: {
@@ -171,6 +174,8 @@ export default {
     payAmount: '支付金额',
     deposit: '押金',
     rentFee: '租金',
+	myCards:'会员卡优惠',
+	myCoupons:'优惠券优惠',
     payNow: '立即支付',
     cancelOrder: '取消订单',
     quickReturn: '快速归还',
@@ -246,6 +251,8 @@ export default {
     perHalfHour: '每半小时',
     deviceNoEject: '宝未弹出',
     returnReminder: '归还提醒',
+    canUsePromotion: '可使用优惠券、会员卡',
+    usedPromotion: '已享受优惠',
     convertToOwn: '不想还了？点击转为自用',
     convertToOwnTitle: '转为自用',
     convertToOwnConfirm: '仅需花费99元，即可转为自用，充电宝将归您所有，确认操作吗？',
@@ -261,7 +268,9 @@ export default {
     deviceNoEjectTitle: '充电宝未弹出',
     deviceNoEjectConfirm: '您的充电宝未弹出吗？我们将立即为您处理，预计5分钟内解决问题。',
     deviceNoEjectSuccess: '反馈已受理，将在5分钟内处理',
-    deviceNoEjectFailed: '反馈提交失败，请稍后重试'
+    deviceNoEjectFailed: '反馈提交失败，请稍后重试',
+    returnProblemTip: '产品归还入仓后，订单仍未结束，请前往',
+    contactStaff: '联系工作人员。'
   },
 
   user: {
@@ -327,7 +336,22 @@ export default {
     phoneSuccess: '手机号获取成功',
     phoneError: '获取手机号异常',
     phoneGetFailed: '获取手机号失败',
-    authCodeFailed: '获取授权码失败'
+    authCodeFailed: '获取授权码失败',
+    phoneLogin: '手机号登录',
+    phonePlaceholder: '请输入手机号码',
+    codePlaceholder: '请输入验证码',
+    getCode: '获取验证码',
+    resend: '重新发送',
+    loginBtn: '立即登录',
+    phoneRequired: '请输入手机号',
+    phoneInvalid: '请输入正确的手机号',
+    codeRequired: '请输入验证码',
+    codeSent: '验证码已发送',
+    sendCodeFailed: '发送验证码失败',
+    regionNotSupported: '非大陆、香港、澳门用户请通过平台手机号授权登录',
+    onlyMainlandSupported: '当前仅支持中国大陆地区',
+    getServicePhoneFailed: '获取客服电话失败',
+    noAuthToken: '登录成功但未获取到授权凭证'
   },
 
   permission: {
@@ -361,7 +385,9 @@ export default {
     package: '套餐',
     total: '合计',
     paymentFailedRetry: '支付失败，请重试',
-    createPayOrderFailed: '创建支付订单失败'
+    createPayOrderFailed: '创建支付订单失败',
+    subscriptionSuccess: '订阅成功',
+    subscriptionFailed: '订阅失败，请稍后重试'
   },
 
   feedback: {
@@ -421,6 +447,7 @@ export default {
     phone: '电话',
     email: '邮箱',
     workingHours: '工作时间',
+    workingHoursValue: '周一至周日 09:00-22:00',
     functionDeveloping: '功能开发中',
     faq1Question: '如何租借风扇？',
     faq1Answer: '点击首页"扫码租借"按钮，使用微信扫描设备上的二维码，按提示完成支付即可使用。',
@@ -440,6 +467,7 @@ export default {
     languageSetting: '语言设置',
     chinese: '简体中文',
     english: 'English',
+    languageSwitched: '语言已切换，正在刷新...',
     notification: '通知',
     privacy: '隐私',
     about: '关于',
@@ -664,6 +692,8 @@ export default {
     withdrawNotice2: '提现申请提交后预计0-7个工作日到账',
     withdrawNotice3: '如超时未收到，请联系客服处理',
     depositRecord: '押金记录',
+    payRecord: '支付记录',
+    refundRecord: '退还记录',
     orderNotReturned: '当前订单尚未归还，请归还后再提现',
     alreadyRefunded: '押金已退还，无需重复提现',
     refundProcessing: '押金退还处理中，请耐心等待'
@@ -719,32 +749,50 @@ export default {
     type: '类型',
     timesCard: '次卡',
     durationCard: '时长卡',
-    remainingTimes: '剩余次数',
+    remainingTimes: '剩余次数：',
     remainingDuration: '剩余时长',
     hours: '小时',
     validPeriod: '有效期',
     active: '使用中',
-    expired: '已过期',
+    expired: '已失效',
     used: '已用完',
     position: '使用地点',
     price: '购买价格',
     noCards: '暂无会员卡',
     buyNow: '立即购买',
-    getListFailed: '获取会员卡列表失败'
+    getListFailed: '获取会员卡列表失败',
+    dailyLimit: '每日限用',
+    singleTimeLimit: '单次限时',
+    unlimited: '不限',
+    times: '次',
+    minutes: '分钟',
+    validWithinDays: '天内有效',
+    validFromPurchase: '从购买时间起',
+    daysValid: '天有效',
+    currentCycleUsed: '本周期已使用',
+    totalCount: '总次数',
+    expire: '到期',
+    expiredOn: '失效于',
+    renew: '续卡',
+    toUse: '去使用',
+    onlyForRegionBefore: '仅限',
+    onlyForRegionAfter: '使用'
   },
 
   myCoupon: {
     available: '可使用',
     used: '已使用',
     expired: '已过期',
-    useNow: '立即使用',
+    useNow: '去使用',
     usedStatus: '已使用',
     expiredStatus: '已过期',
     noAvailableCoupons: '暂无可用优惠券',
     noUsedCoupons: '暂无已使用优惠券',
     noExpiredCoupons: '暂无已过期优惠券',
     buyNow: '立即购买',
-    getListFailed: '获取优惠券列表失败'
+    getListFailed: '获取优惠券列表失败',
+    onlyForRegionBefore: '仅限',
+    onlyForRegionAfter: '使用'
   }
 }