zhb 2 ماه پیش
والد
کامیت
37b1ba898a
2فایلهای تغییر یافته به همراه65 افزوده شده و 17 حذف شده
  1. 64 16
      pages/customer/withdrawal.vue
  2. 1 1
      utils/request.js

+ 64 - 16
pages/customer/withdrawal.vue

@@ -147,44 +147,84 @@
                   </uni-forms-item>
                 </uni-col>
                 <!-- 通用银行信息展示 -->
-                <template v-if="['BANK', 'BANK_TELEGRAPHIC', 'CHANNEL_TYPE_CARD'].includes(channelData.type)">
-                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="form.bankUname">
+                <template v-if="channelData.type == 'BANK'">
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                     <uni-forms-item :label="t('Custom.Withdraw.UserName')">
                       <uni-easyinput disabled v-model="form.bankUname" />
                     </uni-forms-item>
                   </uni-col>
-                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="form.bankCardNum">
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                     <uni-forms-item :label="t('Custom.Withdraw.BankCardNum')">
                       <uni-easyinput disabled v-model="form.bankCardNum" />
                     </uni-forms-item>
                   </uni-col>
-                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="form.bankName">
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                     <uni-forms-item :label="t('Custom.Withdraw.BankName')">
                       <uni-easyinput disabled v-model="form.bankName" />
                     </uni-forms-item>
                   </uni-col>
-                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="form.bankBranchName">
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                     <uni-forms-item :label="t('Custom.Withdraw.bankBranchName')">
                       <uni-easyinput disabled v-model="form.bankBranchName" />
                     </uni-forms-item>
                   </uni-col>
-                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="form.swiftCode">
+                </template>
+                <!-- 信用卡信息展示(针对有信用卡列表的通道) -->
+                <template v-if="channelData.type == 'CHANNEL_TYPE_CARD'">
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+                    <uni-forms-item :label="t('PersonalManagement.Label.CreditCardAccountName')">
+                      <uni-easyinput disabled v-model="form.bankUname" />
+                    </uni-forms-item>
+                  </uni-col>
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+                    <uni-forms-item :label="t('PersonalManagement.Label.CreditCardAccount')">
+                      <uni-easyinput disabled v-model="form.bankCardNum" />
+                    </uni-forms-item>
+                  </uni-col>
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+                    <uni-forms-item label="CVV">
+                      <uni-easyinput disabled v-model="form.cvv" />
+                    </uni-forms-item>
+                  </uni-col>
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+                    <uni-forms-item :label="t('PersonalManagement.Label.ExpirationYear')">
+                      <uni-easyinput disabled v-model="form.expiryYearMonth" />
+                    </uni-forms-item>
+                  </uni-col>
+                </template>
+                <!-- 银行电汇转账信息展示(针对有银行转账列表的通道) -->
+                <template v-if="channelData.type == 'BANK_TELEGRAPHIC'">
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+                    <uni-forms-item :label="t('Custom.Withdraw.UserName')">
+                      <uni-easyinput disabled v-model="form.bankUname" />
+                    </uni-forms-item>
+                  </uni-col>
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+                    <uni-forms-item :label="t('Custom.Withdraw.BankCardNum')">
+                      <uni-easyinput disabled v-model="form.bankCardNum" />
+                    </uni-forms-item>
+                  </uni-col>
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+                    <uni-forms-item :label="t('Custom.Withdraw.BankName')">
+                      <uni-easyinput disabled v-model="form.bankName" />
+                    </uni-forms-item>
+                  </uni-col>
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                     <uni-forms-item :label="t('Custom.Withdraw.swiftCode')">
                       <uni-easyinput disabled v-model="form.swiftCode" />
                     </uni-forms-item>
                   </uni-col>
-                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="form.customBankCode">
-                    <uni-forms-item :label="t('Custom.Withdraw.bankCode')" name="bankCode">
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
+                    <uni-forms-item :label="t('Custom.Withdraw.bankCode')">
                       <uni-easyinput disabled v-model="form.customBankCode" />
                     </uni-forms-item>
                   </uni-col>
