xxxxx

oem/tss/locales/extras/en-US.json

@@ -85,6 +85,8 @@
             "orderqty": "ReservationQty",
             "averageprice": "AveragePrice",
             "subtitle3": "Reservation Info",
+            "tips3": "Are you sure you want to unsubscribe?",
+            "tips4": "Successful unsubscribe",
             "holddetail": {
                 "holderqty": "OrderQty",
                 "freezeqty": "FreezeQty",

oem/tss/locales/extras/th-TH.json

@@ -85,6 +85,8 @@
             "orderqty": "ปริมาณการยกเลิก",
             "averageprice": "ราคาเฉลี่ยคำสั่งซื้อ",
             "subtitle3": "ข้อมูลการยกเลิกการจอง",
+            "tips3": "ยืนยันการสั่งซื้อ หรือไม่?",
+            "tips4": "การสั่งซื้อสำเร็จแล้ว",
             "holddetail": {
                 "holderqty": "จำนวนคำสั่งซื้อ",
                 "freezeqty": "ราคาที่ล็อกไว้",

oem/tss/locales/extras/zh-CN.json

@@ -85,6 +85,8 @@
             "orderqty": "退订量",
             "averageprice": "订单均价",
             "subtitle3": "退订信息",
+            "tips3": "确认要退订吗？",
+            "tips4": "退订成功",
             "holddetail": {
                 "holderqty": "订单数量",
                 "freezeqty": "锁定量",

oem/tss/locales/extras/zh-TW.json

@@ -85,6 +85,8 @@
             "orderqty": "退訂量",
             "averageprice": "訂單均價",
             "subtitle3": "退訂信息",
+            "tips3": "确认要退訂吗？",
+            "tips4": "退訂成功",
             "holddetail": {
                 "holderqty": "訂單數量",
                 "freezeqty": "鎖定量",

public/locales/en-US.json

@@ -364,7 +364,7 @@
             "orderqty": "Qty",
             "marketmaxsub": "MaxSub",
             "marketmaxsub1": "MaxSub",
-            "price": "OrderPrice",
+            "price": "Price",
             "enableQty": "Estimate Buy Qty",
             "deposit": "Deposit",
             "avaiableMoney": "Avaiable Funds",
@@ -1389,7 +1389,17 @@
             "checked": "I have read and agree",
             "ruleszcxy": "《 User Registration Agreement 》",
             "rulesfxgzs": "《 Risk Notification Letter 》",
-            "registersuccess": "Register success"
+            "registersuccess": "Register success",
+            "tips1": "Please enter your mobile phone number",
+            "tips2": "Please enter your login password",
+            "tips3": "Please enter the confirmation password",
+            "tips4": "The login password and confirmation password are inconsistent",
+            "tips5": "Please enter the SMS verification code",
+            "tips6": "Please enter the registration code",
+            "tips7": "Failure to send",
+            "tips8": "Your account has been successfully registered.",
+            "tips9": "Registering now...",
+            "tips10": "Please agree to the registration terms first"
         },
         "password": {
             "title": "Modify Password",
@@ -1430,7 +1440,8 @@
             "tips_3": "No assets, arrears, unsettled funds and spot.",
             "tips_4": "2. The account is secure",
             "tips_5": "The account is in normal use and there is no risk of theft.",
-            "tips_6": "3. There is no dispute over the account number"
+            "tips_6": "3. There is no dispute over the account number",
+            "tips_7": "Submission was successful, please wait for review."
         },
         "authentication": {
             "title": "Authentication",

public/locales/th-TH.json

@@ -1394,7 +1394,17 @@
             "checked": "ฉันได้อ่าน และเห็นด้วย",
             "ruleszcxy": "《โปรโตคอลการลงทะเบียนของผู้ใช้》",
             "rulesfxgzs": "《หนังสือบอกเกี่ยวกับความเสี่ยง》",
-            "registersuccess": "ลงทะเบียนสำเร็จแล้ว!"
+            "registersuccess": "ลงทะเบียนสำเร็จแล้ว!",
+            "tips1": "รบกวนใส่เบอร์มือถือค่ะ",
+            "tips2": "กรุณาใส่รหัสผ่านการล็อกอิน",
+            "tips3": "กรุณาใส่รหัสยืนยัน",
+            "tips4": "รหัสล็อกอิน และการยืนยันรหัสผ่านไม่สอดคล้องกัน",
+            "tips5": "กรุณาพิมพ์รหัสยืนยันข้อความ",
+            "tips6": "กรุณาใส่รหัสลงทะเบียน",
+            "tips7": "การส่งล้มเหลว",
+            "tips8": "บัญชีของคุณถูกลงทะเบียนเรียบร้อยแล้ว",
+            "tips9": "กำลังลงทะเบียน...",
+            "tips10": "โปรดยอมรับเงื่อนไขการลงทะเบียนก่อน"
         },
         "password": {
             "title": "แก้ไขรหัสผ่าน",
@@ -1435,7 +1445,8 @@
             "tips_3": "ไม่มีสินทรัพย์หนี้ ค้างชำระเงิน และเงินในคลัง",
             "tips_4": "2. บัญชีอยู่ในความปลอดภัย",
             "tips_5": "บัญชีอยู่ในระดับปกติไม่มีความเสี่ยง ที่จะถูกขโมย",
-            "tips_6": "3. บัญชีไม่มีข้อพิพาทใด ๆ"
+            "tips_6": "3. บัญชีไม่มีข้อพิพาทใด ๆ",
+            "tips_7": "ส่งสำเร็จแล้วโปรดรอการตรวจสอบ"
         },
         "authentication": {
             "title": "การตรวจสอบความถูกต้อง",

public/locales/zh-CN.json

@@ -1394,7 +1394,17 @@
             "checked": "我已阅读并同意",
             "ruleszcxy": "《用户注册协议》",
             "rulesfxgzs": "《风险告知书》",
-            "registersuccess": "注册成功！"
+            "registersuccess": "注册成功！",
+            "tips1": "请输入手机号码",
+            "tips2": "请输入登录密码",
+            "tips3": "请输入确认密码",
+            "tips4": "登录密码和确认密码不一致",
+            "tips5": "请输入短信验证码",
+            "tips6": "请输入注册编码",
+            "tips7": "发送失败",
+            "tips8": "您的账号已成功注册。",
+            "tips9": "正在注册...",
+            "tips10": "请先同意注册条款"
         },
         "password": {
             "title": "修改密码",
@@ -1435,7 +1445,8 @@
             "tips_3": "没有资产、欠款、未结清的资金和现货。",
             "tips_4": "2. 账号处于安全状态",
             "tips_5": "账号处于正常使用状态，无被盗风险。",
-            "tips_6": "3. 账号无任何纠纷"
+            "tips_6": "3. 账号无任何纠纷",
+            "tips_7": "提交成功，请等待审核。"
         },
         "authentication": {
             "title": "实名认证",

public/locales/zh-TW.json

@@ -1394,7 +1394,17 @@
             "checked": "我已閱讀並同意",
             "ruleszcxy": "《用戶註冊協議》",
             "rulesfxgzs": "《風險告知書》",
-            "registersuccess": "註冊成功！"
+            "registersuccess": "註冊成功！",
+            "tips1": "請輸入手機號碼",
+            "tips2": "請輸入登錄密碼",
+            "tips3": "請輸入確認密碼",
+            "tips4": "登錄密碼和確認密碼不一致",
+            "tips5": "請輸入短信驗證碼",
+            "tips6": "請輸入註冊編碼",
+            "tips7": "發送失敗",
+            "tips8": "您的賬號已成功註冊。",
+            "tips9": "正在註冊...",
+            "tips10": "請先同意註冊條款"
         },
         "password": {
             "title": "修改密碼",
@@ -1435,7 +1445,8 @@
             "tips_3": "沒有資產、欠款、未結清的資金和現貨。",
             "tips_4": "2. 賬號處於安全狀態",
             "tips_5": "賬號處於正常使用狀態，無被盜風險。",
-            "tips_6": "3. 賬號無任何糾紛"
+            "tips_6": "3. 賬號無任何糾紛",
+            "tips_7": "提交成功，請等待審覈。"
         },
         "authentication": {
             "title": "實名認證",

src/packages/mobile/views/bank/capital/statement/index.vue

@@ -14,20 +14,8 @@
                 <span>{{ formatDate(value, 'HH:mm:ss') }}</span>
             </template>
              <!-- 操作类型 -->
-            <template #operatetypename="{ value }" v-if="i18n.global.locale === 'zh-CN'">
-                {{ value }}
-            </template>
-            <!-- 操作类型 -->
-            <template #operatetypename_tw="{ value }" v-if="i18n.global.locale === 'zh-TW'">
-                {{ value }}
-            </template>
-            <!-- 操作类型 -->
-            <template #operatetypenameen="{ value }" v-if="i18n.global.locale === 'en-US'">
-                {{ value }}
-            </template>
-            <!-- 操作类型 -->
-            <template #operatetypenameth="{ value }" v-if="i18n.global.locale === 'th'">
-                {{ value }}
+            <template #operatetypename="{ row }">
+                {{ operatetypename(row) }}
             </template>
         </app-list>
     </app-pull-refresh>
@@ -54,16 +42,26 @@ const pullRefreshRef = shallowRef()
 
 /// 查询数据
 const operateTypeSearchList = [{
-        label: t('common.all'),
-        value: 0
-    }].concat(getOperateTypeSearchList())
+    label: t('common.all'),
+    value: 0
+}].concat(getOperateTypeSearchList())
+
+const operatetypename = ((row: Model.AmountLogRsp) => {
+    switch (i18n.global.locale) {
+        case "zh-CN":
+            return row.operatetypename
+        case "zh-TW":
+            return row.operatetypename_tw
+        case "en-US":
+            return row.operatetypenameen
+        default:
+            return row.operatetypenameth
+    }
+})
 
 const columns: Model.TableColumn[] = [
     { field: 'createtime', label: t('banksign.capital.createtime') },
     { field: 'operatetypename', label: t('banksign.capital.operatetypename') },
-    { field: 'operatetypename_tw', label: 'banksign.capital.operatetypename' },
-    { field: 'operatetypenameen', label: 'banksign.capital.operatetypename' },
-    { field: 'operatetypenameth', label: 'banksign.capital.operatetypename' },
     { field: 'amount', label: t('banksign.capital.amount') },
 ]
 

src/packages/mobile/views/user/cancel/Index.vue

@@ -25,19 +25,24 @@
 import { showFailToast, Button } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { useAccountCancellation } from '@/business/user'
+import { i18n } from '@/stores';
 
 const { formSubmit } = useAccountCancellation()
 
+const { global: { t } } = i18n
+
 const onSubmit = () => {
     dialog({
-        message: '账户注销后不能再使用该系统，如果账户有余额需要人工审核才能注销，确定要注销账户吗？',
+        message: t('user.cancel.submitmessage'),
         showCancelButton: true,
+        confirmButtonText: t('operation.confirm'),
+        cancelButtonText: t('operation.cancel'),
         messageAlign: 'left'
     }).then(() => {
         fullloading((hideLoading) => {
             formSubmit().then(() => {
                 hideLoading()
-                dialog('提交成功，请等待审核。')
+                dialog(t('user.cancel.tips_7'))
             }).catch((err) => {
                 showFailToast(err)
             })

src/packages/mobile/views/user/password/Index.vue

@@ -31,6 +31,7 @@ import { validateRules } from '@/constants/regex'
 import { useAccountPassword } from '@/business/user'
 import { useLogin } from '@/business/login'
 import eventBus from '@/services/bus'
+import { i18n } from '@/stores'
 
 const { getGlobalUrlParams } = useNavigation()
 const { userLogout } = useLogin()
@@ -38,15 +39,17 @@ const { formData, formSubmit } = useAccountPassword(1)
 const formRef = shallowRef<FormInstance>()
 const confirmpassword = shallowRef('')
 
+const { global: { t } } = i18n
+
 // 表单验证规则
 const formRules: { [key in keyof Proto.ModifyPwdReq | 'confirmpassword']?: FieldRule[] } = {
     OldPwd: [{
         required: true,
-        message: '请输入原密码',
+        message: t('user.password.tips1'),
     }],
     NewPwd: [{
         required: true,
-        message: '请输入新密码',
+        message: t('user.password.tips2'),
         validator: (val) => {
             if (validateRules.password.validate(val)) {
                 return true
@@ -56,12 +59,12 @@ const formRules: { [key in keyof Proto.ModifyPwdReq | 'confirmpassword']?: Field
     }],
     confirmpassword: [{
         required: true,
-        message: '请输入确认密码',
+        message: t('user.forget.tips4'),
         validator: (val) => {
             if (formData.NewPwd === val) {
                 return true
             }
-            return '新密码和确认密码不一致'
+            return t('user.forget.tips6')
         }
     }],
 }
@@ -70,7 +73,7 @@ const onSubmit = () => {
     fullloading((hideLoading) => {
         formSubmit().then(() => {
             hideLoading()
-            dialog('密码修改成功，请重新登录。').then(() => {
+            dialog(t('user.password.tips5')).then(() => {
                 eventBus.$emit('LogoutNotify')
             })
         }).catch((err) => {

src/packages/mobile/views/user/register/Index.vue

@@ -60,7 +60,7 @@ import { fullloading, dialog } from '@/utils/vant'
 import { validateRules } from '@/constants/regex'
 import { useNavigation } from '@mobile/router/navigation'
 import { userRegister, sendRegisterVerifyCode, queryMyRegisterMoney } from '@/services/api/common'
-import { useGlobalStore } from '@/stores'
+import { i18n, useGlobalStore } from '@/stores'
 import cryptojs from 'crypto-js'
 import plus from '@/utils/h5plus'
 import AppReward from '@mobile/components/modules/reward/index.vue'
@@ -75,6 +75,8 @@ const isCountdown = ref(false) // 是否正在倒计时
 const showReward = ref(false) // 显示红包
 const redEnvelope = ref(0) // 红包金额
 
+const { global: { t } } = i18n
+
 const confirmpassword = ref('') // 确认密码
 
 // 倒计时函数
@@ -106,7 +108,7 @@ const formData = reactive<Model.RegisterReq>({
 const formRules: { [key: string]: FieldRule[] } = {
   mobilephone: [{
     required: true,
-    message: '请输入手机号码',
+    message: t('user.register.tips1'),
     validator: (val) => {
       if (validateRules.phone.validate(val)) {
         return true
@@ -116,7 +118,7 @@ const formRules: { [key: string]: FieldRule[] } = {
   }],
   loginpwd: [{
     required: true,
-    message: '请输入登录密码',
+    message: t('user.register.tips2'),
     validator: (val) => {
       if (validateRules.password.validate(val)) {
         return true
@@ -126,24 +128,24 @@ const formRules: { [key: string]: FieldRule[] } = {
   }],
   confirmpassword: [{
     required: true,
-    message: '请输入确认密码',
+    message: t('user.register.tips3'),
     validator: (val) => {
       if (formData.loginpwd === val) {
         return true
       }
-      return '登录密码和确认密码不一致'
+      return t('user.register.tips4')
     }
   }],
   vcode: [{
     required: true,
-    message: '请输入短信验证码',
+    message: t('user.register.tips5'),
   }],
   refernum: [{
     validator: (val) => {
       if (!registrationCodeRule || val) {
         return true
       }
-      return '请输入注册编码'
+      return t('user.register.tips6')
     }
   }],
 }
@@ -164,7 +166,7 @@ const sendVerifyCode = () => {
       isCountdown.value = true
       countdown.start()
     }).catch(() => {
-      showFailToast('发送失败')
+      showFailToast(t('user.register.tips7'))
     })
   })
 }
@@ -172,7 +174,7 @@ const sendVerifyCode = () => {
 // 获取注册红包
 const getRegisterMoney = (accountid: number) => {
   const toggleDialog = () => {
-    dialog('您的账号已成功注册。').then(() => {
+    dialog(t('user.register.tips8')).then(() => {
       router.back()
     })
   }
@@ -222,9 +224,9 @@ const formSubmit = () => {
       }).catch((err) => {
         showFailToast(err)
       })
-    }, '正在注册...')
+    }, t('user.register.tips9'))
   } else {
-    showToast('请先同意注册条款')
+    showToast(t('user.register.tips10'))
   }
 }