|
@@ -70,7 +70,7 @@
|
|
|
WireTransferAccount.bankUname || '--'
|
|
WireTransferAccount.bankUname || '--'
|
|
|
}}</text></view>
|
|
}}</text></view>
|
|
|
<view class="row"><text class="label">{{ t('Custom.Deposit.bankName')
|
|
<view class="row"><text class="label">{{ t('Custom.Deposit.bankName')
|
|
|
- }}</text><text class="content">{{ WireTransferAccount.bankName
|
|
|
|
|
|
|
+ }}</text><text class="content">{{ WireTransferAccount.bankName
|
|
|
||
|
|
||
|
|
|
'--'
|
|
'--'
|
|
|
}}</text></view>
|
|
}}</text></view>
|
|
@@ -80,7 +80,7 @@
|
|
|
WireTransferAccount.bankCardNum || '--'
|
|
WireTransferAccount.bankCardNum || '--'
|
|
|
}}</text></view>
|
|
}}</text></view>
|
|
|
<view class="row"><text class="label">{{ t('Custom.Deposit.bankAddr')
|
|
<view class="row"><text class="label">{{ t('Custom.Deposit.bankAddr')
|
|
|
- }}</text><text class="content">{{ WireTransferAccount.bankAddr
|
|
|
|
|
|
|
+ }}</text><text class="content">{{ WireTransferAccount.bankAddr
|
|
|
||
|
|
||
|
|
|
'--'
|
|
'--'
|
|
|
}}</text></view>
|
|
}}</text></view>
|
|
@@ -90,7 +90,7 @@
|
|
|
WireTransferAccount.swiftCode || '--'
|
|
WireTransferAccount.swiftCode || '--'
|
|
|
}}</text></view>
|
|
}}</text></view>
|
|
|
<view class="row"><text class="label">{{ t('Custom.Deposit.bankCode')
|
|
<view class="row"><text class="label">{{ t('Custom.Deposit.bankCode')
|
|
|
- }}</text><text class="content">{{ WireTransferAccount.bankCode
|
|
|
|
|
|
|
+ }}</text><text class="content">{{ WireTransferAccount.bankCode
|
|
|
||
|
|
||
|
|
|
'--'
|
|
'--'
|
|
|
}}</text></view>
|
|
}}</text></view>
|
|
@@ -143,7 +143,7 @@
|
|
|
<view class="label-with-icon">
|
|
<view class="label-with-icon">
|
|
|
<text>{{ t('Custom.Deposit.EstimatedAmount') + '(' +
|
|
<text>{{ t('Custom.Deposit.EstimatedAmount') + '(' +
|
|
|
`${channelData.transformCurrency || channelData.currency}` + ')'
|
|
`${channelData.transformCurrency || channelData.currency}` + ')'
|
|
|
- }}</text>
|
|
|
|
|
|
|
+ }}</text>
|
|
|
<uni-tooltip placement="right">
|
|
<uni-tooltip placement="right">
|
|
|
<!-- <view class="help-icon">ⓘ</view> -->
|
|
<!-- <view class="help-icon">ⓘ</view> -->
|
|
|
<cwg-icon name="icon_about us" :size="16" />
|
|
<cwg-icon name="icon_about us" :size="16" />
|
|
@@ -201,16 +201,16 @@
|
|
|
<checkbox :checked="params.agree4"
|
|
<checkbox :checked="params.agree4"
|
|
|
@click="params.agree4 = !params.agree4" />
|
|
@click="params.agree4 = !params.agree4" />
|
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit1')
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit1')
|
|
|
- }}</text>
|
|
|
|
|
|
|
+ }}</text>
|
|
|
</label>
|
|
</label>
|
|
|
<view style="line-height: 1.5; font-size: 14px">
|
|
<view style="line-height: 1.5; font-size: 14px">
|
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit2')
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit2')
|
|
|
- }}</text>
|
|
|
|
|
|
|
+ }}</text>
|
|
|
<text class="clause crm-cursor" @click="dialogClauseNZ = true">{{
|
|
<text class="clause crm-cursor" @click="dialogClauseNZ = true">{{
|
|
|
t('news_add_field1.activitiesNZ.itemDeposit3')
|
|
t('news_add_field1.activitiesNZ.itemDeposit3')
|
|
|
- }}</text>
|
|
|
|
|
|
|
+ }}</text>
|
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit4')
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit4')
|
|
|
- }}</text>
|
|
|
|
|
|
|
+ }}</text>
|
|
|
</view>
|
|
</view>
|
|
|
</uni-forms-item>
|
|
</uni-forms-item>
|
|
|
|
|
|
|
@@ -223,15 +223,15 @@
|
|
|
<checkbox :checked="params.agree5"
|
|
<checkbox :checked="params.agree5"
|
|
|
@click="params.agree5 = !params.agree5" />
|
|
@click="params.agree5 = !params.agree5" />
|
|
|
<text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit1')
|
|
<text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit1')
|
|
|
- }}</text>
|
|
|
|
|
|
|
+ }}</text>
|
|
|
</label>
|
|
</label>
|
|
|
<view style="line-height: 1.5; font-size: 14px">
|
|
<view style="line-height: 1.5; font-size: 14px">
|
|
|
<text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit2')
|
|
<text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit2')
|
|
|
- }}</text>
|
|
|
|
|
|
|
+ }}</text>
|
|
|
<text class="clause crm-cursor" @click="dialogClauseNZTwo = true">{{
|
|
<text class="clause crm-cursor" @click="dialogClauseNZTwo = true">{{
|
|
|
t('news_add_field1.activitiesNZTwo.itemDeposit3') }}</text>
|
|
t('news_add_field1.activitiesNZTwo.itemDeposit3') }}</text>
|
|
|
<text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit4')
|
|
<text>{{ t('news_add_field1.activitiesNZTwo.itemDeposit4')
|
|
|
- }}</text>
|
|
|
|
|
|
|
+ }}</text>
|
|
|
</view>
|
|
</view>
|
|
|
</uni-forms-item>
|
|
</uni-forms-item>
|
|
|
|
|
|
|
@@ -314,7 +314,7 @@
|
|
|
|
|
|
|
|
<button class="btn btn-dark waves-effect waves-light" @click="submitConfirm">{{
|
|
<button class="btn btn-dark waves-effect waves-light" @click="submitConfirm">{{
|
|
|
t('Btn.Submit')
|
|
t('Btn.Submit')
|
|
|
- }}</button>
|
|
|
|
|
|
|
+ }}</button>
|
|
|
|
|
|
|
|
</view>
|
|
</view>
|
|
|
|
|
|
|
@@ -407,6 +407,7 @@ import CwgCheckConfirmPopup from './components/DepositCheckConfirmPopup.vue'
|
|
|
import VietnamNoticePopup from './components/VietnamNoticePopup.vue'
|
|
import VietnamNoticePopup from './components/VietnamNoticePopup.vue'
|
|
|
import NewYear24Popup from './components/NewYear24Popup.vue'
|
|
import NewYear24Popup from './components/NewYear24Popup.vue'
|
|
|
import DigitalPayConfirmPopup from './components/digitalPayConfirmPopup.vue'
|
|
import DigitalPayConfirmPopup from './components/digitalPayConfirmPopup.vue'
|
|
|
|
|
+import { openExternalUrl } from '@/utils/openExternalUrl'
|
|
|
// 假设原有导入路径保持不变
|
|
// 假设原有导入路径保持不变
|
|
|
import tool from "@/global/tool"
|
|
import tool from "@/global/tool"
|
|
|
import { userToken } from '@/composables/config'
|
|
import { userToken } from '@/composables/config'
|
|
@@ -1172,6 +1173,8 @@ const confirmDigitalPayModal = (e) => {
|
|
|
dialogDigitalPayConfirm.value = false;
|
|
dialogDigitalPayConfirm.value = false;
|
|
|
imageUrl.value = e.voucherUrl || e.image || '';
|
|
imageUrl.value = e.voucherUrl || e.image || '';
|
|
|
hashCode.value = e.hashCode || '';
|
|
hashCode.value = e.hashCode || '';
|
|
|
|
|
+ console.log(e, 2222);
|
|
|
|
|
+
|
|
|
openDontActive();
|
|
openDontActive();
|
|
|
}
|
|
}
|
|
|
// 关闭数字支付确认弹窗
|
|
// 关闭数字支付确认弹窗
|
|
@@ -1248,6 +1251,7 @@ const submit = async () => {
|
|
|
phone: channelData.confirmPhone ? dialogCheckConfirm_form.confirmPhone : null,
|
|
phone: channelData.confirmPhone ? dialogCheckConfirm_form.confirmPhone : null,
|
|
|
ip: uni.getStorageSync("CLIENT")
|
|
ip: uni.getStorageSync("CLIENT")
|
|
|
})
|
|
})
|
|
|
|
|
+ console.log(res, 121212);
|
|
|
dialogCheckWait.value = false
|
|
dialogCheckWait.value = false
|
|
|
if (res.code == Code.StatusOK) {
|
|
if (res.code == Code.StatusOK) {
|
|
|
imageUrl1.value = ""
|
|
imageUrl1.value = ""
|
|
@@ -1276,6 +1280,7 @@ const submit = async () => {
|
|
|
promoCode: params.promoCode,
|
|
promoCode: params.promoCode,
|
|
|
ip: uni.getStorageSync("CLIENT")
|
|
ip: uni.getStorageSync("CLIENT")
|
|
|
})
|
|
})
|
|
|
|
|
+ console.log(res, 121212);
|
|
|
dialogCheckWait.value = false
|
|
dialogCheckWait.value = false
|
|
|
if (res.code == Code.StatusOK) {
|
|
if (res.code == Code.StatusOK) {
|
|
|
dialogCheckOK.value = true
|
|
dialogCheckOK.value = true
|
|
@@ -1308,18 +1313,20 @@ const submit = async () => {
|
|
|
...form
|
|
...form
|
|
|
})
|
|
})
|
|
|
dialogCheckWait.value = false
|
|
dialogCheckWait.value = false
|
|
|
|
|
+ console.log(res, 121212);
|
|
|
|
|
+
|
|
|
if (res.code == Code.StatusOK) {
|
|
if (res.code == Code.StatusOK) {
|
|
|
if (res.data && (res.data.type == 3 || res.data.type == 4 || res.data.type == 6 || res.data.type == 7)) {
|
|
if (res.data && (res.data.type == 3 || res.data.type == 4 || res.data.type == 6 || res.data.type == 7)) {
|
|
|
dealResult(res.data)
|
|
dealResult(res.data)
|
|
|
} else {
|
|
} else {
|
|
|
if (res.data.type == 1) {
|
|
if (res.data.type == 1) {
|
|
|
goPayLink.value = res.data.result
|
|
goPayLink.value = res.data.result
|
|
|
- window.open(res.data.result)
|
|
|
|
|
|
|
+ openExternalUrl(res.data.result)
|
|
|
} else if (res.data.type == 2) {
|
|
} else if (res.data.type == 2) {
|
|
|
let token = userToken.value
|
|
let token = userToken.value
|
|
|
token = tool.tokenReplace(token)
|
|
token = tool.tokenReplace(token)
|
|
|
goPayLink.value = `${Host04}/finance/deposit/get?serial=${res.data.result}&Access-Token=${token}`
|
|
goPayLink.value = `${Host04}/finance/deposit/get?serial=${res.data.result}&Access-Token=${token}`
|
|
|
- window.open(goPayLink.value)
|
|
|
|
|
|
|
+ openExternalUrl(goPayLink.value)
|
|
|
} else if (res.data.type == 5) {
|
|
} else if (res.data.type == 5) {
|
|
|
$pigeon.MessageConfirm(
|
|
$pigeon.MessageConfirm(
|
|
|
t("PersonalManagement.Label.item2"),
|
|
t("PersonalManagement.Label.item2"),
|
|
@@ -1331,18 +1338,18 @@ const submit = async () => {
|
|
|
goPayLink.value = res.data.result
|
|
goPayLink.value = res.data.result
|
|
|
dialogCheck.value = true
|
|
dialogCheck.value = true
|
|
|
dialogVisible.value = true
|
|
dialogVisible.value = true
|
|
|
- window.open(res.data.result)
|
|
|
|
|
|
|
+ openExternalUrl(res.data.result)
|
|
|
}
|
|
}
|
|
|
)
|
|
)
|
|
|
} else if (res.data.type == 8) {
|
|
} else if (res.data.type == 8) {
|
|
|
goPayLink.value = Host04 + res.data.result
|
|
goPayLink.value = Host04 + res.data.result
|
|
|
- window.open(goPayLink.value)
|
|
|
|
|
|
|
+ openExternalUrl(goPayLink.value)
|
|
|
} else if (res.data.type == 9) {
|
|
} else if (res.data.type == 9) {
|
|
|
goPayLink.value = setCardUrl(res.data.result)
|
|
goPayLink.value = setCardUrl(res.data.result)
|
|
|
- window.open(goPayLink.value)
|
|
|
|
|
|
|
+ openExternalUrl(goPayLink.value)
|
|
|
} else if (res.data.type == 10) {
|
|
} else if (res.data.type == 10) {
|
|
|
goPayLink.value = Host80 + '/pay/onchainpay.html?params=' + res.data.result
|
|
goPayLink.value = Host80 + '/pay/onchainpay.html?params=' + res.data.result
|
|
|
- window.open(goPayLink.value)
|
|
|
|
|
|
|
+ openExternalUrl(goPayLink.value)
|
|
|
}
|
|
}
|
|
|
if (res.data.type != 5) {
|
|
if (res.data.type != 5) {
|
|
|
dialogCheck.value = true
|
|
dialogCheck.value = true
|
|
@@ -1358,6 +1365,7 @@ const submit = async () => {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} catch (error) {
|
|
} catch (error) {
|
|
|
|
|
+ console.log(error, 12);
|
|
|
dialogCheckWait.value = false
|
|
dialogCheckWait.value = false
|
|
|
flag.value = false
|
|
flag.value = false
|
|
|
dialogCheckOK.value = true
|
|
dialogCheckOK.value = true
|
|
@@ -1418,12 +1426,12 @@ const submitDealResult = async () => {
|
|
|
} else {
|
|
} else {
|
|
|
if (res.data.type == 1) {
|
|
if (res.data.type == 1) {
|
|
|
goPayLink.value = res.data.result
|
|
goPayLink.value = res.data.result
|
|
|
- window.open(res.data.result)
|
|
|
|
|
|
|
+ openExternalUrl(res.data.result)
|
|
|
} else if (res.data.type == 2) {
|
|
} else if (res.data.type == 2) {
|
|
|
let token = userToken.value
|
|
let token = userToken.value
|
|
|
token = tool.tokenReplace(token)
|
|
token = tool.tokenReplace(token)
|
|
|
goPayLink.value = `${Host04}/finance/deposit/get?serial=${res.data.result}&Access-Token=${token}`
|
|
goPayLink.value = `${Host04}/finance/deposit/get?serial=${res.data.result}&Access-Token=${token}`
|
|
|
- window.open(goPayLink.value)
|
|
|
|
|
|
|
+ openExternalUrl(goPayLink.value)
|
|
|
} else if (res.data.type == 5) {
|
|
} else if (res.data.type == 5) {
|
|
|
$pigeon.MessageConfirm(
|
|
$pigeon.MessageConfirm(
|
|
|
t("PersonalManagement.Label.item2"),
|
|
t("PersonalManagement.Label.item2"),
|
|
@@ -1435,12 +1443,12 @@ const submitDealResult = async () => {
|
|
|
goPayLink.value = res.data.result
|
|
goPayLink.value = res.data.result
|
|
|
dialogCheck.value = true
|
|
dialogCheck.value = true
|
|
|
dialogVisible.value = true
|
|
dialogVisible.value = true
|
|
|
- window.open(res.data.result)
|
|
|
|
|
|
|
+ openExternalUrl(res.data.result)
|
|
|
}
|
|
}
|
|
|
)
|
|
)
|
|
|
} else if (res.data.type == 8) {
|
|
} else if (res.data.type == 8) {
|
|
|
goPayLink.value = Host04 + res.data.result
|
|
goPayLink.value = Host04 + res.data.result
|
|
|
- window.open(goPayLink.value)
|
|
|
|
|
|
|
+ openExternalUrl(goPayLink.value)
|
|
|
} else if (res.data.type == 9) {
|
|
} else if (res.data.type == 9) {
|
|
|
dialogCheckOK.value = true
|
|
dialogCheckOK.value = true
|
|
|
dialogVisible.value = true
|
|
dialogVisible.value = true
|