From 3248274998eddb5c74ad90a06c711caaf2e5cebc Mon Sep 17 00:00:00 2001 From: zpc Date: Wed, 28 Jan 2026 15:37:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E9=A1=B5=E9=9D=A2=E6=94=B6=E5=85=A5/?= =?UTF-8?q?=E6=94=AF=E5=87=BA=E5=88=87=E6=8D=A2=E4=B8=8D=E7=94=9F=E6=95=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20-=20user.js:=20getProfitMoney/get?= =?UTF-8?q?ProfitIntegral/getProfitScore=20=E5=A2=9E=E5=8A=A0=20type=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=20-=20yetx.vue/bi=5Fjl.vue/jf=5Fjl.vue:=20lo?= =?UTF-8?q?adData=20=E4=BC=A0=E9=80=92=20this.show=20=E4=BD=9C=E4=B8=BA=20?= =?UTF-8?q?type=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- honey_box/common/server/user.js | 18 ++++++++++++------ honey_box/pages/user/bi_jl.vue | 2 +- honey_box/pages/user/jf_jl.vue | 2 +- honey_box/pages/user/yetx.vue | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) 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);