diff --git a/app.json b/app.json index f1af796..105e899 100644 --- a/app.json +++ b/app.json @@ -21,7 +21,8 @@ "pages/personCenter/commissionSetting/commissionSetting", "pages/personCenter/resetPwd/resetPwd", "pages/personCenter/bindBankCard/bindBankCard", - "pages/projectModule/settlement/settlement" + "pages/projectModule/settlement/settlement", + "pages/projectModule/subSettlement/subSettlement" ], "window": { "navigationBarTextStyle": "black", diff --git a/pages/loginModule/pwdLogin/pwdLogin.wxml b/pages/loginModule/pwdLogin/pwdLogin.wxml index 8f95500..17e3de3 100644 --- a/pages/loginModule/pwdLogin/pwdLogin.wxml +++ b/pages/loginModule/pwdLogin/pwdLogin.wxml @@ -24,7 +24,7 @@ - {{ item.projectName }} diff --git a/pages/personCenter/fundingDetails/fundingDetails.js b/pages/personCenter/fundingDetails/fundingDetails.js index 39f1169..33cba33 100644 --- a/pages/personCenter/fundingDetails/fundingDetails.js +++ b/pages/personCenter/fundingDetails/fundingDetails.js @@ -57,11 +57,12 @@ Page({ }) } if (res.data.code === 1) { + let result = res.data.data this.setData({ - currentBalance: res.data.data.currentBalance, - withdrawalAmount: res.data.data.withdrawalAmount, - withdrawnAmount: res.data.data.withdrawnAmount, - fundsChangeVOList: res.data.data.fundsChangeVOList + currentBalance: result.currentBalance, + withdrawalAmount: result.withdrawalAmount, + withdrawnAmount: result.withdrawnAmount, + fundsChangeVOList: result.fundsChangeVOList }); } } diff --git a/pages/personCenter/fundingDetails/fundingDetails.wxml b/pages/personCenter/fundingDetails/fundingDetails.wxml index a4a4a7f..c1c0eca 100644 --- a/pages/personCenter/fundingDetails/fundingDetails.wxml +++ b/pages/personCenter/fundingDetails/fundingDetails.wxml @@ -9,11 +9,11 @@ 提现中 - {{withdrawalAmount}}¥ + ¥{{withdrawalAmount}} 已提现 - {{withdrawnAmount}}¥ + ¥{{withdrawnAmount}} @@ -42,11 +42,11 @@ {{item.projectName}} - {{item.changeAmount}} ¥ + {{item.changeAmount}} {{item.createTime}} - {{item.currentAmount}} ¥ + {{item.currentAmount}} diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss index de5f176..9ec55eb 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss @@ -62,6 +62,7 @@ line-height: 24.49rpx; } .section_3 { + position: relative; padding: 40.14rpx 31.69rpx 25.61rpx 34.52rpx; background-color: #f5f5f5; border-radius: 10.05rpx; @@ -101,7 +102,8 @@ line-height: 25.54rpx; } .group_2 { - margin-left: 135.81rpx; + position: absolute; + right: 40rpx; width: 75.75rpx; } .image_2 { diff --git a/pages/personCenter/teamManage/teamManage.js b/pages/personCenter/teamManage/teamManage.js index 589b0b0..45872cf 100644 --- a/pages/personCenter/teamManage/teamManage.js +++ b/pages/personCenter/teamManage/teamManage.js @@ -24,12 +24,13 @@ Page({ }, success: res => { console.log('团队成员信息---->',res.data.data); + let result = res.data.data this.setData({ - directAgentSize: res.data.data.directAgentSize, - teamSize: res.data.data.teamSize, - teamEarnings: res.data.data.teamEarnings, - invitationCode: res.data.data.invitationCode, - userMemberInfoVOList: res.data.data.userMemberInfoVOList + directAgentSize: result.directAgentSize, + teamSize: result.teamSize, + teamEarnings: result.teamEarnings, + invitationCode: result.invitationCode, + userMemberInfoVOList: result.userMemberInfoVOList }) } }) diff --git a/pages/personCenter/teamManage/teamManage.wxss b/pages/personCenter/teamManage/teamManage.wxss index 078ca13..f28d3da 100644 --- a/pages/personCenter/teamManage/teamManage.wxss +++ b/pages/personCenter/teamManage/teamManage.wxss @@ -131,7 +131,7 @@ height: 35.63rpx; } .text_8 { - color: #8c8c8c; + color: #323232; line-height: 20.96rpx; } .list { diff --git a/pages/projectModule/projectDetail/projectDetail.js b/pages/projectModule/projectDetail/projectDetail.js index e427870..b620e4f 100644 --- a/pages/projectModule/projectDetail/projectDetail.js +++ b/pages/projectModule/projectDetail/projectDetail.js @@ -1,4 +1,5 @@ const { baseUrl } = require('../../../request'); +import { globalImgUrl } from '../../../request'; Page({ data: { @@ -10,7 +11,8 @@ Page({ id: null, showPromoPop: false, currentQrcode: '', - currentPromoLink: '' + currentPromoLink: '', + globalImgUrl, }, onLoad(options) { @@ -87,17 +89,24 @@ Page({ }, // 跳转结算明细 - gotoSubSettlement(e) { - + gotoSettlement(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}&picurl=${url}&name=${name}`, }) }, + gotoSubSettlement(e) { + const promoId = e.currentTarget.dataset.id; + const image = e.currentTarget.dataset.image + const name = e.currentTarget.dataset.name + wx.navigateTo({ + url: `/pages/projectModule/subSettlement/subSettlement?id=${promoId}&image=${image}&name=${name}`, + }) + }, + // 推广码-查看资料 goToPromoMaterial(e) { diff --git a/pages/projectModule/projectDetail/projectDetail.wxml b/pages/projectModule/projectDetail/projectDetail.wxml index a5bdce2..ae46c53 100644 --- a/pages/projectModule/projectDetail/projectDetail.wxml +++ b/pages/projectModule/projectDetail/projectDetail.wxml @@ -3,13 +3,13 @@ {{projectDetail.projectName}} {{projectDetail.projectDescription}} - + 查看推广码 - + 结算明细 diff --git a/pages/projectModule/settlement/settlement.js b/pages/projectModule/settlement/settlement.js index 892d4a2..0855c52 100644 --- a/pages/projectModule/settlement/settlement.js +++ b/pages/projectModule/settlement/settlement.js @@ -1,4 +1,5 @@ import { baseUrl } from "../../../request"; +import { globalImgUrl } from "../../../request"; // pages/projectModule/settlement/settlement.js Page({ @@ -17,6 +18,7 @@ Page({ workTime: '', // 作业收益 settlementTime: '', // 结算时间 revenueSource: false, // 收益来源(true抽成,false为推广码) + globalImgUrl, }, // 获取项目结算明细列表 diff --git a/pages/projectModule/settlement/settlement.wxml b/pages/projectModule/settlement/settlement.wxml index 7a5df84..f8b38b8 100644 --- a/pages/projectModule/settlement/settlement.wxml +++ b/pages/projectModule/settlement/settlement.wxml @@ -6,7 +6,7 @@ {{ item.projectDetailName}} diff --git a/pages/projectModule/settlement/settlement.wxss b/pages/projectModule/settlement/settlement.wxss index 6b75937..0740fc2 100644 --- a/pages/projectModule/settlement/settlement.wxss +++ b/pages/projectModule/settlement/settlement.wxss @@ -91,12 +91,6 @@ .text_6 { width: 103.13rpx; } -.pos { - /* position: absolute; - left: 0.99rpx; - top: 50%; - transform: translateY(-50%); */ -} .font_4 { font-size: 26.25rpx; font-family: SourceHanSansCN; @@ -109,12 +103,6 @@ line-height: 19.93rpx; color: #ff8d1a; } -.pos_2 { - /* position: absolute; - right: -14.23rpx; - top: 50%; - transform: translateY(-50%); */ -} .group_1 { display: flex; justify-content: space-between; diff --git a/pages/projectModule/subSettlement/subSettlement.js b/pages/projectModule/subSettlement/subSettlement.js index b63aabc..a81e605 100644 --- a/pages/projectModule/subSettlement/subSettlement.js +++ b/pages/projectModule/subSettlement/subSettlement.js @@ -1,3 +1,6 @@ +import { baseUrl } from "../../../request"; +import { globalImgUrl } from "../../../request"; + // pages/projectModule/settlement/settlement.js Page({ @@ -5,14 +8,59 @@ Page({ * 页面的初始数据 */ data: { - items: [null, null], + settlementData: [], // 用来存储从后端获取的结算数据 + globalImgUrl, + projectImage: '', + saleName: '', + id: '', }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + // 调用后端接口 + this.setData({id: options.id}) + this.setData({projectImage: options.image}) + this.setData({saleName: options.name}) + this.fetchSettlementData(); + }, + /** + * 请求结算数据 + */ + fetchSettlementData() { + const token = wx.getStorageSync('token'); // 从本地存储获取 token + const data = { + id: 5 + }; + wx.request({ + url: baseUrl + '/projectSettlement/query/settle', + method: 'POST', + data: data, + header: { + 'Authorization': token, // 设置请求头,包含 token + }, + success: (res) => { + if (res.data.code === 1) { + // 请求成功,更新页面数据 + this.setData({ + settlementData: res.data.data // 将返回的数据赋值给 settlementData + }); + } else { + wx.showToast({ + title: '加载数据失败', + icon: 'none' + }); + } + }, + fail: () => { + wx.showToast({ + title: '请求失败', + icon: 'none' + }); + } + }); }, /** @@ -63,4 +111,4 @@ Page({ onShareAppMessage() { } -}) \ No newline at end of file +}); diff --git a/pages/projectModule/subSettlement/subSettlement.wxml b/pages/projectModule/subSettlement/subSettlement.wxml index 80f9a22..b4f3b20 100644 --- a/pages/projectModule/subSettlement/subSettlement.wxml +++ b/pages/projectModule/subSettlement/subSettlement.wxml @@ -1,16 +1,18 @@ - 业务员:陈新知 + + 业务员:{{ saleName }} + - + - 美团神券包-春季活动 + {{item.projectDetailName}} - 业务员:陈新知 + 业务员:{{item.salespersonName}} @@ -20,22 +22,22 @@ - 3.6元购买券 - 10 - ¥3.00 + {{item.settlementRevenue}}元购买券 + {{item.settlementQuantity}} + ¥{{item.settlementRevenue}} 作业时间: - 2025-05-20 + {{item.workTime}} 结算时间: - 2025-05-22 + {{item.settlementTime}} - \ No newline at end of file + diff --git a/pages/projectModule/subSettlement/subSettlement.wxss b/pages/projectModule/subSettlement/subSettlement.wxss index 6b75937..4b31b53 100644 --- a/pages/projectModule/subSettlement/subSettlement.wxss +++ b/pages/projectModule/subSettlement/subSettlement.wxss @@ -8,7 +8,7 @@ margin-left: 88.13rpx; } .page { - padding: 50.63rpx 24.38rpx 608.44rpx; + padding: 50.63rpx 24.38rpx 100.44rpx; background-image: linear-gradient(180deg, #ff8d1a -7.3%, #f5f5f5 39.3%); width: 100%; overflow-y: auto; @@ -91,12 +91,6 @@ .text_6 { width: 103.13rpx; } -.pos { - /* position: absolute; - left: 0.99rpx; - top: 50%; - transform: translateY(-50%); */ -} .font_4 { font-size: 26.25rpx; font-family: SourceHanSansCN; @@ -109,12 +103,6 @@ line-height: 19.93rpx; color: #ff8d1a; } -.pos_2 { - /* position: absolute; - right: -14.23rpx; - top: 50%; - transform: translateY(-50%); */ -} .group_1 { display: flex; justify-content: space-between; diff --git a/pages/projectModule/userProject/userProject.js b/pages/projectModule/userProject/userProject.js index e150258..ae52a69 100644 --- a/pages/projectModule/userProject/userProject.js +++ b/pages/projectModule/userProject/userProject.js @@ -1,4 +1,5 @@ import { baseUrl } from "../../../request" +import { globalImgUrl } from "../../../request" // pages/projectModule/userProject/userProject.js Page({ @@ -8,6 +9,7 @@ Page({ */ data: { + globalImgUrl, userProjectList: [], }, @@ -20,11 +22,9 @@ 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}&picurl=${url}&name=${name}`, }) @@ -53,6 +53,7 @@ Page({ gotoProjectDetail(e){ // 获取data-id中的值 const projectId = e.currentTarget.dataset.id; + console.log('项目id =============>', projectId) wx.navigateTo({ url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}&isPromo=0`, }) diff --git a/pages/projectModule/userProject/userProject.wxml b/pages/projectModule/userProject/userProject.wxml index 1159772..533b202 100644 --- a/pages/projectModule/userProject/userProject.wxml +++ b/pages/projectModule/userProject/userProject.wxml @@ -1,11 +1,11 @@ - + {{ item.projectName }} @@ -18,14 +18,14 @@ /> - + 推广码 - +