diff --git a/app.json b/app.json index f1af796..3e60775 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,7 @@ { "pages": [ - "pages/loginModule/pwdLogin/pwdLogin", "pages/personCenter/mine/mine", + "pages/loginModule/pwdLogin/pwdLogin", "pages/personCenter/subCommissionSetting/subCommissionSetting", "pages/test/testVideo/testVideo", "pages/personCenter/withdrawal/withdrawal", diff --git a/pages/personCenter/bindBankCard/bindBankCard.js b/pages/personCenter/bindBankCard/bindBankCard.js index 0f5d7d5..88bfce2 100644 --- a/pages/personCenter/bindBankCard/bindBankCard.js +++ b/pages/personCenter/bindBankCard/bindBankCard.js @@ -47,7 +47,7 @@ Page({ icon: 'success', }); // 这里可以跳转到其他页面 - wx.reLaunch({ + wx.navigateTo({ url: '/pages/personCenter/withdrawalAccount/withdrawalAccount', }); }, @@ -205,7 +205,7 @@ Page({ icon: 'success', }); // 这里可以跳转到其他页面 - wx.reLaunch({ + wx.navigateTo({ url: '/pages/personCenter/withdrawal/withdrawal', }); }, diff --git a/pages/personCenter/commissionSetting/commissionSetting.js b/pages/personCenter/commissionSetting/commissionSetting.js index a8cd5a8..8673ae4 100644 --- a/pages/personCenter/commissionSetting/commissionSetting.js +++ b/pages/personCenter/commissionSetting/commissionSetting.js @@ -14,6 +14,7 @@ Page({ showCommissionRatePop: false, }, + // 获取项目列表 getProjectList() { wx.request({ url: baseUrl + '/projectCommission/query/commission', @@ -90,11 +91,16 @@ Page({ console.log('设置数据:', agentPrice, commissionRate, pricingMethod); this.closeCommissionRatePop(); }, - gotoSubCommission() { + + // 跳转下级单价页面 + gotoSubCommission(e) { + // console.log('e---->',e.currentTarget.dataset.id); + const id = e.currentTarget.dataset.id; wx.navigateTo({ - url: '/pages/personCenter/subCommissionSetting/subCommissionSetting', + url: `/pages/personCenter/subCommissionSetting/subCommissionSetting?id=${ id }`, }) }, + /** * 生命周期函数--监听页面加载 */ diff --git a/pages/personCenter/commissionSetting/commissionSetting.wxml b/pages/personCenter/commissionSetting/commissionSetting.wxml index 2b60eb8..15343f6 100644 --- a/pages/personCenter/commissionSetting/commissionSetting.wxml +++ b/pages/personCenter/commissionSetting/commissionSetting.wxml @@ -30,7 +30,7 @@ - + { + console.log('后端返回---->',res); + if (res.data.data === null) { + wx.showModal({ + title: '账户为空', + content: '请新建账户', + complete: (res) => { + if (res.cancel) { // 点击取消时 + wx.navigateTo({ + url: '/pages/personCenter/mine/mine', + }) + } + + if (res.confirm) { // 点击确定时 + wx.navigateTo({ + url: '/pages/personCenter/bindBankCard/bindBankCard', + }) + } + } + }) + } + if (res.data.code === 1) { + this.setData({ + currentBalance: res.data.data.currentBalance, + withdrawalAmount: res.data.data.withdrawalAmount, + withdrawnAmount: res.data.data.withdrawnAmount, + fundsChangeVOList: res.data.data.fundsChangeVOList + }); + } + } + }) + }, + + gotoBillingDetails() { + wx.navigateTo({ + url: '/pages/personCenter/billingDetails/billingDetails', + }) }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { - + this.getFundChangeList() }, /** @@ -26,7 +92,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.getFundChangeList() }, /** diff --git a/pages/personCenter/fundingDetails/fundingDetails.wxml b/pages/personCenter/fundingDetails/fundingDetails.wxml index ae4c883..a4a4a7f 100644 --- a/pages/personCenter/fundingDetails/fundingDetails.wxml +++ b/pages/personCenter/fundingDetails/fundingDetails.wxml @@ -3,22 +3,22 @@ 钱包余额 - 10.00 - 去提现 + {{currentBalance}} + 去提现 提现中 - ¥0 + {{withdrawalAmount}}¥ 已提现 - ¥0 + {{withdrawnAmount}}¥ - + 更改账户 - + 资金变动记录 - + - 美团省钱包-春季活动(2.9元购买30元券包(5月1日-5.5日)) - +1.20 + {{item.projectName}} + {{item.changeAmount}} ¥ - 2025-02-10 12:10:29 - 11.20 + {{item.createTime}} + {{item.currentAmount}} ¥ - \ No newline at end of file + diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.js b/pages/personCenter/subCommissionSetting/subCommissionSetting.js index c1f30f6..d61204f 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.js +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.js @@ -1,3 +1,5 @@ +import { baseUrl } from "../../../request"; + // pages/personCenter/subCommissionSetting/subCommissionSetting.js Page({ @@ -8,6 +10,9 @@ Page({ items_1: [null, null, null], items: [null, null], showCommissionRatePop: false, + id: 0, // 项目id + subCommissionList: [], // 下级抽佣列表 + }, // 点击“设价”按钮,显示弹窗 @@ -27,11 +32,36 @@ Page({ this.closeCommissionRatePop(); }, + // 查询下级抽佣情况 + getSubCommissionList() { + const id = this.data.id + wx.request({ + url: baseUrl + '/projectCommission/query/sub/commission', + method: 'POST', + header: { + Authorization: wx.getStorageSync('token'), + }, + data: { id: id }, + success: res => { + console.log('下级抽佣列表----->',res.data.data); + if (res.data.code === 1) { + this.setData({ + subCommissionList: res.data.data + }) + } + } + }) + }, + /** * 生命周期函数--监听页面加载 */ onLoad(options) { - + console.log('----->',options); + this.setData({ + id: options.id + }) + this.getSubCommissionList() }, /** diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml index e999631..1c8e060 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml @@ -10,8 +10,8 @@ - - 结算标准:张新然 + + 结算标准:{{ item.subUserNickName }} 结算标准 @@ -21,13 +21,13 @@ - 3.6元购买30元 - 0.30/0.00% + {{ DetailCommission.projectDetailName }} + {{ DetailCommission.agentUnitPrice }}/{{ DetailCommission.currentCommissionRate }}%