revert 33c22eaad9

revert 解决冲突

locale/en.json

@@ -16,8 +16,7 @@
     "dataNull": "No data available",
     "networkConnectionError": "Network connection error.",
     "loginExpired": "Login expired. Please log in again.",
-    "requestException": "Request exception",
-    "coin": "Coin"
+    "requestException": "Request exception"
   },
   "tabar.course": "COURSE",
   "tabar.book": "EBOOK",
@@ -239,6 +238,7 @@
     "amount": "Amount",
     "paymentMethod": "Payment Method",
     "googlePay": "Google Pay",
+    "virtualCoin": "Virtual Coin",
     "balance": "Balance",
     "confirm": "Confirm Order",
     "creating": "Creating order...",
@@ -247,7 +247,6 @@
     "paymentFailed": "Payment failed",
     "paymentCancelled": "Payment cancelled",
     "insufficientBalance": "Insufficient virtual coin balance",
-    "invalidPaymentAmount": "Final amount calculation incomplete",
     "googlePayNotAvailable": "Google Pay not available",
     "productNotFound": "Product not found",
     "orderCreateFailed": "Failed to create order",
@@ -422,9 +421,11 @@
     "coupon": "Coupon",
     "points": "Points",
     "vipDiscount": "VIP Exclusive Discount",
-    "promotionDiscounted": "Promotion Discount",
+    "activityDiscount": "Activity Discount",
+    "districtDiscount": "Regional Discount",
     "actualPayment": "Total",
     "paymentMethod": "Payment Method",
+    "virtualCoin": "Virtual Coin",
     "balance": "Balance",
     "recharge": "Recharge Now",
     "remark": "Order Remark",
@@ -451,11 +452,14 @@
     "duplicateConfirm": "Continue",
     "duplicateCancel": "Cancel",
     "customerService": "Customer Service",
+    "paymentTip": "1 Virtual Coin = 1 CNY",
     "paymentTipTitle": "Notes",
-    "paymentTip1": "1.1 points = 1 Tianyi coin",
-    "paymentTip2-1": "2.1 For assistance, please contact our customer service on WeChat",
-    "paymentTip2-2": "or by email at",
-    "ensureBalance": "Ensure sufficient Tianyi coin balance",
+    "paymentTip1": "1. 1 Virtual Coin = 1 CNY",
+    "paymentTip2": "2. For questions, please call customer service",
+    "paymentTip3": "3. Non-mainland China users can pay by credit card. Simple and fast, recommended! Credit cards with Visa or MasterCard logos are accepted. Please send payment request to email",
+    "paymentTip3_1": "(click to copy) with course name, amount, registered name and phone number, or add WeChat customer service (",
+    "paymentTip3_2": ") (click to copy). We will send payment link within 24 hours.",
+    "ensureBalance": "Ensure sufficient virtual coin balance",
     "vipLabel": "VIP Discount",
     "activityLabel": "Activity Price",
     "vipPriceLabel": "VIP Price",

locale/zh-Hans.json

@@ -16,8 +16,7 @@
     "dataNull": "暂无数据",
     "networkConnectionError": "网络连接错误。",
     "loginExpired": "登录失效，请重新登录。",
-    "requestException": "请求异常",
-    "coin": "天医币"
+    "requestException": "请求异常"
   },
   "tabar.course": "课程",
   "tabar.book": "图书",
@@ -266,6 +265,7 @@
     "amount": "金额",
     "paymentMethod": "支付方式",
     "googlePay": "Google Pay",
+    "virtualCoin": "虚拟币",
     "balance": "余额",
     "confirm": "确认下单",
     "creating": "创建订单中...",
@@ -422,9 +422,11 @@
     "coupon": "优惠券",
     "points": "积分",
     "vipDiscount": "VIP专享立减",
-    "promotionDiscounted": "活动立减",
+    "activityDiscount": "活动立减",
+    "districtDiscount": "地区优惠",
     "actualPayment": "实付款",
     "paymentMethod": "支付方式",
+    "virtualCoin": "天医币",
     "balance": "余额",
     "recharge": "立即充值",
     "remark": "订单备注",
@@ -443,7 +445,6 @@
     "pointsPlaceholder": "请输入积分",
     "allPoints": "全部积分",
     "insufficientBalance": "天医币余额不足",
-    "invalidPaymentAmount": "实付金额计算未完成",
     "orderCreating": "正在请求订单",
     "orderSuccess": "购买成功",
     "orderFailed": "失败,请重新下单",
@@ -452,10 +453,13 @@
     "duplicateConfirm": "继续操作",
     "duplicateCancel": "点错了",
     "customerService": "客服",
+    "paymentTip": "1天医币 = 1元人民币",
     "paymentTipTitle": "说明",
-    "paymentTip1": "1. 1积分=1天医币",
-    "paymentTip2-1": "2. 若有疑问请加客服微信：{ customerServiceWechat }  { customerServiceEmail }",
-    "paymentTip2-2": "或邮箱联系",
+    "paymentTip1": "1. 1天医币 = 1元人民币",
+    "paymentTip2": "2.若有疑问或意见请致电客服",
+    "paymentTip3": "3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱",
+    "paymentTip3_1": "（点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（",
+    "paymentTip3_2": "）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。",
     "ensureBalance": "确保您的天医币足够支付",
     "vipLabel": "VIP优惠",
     "activityLabel": "活动价",