diff --git a/config/request.js b/config/request.js index 1f704ab..0cf3490 100644 --- a/config/request.js +++ b/config/request.js @@ -20,7 +20,7 @@ module.exports = vm => { //#ifdef DEV_SERVER console.log('DEV_SERVER') - config.baseURL = 'http://192.168.0.102:8080' + config.baseURL = 'http://t-app.beida777.com/prod-api' //#endif //#ifdef QA_SERVER diff --git a/pages/bonus/index.vue b/pages/bonus/index.vue index 3259398..5edfad0 100644 --- a/pages/bonus/index.vue +++ b/pages/bonus/index.vue @@ -27,7 +27,7 @@ - + 暂无数据 @@ -110,10 +110,6 @@ export default { bonusList: [], loading: false, hasMore: true, - page: { - pageNum: 1, - pageSize: 10, - }, BONUS_FIELD_MAP: { retailRangeIncome: '直推收益', retailSameLevelIncome: '平级收益', @@ -160,9 +156,18 @@ export default { }) return } - this.page.pageNum = 1 + // 校验区间不能超过31天 + const start = dayjs(this.startDate) + const end = dayjs(this.endDate) + console.log(end.diff(start, 'day'), '...a?') + if (end.diff(start, 'day') > 30) { + uni.showToast({ + title: '最多只能查询31天内的数据', + icon: 'none', + }) + return + } this.bonusList = [] - this.hasMore = true this.fetchBonusData() }, onStartDateConfirm(e) { @@ -175,13 +180,6 @@ export default { this.endDateValue = e.value this.showEndDatePicker = false }, - loadMore() { - if (this.loading || !this.hasMore) { - return - } - this.page.pageNum++ - this.fetchBonusData() - }, getBonusTotal() { queryBonusTotal().then(res => { this.realIncomeTotal = res.rows[0]?.realIncomeTotal || '0.00' @@ -195,15 +193,10 @@ export default { const params = { startDate: this.startDate, endDate: this.endDate, - pageNum: this.page.pageNum, - pageSize: this.page.pageSize, } const res = await queryBonusList(params) console.log(res) - if (res.rows.length < this.page.pageSize) { - this.hasMore = false - } - this.bonusList = [...this.bonusList, ...res.rows] + this.bonusList = res.rows || [] } catch (error) { console.error('Failed to fetch bonus data:', error) uni.showToast({ title: '数据加载失败', icon: 'none' }) diff --git a/pages/mine/index.vue b/pages/mine/index.vue index fd57620..b460b1e 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -426,7 +426,7 @@ - + @@ -648,11 +648,18 @@ export default { methods: { getRegionSelect() { - getRegionSelect().then(res => { - if (res.code == 200) { - this.regionInfo = res.data - } + uni.showLoading({ + title: '加载中...', }) + getRegionSelect() + .then(res => { + if (res.code == 200) { + this.regionInfo = res.data + } + }) + .finally(() => { + uni.hideLoading() + }) }, openRegionSelect() { uni.showLoading({