revert 33c22eaad9

revert 解决冲突

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": "活动价",