Commit c1db7246 authored by 汪晓凯's avatar 汪晓凯

筛选条件默认为空

parent e3549f1d
...@@ -598,8 +598,8 @@ ...@@ -598,8 +598,8 @@
total: 0, //记录总条数 total: 0, //记录总条数
list: [],//表格数据 list: [],//表格数据
isIndeterminate: true, isIndeterminate: true,
checkAll: true, checkAll: false,
checkedOptions: ['0', '1'], checkedOptions: [],
options: ["买入", "卖出"], options: ["买入", "卖出"],
/*充提记录参数*/ /*充提记录参数*/
transactionTime1: null,// 时间筛选 transactionTime1: null,// 时间筛选
...@@ -609,15 +609,15 @@ ...@@ -609,15 +609,15 @@
list1: [],//表格数据 list1: [],//表格数据
recordsCountList: [],//充提记录统计 recordsCountList: [],//充提记录统计
isIndeterminate2: true, isIndeterminate2: true,
checkAll2: true, checkAll2: false,
checkedOptions1: ['0', '1'], checkedOptions1: [],
options1: ["充币", "提币"], options1: ["充币", "提币"],
isIndeterminate3: true, isIndeterminate3: true,
checkAll3: false, checkAll3: false,
checkedStates1: ['0'], checkedStates1: ['0'],
states1: ["成功", "失败"], states1: ["成功", "失败"],
isIndeterminate4: true,//币种筛选 isIndeterminate4: true,//币种筛选
checkAll4: true, checkAll4: false,
checkedCoins: [], checkedCoins: [],
coins: [], coins: [],
Loading: false,//充提币后数据加载标志 Loading: false,//充提币后数据加载标志
...@@ -638,7 +638,7 @@ ...@@ -638,7 +638,7 @@
//页面初始化 //页面初始化
init() { init() {
this.robotDetailInfo = JSON.parse(sessionStorage.getItem('robotDetailInfo')); this.robotDetailInfo = JSON.parse(sessionStorage.getItem('robotDetailInfo'));
this.checkedCoins = this.coins = [this.robotDetailInfo.coin, this.robotDetailInfo.base]; this.coins = [this.robotDetailInfo.coin, this.robotDetailInfo.base];
this.getWalletInfo(); this.getWalletInfo();
this.getTransaction(); this.getTransaction();
this.getRecords(); this.getRecords();
...@@ -862,10 +862,9 @@ ...@@ -862,10 +862,9 @@
//查询充提记录 //查询充提记录
getRecords(params) { getRecords(params) {
this.recordsLoading = true; this.recordsLoading = true;
const Coin = this.checkedCoins.length !== 0 ? this.checkedCoins : this.coins;
const baseParams = { const baseParams = {
account: this.robotDetailInfo.account, account: this.robotDetailInfo.account,
coin: Coin, coin: this.checkedCoins,
page: "1", page: "1",
size: this.pageSize1 + '', size: this.pageSize1 + '',
opt: this.checkedOptions1, opt: this.checkedOptions1,
...@@ -1065,8 +1064,8 @@ ...@@ -1065,8 +1064,8 @@
this.total = 0; //记录总条数 this.total = 0; //记录总条数
this.list = [];//表格数据 this.list = [];//表格数据
this.isIndeterminate = true; this.isIndeterminate = true;
this.checkAll = true; this.checkAll = false;
this.checkedOptions = ['0', '1']; this.checkedOptions = [];
/*充提记录参数*/ /*充提记录参数*/
this.transactionTime1 = null;// 时间筛选 this.transactionTime1 = null;// 时间筛选
this.pageSize1 = 10; //表格每页的条数 this.pageSize1 = 10; //表格每页的条数
...@@ -1075,13 +1074,13 @@ ...@@ -1075,13 +1074,13 @@
this.list1 = [];//表格数据 this.list1 = [];//表格数据
this.recordsCountList = [];//充提记录统计 this.recordsCountList = [];//充提记录统计
this.isIndeterminate2 = true; this.isIndeterminate2 = true;
this.checkAll2 = true; this.checkAll2 = false;
this.checkedOptions1 = ['0', '1']; this.checkedOptions1 = [];
this.isIndeterminate3 = true; this.isIndeterminate3 = true;
this.checkAll3 = false; this.checkAll3 = false;
this.checkedStates1 = ['0']; this.checkedStates1 = ['0'];
this.isIndeterminate4 = true;//币种筛选 this.isIndeterminate4 = true;//币种筛选
this.checkAll4 = true; this.checkAll4 = false;
this.checkedCoins = []; this.checkedCoins = [];
this.coins = []; this.coins = [];
this.Loading = false;//充提币后数据加载标志 this.Loading = false;//充提币后数据加载标志
......
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
pageSize: 10, pageSize: 10,
transactionTime: '', //操作记录时间筛选 transactionTime: '', //操作记录时间筛选
isIndeterminate: true, isIndeterminate: true,
checkAll: true, checkAll: false,
checkedCoins: [], checkedCoins: [],
transactionLoading: false, //操作记录表格刷新标志 transactionLoading: false, //操作记录表格刷新标志
foldBar: true, foldBar: true,
...@@ -379,7 +379,7 @@ ...@@ -379,7 +379,7 @@
this.walletInfo.forEach(item => { this.walletInfo.forEach(item => {
this.coinList.push(item.coin); this.coinList.push(item.coin);
}) })
this.checkedCoins = this.coinList = [...new Set(this.coinList)]; this.coinList = [...new Set(this.coinList)];
this.getRecords('1', 'init'); this.getRecords('1', 'init');
this.getBankConfig(); this.getBankConfig();
}) })
......
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
Loading: false, Loading: false,
checkedWeb: '', checkedWeb: '',
webs: [], webs: [],
checkAll0: true, //币种筛选 checkAll0: false, //币种筛选
checkedCurrencies: [], checkedCurrencies: [],
currencies: [],//符合交易所条件的所有币种 currencies: [],//符合交易所条件的所有币种
isIndeterminate0: true, isIndeterminate0: true,
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
this.checkedWeb = this.webs[0]; this.checkedWeb = this.webs[0];
for (let item of JSON.parse(sessionStorage.getItem('platInfo'))) { for (let item of JSON.parse(sessionStorage.getItem('platInfo'))) {
if(item.platform === this.checkedWeb) { if(item.platform === this.checkedWeb) {
this.checkedCurrencies = this.currencies = item.coin; this.currencies = item.coin;
} }
} }
this.getRechargeList(); this.getRechargeList();
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
this.checkedWeb = val; this.checkedWeb = val;
for (let item of JSON.parse(sessionStorage.getItem('platInfo'))) { for (let item of JSON.parse(sessionStorage.getItem('platInfo'))) {
if(item.platform === this.checkedWeb) { if(item.platform === this.checkedWeb) {
this.checkedCurrencies = this.currencies = item.coin; this.currencies = item.coin;
} }
} }
this.getRechargeList(); this.getRechargeList();
......
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
<nav-left :platInfo="platInfo"></nav-left> <nav-left :platInfo="platInfo"></nav-left>
</div> </div>
<div class="main" ref="mainBox"> <div class="main" ref="mainBox">
<router-view :platInfo="platInfo"></router-view> <keep-alive>
<router-view :platInfo="platInfo"></router-view>
</keep-alive>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -161,18 +161,18 @@ ...@@ -161,18 +161,18 @@
robotList: [],//符合条件的机器人列表 robotList: [],//符合条件的机器人列表
robotDetailInfo: '', robotDetailInfo: '',
subtitle: '所有机器人', //副标题 subtitle: '所有机器人', //副标题
checkAll: true, //交易所筛选 checkAll: false, //交易所筛选
checkedWebs: [], checkedWebs: [],
webs: [], webs: [],
isIndeterminate: true, isIndeterminate: true,
foldExchange: true, foldExchange: true,
checkAll0: true, //币种筛选 checkAll0: false, //币种筛选
checkedCurrencies: [], checkedCurrencies: [],
allCurrencies: [],//所有币种 allCurrencies: [],//所有币种
currencies: [],//符合交易所条件的所有币种 currencies: [],//符合交易所条件的所有币种
isIndeterminate0: true, isIndeterminate0: true,
foldExchange0: true, foldExchange0: true,
checkAll1: true, //交易对筛选 checkAll1: false, //交易对筛选
checkedPairs: [], checkedPairs: [],
pairs: [], pairs: [],
isIndeterminate1: true, isIndeterminate1: true,
...@@ -193,23 +193,23 @@ ...@@ -193,23 +193,23 @@
ClickOutside ClickOutside
}, },
created() { created() {
this.checkedWebs = this.webs = this.webs.length === 0 && sessionStorage.getItem('webs') ? JSON.parse(sessionStorage.getItem('webs')) : this.webs; this.webs = this.webs.length === 0 && sessionStorage.getItem('webs') ? JSON.parse(sessionStorage.getItem('webs')) : this.webs;
this.checkedCurrencies = this.currencies = this.currencies.length === 0 && sessionStorage.getItem('currencies') ? JSON.parse(sessionStorage.getItem('currencies')) : this.currencies; this.currencies = this.currencies.length === 0 && sessionStorage.getItem('currencies') ? JSON.parse(sessionStorage.getItem('currencies')) : this.currencies;
this.init(); this.init();
Bus.$on('refresh', ()=>{ Bus.$on('refresh', ()=>{
this.robotAccount = this._robotAccount =''; this.robotAccount = this._robotAccount ='';
this.checkAll = true; this.checkAll = false;
this.isIndeterminate = true; this.isIndeterminate = true;
this.foldExchange = true; this.foldExchange = true;
this.checkAll0 = true; this.checkAll0 = false;
this.isIndeterminate0 = true; this.isIndeterminate0 = true;
this.foldExchange0 = true; this.foldExchange0 = true;
this.checkAll1 = true; this.checkAll1 = false;
this.isIndeterminate1 = true; this.isIndeterminate1 = true;
this.foldExchange1 = true; this.foldExchange1 = true;
this.checkedWebs = this.webs; this.checkedWebs = [];
this.checkedCurrencies = this.currencies; this.checkedCurrencies = [];
this.checkedPairs = this.pairs; this.checkedPairs = [];
this.robotStatus = '', //机器人状态 this.robotStatus = '', //机器人状态
this.subtitle = '所有机器人'; this.subtitle = '所有机器人';
this.init(); this.init();
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
var index = +RouteParam; var index = +RouteParam;
this.pairs = JSON.parse(sessionStorage.getItem('platInfo'))[index].symbol; this.pairs = JSON.parse(sessionStorage.getItem('platInfo'))[index].symbol;
if(type !== 'back') { if(type !== 'back') {
this.checkedPairs = this.pairs; this.checkedPairs = [];
} }
this.platform = JSON.parse(sessionStorage.getItem('platInfo'))[index].platform; this.platform = JSON.parse(sessionStorage.getItem('platInfo'))[index].platform;
StatusParams.platform = this.platform; StatusParams.platform = this.platform;
...@@ -321,8 +321,8 @@ ...@@ -321,8 +321,8 @@
this.isIndeterminate = false; this.isIndeterminate = false;
this.currencies = JSON.parse(sessionStorage.getItem('currencies')); this.currencies = JSON.parse(sessionStorage.getItem('currencies'));
// console.log(this.allCurrencies); // console.log(this.allCurrencies);
this.checkedCurrencies = this.currencies; this.checkedCurrencies = [];
this.checkAll0 = true; this.checkAll0 = false;
let ListParams = this.RobotListParams; let ListParams = this.RobotListParams;
ListParams.platform = []; ListParams.platform = [];
const RoutePath = this.$route.params.name; const RoutePath = this.$route.params.name;
...@@ -502,8 +502,6 @@ ...@@ -502,8 +502,6 @@
sessionStorage.setItem('webs', JSON.stringify(this.webs)); sessionStorage.setItem('webs', JSON.stringify(this.webs));
sessionStorage.setItem('currencies', JSON.stringify(this.currencies)); sessionStorage.setItem('currencies', JSON.stringify(this.currencies));
} }
this.checkedWebs = this.webs;
this.checkedCurrencies = this.allCurrencies;
} }
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment