zhb 1 bulan lalu
induk
melakukan
5ad98f4e33
3 mengubah file dengan 28 tambahan dan 16 penghapusan
  1. 12 10
      pages/customer/withdrawal.vue
  2. 1 1
      pages/ib/index.vue
  3. 15 5
      pages/ib/withdraw.vue

+ 12 - 10
pages/customer/withdrawal.vue

@@ -133,7 +133,7 @@
                         </text>
                         <text v-if="channelData.type == 'BANK'">{{
                           t('Custom.Withdraw.addBank')
-                          }}</text>
+                        }}</text>
                         <text v-if="channelData.type == 'BANK'" class="add-btn crm-cursor"
                           @click="openAddBankCard('add_bankCard')">
                           {{ t('Custom.Withdraw.addBank1') }}
@@ -257,7 +257,7 @@
                   <view v-if="channelData.type != 'BANK_TELEGRAPHIC' && isStep3">
                     <view class="tit">
                       <text>{{ t('Custom.Withdraw.Title3') + '(' + channelData.currency + ')'
-                        }}</text>
+                      }}</text>
                     </view>
                   </view>
                   <view v-if="channelData.type !== 'BANK_TELEGRAPHIC'" class="amount-box amount-box1">
@@ -499,6 +499,7 @@ const resetForm = () => {
   form.agree2 = false
   form.agree3 = false
   amountErrorMessage.value = ""
+  dialogDealResult_form.emailCode = ''
 }
 //数量区间
 const mAmount = reactive({
@@ -1091,10 +1092,7 @@ function selectCode(codeVal) {
 //关闭提交后的弹出框
 function closeDia() {
   resetForm()
-  isStep3.value = false;
-  step2.value = false;
   showTable();
-  loginValue.value = "";
   dialogCheck.value = false;
   dialogVisible.value = false;
 }
@@ -1219,6 +1217,8 @@ async function qrCode(serial) {
   }
 }
 const submitCode = async (code) => {
+  console.log(code, 111);
+
   if (channelData.value.type == "DIGITAL_CURRENCY") {
     dialogDealResult_form.emailCode = code;
     submit("form");
@@ -1227,6 +1227,8 @@ const submitCode = async (code) => {
 
 //提交
 async function submit(formName) {
+  console.log(channelData.value, 1212);
+
   if (channelData.value.type == "BANK_TELEGRAPHIC" && !myId.value) {
     showToast(t("vaildate.withdrawBank.empty"));
     return;
@@ -1301,10 +1303,10 @@ async function submit(formName) {
         let res = await financialApi.WithdrawAapplyDigitalCurrency(
           channelData.value.requestUrl,
           {
+            ...form,
             login: loginValue.value,
             payType: channelData.value.code,
             emailCode: dialogDealResult_form.emailCode,
-            ...form,
           }
         );
         if (res.code == Code.StatusOK) {
@@ -1327,9 +1329,9 @@ async function submit(formName) {
         let res = await financialApi.WithdrawAapplyDigitalCurrency(
           channelData.value.requestUrl,
           {
+            ...form,
             login: loginValue.value,
             payType: channelData.value.code,
-            ...form,
           }
         );
         if (res.code == Code.StatusOK) {
@@ -1349,9 +1351,9 @@ async function submit(formName) {
         let res = await financialApi.WithdrawApplyBank(
           channelData.value.requestUrl,
           {
+            ...form,
             login: loginValue.value,
             payType: channelData.value.code,
-            ...form,
           }
         );
         if (res.code == Code.StatusOK) {
@@ -1369,9 +1371,9 @@ async function submit(formName) {
         let res = await financialApi.WithdrawApplyBank(
           channelData.value.requestUrl,
           {
+            ...form,
             login: loginValue.value,
             payType: channelData.value.code,
-            ...form,
           }
         );
 
@@ -1390,9 +1392,9 @@ async function submit(formName) {
         let res = await financialApi.WithdrawApplyBank(
           channelData.value.requestUrl,
           {
+            ...form,
             login: loginValue.value,
             payType: channelData.value.code,
-            ...form,
           }
         );
         if (res.code == Code.StatusOK) {

+ 1 - 1
pages/ib/index.vue

@@ -749,7 +749,7 @@
 
   const toWithdraw = () => {
     router.push({
-        path: '/pages/ib/withdraw',
+        path: '/pages/ib/withdraw-select',
       },
     )
   }

+ 15 - 5
pages/ib/withdraw.vue

@@ -832,6 +832,7 @@ const bankList = computed(() => {
     if (channelData.value.type === 'BANK') return ruleForm.bankInfo
     if (channelData.value.type === 'BANK_TELEGRAPHIC') return ruleForm.bankWrit
     if (channelData.value.type === 'CHANNEL_TYPE_CARD') return ruleForm.xykInfo
+    if (channelData.value.type === 'DIGITAL_CURRENCY') return ruleForm.bankBlockchain
     return []
 })
 const bankOptions = computed(() => {
@@ -1112,20 +1113,28 @@ const getBankInfo = async () => {
                 Object.assign(form, item)
             }
         })
+        bankList.value = ref.data
     } else {
         $pigeon.MessageError(res.msg)
     }
 }
 const onDigitalCurrencyChange = (val) => {
+    console.log(val, 22);
+
     const item = ruleForm.bankBlockchain.find(b => b.id === val)
+    console.log(item, ruleForm.bankBlockchain);
+
     chooseBank(item.id)
 }
 const chooseBank = (id) => {
     const item = bankList.value.find(b => b.id === id)
-    // if (!item) {
-    //     showToast(t("Msg.item11"));
-    //     return;
-    // }
+
+    if (channelData.value.type == "DIGITAL_CURRENCY") {
+        if (item.authStatus == 0) {
+            showToast(t("Msg.item11"));
+            return;
+        }
+    }
     let codeCache = ""
     if (form.bankCode) codeCache = form.bankCode
     Object.assign(form, item)
@@ -1437,7 +1446,7 @@ const allTabs = computed(() => {
         "Electronic_Wallet": t('Custom.Deposit.Channel4'),
         "International_Transfer": t('Custom.Deposit.Channel1'),
         "CHANNEL_TYPE_CARD": t('PersonalManagement.Label.CreditCard'),
-        "Ucard_Wallet": t('card.title'),
+        "UCARD_WALLET": t('card.title'),
         "CHANNEL_TYPE_ALI_WALLET": t('Label.Ali'),
     }
 })
@@ -1511,6 +1520,7 @@ watch(() => form.amount, (newVal) => {
 
 .custom-withdraw {
     width: px2rpx(566);
+    flex-shrink: 0;
 
     .box {
         margin-bottom: px2rpx(20);