diff --git a/components/smarttrading/item.vue b/components/smarttrading/item.vue index 0799155..e95c560 100644 --- a/components/smarttrading/item.vue +++ b/components/smarttrading/item.vue @@ -35,7 +35,7 @@ 購買時間 : - {{$moment(Number(detail.createTimes||detail.createTimestamp)).format('YYYY-MM-DD HH:mm:ss')}} + {{$moment(Number(detail.purchaseTime)).format('YYYY-MM-DD HH:mm:ss')}} { + }).then((res) => { + uni.hideLoading() let toast = { type: "success", position: 'bottom', @@ -223,8 +224,6 @@ ...toast, complete: () => { uni.$emit('updateView', {}) - uni.hideLoading() - this.loading = false uni.navigateBack() } }); diff --git a/pages/smarttrading/incomes.vue b/pages/smarttrading/incomes.vue index 4844078..78a6626 100644 --- a/pages/smarttrading/incomes.vue +++ b/pages/smarttrading/incomes.vue @@ -53,8 +53,8 @@ coins: ['USDT','BNB', 'ETH', 'BTC'], scrollHeight: 0, search: { - size: 10, - listrow: 1, + page: 1, + listrow: 10, totalPage: 0, }, optionsType: ['CALL', 'PUT'], @@ -97,6 +97,7 @@ }) this.loading = true let search = { + 'type':this.coins[this.coinIndex], ...this.search } delete search.totalPage @@ -113,7 +114,7 @@ this.incomes = this.incomes.concat(res.data.data) } this.list = this.incomes.map(item => { - return item.info + return {...item.info,'money':item.money} }) this.search.totalPage = Math.ceil(res.data.total / this.search.page) uni.hideLoading() diff --git a/request/api.js b/request/api.js index e650565..ebc12db 100644 --- a/request/api.js +++ b/request/api.js @@ -340,7 +340,7 @@ export function _getaccountorder(data){ export function _myIncome(data){ return jyRequest.get({ - url:`/api/quantify/getlist` // 获取收益列表 + url:`/api/quantify/getlist?${data}` // 获取收益列表 }) }