diff --git a/honey_box/common/server/user.js b/honey_box/common/server/user.js index f1235743..cec48f76 100644 --- a/honey_box/common/server/user.js +++ b/honey_box/common/server/user.js @@ -51,12 +51,14 @@ export const getVipList = async () => { * 获取余额流水记录 * @param {Number} page 页码 * @param {Number} pageSize 每页数量 + * @param {Number} type 类型 0-全部 1-收入 2-支出 * @returns {Promise} 流水记录 */ -export const getProfitMoney = async (page = 1, pageSize = 10) => { +export const getProfitMoney = async (page = 1, pageSize = 10, type = 0) => { return await RequestManager.get('/profitMoney', { page, - pageSize + pageSize, + type }, true); }; @@ -64,12 +66,14 @@ export const getProfitMoney = async (page = 1, pageSize = 10) => { * 获取积分流水记录 * @param {Number} page 页码 * @param {Number} pageSize 每页数量 + * @param {Number} type 类型 0-全部 1-收入 2-支出 * @returns {Promise} 流水记录 */ -export const getProfitIntegral = async (page = 1, pageSize = 10) => { +export const getProfitIntegral = async (page = 1, pageSize = 10, type = 0) => { return await RequestManager.get('/profitIntegral', { page, - pageSize + pageSize, + type }, true); }; @@ -77,12 +81,14 @@ export const getProfitIntegral = async (page = 1, pageSize = 10) => { * 获取欧气值流水记录 * @param {Number} page 页码 * @param {Number} pageSize 每页数量 + * @param {Number} type 类型 0-全部 1-收入 2-支出 * @returns {Promise} 流水记录 */ -export const getProfitScore = async (page = 1, pageSize = 10) => { +export const getProfitScore = async (page = 1, pageSize = 10, type = 0) => { return await RequestManager.get('/profitScore', { page, - pageSize + pageSize, + type }, true); }; diff --git a/honey_box/pages/user/bi_jl.vue b/honey_box/pages/user/bi_jl.vue index 8676e2f9..a56b24c4 100644 --- a/honey_box/pages/user/bi_jl.vue +++ b/honey_box/pages/user/bi_jl.vue @@ -79,7 +79,7 @@ }, async loadData(pageNo) { // 模拟接口 - const res = await getProfitIntegral(pageNo, 10); + const res = await getProfitIntegral(pageNo, 10, this.show); this.mescroll.endByPage(res.data.list.length, res.data.last_page); if (pageNo == 1) { this.aixuanArr = res.data.list; diff --git a/honey_box/pages/user/jf_jl.vue b/honey_box/pages/user/jf_jl.vue index 6ffed10a..a0785ff0 100644 --- a/honey_box/pages/user/jf_jl.vue +++ b/honey_box/pages/user/jf_jl.vue @@ -99,7 +99,7 @@ }, async loadData(pageNo) { // 模拟接口 - const res = await getProfitScore(pageNo, 10); + const res = await getProfitScore(pageNo, 10, this.show); this.mescroll.endByPage(res.data.list.length, res.data.last_page) if (pageNo == 1) { this.aixuanArr = res.data.list diff --git a/honey_box/pages/user/yetx.vue b/honey_box/pages/user/yetx.vue index 6f687364..0e17b309 100644 --- a/honey_box/pages/user/yetx.vue +++ b/honey_box/pages/user/yetx.vue @@ -109,7 +109,7 @@ export default { }, async loadData(pageNo) { // 模拟接口 - const res = await getProfitMoney(pageNo, 10); + const res = await getProfitMoney(pageNo, 10, this.show); // 兼容新旧接口:新接口返回 list,旧接口返回 data const list = res.data.list ; this.mescroll.endByPage(list.length, res.data.last_page);