From e2182c82481c4c6abcfdc05c6333cd9441700999 Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Thu, 5 Jun 2025 11:21:05 +0800 Subject: [PATCH] commission--yt-commit --- .../commissionSetting/commissionSetting.js | 1 + .../commissionSetting/commissionSetting.wxml | 1 + .../commissionRatePop/commissionRatePop.js | 80 +++++++++++++------ .../subCommissionSetting.js | 27 +++++-- .../subCommissionSetting.wxml | 9 ++- request.js | 2 +- 6 files changed, 88 insertions(+), 32 deletions(-) diff --git a/pages/personCenter/commissionSetting/commissionSetting.js b/pages/personCenter/commissionSetting/commissionSetting.js index 6bab692..f92ed34 100644 --- a/pages/personCenter/commissionSetting/commissionSetting.js +++ b/pages/personCenter/commissionSetting/commissionSetting.js @@ -17,6 +17,7 @@ Page({ nowCommissionRate: 0, // 现在的'抽成比例', 用于传给弹窗 nowAgentUnitPrice: 0, // 现在的‘代理单价’,用于传给弹窗 nowProjectDetailName: '', // 现在的‘项目详细名称’，用于传给弹窗 + isSub: false, // 用于区分是项目抽佣页面还是单个用户抽佣页面 }, // 获取项目列表 diff --git a/pages/personCenter/commissionSetting/commissionSetting.wxml b/pages/personCenter/commissionSetting/commissionSetting.wxml index 65f750e..3e89094 100644 --- a/pages/personCenter/commissionSetting/commissionSetting.wxml +++ b/pages/personCenter/commissionSetting/commissionSetting.wxml @@ -82,4 +82,5 @@ projectDetailName="{{ nowProjectDetailName }}" detailId="{{ projectId }}" maxCommissionRate="{{ maxCommissionRate }}" + isSub="{{ isSub }}" /> diff --git a/pages/personCenter/component/commissionRatePop/commissionRatePop.js b/pages/personCenter/component/commissionRatePop/commissionRatePop.js index fb29376..da5dca2 100644 --- a/pages/personCenter/component/commissionRatePop/commissionRatePop.js +++ b/pages/personCenter/component/commissionRatePop/commissionRatePop.js @@ -37,6 +37,10 @@ Component({ maxCommissionRate: { // 最大抽佣比例 type: Number, value: 0 + }, + isSub: { + type: Boolean, + value: false } }, @@ -57,7 +61,10 @@ Component({ const id = this.data.detailId; const Rate = this.data.commissionRate; const maxRate = this.data.maxCommissionRate; - // console.log('maxRate---->', maxRate); + const isSub = this.data.isSub; + console.log('id---->', id); + console.log('Rate--->',Rate); + console.log('isSub---->',isSub); if (Rate > maxRate || Rate < 0) { wx.showModal({ title: '抽佣比率错误', @@ -71,29 +78,56 @@ Component({ mask: true }) // 发送请求 - wx.request({ - url: baseUrl + '/projectCommission/update/rate', - method: 'POST', - header: { - Authorization: wx.getStorageSync('token'), - }, - data: { - id: id, - currentCommissionRate: Rate - }, - success: res => { - console.log('后端结果---->',res.data); - if (res.data.code === 1) { - wx.hideLoading() // 加载框关闭 - this.triggerEvent('confirm', {}); - } else { - wx.showToast({ - title: '服务异常', - icon: 'error' - }) + if (isSub) { + wx.request({ + url: baseUrl + '/projectCommission/update/sub/rate', + method: 'POST', + header: { + Authorization: wx.getStorageSync('token'), + }, + data: { + id: id, + currentCommissionRate: Rate + }, + success: res=> { + console.log('用户抽用户----->',res.data); + if ( res.data.code === 1 ) { + wx.hideLoading() // 加载框关闭 + this.triggerEvent('confirm', {}); + } else { + wx.showToast({ + title: '服务异常', + icon: 'error' + }) + } } - } - }) + }) + } else { + wx.request({ + url: baseUrl + '/projectCommission/update/rate', + method: 'POST', + header: { + Authorization: wx.getStorageSync('token'), + }, + data: { + id: id, + currentCommissionRate: Rate + }, + success: res => { + console.log('项目抽佣结果---->',res.data); + if (res.data.code === 1) { + wx.hideLoading() // 加载框关闭 + this.triggerEvent('confirm', {}); + } else { + wx.showToast({ + title: '服务异常', + icon: 'error' + }) + } + } + }) + } + this.resetStatus(); }, diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.js b/pages/personCenter/subCommissionSetting/subCommissionSetting.js index d61204f..b07c08f 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.js +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.js @@ -7,16 +7,30 @@ Page({ * 页面的初始数据 */ data: { - items_1: [null, null, null], - items: [null, null], - showCommissionRatePop: false, + showCommissionRatePop: false, // 控制弹窗显隐 id: 0, // 项目id subCommissionList: [], // 下级抽佣列表 - + projectId: 0, // 项目ID + maxCommissionRate: 0, // 最大抽佣比率 + LodingHidden: true, // 控制加载框取消 + nowMyUnitPrice: 0, // 现在的‘我的单价’，用于传给弹窗 + nowCommissionRate: 0, // 现在的'抽成比例', 用于传给弹窗 + nowAgentUnitPrice: 0, // 现在的‘代理单价’,用于传给弹窗 + nowProjectDetailName: '', // 现在的‘项目详细名称’，用于传给弹窗 + isSub: true, // 用于区分是项目抽佣页面还是单个用户抽佣页面 }, // 点击“设价”按钮，显示弹窗 - showCommissionRatePop() { + showCommissionRatePop(e) { + console.log('弹窗传值----->',e); + this.setData({ + nowCommissionRate: e.currentTarget.dataset.currentcommissionrate, + nowMyUnitPrice: e.currentTarget.dataset.nowmyunitprice, + nowAgentUnitPrice: e.currentTarget.dataset.agentunitprice, + nowProjectDetailName: e.currentTarget.dataset.projectdetailname, + projectId: e.currentTarget.dataset.detailid, + maxCommissionRate: e.currentTarget.dataset.maxcommissionrate, + }) this.setData({ showCommissionRatePop: true }); }, @@ -27,8 +41,7 @@ Page({ // 确认按钮回调 handleCommissionRateConfirm(e) { - const { agentPrice, commissionRate, pricingMethod } = e.detail; - console.log('设置数据:', agentPrice, commissionRate, pricingMethod); + this.getSubCommissionList(); this.closeCommissionRatePop(); }, diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml index 1c8e060..03d7611 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml @@ -28,7 +28,7 @@ > {{ DetailCommission.projectDetailName }} {{ DetailCommission.agentUnitPrice }}/{{ DetailCommission.currentCommissionRate }}% - + \ No newline at end of file diff --git a/request.js b/request.js index 656528d..5c288cf 100644 --- a/request.js +++ b/request.js @@ -1,3 +1,3 @@ export const local='http://localhost:3456'; export const ip = 'http://1.94.237.210:3457'; -export const baseUrl = ip; +export const baseUrl = local;