-                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8" v-if="form.bankAddr">
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                     <uni-forms-item :label="t('Custom.Withdraw.bankAddr')">
                       <uni-easyinput disabled v-model="form.bankAddr" />
                     </uni-forms-item>
                   </uni-col>
-                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
-                    v-if="channelData.type === 'BANK_TELEGRAPHIC' && form.agencyNo">
+                  <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                     <uni-forms-item label="Account Agency NO" name="agencyNo"
                       v-if="channelData.code == 'PAY_RETAILER_REMIT_PAY_KEY_BRW'">
                       <uni-easyinput v-model="form.agencyNo" />
@@ -194,7 +234,7 @@
                     </uni-forms-item>
                   </uni-col>
                   <uni-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8"
-                    v-if="channelData.type === 'BANK_TELEGRAPHIC' && form.cpf">
+                    v-if="channelData.code == 'PAY_RETAILER_REMIT_PAY_KEY_BRW'">
                     <uni-forms-item label="CPF" name="cpf">
                       <uni-easyinput v-model="form.cpf" />
                     </uni-forms-item>
@@ -366,6 +406,8 @@ const form = reactive({
   bankAddr: '',          // 银行地址
   agencyNo: '',          // 代理机构编号(电汇专用,可编辑)
   cpf: '',               // CPF号码(电汇专用,可编辑)
+  cvv: '',               // CVV码(电汇专用,可编辑)
+  expiryYearMonth: '',   // 过期年(电汇专用,可编辑)
   agree2: false,         // 协议勾选2
   agree3: false          // 协议勾选3(当dialogTipsIsShow为true时显示)
 })
@@ -388,6 +430,8 @@ const resetForm = () => {
   form.cpf = ""
   form.bankBranchName = ""
   form.cpf = ""
+  form.cvv = ""
+  form.expiryYearMonth = ""
   form.agree2 = false
   form.agree3 = false
   amountErrorMessage.value = ""
@@ -899,6 +943,8 @@ const getBankInfo = async () => {
     })
     // 如果有默认选中
     const findDefault = (list, type) => list.find(b => b.defaultBank && b.type === type)
+
+
     const defaultBank = findDefault(ruleForm.bankInfo, 1)
     const defaultWire = findDefault(ruleForm.bankWrit, 2)
     const defaultCard = findDefault(ruleForm.xykInfo, 3)
@@ -916,7 +962,11 @@ const selectBankCard = (item) => {
   const index = bankList.value.findIndex(b => b.id === item.id)
   if (index !== -1) {
     myId.value = item.id
-    Object.assign(form, item)
+    nextTick(() => {
+      Object.assign(form, item)
+    })
+
+
   }
 }
 
@@ -1391,8 +1441,7 @@ function isShowStep3(row) {
   introduce.introduce = row.introduce
   introduce.enIntroduce = row.enIntroduce
 
-  // 重置表单并清除校验结果
-  resetForm();
+
 
 
 }
@@ -1601,7 +1650,6 @@ watch(isStep3, async (newVal) => {
   if (newVal) {
     await nextTick();
     formRef.value?.clearValidate();   // 先清除旧错误
-    resetForm();                      // 再重置数据(重置数据可能触发新校验)
     await nextTick();
     formRef.value?.clearValidate();   // 再次清除可能因数据重置产生的新错误
   }

+ 1 - 1
utils/request.js

@@ -2,7 +2,7 @@
 import { showLoading, hideLoading } from '@/hooks/useLoading'
 import config1 from "@/config";
 const baseUrl = config1.Host85;
-const timeout = 10000;
+const timeout = 60000;
 // 不加loading
 const urlLoading = ['/list', '/page', '/field/params', '/dropdown', '/single', '/detail']
 import { CLIENT, lang, userToken, shopToken } from "@/composables/config";