Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

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

@@ -4,5 +4,25 @@
             "Buy": "买料",
             "Sell": "卖料"
         }
+    },
+    "mine": {
+        "cashin": "付款",
+        "cashout": "提现"
+    },
+    "banksign": {
+        "wallet": {
+            "cashin": "付款",
+            "cashout": "提现",
+            "withdraw": {
+                "subtitle": "提现时间",
+                "outamount": "提现金额",
+                "pleaseenteroutamount": "请填写提现金额",
+                "time": "提现时间：交易日 ",
+                "theamountavailableis0": "可提现金额为0",
+                "exceedingthepayableamount": "超过可提现金额",
+                "goldisnotwithinthetimeframe": "提现不在时间范围内",
+                "availableoutmoney": "提现金额"
+            }
+        }
     }
 }

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

@@ -4,5 +4,25 @@
             "Buy": "买料",
             "Sell": "卖料"
         }
+    },
+    "mine": {
+        "cashin": "付款",
+        "cashout": "提现"
+    },
+    "banksign": {
+        "wallet": {
+            "cashin": "付款",
+            "cashout": "提现",
+            "withdraw": {
+                "subtitle": "提现时间",
+                "outamount": "提现金额",
+                "pleaseenteroutamount": "请填写提现金额",
+                "time": "提现时间：交易日 ",
+                "theamountavailableis0": "可提现金额为0",
+                "exceedingthepayableamount": "超过可提现金额",
+                "goldisnotwithinthetimeframe": "提现不在时间范围内",
+                "availableoutmoney": "提现金额"
+            }
+        }
     }
 }

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

@@ -4,5 +4,25 @@
             "Buy": "买料",
             "Sell": "卖料"
         }
+    },
+    "mine": {
+        "cashin": "付款",
+        "cashout": "提现"
+    },
+    "banksign": {
+        "wallet": {
+            "cashin": "付款",
+            "cashout": "提现",
+            "withdraw": {
+                "subtitle": "提现时间",
+                "outamount": "提现金额",
+                "pleaseenteroutamount": "请填写提现金额",
+                "time": "提现时间：交易日 ",
+                "theamountavailableis0": "可提现金额为0",
+                "exceedingthepayableamount": "超过可提现金额",
+                "goldisnotwithinthetimeframe": "提现不在时间范围内",
+                "availableoutmoney": "提现金额"
+            }
+        }
     }
 }

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

@@ -4,5 +4,25 @@
             "Buy": "买料",
             "Sell": "卖料"
         }
+    },
+    "mine": {
+        "cashin": "付款",
+        "cashout": "提现"
+    },
+    "banksign": {
+        "wallet": {
+            "cashin": "付款",
+            "cashout": "提现",
+            "withdraw": {
+                "subtitle": "提现时间",
+                "outamount": "提现金额",
+                "pleaseenteroutamount": "请填写提现金额",
+                "time": "提现时间：交易日 ",
+                "theamountavailableis0": "可提现金额为0",
+                "exceedingthepayableamount": "超过可提现金额",
+                "goldisnotwithinthetimeframe": "提现不在时间范围内",
+                "availableoutmoney": "提现金额"
+            }
+        }
     }
 }

src/packages/mobile/views/bank/wallet/components/withdraw/Index.vue

@@ -60,7 +60,7 @@
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 import { Form, Field, Cell, CellGroup, FormInstance, Button, FieldRule } from 'vant'
-import { fullloading, dialog, } from '@/utils/vant'
+import { fullloading, dialog } from '@/utils/vant'
 import { useDoWithdraw, useAccountFundInfo, useDoCusBankExtendConfigs } from '@/business/bank'
 import { getServerTime } from '@/services/api/common'
 import { useNavigation } from '@mobile/router/navigation'

src/packages/sbyj/views/bank/wallet/components/withdraw/index.vue

@@ -2,11 +2,11 @@
     <app-view class="g-form bank-wallet-withdraw">
         <Form ref="formRef" class="g-form__container" @submit="doWithDrawWarning">
             <CellGroup inset v-if="cusBank?.canoutamount === 1">
