diff --git a/app.json b/app.json
index 3e60775..f1af796 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
{
"pages": [
- "pages/personCenter/mine/mine",
"pages/loginModule/pwdLogin/pwdLogin",
+ "pages/personCenter/mine/mine",
"pages/personCenter/subCommissionSetting/subCommissionSetting",
"pages/test/testVideo/testVideo",
"pages/personCenter/withdrawal/withdrawal",
diff --git a/pages/personCenter/commissionSetting/commissionSetting.js b/pages/personCenter/commissionSetting/commissionSetting.js
index f92ed34..3550e34 100644
--- a/pages/personCenter/commissionSetting/commissionSetting.js
+++ b/pages/personCenter/commissionSetting/commissionSetting.js
@@ -18,6 +18,7 @@ Page({
nowAgentUnitPrice: 0, // 现在的‘代理单价’,用于传给弹窗
nowProjectDetailName: '', // 现在的‘项目详细名称’，用于传给弹窗
isSub: false, // 用于区分是项目抽佣页面还是单个用户抽佣页面
+ fixedRate: 0, // 固定抽佣——一键设置
},
// 获取项目列表
@@ -55,30 +56,29 @@ Page({
// 处理抽佣比例提交
handleCommissionSubmit(e) {
- const { commissionRate } = e.detail;
- console.log(`设置的抽佣比例是：${commissionRate}%`);
// 你可以在这里保存提交的数据，或者执行其他操作
+ this.getProjectList()
+ this.getFixedRate()
+ this.closePopup(); // 确认后关闭弹窗
+ },
+
+ // 获取一键抽佣比例
+ getFixedRate() {
wx.request({
- url: baseUrl + '/projectCommission/update/unite/rate',
- method: 'POST',
+ url: baseUrl + '/userInfo/get/main/jwt',
+ method: 'GET',
header: {
- Authorization: wx.getStorageSync('token'),
- },
- data: {
- uniteCommissionRate: commissionRate
+ Authorization: wx.getStorageSync('token')
},
success: res => {
- console.log('一键设置下级抽成比例结果---->',res.data);
- if (res.data.code === 1) {
- wx.showToast({
- title: '设置成功',
- icon: 'success',
- duration: 1500
+ console.log('一键抽佣--->',res.data);
+ if ( res.data.code === 1 ) {
+ this.setData({
+ fixedRate: res.data.data.uniteRate,
})
}
}
})
- this.closePopup(); // 确认后关闭弹窗
},
// 点击“设价”按钮，显示弹窗
@@ -121,6 +121,7 @@ Page({
*/
onLoad(options) {
this.getProjectList()
+ this.getFixedRate()
},
/**
diff --git a/pages/personCenter/commissionSetting/commissionSetting.wxml b/pages/personCenter/commissionSetting/commissionSetting.wxml
index 3e89094..549d708 100644
--- a/pages/personCenter/commissionSetting/commissionSetting.wxml
+++ b/pages/personCenter/commissionSetting/commissionSetting.wxml
@@ -7,7 +7,7 @@
/>
一键设置下级抽成比例：
- 1.36%
+ {{ fixedRate }}%
5) {
wx.showToast({
title: `请输入有效的比例，最大为 5%`,
@@ -39,14 +39,42 @@ Component({
});
return;
}
+ wx.showLoading({
+ title: '加载中',
+ mask: true
+ })
- // 触发父组件的事件，将设置的比例传递出去
- this.triggerEvent('submit', {
- commissionRate: rate,
- });
-
- // 关闭弹窗
- this.triggerEvent('close');
+ // 一键设置抽佣
+ wx.request({
+ url: baseUrl + '/projectCommission/update/unite/rate',
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token'),
+ },
+ data: {
+ uniteCommissionRate: rate
+ },
+ success: res => {
+ console.log('一键设置下级抽成比例结果---->',res.data);
+ if (res.data.code === 1) {
+ wx.hideLoading()
+ wx.showToast({
+ title: '设置成功',
+ icon: 'success',
+ duration: 1500
+ })
+ // 触发父组件的事件，将设置的比例传递出去
+ this.triggerEvent('submit', {});
+ // 关闭弹窗
+ this.triggerEvent('close');
+ } else {
+ wx.showToast({
+ title: '服务错误',
+ icon: 'error'
+ })
+ }
+ }
+ })
},
// 关闭弹窗
diff --git a/pages/projectModule/settlement/settlement.js b/pages/projectModule/settlement/settlement.js
index ce962fc..892d4a2 100644
--- a/pages/projectModule/settlement/settlement.js
+++ b/pages/projectModule/settlement/settlement.js
@@ -8,10 +8,18 @@ Page({
*/
data: {
pid: 0, // 项目id
+ pname: '', // 项目名称
+ picurl: '', // 项目图片
projectSettlementList: [], // 项目结算列表
+ projectDetailName: '', // 项目明细名称
+ settlementQuantity: 0, // 结算数量
+ settlementRevenue: 0, // 结算收益
+ workTime: '', // 作业收益
+ settlementTime: '', // 结算时间
+ revenueSource: false, // 收益来源(true抽成，false为推广码)
},
- // 获取项目明细列表
+ // 获取项目结算明细列表
getProjectSettlementList() {
const pid = this.data.pid
wx.request({
@@ -26,7 +34,13 @@ Page({
success: res =>{
console.log('---->',res.data);
if (res.data.code === 1) {
-
+ this.setData({
+ projectSettlementList: res.data.data
+ })
+ } else {
+ wx.showToast({
+ title: '服务错误',
+ })
}
}
})
@@ -36,32 +50,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- this.setData({ pid: options.id })
+ this.setData({ pid: options.id });
+ this.setData({ pname: options.name })
+ this.setData({ picurl: options.picurl })
console.log('项目id--->',options.id);
- this.getProjectSettlementList()
- // 模拟后端响应数据
- const response = {
- code: 0,
- data: [
- {
- id: 1,
- projectDetailName: "新用户完成首单",
- settlementQuantity: 2,
- settlementRevenue: 2.34,
- workTime: "2025-05-20", // 示例作业时间
- settlementTime: "2025-05-22", // 示例结算时间
- revenueSource: false
- }
- ],
- message: ""
- };
-
- if (response.code === 0) {
- // 将后端返回的数据赋值给 projectSettlementList
- this.setData({
- projectSettlementList: response.data
- });
- }
+ this.getProjectSettlementList();
},
/**
diff --git a/pages/projectModule/settlement/settlement.wxml b/pages/projectModule/settlement/settlement.wxml
index 2d03ea0..7a5df84 100644
--- a/pages/projectModule/settlement/settlement.wxml
+++ b/pages/projectModule/settlement/settlement.wxml
@@ -1,16 +1,16 @@
- 项目：饿了么-超吃卡
+ 项目：{{ pname }}
- {{ projectSettlementList.projectDetailName}}
+ {{ item.projectDetailName}}
- 业务员：陈新知
+ 业务员：{{ item.salespersonName }}
@@ -20,20 +20,20 @@
- {{ projectSettlementList.settlementQuantity }}元购买券
- {{ projectSettlementList.settlementQuantity }}
- ￥{{ projectSettlementList.settlementRevenue.toFixed(2) }}
+ {{ item.projectDetailName }}
+ {{ item.settlementQuantity }}
+ ￥{{ item.settlementRevenue }}
作业时间：
- {{ projectSettlementList.workTime || '暂无' }}
+ {{ item.workTime || '暂无' }}
结算时间：
- {{ projectSettlementList.settlementTime || '暂无' }}
+ {{ item.settlementTime || '暂无' }}
diff --git a/pages/projectModule/userProject/userProject.js b/pages/projectModule/userProject/userProject.js
index f4b21f3..e150258 100644
--- a/pages/projectModule/userProject/userProject.js
+++ b/pages/projectModule/userProject/userProject.js
@@ -22,9 +22,11 @@ Page({
gotoSubSettlement(e) {
const projectId = e.currentTarget.dataset.id;
+ const url = e.currentTarget.dataset.url;
+ const name = e.currentTarget.dataset.name;
wx.navigateTo({
- url: `/pages/projectModule/settlement/settlement?id=${projectId}`,
+ url: `/pages/projectModule/settlement/settlement?id=${projectId}&picurl=${url}&name=${name}`,
})
},
@@ -37,7 +39,7 @@ Page({
Authorization: wx.getStorageSync('token')
},
success: res => {
- // console.log(res.data);
+ console.log('项目列表---->',res.data);
if(res.data.code === 1) {
this.setData({
userProjectList: res.data.data
diff --git a/pages/projectModule/userProject/userProject.wxml b/pages/projectModule/userProject/userProject.wxml
index 64d3435..1159772 100644
--- a/pages/projectModule/userProject/userProject.wxml
+++ b/pages/projectModule/userProject/userProject.wxml
@@ -25,7 +25,7 @@
/>
推广码
-
+