From e39ba3508e3ed11e291bd580e93d19a308577539 Mon Sep 17 00:00:00 2001 From: yuanteng0011 <1876787513@qq.com> Date: Fri, 30 May 2025 08:30:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E4=BA=86=E6=88=91=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=8C=E6=88=91=E7=9A=84=E6=8A=BD=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 5 +- pages/loginModule/pwdLogin/pwdLogin.js | 1 + .../personCenter/bindBankCard/bindBankCard.js | 66 ----------- .../bindBankCard/bindBankCard.json | 3 - .../bindBankCard/bindBankCard.wxml | 44 -------- .../bindBankCard/bindBankCard.wxss | 103 ------------------ .../commissionSetting/commissionSetting.js | 56 ++++------ .../commissionSetting/commissionSetting.json | 5 +- .../commissionSetting/images/right.png | Bin 182 -> 0 bytes .../commissionSetting/images/rightBlack.png | Bin 603 -> 0 bytes .../InvitationCodePop/InvitationCodePop.js | 36 +++--- .../InvitationCodePop/images/cha.png | Bin 1100 -> 0 bytes .../component/commissionPop/commissionPop.js | 41 +------ .../commissionRatePop/commissionRatePop.js | 28 ++--- pages/personCenter/mine/mine.js | 17 +-- pages/personCenter/mine/mine.wxml | 2 +- .../subCommissionSetting.js | 18 --- .../withdrawalAccount/withdrawalAccount.js | 6 +- 18 files changed, 58 insertions(+), 373 deletions(-) delete mode 100644 pages/personCenter/bindBankCard/bindBankCard.js delete mode 100644 pages/personCenter/bindBankCard/bindBankCard.json delete mode 100644 pages/personCenter/bindBankCard/bindBankCard.wxml delete mode 100644 pages/personCenter/bindBankCard/bindBankCard.wxss delete mode 100644 pages/personCenter/commissionSetting/images/right.png delete mode 100644 pages/personCenter/commissionSetting/images/rightBlack.png delete mode 100644 pages/personCenter/component/InvitationCodePop/images/cha.png diff --git a/app.json b/app.json index 1216b58..a4805b6 100644 --- a/app.json +++ b/app.json @@ -1,12 +1,11 @@ { "pages": [ - "pages/personCenter/mine/mine", - "pages/personCenter/withdrawalAccount/withdrawalAccount", - "pages/personCenter/bindBankCard/bindBankCard", "pages/loginModule/pwdLogin/pwdLogin", + "pages/personCenter/mine/mine", "pages/personCenter/subCommissionSetting/subCommissionSetting", "pages/test/testVideo/testVideo", "pages/personCenter/withdrawal/withdrawal", + "pages/personCenter/withdrawalAccount/withdrawalAccount", "pages/personCenter/accountSetting/accountSetting", "pages/personCenter/contactSuper/contactSuper", "pages/personCenter/fundingDetails/fundingDetails", diff --git a/pages/loginModule/pwdLogin/pwdLogin.js b/pages/loginModule/pwdLogin/pwdLogin.js index b2ffd96..0d48b0d 100644 --- a/pages/loginModule/pwdLogin/pwdLogin.js +++ b/pages/loginModule/pwdLogin/pwdLogin.js @@ -150,6 +150,7 @@ Page({ method: 'POST', data: payload, success: res => { + console.log('--->',res.data.data); if (res.data.code === 1) { // ← 新增：从返回数据中取出 token const token = res.data.data.token || res.data.data; diff --git a/pages/personCenter/bindBankCard/bindBankCard.js b/pages/personCenter/bindBankCard/bindBankCard.js deleted file mode 100644 index ff883dc..0000000 --- a/pages/personCenter/bindBankCard/bindBankCard.js +++ /dev/null @@ -1,66 +0,0 @@ -// 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 deleted file mode 100644 index 8835af0..0000000 --- a/pages/personCenter/bindBankCard/bindBankCard.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/pages/personCenter/bindBankCard/bindBankCard.wxml b/pages/personCenter/bindBankCard/bindBankCard.wxml deleted file mode 100644 index a18e364..0000000 --- a/pages/personCenter/bindBankCard/bindBankCard.wxml +++ /dev/null @@ -1,44 +0,0 @@ - - 绑定银行卡 - 请绑定持卡人本人的银行卡 - - - 持卡人 - * - - - - - - 身份证号 - * - - - - - - 手机号 - * - - - - - - 银行卡号 - * - - - - - - 开户银行 - * - - - - - - - 保存 - - \ No newline at end of file diff --git a/pages/personCenter/bindBankCard/bindBankCard.wxss b/pages/personCenter/bindBankCard/bindBankCard.wxss deleted file mode 100644 index 189d490..0000000 --- a/pages/personCenter/bindBankCard/bindBankCard.wxss +++ /dev/null @@ -1,103 +0,0 @@ -.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 a9a4ba3..9f8ebbb 100644 --- a/pages/personCenter/commissionSetting/commissionSetting.js +++ b/pages/personCenter/commissionSetting/commissionSetting.js @@ -1,3 +1,5 @@ +import { baseUrl } from "../../../request"; + // pages/personCenter/commissionSetting/commissionSetting.js Page({ @@ -7,44 +9,28 @@ Page({ data: { items_1: [null, null, null], items: [null, null], - 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 }); + projectList: [] }, - // 关闭弹窗（包括遮罩点击和取消按钮） - closeCommissionRatePop() { - this.setData({ showCommissionRatePop: false }); + // 获取项目列表 + 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 + }) + } + } + }) }, - // 确认按钮回调 - handleCommissionRateConfirm(e) { - const { agentPrice, commissionRate, pricingMethod } = e.detail; - console.log('设置数据:', agentPrice, commissionRate, pricingMethod); - this.closeCommissionRatePop(); - }, gotoSubCommission() { wx.navigateTo({ url: '/pages/personCenter/subCommissionSetting/subCommissionSetting', @@ -54,7 +40,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - + this.getProjectList() }, /** diff --git a/pages/personCenter/commissionSetting/commissionSetting.json b/pages/personCenter/commissionSetting/commissionSetting.json index 2969084..8835af0 100644 --- a/pages/personCenter/commissionSetting/commissionSetting.json +++ b/pages/personCenter/commissionSetting/commissionSetting.json @@ -1,6 +1,3 @@ { - "usingComponents": { - "commissionPop": "/pages/personCenter/component/commissionPop/commissionPop", - "commissionRatePop": "/pages/personCenter/component/commissionRatePop/commissionRatePop" - } + "usingComponents": {} } \ No newline at end of file diff --git a/pages/personCenter/commissionSetting/images/right.png b/pages/personCenter/commissionSetting/images/right.png deleted file mode 100644 index a4866e1fbd62433c5efb0eb4487f09ffd6a25ff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%jKx9jP7LeL$-D$|Sc;uILpXq- zh9ji|$WQQeaSZY3e0$lEx4}TbTA46m9V+fY)8d>*4(M aRk0=&&rJ6UyS@S1#o+1c=d#Wzp$Pz=ggQz9 diff --git a/pages/personCenter/commissionSetting/images/rightBlack.png b/pages/personCenter/commissionSetting/images/rightBlack.png deleted file mode 100644 index e12ea1114e0d79f53c18b3d4516410edafbdcde0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 603 zcmV-h0;K(kP)Px#1am@3R0s$N2z&@+hyVZr1xZ9fR9J=W*RgKeKpe;M@87PgDj@Y}ak=q?myBfV z7~UX#gYpJ>gYYJF%|ttPLU{ssfmS!7(uf-fA|mm10R~HvYGc92DDmOt+vxSJ z+iW(q!gjd315VIE7@RL3*0;68vN%M}TaAWVKCHjj4%_42H5&%#iSV)2JY%_9-_;HS zSgzLJT8+k)2wITKV{wH}=(L}%ikfxu0{JQ^I zI}9>7k9$t(@9w_8PN`eDkDWW49bI{AR07LJJSy)ymB98}iJViH?0&w{Pn9 z0MOO#n>{Mg@u+SOkU@3Yx$mo&a#W9XJMC*hh5+6(OCO&GrKmV!Bqcij42%Fg*mSeK zu+F(!VJ41yVZa1Id9W$lzMVT;7OD`;Xk|hlO%J!aY%j`2LCzjCN~!Fqv5WFixnZyy p$U@;!Q(25ss;a;5Q%?Dp`2%Ac!d(ZjZ{Pp`002ovPDHLkV1hz55<&m~ diff --git a/pages/personCenter/component/InvitationCodePop/InvitationCodePop.js b/pages/personCenter/component/InvitationCodePop/InvitationCodePop.js index 5805e81..0c87a48 100644 --- a/pages/personCenter/component/InvitationCodePop/InvitationCodePop.js +++ b/pages/personCenter/component/InvitationCodePop/InvitationCodePop.js @@ -1,32 +1,24 @@ +// 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/InvitationCodePop/images/cha.png b/pages/personCenter/component/InvitationCodePop/images/cha.png deleted file mode 100644 index f34afe806d381d9d53cd520fcc80066161d01524..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1100 zcmV-S1he~zP)Px#1am@3R0s$N2z&@+hyVZs_DMuRRA_-x`9VfH}D2lCrCO$ z)d@U;vq461I)Sr+oC%yv@cKddtT-SDQjl|(;x3om3B15;6IUSZUB-sfF*!$ z0KNkF0$?#beja{50XS4u^)#0s?nFs00IU(nt#Bq~l}7-70o+$rb#QggLr69xcO;MW zlRe4yqqzZiLvT*%Ka4QR`U(Wy2p8>9l6L@p!?yok033#&7lZ`V4`b`$XZ*KC?g9L& zs_Mn4pC=?2BsYecKa$*%TrngktNmuMzc)s=o{MD4fu7{b39lX|D>b1@54MV$K{EM%B)JyG9Vu09lq1s`9gQW0B-s>6(b@MlVk@h; zR9r@YY75a)vK}NywswMz&85<rPVPvAh}SNC1;ApQ@_r0Q@nkKLPmRaN#A5KXZ%B zu*=PXA+nPrIl_`I3f4F2p)PVrJb#+)>N3ddn5Z7|LSZO4Qq@t*i3fp^h+8m4w4Q=! zBzY1qvbFk@@=f2m6pi|OvR9r>J>p4Hj}^9pLTSN}ECx8CHdb)Od#+0*uM*H)@pzMs zVDB%LVrS8uqB^^*^CV08)$;yKO8J;$+NUKXy~#$#zb|7c*Pxbz_o|en7g@yz@!(x@ zm7?C9TSywowu!O3tO=sLe4|N8nViz2R*Y=PQPJbp;h#IK|gvA ztvOEWQC$sSM}`BuOX)basp!Qn=2{C#EUMj90-nP7_ZK~yBLmvks&-!YZ9+W>HaUi3 zNyfKtpimh93ZGv-GTwpGe-znawe1wY%JPFUb7bf@x|&d5uH~Qh2jkj)C9jmA7`Bqu zXXw(IqRk{ZW3L` 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 9b1b3ef..e3e074e 100644 --- a/pages/personCenter/component/commissionRatePop/commissionRatePop.js +++ b/pages/personCenter/component/commissionRatePop/commissionRatePop.js @@ -1,28 +1,24 @@ +// pages/personCenter/component/commissionRatePop/commissionRatePop.js Component({ + /** * 组件的属性列表 */ properties: { - show: { // 控制显示/隐藏 - type: Boolean, - value: false - }, + + }, + + /** + * 组件的初始数据 + */ + data: { + }, /** * 组件的方法列表 */ 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 1dda561..517c284 100644 --- a/pages/personCenter/mine/mine.js +++ b/pages/personCenter/mine/mine.js @@ -16,22 +16,7 @@ Page({ currentBalance: "", // 当前余额 withdrawalAmount: "", // 提现中的余额 withdrawnAmount: "", // 已提现的余额 - totalIncome:"", // 累计收入 - showPopup: false, // 控制弹窗显示与否 - qrcode: "https://img.picui.cn/free/2025/05/29/6837c53582068.gif", // 设置二维码图片的路径 - }, - // 点击二维码时，显示弹窗 - showPromoPopup() { - this.setData({ - showPopup: true - }); - }, - - // 关闭弹窗 - closePopup() { - this.setData({ - showPopup: false - }); + totalIncome:"" // 累计收入 }, myteam(){ wx.navigateTo({ diff --git a/pages/personCenter/mine/mine.wxml b/pages/personCenter/mine/mine.wxml index 2defb41..62268b8 100644 --- a/pages/personCenter/mine/mine.wxml +++ b/pages/personCenter/mine/mine.wxml @@ -2,7 +2,7 @@ - 000000 + {{ nickName }}