-                <Field class="form-field" type="number" label="收款金额" v-model="formData.Amount"
+                <Field class="form-field" type="number" :label="$t('banksign.wallet.withdraw.outamount')" v-model="formData.Amount"
                     :rules="formRules.Amount">
                     <template #input>
                         <input v-model="formData.Amount" placeholder="请输入" />
-                        <span class="form-field__tips">可收款额：{{ fund.AvailableOutMoney }}</span>
+                        <span class="form-field__tips">{{ $t('banksign.wallet.withdraw.availableoutmoney') }}{{ fund.AvailableOutMoney }}</span>
                     </template>
                 </Field>
                 <Field label="开户银行">
@@ -30,7 +30,7 @@
                 </template>
             </CellGroup>
             <div class="tips_time">
-                <span class="msg_tips">收款时间：交易日 {{ startTime }} - {{ endTime }}</span>
+                <span class="msg_tips">{{ $t('banksign.wallet.withdraw.time') }}  {{ startTime }} - {{ endTime }}</span>
                 <span class="msg_tips"><br>节假日以通知、公告为准，非交易日请勿操作！</span>
             </div>
             <CellGroup inset v-if="msg_317">
@@ -63,7 +63,7 @@ import { fullloading, dialog, } from '@/utils/vant'
 import { useDoWithdraw, useAccountFundInfo, useDoCusBankExtendConfigs } from '@/business/bank'
 import { getServerTime } from '@/services/api/common'
 import { useNavigation } from '@mobile/router/navigation'
-import { useUserStore } from '@/stores'
+import { useUserStore, i18n } from '@/stores'
 import moment from 'moment'
 
 const { formData, onSubmit, sign } = useDoWithdraw()
@@ -76,6 +76,7 @@ const { getSystemParamValue } = useUserStore()
 const msg = getSystemParamValue('302')
 const msg_317 = getSystemParamValue('317')
 const userStore = useUserStore()
+const { global: { t }} = i18n
 
 // 表单验证规则
 const formRules: { [key: string]: FieldRule[] } = {
@@ -86,9 +87,9 @@ const formRules: { [key: string]: FieldRule[] } = {
             if (val <= (fund.value.AvailableOutMoney ?? 0.0) && val > 0.0) {
                 return true
             } else if (fund.value.AvailableOutMoney === 0.0) {
-                return '可收款额为0'
+                return t('banksign.wallet.withdraw.theamountavailableis0')
             } else {
-                return '超过可收款额'
+                return t('banksign.wallet.withdraw.exceedingthepayableamount')
             }
         }
     }]
@@ -108,7 +109,7 @@ const doWithDrawWarning = () => {
             } else {
                 dialog({
                     title: '提示',
-                    message: '收款不在时间范围内',
+                    message: t('banksign.wallet.withdraw.goldisnotwithinthetimeframe'),
                     confirmButtonText: '我知道了'
                 })
             }

src/packages/sbyj/views/bank/wallet/index.vue

@@ -10,10 +10,10 @@
             </app-navbar>
         </template>
         <Tabs v-model:active="active">
-            <Tab title="付款">
+            <Tab :title="$t('banksign.wallet.cashin')">
                 <app-deposit />
             </Tab>
-            <Tab title="收款">
+            <Tab :title="$t('banksign.wallet.cashout')">
                 <app-withdraw />
             </Tab>
         </Tabs>

src/packages/sbyj/views/mine/index.vue

@@ -58,8 +58,8 @@
                     </ul>
                 </div>
                 <div class="button">
-                    <Button type="danger" size="small" round @click="doInOutMoney('0')">付款</Button>
-                    <Button size="small" round @click="doInOutMoney('1')">收款</Button>
+                    <Button type="danger" size="small" round @click="doInOutMoney('0')">{{ $t('mine.cashin') }}</Button>
+                    <Button size="small" round @click="doInOutMoney('1')">{{ $t('mine.cashout') }}</Button>
                 </div>
             </div>
         </div>