diff --git a/pages/loginModule/pwdLogin/pwdLogin.wxml b/pages/loginModule/pwdLogin/pwdLogin.wxml index 17e3de3..7042cbb 100644 --- a/pages/loginModule/pwdLogin/pwdLogin.wxml +++ b/pages/loginModule/pwdLogin/pwdLogin.wxml @@ -22,9 +22,8 @@ - - - + - - - ',res.data); // 成功的回调 - wx.showToast({ - title: '更新成功', - icon: 'success', - }); - // 这里可以跳转到其他页面 - wx.navigateTo({ - url: '/pages/personCenter/withdrawalAccount/withdrawalAccount', - }); + if (res.data.code === 1) { + wx.showToast({ + title: '更新成功', + icon: 'success', + }); + wx.navigateBack({}); + } }, fail(err) { // 失败的回调 diff --git a/pages/personCenter/bindBankCard/bindBankCard.wxss b/pages/personCenter/bindBankCard/bindBankCard.wxss index e3b6426..00f5da0 100644 --- a/pages/personCenter/bindBankCard/bindBankCard.wxss +++ b/pages/personCenter/bindBankCard/bindBankCard.wxss @@ -37,6 +37,7 @@ border-radius: 10rpx; } .text_3 { + width: 90%; margin-left: 27.52rpx; } .font { @@ -60,13 +61,14 @@ border-radius: 10rpx; } .text_12 { + width: 90%; margin-left: 25.8rpx; } .group_4 { line-height: 28.09rpx; } .text_1 { - width: 400rpx; + width: 90%; margin-left: 27.82rpx; } .group_5 { @@ -76,6 +78,7 @@ line-height: 28.21rpx; } .text_5 { + width: 90%; margin-left: 26.74rpx; } .font_4 { @@ -98,5 +101,6 @@ width: 248.09rpx; } .text_8 { + line-height: 100%; color: #ffffff; } \ No newline at end of file diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.js b/pages/personCenter/subCommissionSetting/subCommissionSetting.js index b07c08f..d5a7a0e 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.js +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.js @@ -18,8 +18,29 @@ Page({ nowAgentUnitPrice: 0, // 现在的‘代理单价’,用于传给弹窗 nowProjectDetailName: '', // 现在的‘项目详细名称’,用于传给弹窗 isSub: true, // 用于区分是项目抽佣页面还是单个用户抽佣页面 + searchText: '', + tempSubCommissionList: [] }, + // 输入框内容变化时更新数据 + onInput(e) { + this.setData({ + searchText: e.detail.value, // 获取用户输入的关键字 + }); + }, + + onSearch() { + let searchValue = this.data.searchText; // 获取输入框的值 + let subCommissionList = this.data.subCommissionList + // 筛选出 salespersonName 包含 searchText 的项 + let filtered = subCommissionList.filter(item => + item.subUserNickName.includes(searchValue) + ); + this.setData({ + tempSubCommissionList: filtered + }) + }, + // 点击“设价”按钮,显示弹窗 showCommissionRatePop(e) { console.log('弹窗传值----->',e); @@ -59,7 +80,8 @@ Page({ console.log('下级抽佣列表----->',res.data.data); if (res.data.code === 1) { this.setData({ - subCommissionList: res.data.data + subCommissionList: res.data.data, + tempSubCommissionList: res.data.data }) } } diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml index aa136b7..e74873d 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxml @@ -7,11 +7,11 @@ class="image" src="./images/ss.png" /> - + - + 结算标准:{{ item.subUserNickName }} diff --git a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss index 9ec55eb..fd1a935 100644 --- a/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss +++ b/pages/personCenter/subCommissionSetting/subCommissionSetting.wxss @@ -41,7 +41,7 @@ height: 35.63rpx; } .text_2 { - color: #999999; + color: #323232; line-height: 27.96rpx; } .list-item_1 { diff --git a/pages/personCenter/teamManage/teamManage.js b/pages/personCenter/teamManage/teamManage.js index 45872cf..0fbf0ad 100644 --- a/pages/personCenter/teamManage/teamManage.js +++ b/pages/personCenter/teamManage/teamManage.js @@ -8,10 +8,12 @@ Page({ */ data: { directAgentSize: 0, // 直接代理人数 - teamSize: null, // 团队人数 - teamEarnings: null, // 团队收益 + teamSize: '', // 团队人数 + teamEarnings: '', // 团队收益 invitationCode: "", // 邀请码 - userMemberInfoVOList: [] // 成员列表 + userMemberInfoVOList: [], // 成员列表 + searchText: '', + tempUserMemberInfoVOList: [], }, // 获取团队成员信息 @@ -23,19 +25,39 @@ Page({ Authorization: wx.getStorageSync('token') }, success: res => { - console.log('团队成员信息---->',res.data.data); + // console.log('团队成员信息---->',res.data.data); let result = res.data.data this.setData({ directAgentSize: result.directAgentSize, teamSize: result.teamSize, teamEarnings: result.teamEarnings, invitationCode: result.invitationCode, - userMemberInfoVOList: result.userMemberInfoVOList + userMemberInfoVOList: result.userMemberInfoVOList, + tempUserMemberInfoVOList: result.userMemberInfoVOList }) } }) }, + // 输入框内容变化时更新数据 + onInput(e) { + this.setData({ + searchText: e.detail.value, // 获取用户输入的关键字 + }); + }, + + onSearch() { + let searchValue = this.data.searchText; // 获取输入框的值 + let userMemberList = this.data.userMemberInfoVOList + // 筛选出 salespersonName 包含 searchText 的项 + let filtered = userMemberList.filter(item => + item.nickName.includes(searchValue) + ); + this.setData({ + tempUserMemberInfoVOList: filtered + }) + }, + // 复制邀请码到剪贴板 copyInvitationCode() { wx.setClipboardData({ diff --git a/pages/personCenter/teamManage/teamManage.wxml b/pages/personCenter/teamManage/teamManage.wxml index 018b6bb..0825426 100644 --- a/pages/personCenter/teamManage/teamManage.wxml +++ b/pages/personCenter/teamManage/teamManage.wxml @@ -44,13 +44,13 @@ class="image_4" src="./images/ss.png" /> - +