Handy_Cao 1 yıl önce
ebeveyn
işleme
ee7d522051

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

@@ -215,13 +215,13 @@
         }
     },
     "mine": {
-        "fundsinfo": "Account information",
-        "banksign": "My bank card",
-        "delivery": "Delivery pickup",
+        "fundsinfo": "Account Information",
+        "banksign": "My Bank Card",
+        "delivery": "Delivery PickUp",
         "cashin": "Deposit",
         "cashout": "WithDrawal",
-        "myposition": "Held orders",
-        "myorder": "Historical orders",
+        "myposition": "Held Orders",
+        "myorder": "Historical Orders",
         "setting": {
             "orderBuyOrSell": "Default"
         }

+ 11 - 11
public/locales/en-US.json

@@ -1147,7 +1147,7 @@
         "zcxy": "User Registration Agreement",
         "yszc": "About Privacy",
         "ryszc": "Privacy Policy",
-        "fwrx": "Customer service hotline",
+        "fwrx": "Customer Service HotLine",
         "zrxy": "Transfer Agreement"
     },
     "mine": {
@@ -1164,19 +1164,19 @@
         "myposition": "My Positions",
         "myorder": "My Orders",
         "delivery": "Pick Up",
-        "performance": "Performance information",
+        "performance": "Performance Information",
         "fundsinfo": "Funds Infos",
-        "authentication": "Real-name authentication",
+        "authentication": "Real-name Authentication",
         "banksign": "Bank Management",
-        "personalinformation": "Personal information",
+        "personalinformation": "Personal Information",
         "settings": "Settings",
         "aboutus": "About Us",
-        "protocol": "Market entry agreement",
-        "positiontransfer": "Position transfer",
+        "protocol": "Market Entry Agreement",
+        "positiontransfer": "Position Transfer",
         "profile": {
-            "title": "Personal information",
-            "invoiceinfo": "Invoice information",
-            "addressinfo": "Delivery address",
+            "title": "Personal Information",
+            "invoiceinfo": "Invoice Information",
+            "addressinfo": "Delivery Address",
             "wechat": "WeChat",
             "email": "Email",
             "tips1": "Please enter your WeChat ID"
@@ -1257,7 +1257,7 @@
         "cusbankname": "Custodian bank",
         "bankaccountno1": "Contract bank account number",
         "currency": "Currency",
-        "bankname": "Contract bank",
+        "bankname": "Contract Bank",
         "bankname1": "Bank Name",
         "bankno": "Bank CardNo",
         "bankaccountname": "Name",
@@ -1280,7 +1280,7 @@
         "fundstype": "Fund type",
         "pleasechoicefundstype": "Please select the fund type",
         "time": "Time",
-        "operatetype": "Operation type",
+        "operatetype": "Operation Type",
         "amount": "Amount",
         "bankaccountno": "Bank CardNo",
         "verificationcode": "Get verification code",

+ 0 - 3
src/packages/mobile/views/mine/Index.vue

@@ -191,7 +191,6 @@ const doInOutMoney = (tab: string) => {
                     dialog({
                         message: t('banksign.tips1'),
                         showCancelButton: true,
-                        cancelButtonText: t('operation.cancel'),
                         confirmButtonText: t('banksign.tips2')
                     }).then(() => {
                         router.push({ name: 'bank-sign' })
@@ -205,7 +204,6 @@ const doInOutMoney = (tab: string) => {
         dialog({
             message: t('banksign.tips3'),
             showCancelButton: true,
-            cancelButtonText: t('operation.cancel'),
             confirmButtonText: t('banksign.tips4')
         }).then(() => {
             router.push({ name: 'account-certification' })
@@ -217,7 +215,6 @@ const userLogout = () => {
     dialog({
         message: t('banksign.tips5'),
         showCancelButton: true,
-        cancelButtonText: t('operation.cancel'),
         confirmButtonText: t('operation.confirm'),
     }).then(() => {
         loginStore.clearAutoLoginData()

+ 0 - 2
src/packages/mobile/views/order/list/components/pricingorder/detail/Index.vue

@@ -52,8 +52,6 @@ const onCancelSumit = () => {
     console.log('goodsid')
     dialog({
         message: t('order.pricingorder.tips1'),
-        confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         const { marketid, goodsid } = props.selectedRow

+ 0 - 1
src/packages/mobile/views/order/list/components/pricingorder/list/Index.vue

@@ -99,7 +99,6 @@ const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
     dialog({
         message: t('order.pricingorder.tips1'),
         confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         formData.Header = { MarketID: item.marketid, GoodsID: item.goodsid }

+ 0 - 2
src/packages/mobile/views/order/position/components/pricing/detail2/components/delivery/Index.vue

@@ -142,8 +142,6 @@ const contactChange = (item: Model.UserReceiveInfoRsp) => {
 const onDeliverySumit = () => {
     dialog({
         message: t('position.goods.tips5'),
-        confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         const { buyOrSell, tradeID } = props.selectedRow.tHDetailEx

+ 0 - 2
src/packages/mobile/views/order/position/components/pricing/detail2/components/transfer/Index.vue

@@ -159,8 +159,6 @@ const formRules: { [key: string]: FieldRule[] } = {
 const onCloseSumit = () => {
     dialog({
         message: t('position.goods.tips3'),
-        confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
 

+ 0 - 1
src/packages/mobile/views/pricing/trade/components/cancel/Index.vue

@@ -91,7 +91,6 @@ const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
     dialog({
         message: t('order.pricingorder.tips1'),
         confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         showCancelButton: true,
     }).then(() => {
         formData.Header = { MarketID: item.marketid, GoodsID: item.goodsid }

+ 0 - 1
src/packages/mobile/views/user/cancel/Index.vue

@@ -36,7 +36,6 @@ const onSubmit = () => {
         message: t('user.cancel.submitmessage'),
         showCancelButton: true,
         confirmButtonText: t('operation.confirm'),
-        cancelButtonText: t('operation.cancel'),
         messageAlign: 'left'
     }).then(() => {
         fullloading((hideLoading) => {

+ 1 - 1
src/packages/mobile/views/user/register/Index.vue

@@ -77,7 +77,7 @@
 
 <script lang="ts" setup>
 import { reactive, shallowRef, ref, computed, onMounted } from 'vue'
-import { CellGroup, Cell, Button, Icon, Field, Form, FormInstance, Checkbox, showFailToast, showToast, FieldRule, Popup, Picker, PickerConfirmEventParams } from 'vant'
+import { CellGroup, Cell, Button, Field, Form, FormInstance, Checkbox, showFailToast, showToast, FieldRule, Popup, Picker, PickerConfirmEventParams } from 'vant'
 import { useCountDown } from '@vant/use'
 import { fullloading, dialog } from '@/utils/vant'
 import { validateRules } from '@/constants/regex'

+ 1 - 1
src/packages/pc/views/footer/presell/transferposition/giveup/index.vue

@@ -78,7 +78,7 @@ const onConfirm = () => {
             formData.GoodsID = goodsid
             
             onSubmit().then(() => {
-                ElMessage.success(t('position.transfer.tips1'))
+                ElMessage.success(t('position.transfer.tips2'))
                 onCancel(true)
             }).catch((err) => {
                 ElMessage.error(t('common.submitfailure') + err)

+ 0 - 4
src/packages/tss/views/mine/Index.vue

@@ -167,7 +167,6 @@ const doInOutMoney = (tab: string) => {
                     dialog({
                         message: t('banksign.tips1'),
                         showCancelButton: true,
-                        cancelButtonText: t('operation.cancel'),
                         confirmButtonText: t('banksign.tips2')
                     }).then(() => {
                         router.push({ name: 'bank-sign' })
@@ -181,7 +180,6 @@ const doInOutMoney = (tab: string) => {
         dialog({
             message: t('banksign.tips3'),
             showCancelButton: true,
-            cancelButtonText: t('operation.cancel'),
             confirmButtonText: t('banksign.tips4')
         }).then(() => {
             router.push({ name: 'account-certification' })
@@ -192,8 +190,6 @@ const doInOutMoney = (tab: string) => {
 const userLogout = () => {
     dialog({
         message: t('banksign.tips5'),
-        // cancelButtonText: t('operation.cancel'),
-        // confirmButtonText: t('operation.confirm'),
         showCancelButton: true
     }).then(() => {
         loginStore.clearAutoLoginData()