diff --git a/common/config.js b/common/config.js index d614bd8..73a8e9c 100644 --- a/common/config.js +++ b/common/config.js @@ -1,10 +1,10 @@ -const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; // -const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名 -const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 +// const ROOTPATH1 = "https://dj-api.hnsiyao.cn/sqx_fast/"; // +// const ROOTPATH = "https://dj-api.hnsiyao.cn/sqx_fast/"; //后台服务域名 +// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名 -// const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // -// const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 -// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 +const ROOTPATH1 = "https://video.hnsiyao.cn/sqx_fast/"; // +const ROOTPATH = "https://video.hnsiyao.cn/sqx_fast/"; //后台服务域名 +const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名 module.exports = { APIHOST: ROOTPATH, diff --git a/me/invite/cashDetail.vue b/me/invite/cashDetail.vue index f5c9ebd..b158804 100644 --- a/me/invite/cashDetail.vue +++ b/me/invite/cashDetail.vue @@ -178,6 +178,9 @@ let data = { amount: that.money } + uni.showLoading({ + title: '提现中' + }); this.$u.api.withdraw(data).then(res => { if (res.code == 0) { uni.showToast({ diff --git a/me/invite/cashList.vue b/me/invite/cashList.vue index e71e6f6..64c622f 100644 --- a/me/invite/cashList.vue +++ b/me/invite/cashList.vue @@ -41,7 +41,8 @@ return { list: [], page: 1, - limit: 10 + limit: 10, + totalCount: 0, } }, onLoad: function(e) { @@ -56,30 +57,24 @@ if (token) { //可以提现金额查询预估收入查询 let data = { - page: that.page, - limit: that.limit + page: this.page, + limit: this.limit } this.$Request.getT('app/cash/selectPayDetails', data).then(res => { - if (that.page == 1) { - that.list = res.data.list - uni.stopPullDownRefresh(); - return + this.totalCount = res.data.totalCount; + if ( res.data.list.length > 0) { + this.list = [...this.list,...res.data.list]; } - that.list = res.data.list; }) - // this.$Request.getT("/cash/selectCashOutList/" + userId).then(res => { - // if (res.status === 0 && res.data) { - // that.list = res.data; - // } - // uni.hideLoading(); - // }); } }, }, onReachBottom: function() { - this.page = this.page + 1; - this.getMoney(); + if (this.page*this.limit < this.totalCount) { + this.page = this.page + 1; + this.getMoney(); + } }, onPullDownRefresh: function() { this.page = 1; diff --git a/me/invite/moneyList.vue b/me/invite/moneyList.vue index c85a2c1..92d5d5b 100644 --- a/me/invite/moneyList.vue +++ b/me/invite/moneyList.vue @@ -34,7 +34,8 @@ return { list: [], page: 1, - limit: 10 + limit: 10, + totalCount: 0 } }, onLoad: function(e) { @@ -53,12 +54,10 @@ } this.$Request.getT('app/moneyDetails/queryUserMoneyDetails', data).then(res => { - if(that.page == 1) { - that.list = res.data.records - uni.stopPullDownRefresh(); - return + this.totalCount = res.data.total; + if ( res.data.records.length > 0) { + this.list = [...this.list,...res.data.records]; } - that.list = [...that.list, ...res.data.records] }) } @@ -66,8 +65,10 @@ }, }, onReachBottom: function() { - this.page = this.page + 1; - this.getMoney(); + if (this.page*this.limit < this.totalCount) { + this.page = this.page + 1; + this.getMoney(); + } }, onPullDownRefresh: function() { this.page = 1;