diff --git a/src/views/configManage/walletConfig/txgs.vue b/src/views/configManage/walletConfig/txgs.vue index c94787b..eefe5a6 100644 --- a/src/views/configManage/walletConfig/txgs.vue +++ b/src/views/configManage/walletConfig/txgs.vue @@ -48,11 +48,12 @@ :formatter="stateFormat" prop="upperBound" :label="`${'个税上界'}(${getUser.currency.symbol})`" + min-width="140" /> - + @@ -277,9 +278,11 @@ export default { } }, created() { - this.getWithdrawalList() - this.userCountryList() - this.getcellTypeList() + // this.userCountryList() + // this.getcellTypeList() + this.initEnum().finally(() => { + this.getWithdrawalList() + }) }, methods: { stateFormat, @@ -289,6 +292,24 @@ export default { this.cellTypeList = res.data }) }, + initEnum() { + return new Promise((resolve, reject) => { + Promise.allSettled([ + this.userCountryList(), + this.getcellTypeList() + ]).then(([countryList, cellTypeList]) => { + if (countryList.status === 'fulfilled') { + this.countryList = countryList.value.data + } + if (cellTypeList.status === 'fulfilled') { + this.cellTypeList = cellTypeList.value.data + } + resolve() + }).catch((err) => { + reject(err) + }) + }) + }, addList() { this.form.withdrawalTaxDetailsList.push({ lowerBound: '', diff --git a/src/views/configManage/walletConfig/txpz.vue b/src/views/configManage/walletConfig/txpz.vue index 3d5a126..a9248e1 100644 --- a/src/views/configManage/walletConfig/txpz.vue +++ b/src/views/configManage/walletConfig/txpz.vue @@ -438,9 +438,9 @@ export default { ...mapGetters(['getUser']) }, mounted() { - this.getOthers() - // 获取列表 - this.getDataList() + this.getOthers().finally(() => { + this.getDataList() + }) }, methods: { stateFormat, @@ -499,10 +499,6 @@ export default { this.dialogVisible = true }, getOthers() { - // 获取国家 - userCountryList().then((res) => { - this.countryList = res.data - }) // 币种下拉选 getPubEnumsAccount().then((res) => { this.pubEnumsAccountList = res.rows @@ -511,9 +507,21 @@ export default { api.pkBdAccountList().then((res) => { this.pkAccountList = res.rows }) - // 提现周期 - api.getCycle().then((res) => { - this.cycleList = res.data + return new Promise((resolve, reject) => { + Promise.allSettled([ + userCountryList(), + api.getCycle() + ]).then(([countryList, cycleList]) => { + if (countryList.status === 'fulfilled') { + this.countryList = countryList.value.data + } + if (cycleList.status === 'fulfilled') { + this.cycleList = cycleList.value.data + } + resolve() + }).catch((err) => { + reject(err) + }) }) }, getDataList() { diff --git a/src/views/configManage/walletConfig/txsxf.vue b/src/views/configManage/walletConfig/txsxf.vue index 1cf1aa3..703d991 100644 --- a/src/views/configManage/walletConfig/txsxf.vue +++ b/src/views/configManage/walletConfig/txsxf.vue @@ -3,9 +3,9 @@
+ />
@@ -17,48 +17,53 @@
- + - + + - + /> - + /> - + /> -