diff --git a/app.json b/app.json index a4805b6..2c2b246 100644 --- a/app.json +++ b/app.json @@ -19,7 +19,8 @@ "pages/projectModule/userProject/userProject", "pages/loginModule/forgetPwd/forgetPwd", "pages/personCenter/commissionSetting/commissionSetting", - "pages/personCenter/resetPwd/resetPwd" + "pages/personCenter/resetPwd/resetPwd", + "pages/personCenter/bindBankCard/bindBankCard" ], "window": { "navigationBarTextStyle": "black", diff --git a/pages/personCenter/bindBankCard/bindBankCard.js b/pages/personCenter/bindBankCard/bindBankCard.js new file mode 100644 index 0000000..ff883dc --- /dev/null +++ b/pages/personCenter/bindBankCard/bindBankCard.js @@ -0,0 +1,66 @@ +// pages/personCenter/bindBankCard/bindBankCard.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/personCenter/bindBankCard/bindBankCard.json b/pages/personCenter/bindBankCard/bindBankCard.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/personCenter/bindBankCard/bindBankCard.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/personCenter/bindBankCard/bindBankCard.wxml b/pages/personCenter/bindBankCard/bindBankCard.wxml new file mode 100644 index 0000000..a18e364 --- /dev/null +++ b/pages/personCenter/bindBankCard/bindBankCard.wxml @@ -0,0 +1,44 @@ + + 绑定银行卡 + 请绑定持卡人本人的银行卡 + + + 持卡人 + * + + + + + + 身份证号 + * + + + + + + 手机号 + * + + + + + + 银行卡号 + * + + + + + + 开户银行 + * + + + + + + + 保存 + + \ No newline at end of file diff --git a/pages/personCenter/bindBankCard/bindBankCard.wxss b/pages/personCenter/bindBankCard/bindBankCard.wxss new file mode 100644 index 0000000..189d490 --- /dev/null +++ b/pages/personCenter/bindBankCard/bindBankCard.wxss @@ -0,0 +1,103 @@ +.mt-11 { + margin-top: 20.99rpx; +} +.page { + padding: 77.27rpx 45.8rpx 372.14rpx 45.8rpx; + background-color: #ffffff; + width: 100%; + overflow-y: auto; + overflow-x: hidden; + height: 100%; +} +.font_2 { + font-size: 30.53rpx; + font-family: SourceHanSansCN; + line-height: 28.09rpx; + color: #000000; +} +.text_2 { + margin-top: 53.49rpx; + color: #808080; + line-height: 28.4rpx; +} +.group { + margin-top: 84.43rpx; +} +.group_2 { + line-height: 28.09rpx; +} +.font_3 { + font-size: 30.53rpx; + font-family: SourceHanSansCN; + line-height: 9.92rpx; + color: #ff5733; +} +.text-wrapper { + padding: 26.87rpx 0 23.32rpx; + background-color: #f5f5f5; + border-radius: 10rpx; +} +.text_3 { + margin-left: 27.52rpx; +} +.font { + font-size: 34.35rpx; + font-family: SourceHanSansCN; + line-height: 31.87rpx; + color: #000000; +} +.text { + line-height: 32.25rpx; +} +.group_3 { + line-height: 28.44rpx; +} +.text_4 { + line-height: 28.44rpx; +} +.text-wrapper_2 { + padding: 30.38rpx 0 25.61rpx; + background-color: #f5f5f5; + border-radius: 10rpx; +} +.text_12 { + margin-left: 25.8rpx; +} +.group_4 { + line-height: 28.09rpx; +} +.text_1 { + width: 400rpx; + margin-left: 27.82rpx; +} +.group_5 { + line-height: 28.21rpx; +} +.text_6 { + line-height: 28.21rpx; +} +.text_5 { + margin-left: 26.74rpx; +} +.font_4 { + font-size: 34.35rpx; + font-family: SourceHanSansCN; + line-height: 26.07rpx; + color: #000000; +} +.group_6 { + line-height: 28.49rpx; +} +.text_7 { + line-height: 28.49rpx; +} +.text-wrapper_3 { + margin-top: 57.25rpx; + padding: 25.84rpx 0 20.5rpx; + background-color: #ff8d1a; + border-radius: 19.08rpx; + width: 248.09rpx; +} +.text_8 { + color: #ffffff; +} \ No newline at end of file diff --git a/pages/personCenter/commissionSetting/commissionSetting.js b/pages/personCenter/commissionSetting/commissionSetting.js index 9f8ebbb..a9a4ba3 100644 --- a/pages/personCenter/commissionSetting/commissionSetting.js +++ b/pages/personCenter/commissionSetting/commissionSetting.js @@ -1,5 +1,3 @@ -import { baseUrl } from "../../../request"; - // pages/personCenter/commissionSetting/commissionSetting.js Page({ @@ -9,28 +7,44 @@ Page({ data: { items_1: [null, null, null], items: [null, null], - projectList: [] + showPopup: false, // 控制弹窗显隐 + showCommissionRatePop: false, + }, + // 显示弹窗 + showPopup() { + this.setData({ + showPopup: true + }); + }, + // 关闭弹窗 + closePopup() { + this.setData({ + showPopup: false + }); + }, + // 处理抽佣比例提交 + handleCommissionSubmit(e) { + const { commissionRate } = e.detail; + console.log(`设置的抽佣比例是：${commissionRate}%`); + // 你可以在这里保存提交的数据，或者执行其他操作 + this.closePopup(); // 确认后关闭弹窗 + }, + // 点击“设价”按钮，显示弹窗 + showCommissionRatePop() { + this.setData({ showCommissionRatePop: true }); }, - // 获取项目列表 - getProjectList() { - wx.request({ - url: baseUrl + '/projectCommission/query/commission ', - method: 'POST', - header: { - Authorization: wx.getStorageSync('token') - }, - success: res => { - console.log('项目列表-->',res.data); - if (res.data.code === 1) { - this.setData({ - projectList: res.data.data - }) - } - } - }) + // 关闭弹窗（包括遮罩点击和取消按钮） + closeCommissionRatePop() { + this.setData({ showCommissionRatePop: false }); }, + // 确认按钮回调 + handleCommissionRateConfirm(e) { + const { agentPrice, commissionRate, pricingMethod } = e.detail; + console.log('设置数据:', agentPrice, commissionRate, pricingMethod); + this.closeCommissionRatePop(); + }, gotoSubCommission() { wx.navigateTo({ url: '/pages/personCenter/subCommissionSetting/subCommissionSetting', @@ -40,7 +54,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - this.getProjectList() + }, /** diff --git a/pages/personCenter/commissionSetting/commissionSetting.json b/pages/personCenter/commissionSetting/commissionSetting.json index 8835af0..2969084 100644 --- a/pages/personCenter/commissionSetting/commissionSetting.json +++ b/pages/personCenter/commissionSetting/commissionSetting.json @@ -1,3 +1,6 @@ { - "usingComponents": {} + "usingComponents": { + "commissionPop": "/pages/personCenter/component/commissionPop/commissionPop", + "commissionRatePop": "/pages/personCenter/component/commissionRatePop/commissionRatePop" + } } \ No newline at end of file diff --git a/pages/personCenter/commissionSetting/commissionSetting.wxml b/pages/personCenter/commissionSetting/commissionSetting.wxml index 118fb04..df1da18 100644 --- a/pages/personCenter/commissionSetting/commissionSetting.wxml +++ b/pages/personCenter/commissionSetting/commissionSetting.wxml @@ -3,7 +3,7 @@ 一键设置下级抽成比例： @@ -12,28 +12,28 @@ - + - {{ item.projectName }} + 美团神券包-春季活动 - 结算T+{{ item.projectSettlementCycle }} + 结算T+2 下级单价 @@ -47,17 +47,17 @@ - {{ commission.projectDetailName }} - {{ commission.myUnitPrice }}/{{ commission.agentUnitPrice }}/{{ commission.currentCommissionRate }}% + 3.6元购买 + 0.30/0.30/0.00% 设价 diff --git a/pages/personCenter/commissionSetting/images/tz.png b/pages/personCenter/commissionSetting/images/tz.png new file mode 100644 index 0000000..fdb06e5 Binary files /dev/null and b/pages/personCenter/commissionSetting/images/tz.png differ diff --git a/pages/personCenter/commissionSetting/images/xmtp.png b/pages/personCenter/commissionSetting/images/xmtp.png new file mode 100644 index 0000000..82ef521 Binary files /dev/null and b/pages/personCenter/commissionSetting/images/xmtp.png differ diff --git a/pages/personCenter/commissionSetting/images/yjt1.png b/pages/personCenter/commissionSetting/images/yjt1.png new file mode 100644 index 0000000..e12ea11 Binary files /dev/null and b/pages/personCenter/commissionSetting/images/yjt1.png differ diff --git a/pages/personCenter/commissionSetting/images/yjt2.png b/pages/personCenter/commissionSetting/images/yjt2.png new file mode 100644 index 0000000..a4866e1 Binary files /dev/null and b/pages/personCenter/commissionSetting/images/yjt2.png differ diff --git a/pages/personCenter/commissionSetting/images/yjt3.png b/pages/personCenter/commissionSetting/images/yjt3.png new file mode 100644 index 0000000..66fb8f0 Binary files /dev/null and b/pages/personCenter/commissionSetting/images/yjt3.png differ diff --git a/pages/personCenter/component/InvitationCodePop/InvitationCodePop.js b/pages/personCenter/component/InvitationCodePop/InvitationCodePop.js index 0c87a48..5805e81 100644 --- a/pages/personCenter/component/InvitationCodePop/InvitationCodePop.js +++ b/pages/personCenter/component/InvitationCodePop/InvitationCodePop.js @@ -1,24 +1,32 @@ -// pages/personCenter/component/InvitationCodePop/InvitationCodePop.js Component({ - - /** - * 组件的属性列表 - */ properties: { - + // 接收传递进来的二维码图片路径 + show: { // 控制显示/隐藏 + type: Boolean, + value: false + }, + qrcode: { + type: String, + value: "" + }, }, - /** - * 组件的初始数据 - */ data: { - + closeIcon: "./images/cha.png", // 关闭按钮的图标 }, - /** - * 组件的方法列表 - */ methods: { + // 关闭弹窗 + close() { + // 触发关闭弹窗事件 + this.triggerEvent('close'); + }, + // 预览二维码 + previewQrcode() { + wx.previewImage({ + urls: [this.data.qrcode], // 预览图片 + }); + } } -}) \ No newline at end of file +}); diff --git a/pages/personCenter/component/commissionPop/commissionPop.js b/pages/personCenter/component/commissionPop/commissionPop.js index 80c93e0..eea94d6 100644 --- a/pages/personCenter/component/commissionPop/commissionPop.js +++ b/pages/personCenter/component/commissionPop/commissionPop.js @@ -1,24 +1,57 @@ -// pages/personCenter/component/commissionPop/commissionPop.js Component({ /** * 组件的属性列表 */ properties: { - + show: { + type: Boolean, + value: false, + }, }, /** * 组件的初始数据 */ data: { - + commissionRate: "", // 用户输入的抽佣比例 }, /** * 组件的方法列表 */ methods: { + // 获取用户输入的比例 + handleInput(e) { + this.setData({ + commissionRate: e.detail.value, + }); + }, - } + // 提交设置 + submit() { + const rate = parseFloat(this.data.commissionRate); + + if (isNaN(rate) || rate <= 0 || rate > 5) { + wx.showToast({ + title: `请输入有效的比例，最大为 5%`, + icon: 'none', + }); + return; + } + + // 触发父组件的事件，将设置的比例传递出去 + this.triggerEvent('submit', { + commissionRate: rate, + }); + + // 关闭弹窗 + this.triggerEvent('close'); + }, + + // 关闭弹窗 + close() { + this.triggerEvent('close'); + } + } }) \ No newline at end of file diff --git a/pages/personCenter/component/commissionRatePop/commissionRatePop.js b/pages/personCenter/component/commissionRatePop/commissionRatePop.js index e3e074e..9b1b3ef 100644 --- a/pages/personCenter/component/commissionRatePop/commissionRatePop.js +++ b/pages/personCenter/component/commissionRatePop/commissionRatePop.js @@ -1,24 +1,28 @@ -// pages/personCenter/component/commissionRatePop/commissionRatePop.js Component({ - /** * 组件的属性列表 */ properties: { - - }, - - /** - * 组件的初始数据 - */ - data: { - + show: { // 控制显示/隐藏 + type: Boolean, + value: false + }, }, /** * 组件的方法列表 */ methods: { - + close() { + this.triggerEvent('close'); + }, + cancel() { + this.triggerEvent('cancel'); + }, + confirm() { + // 触发confirm事件带数据 + this.triggerEvent('confirm', {/*数据*/}); + }, } -}) \ No newline at end of file +}) + diff --git a/pages/personCenter/mine/mine.js b/pages/personCenter/mine/mine.js index f2178f6..1dda561 100644 --- a/pages/personCenter/mine/mine.js +++ b/pages/personCenter/mine/mine.js @@ -7,10 +7,7 @@ Page({ * 页面的初始数据 */ data: { - items: [null, null, null], - cxz: "", - cxz2: "", - cxz3: "", + items: [null], nickName: "", userAvatar: "", phoneNumber: "", @@ -19,7 +16,22 @@ Page({ currentBalance: "", // 当前余额 withdrawalAmount: "", // 提现中的余额 withdrawnAmount: "", // 已提现的余额 - totalIncome:"" // 累计收入 + totalIncome:"", // 累计收入 + showPopup: false, // 控制弹窗显示与否 + qrcode: "https://img.picui.cn/free/2025/05/29/6837c53582068.gif", // 设置二维码图片的路径 + }, + // 点击二维码时，显示弹窗 + showPromoPopup() { + this.setData({ + showPopup: true + }); + }, + + // 关闭弹窗 + closePopup() { + this.setData({ + showPopup: false + }); }, myteam(){ wx.navigateTo({ diff --git a/pages/personCenter/mine/mine.wxml b/pages/personCenter/mine/mine.wxml index 62268b8..a8a0770 100644 --- a/pages/personCenter/mine/mine.wxml +++ b/pages/personCenter/mine/mine.wxml @@ -2,25 +2,25 @@ - {{ nickName }} + qingcheng - {{ phoneNumber }} + 15214547473 + 邀请码：123445 - 邀请码：{{ invitationCode }} - + 当前金额： - ￥{{ currentBalance }} + ￥5.00 提现中 - ￥{{ withdrawalAmount }} + ￥0.00 已提现 - ￥{{ withdrawnAmount }} + ￥0.00 累计收入 - ￥{{ totalIncome }} + ￥0.00 diff --git a/pages/personCenter/subCommissionSetting/images/ss.png b/pages/personCenter/subCommissionSetting/images/ss.png new file mode 100644 index 0000000..7b711dd Binary files /dev/null and b/pages/personCenter/subCommissionSetting/images/ss.png differ diff --git a/pages/personCenter/subCommissionSetting/images/yjt.png b/pages/personCenter/subCommissionSetting/images/yjt.png new file mode 100644 index 0000000..66fb8f0 Binary files /dev/null and b/pages/personCenter/subCommissionSetting/images/yjt.png differ diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.js b/pages/personCenter/subCommissionSetting/subCommissionSetting.js index 116d883..c1f30f6 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.js +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.js @@ -7,6 +7,24 @@ Page({ data: { items_1: [null, null, null], items: [null, null], + showCommissionRatePop: false, + }, + + // 点击“设价”按钮，显示弹窗 + showCommissionRatePop() { + this.setData({ showCommissionRatePop: true }); + }, + + // 关闭弹窗（包括遮罩点击和取消按钮） + closeCommissionRatePop() { + this.setData({ showCommissionRatePop: false }); + }, + + // 确认按钮回调 + handleCommissionRateConfirm(e) { + const { agentPrice, commissionRate, pricingMethod } = e.detail; + console.log('设置数据:', agentPrice, commissionRate, pricingMethod); + this.closeCommissionRatePop(); }, /** diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml index 120fb24..e999631 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml @@ -4,7 +4,7 @@ @@ -31,7 +31,7 @@ 设价 diff --git a/pages/personCenter/withdrawalAccount/withdrawalAccount.js b/pages/personCenter/withdrawalAccount/withdrawalAccount.js index bd23c11..5de224d 100644 --- a/pages/personCenter/withdrawalAccount/withdrawalAccount.js +++ b/pages/personCenter/withdrawalAccount/withdrawalAccount.js @@ -7,7 +7,11 @@ Page({ data: { }, - + gotoEditBankCardInfo() { + wx.navigateTo({ + url: '/pages/personCenter/bindBankCard/bindBankCard', + }) + }, /** * 生命周期函数--监听页面加载 */