|
|
@@ -11,7 +11,7 @@
|
|
|
<view class="card-top">
|
|
|
<text class="tit"><text class="iconfont icon-caret-right"></text>{{
|
|
|
t('Custom.Deposit.Title1')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
<cwg-combox :clearable="false" v-model:value="loginValue" :options="loginComboxOptions"
|
|
|
:placeholder="t('placeholder.choose')" />
|
|
|
</view>
|
|
|
@@ -23,7 +23,7 @@
|
|
|
<view class="card-top">
|
|
|
<text class="tit"><text class="iconfont icon-caret-right"></text>{{
|
|
|
t('Custom.Deposit.Title2')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
<cwg-combox :clearable="false" v-model:value="channelId" :options="channelListOptions"
|
|
|
:placeholder="t('placeholder.choose')">
|
|
|
</cwg-combox>
|
|
|
@@ -72,7 +72,7 @@
|
|
|
<view>
|
|
|
<text class="tit"><text class="iconfont icon-caret-right"></text>{{
|
|
|
t('news_add_field.Label.Title4')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
</view>
|
|
|
<view>
|
|
|
<uni-forms-item>
|
|
|
@@ -103,7 +103,7 @@
|
|
|
WireTransferAccount.bankUname || '--'
|
|
|
}}</text></view>
|
|
|
<view class="row"><text class="label">{{ t('Custom.Deposit.bankName')
|
|
|
- }}</text><text class="content">{{ WireTransferAccount.bankName
|
|
|
+ }}</text><text class="content">{{ WireTransferAccount.bankName
|
|
|
||
|
|
|
'--'
|
|
|
}}</text></view>
|
|
|
@@ -113,7 +113,7 @@
|
|
|
WireTransferAccount.bankCardNum || '--'
|
|
|
}}</text></view>
|
|
|
<view class="row"><text class="label">{{ t('Custom.Deposit.bankAddr')
|
|
|
- }}</text><text class="content">{{ WireTransferAccount.bankAddr
|
|
|
+ }}</text><text class="content">{{ WireTransferAccount.bankAddr
|
|
|
||
|
|
|
'--'
|
|
|
}}</text></view>
|
|
|
@@ -123,7 +123,7 @@
|
|
|
WireTransferAccount.swiftCode || '--'
|
|
|
}}</text></view>
|
|
|
<view class="row"><text class="label">{{ t('Custom.Deposit.bankCode')
|
|
|
- }}</text><text class="content">{{ WireTransferAccount.bankCode
|
|
|
+ }}</text><text class="content">{{ WireTransferAccount.bankCode
|
|
|
||
|
|
|
'--'
|
|
|
}}</text></view>
|
|
|
@@ -137,7 +137,7 @@
|
|
|
|
|
|
|
|
|
<!-- 数字货币信息展示 -->
|
|
|
- <template
|
|
|
+ <!-- <template
|
|
|
v-if="isStep3 && channelData.code && channelData.code.indexOf('DIGITAL_PAY_TYPE_KEY') === 0">
|
|
|
<view>
|
|
|
<text class="tit"><text class="iconfont icon-caret-right"></text>{{
|
|
|
@@ -151,7 +151,7 @@
|
|
|
+ '-' +
|
|
|
WireTransferAccount.type }}</text></view>
|
|
|
<view class="row"><text class="label">{{ t('Custom.Withdraw.Title6')
|
|
|
- }}</text><text class="content">{{ WireTransferAccount.address ||
|
|
|
+ }}</text><text class="content">{{ WireTransferAccount.address ||
|
|
|
'--'
|
|
|
}}</text></view>
|
|
|
<view class="row"><text class="label">QR Code</text>
|
|
|
@@ -160,7 +160,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </template>
|
|
|
+ </template> -->
|
|
|
<!-- 表单区域（含金额、预估金额、上传凭证、优惠码） -->
|
|
|
<template v-if="isStep3">
|
|
|
<view>
|
|
|
@@ -220,12 +220,11 @@
|
|
|
<view v-if="
|
|
|
channelData.code == 'UNION_PAY_TELEGRAPHIC' ||
|
|
|
channelData.code == 'UNION_PAY_TELEGRAPHIC_SPECIAL' ||
|
|
|
- channelData.code && channelData.code.indexOf('DIGITAL_PAY_TYPE_KEY') === 0 ||
|
|
|
channelData.code == 'UNION_PAY_TELEGRAPHIC_TWO'
|
|
|
">
|
|
|
<uni-forms-item :label="t('Custom.Deposit.UploadRemittanceVoucher')">
|
|
|
<cwg-file-picker-wrapper v-model="imageUrl" :limit="1" :editable="true"
|
|
|
- :fileMediatype="'all'" uploadUrl="/wasabi/upload/file"
|
|
|
+ :fileMediatype="'all'" uploadUrl="/common/upload"
|
|
|
:baseUrl="Host80" />
|
|
|
</uni-forms-item>
|
|
|
</view>
|
|
|
@@ -246,16 +245,16 @@
|
|
|
<checkbox :checked="params.agree4"
|
|
|
@click="params.agree4 = !params.agree4" />
|
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit1')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
</label>
|
|
|
<view style="line-height: 1.5; font-size: 14px">
|
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit2')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
<text class="clause crm-cursor" @click="dialogClauseNZ = true">{{
|
|
|
t('news_add_field1.activitiesNZ.itemDeposit3')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit4')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
</view>
|
|
|
</uni-forms-item>
|
|
|
|
|
|
@@ -268,15 +267,15 @@
|
|
|
<checkbox :checked="params.agree5"
|
|
|
@click="params.agree5 = !params.agree5" />
|
|
|
<text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit1')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
</label>
|
|
|
<view style="line-height: 1.5; font-size: 14px">
|
|
|
<text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit2')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
<text class="clause crm-cursor" @click="dialogClauseNZTwo = true">{{
|
|
|
t('news_add_field1.activitiesNZTwo.itemDeposit3') }}</text>
|
|
|
<text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit4')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
</view>
|
|
|
</uni-forms-item>
|
|
|
|
|
|
@@ -360,7 +359,7 @@
|
|
|
</view>
|
|
|
</template>
|
|
|
<button class="s-btn" type="primary" @click="submitConfirm">{{ t('Btn.Submit')
|
|
|
- }}</button>
|
|
|
+ }}</button>
|
|
|
</uni-forms>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -371,8 +370,7 @@
|
|
|
<view class="step3-attention">
|
|
|
<view class="tips" v-if="(introduce.introduce || introduce.enIntroduce)">
|
|
|
<view>
|
|
|
- <cwg-rich-text class="attention"
|
|
|
- :nodes="isZh ? introduce.introduce : introduce.enIntroduce" />
|
|
|
+ <cwg-rich-text class="attention" :nodes="isZh ? introduce.introduce : introduce.enIntroduce" />
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -418,6 +416,9 @@
|
|
|
@confirm="submitDealResult" />
|
|
|
<!-- KYC成功弹窗 -->
|
|
|
<cwg-kyc-popup v-model:visible="dialogKyc" :qrText="text1" />
|
|
|
+ <!-- 数字支付确认弹窗 -->
|
|
|
+ <DigitalPayConfirmPopup v-model:visible="dialogDigitalPayConfirm" :WireTransferAccount="WireTransferAccount"
|
|
|
+ @close="closeDigitalPayConfirm" @confirm="confirmDigitalPayModal" />
|
|
|
</cwg-page-wrapper>
|
|
|
</template>
|
|
|
|
|
|
@@ -446,6 +447,7 @@ import CheckPopup from './components/CheckPopup.vue'
|
|
|
import CwgCheckConfirmPopup from './components/DepositCheckConfirmPopup.vue'
|
|
|
import VietnamNoticePopup from './components/VietnamNoticePopup.vue'
|
|
|
import NewYear24Popup from './components/NewYear24Popup.vue'
|
|
|
+import DigitalPayConfirmPopup from './components/digitalPayConfirmPopup.vue'
|
|
|
// 假设原有导入路径保持不变
|
|
|
import tool from "@/global/tool"
|
|
|
// import { createUploadRequest } from "@/lib/upload"
|
|
|
@@ -638,6 +640,9 @@ const resetForm = () => {
|
|
|
form.expiryYear = undefined
|
|
|
form.pin = undefined
|
|
|
amountErrorMessage.value = ""
|
|
|
+ requiteVoucherUrl.value = ""
|
|
|
+ imageUrl.value = ""
|
|
|
+ imageUrl1.value = ""
|
|
|
}
|
|
|
const formRef = ref(null)
|
|
|
const mAmount = reactive({
|
|
|
@@ -1127,9 +1132,9 @@ const chooseBank = (item) => {
|
|
|
const toHome = () => {
|
|
|
uni.switchTab({ url: "/pages/customer/index" })
|
|
|
}
|
|
|
+const dialogDigitalPayConfirm = ref(false)
|
|
|
// 提交确认信息弹窗
|
|
|
const submitConfirm = async () => {
|
|
|
- console.log(params.requiteVoucherUrl, 1212);
|
|
|
|
|
|
if (channelData.confirmCreditCard == 1 && !myId.value) {
|
|
|
$pigeon.MessageWarning(t("PersonalManagement.Label.selectCreditCard"))
|
|
|
@@ -1163,15 +1168,24 @@ const submitConfirm = async () => {
|
|
|
$pigeon.MessageWarning(t("news_add_field.Des.item2"))
|
|
|
return
|
|
|
}
|
|
|
- if (channelData.code && channelData.code.indexOf('DIGITAL_PAY_TYPE_KEY') === 0 && !imageUrl.value) {
|
|
|
- $pigeon.MessageWarning(t("vaildate.depositVoucher.empty"))
|
|
|
- return
|
|
|
- }
|
|
|
+ // if (channelData.code && channelData.code.indexOf('DIGITAL_PAY_TYPE_KEY') === 0 && !imageUrl.value) {
|
|
|
+ // $pigeon.MessageWarning(t("vaildate.depositVoucher.empty"))
|
|
|
+ // return
|
|
|
+ // }
|
|
|
|
|
|
try {
|
|
|
if (formRef.value) {
|
|
|
await formRef.value.validate()
|
|
|
- openDontActive()
|
|
|
+ console.log(channelData, channelData.code, 12);
|
|
|
+ if (
|
|
|
+ channelData.code &&
|
|
|
+ channelData.code.indexOf("DIGITAL_PAY_TYPE_KEY") === 0
|
|
|
+ ) {
|
|
|
+ imageUrl.value = "";
|
|
|
+ dialogDigitalPayConfirm.value = true;
|
|
|
+ } else {
|
|
|
+ openDontActive();
|
|
|
+ }
|
|
|
}
|
|
|
} catch (error) {
|
|
|
if (error instanceof Array) {
|
|
|
@@ -1183,6 +1197,15 @@ const submitConfirm = async () => {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+const confirmDigitalPayModal = (e) => {
|
|
|
+ dialogDigitalPayConfirm.value = false;
|
|
|
+ imageUrl.value = e;
|
|
|
+ openDontActive();
|
|
|
+}
|
|
|
+// 关闭数字支付确认弹窗
|
|
|
+const closeDigitalPayConfirm = () => {
|
|
|
+ dialogDigitalPayConfirm.value = false;
|
|
|
+}
|
|
|
// 打开不参加活动弹窗
|
|
|
const openDontActive = () => {
|
|
|
if (!tableData4Flag.value && !tableData4TwoFlag.value && !tableDataNewListFlag.value && (country.value != "CN" || (country.value == "CN" && (ACCType.value == 1 || ACCType.value == 2 || ACCType.value == 7))) && ACCType.value != 3 && params.agree2) {
|
|
|
@@ -1531,6 +1554,7 @@ const doShowStep3 = (row) => {
|
|
|
isChannel.value = false
|
|
|
step3.value = true
|
|
|
Object.assign(channelData, row)
|
|
|
+ console.log(channel.value, channelListOptions.value, channelData, 1112);
|
|
|
mAmount.minAmount = row.minAmount
|
|
|
mAmount.maxAmount = row.maxAmount
|
|
|
} else {
|
|
|
@@ -1603,6 +1627,7 @@ const showTable = () => {
|
|
|
params.promoCode = ""
|
|
|
isChannel.value = true
|
|
|
imageUrl.value = ""
|
|
|
+ requiteVoucherUrl.value = ""
|
|
|
code.value = ""
|
|
|
WireTransferAccount.bankMsg = ""
|
|
|
introduce.introduce = ""
|
|
|
@@ -1880,6 +1905,8 @@ onMounted(() => {
|
|
|
channelListOptions.value = formatChannels(channelList.value)
|
|
|
}
|
|
|
channelId.value = channel.value
|
|
|
+
|
|
|
+
|
|
|
getDateList()
|
|
|
isStep3Open()
|
|
|
setTimeout(() => {
|
|
|
@@ -1898,9 +1925,12 @@ onUnmounted(() => {
|
|
|
})
|
|
|
|
|
|
watch(channelId, async (newVal) => {
|
|
|
+
|
|
|
if (newVal) {
|
|
|
showTable()
|
|
|
let row = channelListOptions.value.find(item => item.code == newVal)
|
|
|
+ console.log(newVal, channelListOptions, 12);
|
|
|
+ console.log(row, 12);
|
|
|
isShowStep3(row)
|
|
|
}
|
|
|
});
|
