|
|
@@ -7,7 +7,7 @@
|
|
|
<view class="b-card">
|
|
|
<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>
|
|
|
@@ -18,16 +18,16 @@
|
|
|
<view class="b-card">
|
|
|
<view class="card-top">
|
|
|
<text class="tit"><text class="iconfont icon-caret-right"></text>{{ t('Custom.Deposit.Title2')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
<cwg-asset-tabs v-if="tabsConfig.length > 0" v-model="activeTab" :tabs="tabsConfig" />
|
|
|
<uni-loading v-if="currentTableData.length == 0" />
|
|
|
<view v-if="currentTableData.length">
|
|
|
<PaymentMethodsList :list="currentTableData" @select="isShowStep3" />
|
|
|
</view>
|
|
|
- <view v-if="step3" class="reselect-btn">
|
|
|
+ <!-- <view v-if="step3" class="reselect-btn">
|
|
|
<button class="s-btn reselect" type="primary" @click="showTable">{{
|
|
|
t('Custom.Deposit.Reselect') }}</button>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -47,7 +47,7 @@
|
|
|
</view>
|
|
|
<view class="btn-bottom">
|
|
|
<text class="btn crm-cursor" @click="isStep3Open()">{{ t('Btn.Confirm')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
</view>
|
|
|
|
|
|
</view>
|
|
|
@@ -85,7 +85,7 @@
|
|
|
<uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
<text class="tit"><text class="iconfont icon-caret-right"></text>{{
|
|
|
t('news_add_field.Label.Title4')
|
|
|
- }}</text>
|
|
|
+ }}</text>
|
|
|
</uni-col>
|
|
|
<uni-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
<uni-forms-item>
|
|
|
@@ -117,7 +117,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>
|
|
|
<view class="row"><text class="label SpecialColor">{{
|
|
|
@@ -126,7 +126,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>
|
|
|
<view class="row"><text class="label SpecialColor">{{
|
|
|
@@ -135,7 +135,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>
|
|
|
<view class="row"><text class="label SpecialColor">{{
|
|
|
@@ -162,7 +162,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>
|
|
|
@@ -264,7 +264,7 @@
|
|
|
<text>{{ t('news_add_field1.activitiesNZ.itemDeposit2') }}</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>
|
|
|
</view>
|
|
|
</uni-forms-item>
|
|
|
@@ -446,6 +446,7 @@ import VietnamNoticePopup from './components/VietnamNoticePopup.vue'
|
|
|
import NewYear24Popup from './components/NewYear24Popup.vue'
|
|
|
// 假设原有导入路径保持不变
|
|
|
import tool from "@/global/tool"
|
|
|
+import { object } from 'uview-plus/libs/function/test'
|
|
|
// import { createUploadRequest } from "@/lib/upload"
|
|
|
// 常量
|
|
|
const countries = [
|
|
|
@@ -547,6 +548,13 @@ const tableData = reactive({
|
|
|
Electronic_Wallet: [],
|
|
|
Ucard_Wallet: []
|
|
|
})
|
|
|
+const tableData1 = reactive({
|
|
|
+ International_Transfer: [],
|
|
|
+ China_UnionPay: [],
|
|
|
+ Digital_Currency: [],
|
|
|
+ Electronic_Wallet: [],
|
|
|
+ Ucard_Wallet: []
|
|
|
+})
|
|
|
//通道table-选择前后
|
|
|
const activeTab = ref(1)
|
|
|
// 🔥 自动过滤掉空数据的 tab
|
|
|
@@ -560,8 +568,8 @@ const tabsConfig = computed(() => {
|
|
|
]
|
|
|
// ✅ 只保留有数据的 tab
|
|
|
return allTabs.filter(tab => {
|
|
|
- console.log(tableData[tab.type], tab.type);
|
|
|
- return tableData[tab.type]?.length > 0
|
|
|
+ console.log(tableData1[tab.type], tab.type);
|
|
|
+ return tableData1[tab.type]?.length > 0
|
|
|
})
|
|
|
})
|
|
|
// 当前选中的 tab 项
|
|
|
@@ -582,6 +590,13 @@ watch(
|
|
|
},
|
|
|
{ immediate: true }
|
|
|
)
|
|
|
+watch(
|
|
|
+ currentTab,
|
|
|
+ (newTabs) => {
|
|
|
+ showTable()
|
|
|
+ },
|
|
|
+ { immediate: true }
|
|
|
+)
|
|
|
const bankDate = ref([])
|
|
|
const channelData = reactive({})
|
|
|
const WireTransferAccount = reactive({})
|
|
|
@@ -1599,7 +1614,7 @@ const showTable = () => {
|
|
|
WireTransferAccount.bankMsg = ""
|
|
|
introduce.introduce = ""
|
|
|
introduce.enIntroduce = ""
|
|
|
- getDepositList()
|
|
|
+ Object.assign(tableData, tableData1)
|
|
|
}
|
|
|
const loginComboxOptions = computed(() => {
|
|
|
return loginOptions.value.map((item) => ({
|
|
|
@@ -1652,14 +1667,12 @@ const getDepositList = async () => {
|
|
|
let res = await financialApi.RemittanceChannelList({})
|
|
|
if (res.code == Code.StatusOK) {
|
|
|
res.data.forEach(item => {
|
|
|
- if (item.type == 1) tableData.International_Transfer.push(item)
|
|
|
- if (item.type == 2) tableData.China_UnionPay.push(item)
|
|
|
- if (item.type == 3) tableData.Digital_Currency.push(item)
|
|
|
- if (item.type == 4) tableData.Electronic_Wallet.push(item)
|
|
|
- if (item.type == 5) tableData.Ucard_Wallet.push(item)
|
|
|
+ if (item.type == 1) tableData.International_Transfer.push(item), tableData1.International_Transfer.push(item)
|
|
|
+ if (item.type == 2) tableData.China_UnionPay.push(item), tableData1.China_UnionPay.push(item)
|
|
|
+ if (item.type == 3) tableData.Digital_Currency.push(item), tableData1.Digital_Currency.push(item)
|
|
|
+ if (item.type == 4) tableData.Electronic_Wallet.push(item), tableData1.Electronic_Wallet.push(item)
|
|
|
+ if (item.type == 5) tableData.Ucard_Wallet.push(item), tableData1.Ucard_Wallet.push(item)
|
|
|
})
|
|
|
- console.log(tableData, res.data, 222222);
|
|
|
-
|
|
|
pictLoading.value = false
|
|
|
} else {
|
|
|
$pigeon.MessageError(res.msg)
|
|
|
@@ -1847,7 +1860,7 @@ watch(isStep3, async (newVal) => {
|
|
|
watch(loginValue, (login) => {
|
|
|
if (login) {
|
|
|
step2.value = true
|
|
|
- showTable()
|
|
|
+ getDepositList()
|
|
|
get23nianzhongTwoLogin(login)
|
|
|
getActivityExtensionGiveLogin(login)
|
|
|
getActivityExtensionGiveLoginJoin(login)
|
|
|
@@ -2053,7 +2066,7 @@ watch(() => params.agree6, (newVal) => {
|
|
|
.s-btn[type="primary"] {
|
|
|
width: 100%;
|
|
|
height: px2rpx(48);
|
|
|
- background: var(--color-navy-900);
|
|
|
+ background-color: #cf1322;
|
|
|
color: #fff;
|
|
|
border-radius: px2rpx(12);
|
|
|
font-size: px2rpx(16);
|
|
|
@@ -2392,7 +2405,7 @@ watch(() => params.agree6, (newVal) => {
|
|
|
border: none;
|
|
|
|
|
|
&[type="primary"] {
|
|
|
- background: var(--color-navy-900);
|
|
|
+ background-color: #cf1322;
|
|
|
color: #fff;
|
|
|
}
|
|
|
|
ljc