Handy_Cao 1 jaar geleden
bovenliggende
commit
bfbab8d12d

+ 2 - 0
public/locales/en-US.json

@@ -1327,6 +1327,7 @@
                 "paste": "Copy, go to paste ~",
                 "pastefailure": "Paste failure",
                 "submitfailure": "Failure:",
+                "pleaseuploadthetransfervoucher": "Please upload the transfer voucher",
                 "whetherthedeposittransferhasbeenmadeatthebankend": "Is golden on bank account transfer?"
             },
             "withdraw": {
@@ -1344,6 +1345,7 @@
                 "failedtogetservertime": "Failed to get server time",
                 "submitsuccess": "Submit successfully. don't submit again. confirm the result later",
                 "submitfailure": "Commit failure:",
+                "pleaseuploadthetransfervoucher": "Please upload the transfer voucher",
                 "availableoutmoney": "Available ",
                 "remark": "Remark"
             },

+ 1 - 0
public/locales/th-TH.json

@@ -1331,6 +1331,7 @@
                 "paste": "ลอกแล้ววางเลย~",
                 "pastefailure": "การคัดลอกล้มเหลว",
                 "submitfailure": "ล้มเหลวในการส่ง:",
+                "pleaseuploadthetransfervoucher": "กรุณาอัปโหลดใบรับรองการโอนเงิน",
                 "whetherthedeposittransferhasbeenmadeatthebankend": "มีการโอนเงินเข้าสู่ระบบธนาคาร หรือไม่?"
             },
             "withdraw": {

+ 1 - 0
public/locales/zh-CN.json

@@ -1331,6 +1331,7 @@
                 "paste": "已复制,快去粘贴吧~",
                 "pastefailure": "复制失败",
                 "submitfailure": "提交失败:",
+                "pleaseuploadthetransfervoucher": "请上传转账凭证",
                 "whetherthedeposittransferhasbeenmadeatthebankend": "是否已在银行端进行入金转账?"
             },
             "withdraw": {

+ 1 - 0
public/locales/zh-TW.json

@@ -1331,6 +1331,7 @@
                 "paste": "已複製,快去粘貼吧~",
                 "pastefailure": "複製失敗",
                 "submitfailure": "提交失敗:",
+                "pleaseuploadthetransfervoucher": "請上傳轉賬憑證",
                 "whetherthedeposittransferhasbeenmadeatthebankend": "是否已在銀行端進行入金轉賬?"
             },
             "withdraw": {

+ 11 - 2
src/business/bank/index.ts

@@ -85,7 +85,14 @@ export function useDoWithdraw() {
 export function useDoDeposit(userid?: number) {
     const loading = shallowRef(false)
     /// 获取当前是否已签约
-    const sign = shallowRef<Model.BankAccountSignRsp[]>([])
+    const bankAccountSign = shallowRef<Model.BankAccountSignRsp[]>([])
+
+    const sign = computed<Partial<Model.BankAccountSignRsp>>(() => {
+        if (bankAccountSign.value.length) {
+            return bankAccountSign.value[0]
+        }
+        return {}
+    })
     /// formData
     const formData = reactive<Partial<Proto.t2bBankDepositReq>>({})
 
@@ -95,7 +102,7 @@ export function useDoDeposit(userid?: number) {
         }
     }).then((res) => {
         if (res.data.length) {
-            sign.value = res.data
+            bankAccountSign.value = res.data
             const data = res.data[0]
             formData.Currency = data.currency
             formData.CusBankID = data.cusbankid
@@ -134,6 +141,7 @@ export function useDoBankSign() {
     const bankInfo = shallowRef<Model.BankAccountSignRsp>()
     const system_1010 = shallowRef(getSystemParamValue('1010') ?? '1')
     const cusSignBank = shallowRef<Model.CusBankSignBankRsp>() /// 托管银行信息
+    const system_1013 = shallowRef(getSystemParamValue('1013') ?? '30')
 
     /// 数据
     const formData = reactive<Partial<Proto.t2bBankSignReq>>({
@@ -236,6 +244,7 @@ export function useDoBankSign() {
         onSubmit,
         smsVerificationCode,
         system_1010,
+        system_1013,
         bankInfo
     }
 }

+ 2 - 2
src/packages/mobile/views/bank/sign/components/edit/Index.vue

@@ -82,7 +82,7 @@ const SelectBank = defineAsyncComponent(() => import('./select-bank/index.vue'))
 // 搜索支行
 const SearchBank = defineAsyncComponent(() => import('./search-bank/index.vue'))
 
-const { formData, onSubmit, banklist, bankInfo, system_1010, smsVerificationCode } = useDoBankSign()
+const { formData, onSubmit, banklist, bankInfo, system_1010, system_1013, smsVerificationCode } = useDoBankSign()
 const showModal = shallowRef(true)
 const refresh = shallowRef(false) // 是否刷新父组件数据
 const formRef = shallowRef<FormInstance>()
@@ -98,7 +98,7 @@ const { global: { t } } = i18n
 const CenterErrMsg = shallowRef('')
 // 倒计时函数
 const countdown = useCountDown({
-    time: 60 * 1000,
+    time: +system_1013 * 1000,
     onFinish: () => {
         countdown.reset()
         isCountdown.value = false

+ 2 - 2
src/packages/tss/views/bank/sign/components/edit/Index.vue

@@ -82,7 +82,7 @@ const SelectBank = defineAsyncComponent(() => import('./select-bank/index.vue'))
 // 搜索支行
 const SearchBank = defineAsyncComponent(() => import('./search-bank/index.vue'))
 
-const { formData, onSubmit, banklist, bankInfo, system_1010, smsVerificationCode } = useDoBankSign()
+const { formData, onSubmit, banklist, bankInfo, system_1010, system_1013, smsVerificationCode } = useDoBankSign()
 const showModal = shallowRef(true)
 const refresh = shallowRef(false) // 是否刷新父组件数据
 const formRef = shallowRef<FormInstance>()
@@ -98,7 +98,7 @@ const { global: { t } } = i18n
 const CenterErrMsg = shallowRef('')
 // 倒计时函数
 const countdown = useCountDown({
-    time: 60 * 1000,
+    time: +system_1013 * 1000,
     onFinish: () => {
         countdown.reset()
         isCountdown.value = false

+ 16 - 1
src/packages/tss/views/bank/wallet/components/deposit/Index.vue

@@ -9,6 +9,21 @@
                         <span>{{ currentAccount.currentbalance?.toFixed(2) }}</span>
                     </template>
                 </Field>
+                <Field :label="$t('banksign.wallet.withdraw.bankname')">
+                    <template #input>
+                        {{ sign.bankname }}
+                    </template>
+                </Field>
+                <Field :label="$t('banksign.wallet.withdraw.bankaccountno')">
+                    <template #input>
+                        {{ sign.bankaccountno }}
+                    </template>
+                </Field>
+                <Field :label="$t('banksign.wallet.withdraw.bankaccountname')">
+                    <template #input>
+                        {{ sign.bankaccountname }}
+                    </template>
+                </Field>
                 <template v-for="(item, index) in configs" :key="index">
                     <Field v-if="item.usabletype === 1 || item.usabletype === userStore.userInfo?.userinfotype"
                         :name="item.fieldcode" :label="item.fieldname" v-model="item.value"
@@ -64,7 +79,7 @@ import { useUserStore, useAccountStore, i18n } from '@/stores'
 import moment from 'moment'
 
 const formRef = shallowRef<FormInstance>()
-const { formData, onSubmit } = useDoDeposit()
+const { formData, onSubmit, sign } = useDoDeposit()
 const { router } = useNavigation()
 const { getSystemParamValue } = useUserStore()
 const { configs, cusBank, startTime, endTime } = useDoCusBankExtendConfigs(2)

+ 0 - 1
src/packages/tss/views/bank/wallet/components/inoutapply/Index.vue

@@ -86,7 +86,6 @@ const goToAmtInByPaidUrl = (item: Model.AccountOutInApplyRsp) => {
     })
 }
 
-
 const openWebview = (url: string) => {
     const ua = window.navigator.userAgent.toLowerCase()
     if (ua.indexOf('micromessenger') !== -1) {