diff --git a/app.json b/app.json
index 2da8389..3e60775 100644
--- a/app.json
+++ b/app.json
@@ -20,7 +20,8 @@
"pages/loginModule/forgetPwd/forgetPwd",
"pages/personCenter/commissionSetting/commissionSetting",
"pages/personCenter/resetPwd/resetPwd",
- "pages/personCenter/bindBankCard/bindBankCard"
+ "pages/personCenter/bindBankCard/bindBankCard",
+ "pages/projectModule/settlement/settlement"
],
"window": {
"navigationBarTextStyle": "black",
diff --git a/pages/personCenter/billingDetails/billingDetails.js b/pages/personCenter/billingDetails/billingDetails.js
index 5d616c9..37fa07a 100644
--- a/pages/personCenter/billingDetails/billingDetails.js
+++ b/pages/personCenter/billingDetails/billingDetails.js
@@ -1,3 +1,5 @@
+import { baseUrl } from "../../../request"
+
// pages/personCenter/billingDetails/billingDetails.js
Page({
@@ -5,14 +7,33 @@ Page({
* 页面的初始数据
*/
data: {
- items: [null, null, null, null]
+ withdrawalList: [],
+ withdrawalStatus: ['审核中', '提现成功', '提现失败']
},
+ getWithdrawalList() {
+ wx.request({
+ url: baseUrl + '/withdrawalApply/query',
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token')
+ },
+ success: res => {
+ console.log('账单明细---->',res.data);
+ console.log('登录token---->',wx.getStorageSync('token'));
+ if (res.data.code === 1) {
+ this.setData({
+ withdrawalList: res.data.data
+ })
+ }
+ }
+ })
+ },
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
+ this.getWithdrawalList()
},
/**
diff --git a/pages/personCenter/bindBankCard/bindBankCard.js b/pages/personCenter/bindBankCard/bindBankCard.js
index ff883dc..0f5d7d5 100644
--- a/pages/personCenter/bindBankCard/bindBankCard.js
+++ b/pages/personCenter/bindBankCard/bindBankCard.js
@@ -1,66 +1,268 @@
+import { baseUrl } from "../../../request"
+
// pages/personCenter/bindBankCard/bindBankCard.js
Page({
-
/**
* 页面的初始数据
*/
data: {
+ id: 0, // 账户ID
+ cardHolder: '', // 持卡人
+ idCardNumber: '', // 身份证号
+ phoneNumber: '', // 手机号
+ bankCardNumber: '', // 银行卡号
+ bankName: '', // 开户银行
+ isUpdate: false, // 是否更新
+ },
+
+ /**
+ * 更新按钮点击事件
+ */
+ updateInfo() {
+ if (this.validateForm()) {
+ // 构建请求体
+ const requestData = {
+ id: this.data.id,
+ cardHolder: this.data.cardHolder,
+ idCardNumber: this.data.idCardNumber,
+ phoneNumber: this.data.phoneNumber,
+ bankCardNumber: this.data.bankCardNumber,
+ openBank: this.data.bankName, // 添加开户银行字段
+ };
+
+ // 发送请求到后台接口
+ wx.request({
+ url: baseUrl + '/userAccount/update', // 替换成实际接口地址
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token')
+ },
+ data: requestData,
+ success(res) {
+ // console.log('后端返回---->',res.data);
+ // 成功的回调
+ wx.showToast({
+ title: '更新成功',
+ icon: 'success',
+ });
+ // 这里可以跳转到其他页面
+ wx.reLaunch({
+ url: '/pages/personCenter/withdrawalAccount/withdrawalAccount',
+ });
+ },
+ fail(err) {
+ // 失败的回调
+ wx.showToast({
+ title: '绑定失败，请重试',
+ icon: 'none',
+ });
+ }
+ });
+ }
+ },
+
+ // 获取当前账户信息
+ getAccountInfo() {
+ wx.request({
+ url: baseUrl + '/userAccount/queryById', // 替换为你的后端接口
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token'),
+ },
+ success: (res) => {
+ // console.log('当前账户是---->',res.data.data);
+ if (res.data.code === 1) {
+ this.setData({
+ id: res.data.data.id,
+ cardHolder: res.data.data.cardHolder,
+ idCardNumber: res.data.data.idCardNumber,
+ phoneNumber: res.data.data.phoneNumber,
+ bankCardNumber: res.data.data.bankCardNumber,
+ bankName: res.data.data.openBank
+ });
+ } else {
+ wx.showToast({
+ title: '获取数据失败',
+ icon: 'none'
+ });
+ }
+ },
+ fail: () => {
+ wx.showToast({
+ title: '请求失败',
+ icon: 'none'
+ });
+ }
+ });
+ },
+
+ /**
+ * 处理输入框的变化
+ */
+ handleInputChange(e) {
+ const { field } = e.target.dataset; // 获取字段名
+ this.setData({
+ [field]: e.detail.value, // 动态更新输入框数据
+ });
+ },
+
+ /**
+ * 验证表单
+ */
+ validateForm() {
+ const { cardHolder, idCardNumber, phoneNumber, bankCardNumber, bankName } = this.data;
+
+ // 检查必填字段是否为空
+ if (!cardHolder || !idCardNumber || !phoneNumber || !bankCardNumber || !bankName) {
+ wx.showToast({
+ title: '用户信息不全',
+ icon: 'none',
+ });
+ return false;
+ }
+
+ // 检查手机号是否为 11 位且只包含数字
+ const phonePattern = /^[0-9]{11}$/;
+ if (!phonePattern.test(phoneNumber)) {
+ wx.showToast({
+ title: '手机号必须是 11 位数字',
+ icon: 'none',
+ });
+ return false;
+ }
+
+ // 检查身份证号是否为 18 位且只包含数字
+ const idCardPattern = /^[0-9]{18}$/;
+ if (!idCardPattern.test(idCardNumber)) {
+ wx.showToast({
+ title: '身份证号必须是 18 位数字',
+ icon: 'none',
+ });
+ return false;
+ }
+
+ // 检查银行卡号是否为 16 位且只包含数字
+ const bankCardPattern = /^[0-9]{16}$/;
+ if (!bankCardPattern.test(bankCardNumber)) {
+ wx.showToast({
+ title: '银行卡号必须是 16 位数字',
+ icon: 'none',
+ });
+ return false;
+ }
+
+ // 检查持卡人不能是纯数字
+ const cardHolderPattern = /^\d+$/;
+ if (cardHolderPattern.test(cardHolder)) {
+ wx.showToast({
+ title: '持卡人姓名不能是数字',
+ icon: 'none',
+ });
+ return false;
+ }
+
+ // 检查开户银行不能包含字母或数字，只能是中文
+ const bankNamePattern = /^[\u4e00-\u9fa5]+$/; // 只允许中文字符
+ if (!bankNamePattern.test(bankName)) {
+ wx.showToast({
+ title: '开户银行只能包含中文字符',
+ icon: 'none',
+ });
+ return false;
+ }
+
+ return true;
+ },
+
+ /**
+ * 保存按钮点击事件
+ */
+ saveInfo() {
+ if (this.validateForm()) {
+ // 构建请求体
+ const requestData = {
+ cardHolder: this.data.cardHolder,
+ idCardNumber: this.data.idCardNumber,
+ phoneNumber: this.data.phoneNumber,
+ bankCardNumber: this.data.bankCardNumber,
+ openBank: this.data.bankName, // 添加开户银行字段
+ };
+
+ // 发送请求到后台接口
+ wx.request({
+ url: baseUrl + '/userAccount/add', // 替换成实际接口地址
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token')
+ },
+ data: requestData,
+ success(res) {
+ console.log('后端返回---->',res.data);
+ // 成功的回调
+ wx.showToast({
+ title: '绑定成功',
+ icon: 'success',
+ });
+ // 这里可以跳转到其他页面
+ wx.reLaunch({
+ url: '/pages/personCenter/withdrawal/withdrawal',
+ });
+ },
+ fail(err) {
+ // 失败的回调
+ wx.showToast({
+ title: '绑定失败，请重试',
+ icon: 'none',
+ });
+ }
+ });
+ }
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
+ // console.log('---->',options.isUpdate);
+ this.getAccountInfo()
+ this.setData({
+ isUpdate: options.isUpdate
+ })
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
- onReady() {
-
- },
+ onReady() {},
/**
* 生命周期函数--监听页面显示
*/
- onShow() {
-
- },
+ onShow() {},
/**
* 生命周期函数--监听页面隐藏
*/
- onHide() {
-
- },
+ onHide() {},
/**
* 生命周期函数--监听页面卸载
*/
- onUnload() {
-
- },
+ onUnload() {},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
- onPullDownRefresh() {
-
- },
+ onPullDownRefresh() {},
/**
* 页面上拉触底事件的处理函数
*/
- onReachBottom() {
-
- },
+ onReachBottom() {},
/**
* 用户点击右上角分享
*/
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
+ onShareAppMessage() {},
+});
\ No newline at end of file
diff --git a/pages/personCenter/bindBankCard/bindBankCard.wxml b/pages/personCenter/bindBankCard/bindBankCard.wxml
index a18e364..43b7169 100644
--- a/pages/personCenter/bindBankCard/bindBankCard.wxml
+++ b/pages/personCenter/bindBankCard/bindBankCard.wxml
@@ -1,44 +1,88 @@
- 绑定银行卡
+ 更改银行卡信息
+ 绑定银行卡信息
请绑定持卡人本人的银行卡
+
+
持卡人
*
-
+
+
+
身份证号
*
-
+
+
+
手机号
*
-
+
+
+
银行卡号
*
-
+
开户银行
*
-
+
-
- 保存
+
+
+
+ 更新
-
\ No newline at end of file
+
+ 保存
+
+
diff --git a/pages/personCenter/mine/mine.js b/pages/personCenter/mine/mine.js
index a1ef13f..a648f4a 100644
--- a/pages/personCenter/mine/mine.js
+++ b/pages/personCenter/mine/mine.js
@@ -7,15 +7,15 @@ Page({
* 页面的初始数据
*/
data: {
- items: [null, null],
+ items: [null],
nickName: "",
userAvatar: "",
phoneNumber: "",
userAccount: "",
invitationCode: "",
currentBalance: "", // 当前余额
- withdrawalAmount: "", // 提现中的余额
- withdrawnAmount: "", // 已提现的余额
+ withdrawalingBalance: 0, // 提现中的余额
+ withdrawaledAmount: "", // 已提现的余额
totalIncome:"", // 累计收入
showPopup: false, // 控制弹窗显示与否
qrcode: "https://img.picui.cn/free/2025/05/29/6837c53582068.gif", // 设置二维码图片的路径
@@ -98,8 +98,8 @@ Page({
if (res.data.code === 1) {
this.setData({
currentBalance: res.data.data.currentBalance, // 当前余额
- withdrawalAmount: res.data.data.withdrawalAmount, // 提现中的余额
- withdrawnAmount: res.data.data.withdrawnAmount, // 已提现的余额
+ withdrawalingBalance: res.data.data.withdrawalAmount, // 提现中的余额
+ withdrawaledAmount: res.data.data.withdrawnAmount, // 已提现的余额
totalIncome: res.data.data.totalIncome // 累计收入
})
} else {
diff --git a/pages/personCenter/mine/mine.wxml b/pages/personCenter/mine/mine.wxml
index a8a0770..61b122c 100644
--- a/pages/personCenter/mine/mine.wxml
+++ b/pages/personCenter/mine/mine.wxml
@@ -2,17 +2,17 @@
- qingcheng
+ {{ nickName }}
- 15214547473
+ {{ phoneNumber }}
- 邀请码：123445
+ 邀请码：{{ invitationCode }}
当前金额：
- ￥5.00
+ ￥{{ currentBalance }}
提现中
- ￥0.00
+ ￥{{ withdrawalingBalance }}
已提现
- ￥0.00
+ ￥{{ withdrawaledAmount }}
累计收入
- ￥0.00
+ ￥{{ totalIncome }}
diff --git a/pages/personCenter/withdrawal/withdrawal.js b/pages/personCenter/withdrawal/withdrawal.js
index 4733356..d54b3f7 100644
--- a/pages/personCenter/withdrawal/withdrawal.js
+++ b/pages/personCenter/withdrawal/withdrawal.js
@@ -1,66 +1,92 @@
+import { baseUrl } from "../../../request";
+
// pages/personCenter/withdrawal/withdrawal.js
Page({
-
/**
* 页面的初始数据
*/
data: {
+ withdrawalAccount: '', // 这里保存提现账户信息
+ },
+ // 获取当前账户信息
+ getAccountInfo() {
+ wx.request({
+ url: baseUrl + '/userAccount/queryById', // 替换为你的后端接口
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token'),
+ },
+ success: (res) => {
+ console.log('当前账户是---->',res.data.data);
+ if (res.data.code === 1) {
+ this.setData({
+ withdrawalAccount: res.data.data.bankCardNumber,
+ });
+ } else {
+ wx.showToast({
+ title: '获取数据失败',
+ icon: 'none'
+ });
+ }
+ },
+ fail: () => {
+ wx.showToast({
+ title: '请求失败',
+ icon: 'none'
+ });
+ }
+ });
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ this.getAccountInfo()
+ },
+ /**
+ * 跳转到添加提现账户页面
+ */
+ goToAddAccount() {
+ wx.navigateTo({
+ url: '/pages/personCenter/bindBankCard/bindBankCard', // 自定义的添加提现账户页面
+ });
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
- onReady() {
-
- },
+ onReady() {},
/**
* 生命周期函数--监听页面显示
*/
- onShow() {
-
- },
+ onShow() {},
/**
* 生命周期函数--监听页面隐藏
*/
- onHide() {
-
- },
+ onHide() {},
/**
* 生命周期函数--监听页面卸载
*/
- onUnload() {
-
- },
+ onUnload() {},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
- onPullDownRefresh() {
-
- },
+ onPullDownRefresh() {},
/**
* 页面上拉触底事件的处理函数
*/
- onReachBottom() {
-
- },
+ onReachBottom() {},
/**
* 用户点击右上角分享
*/
- onShareAppMessage() {
-
- }
-})
\ No newline at end of file
+ onShareAppMessage() {},
+});
\ No newline at end of file
diff --git a/pages/personCenter/withdrawal/withdrawal.wxml b/pages/personCenter/withdrawal/withdrawal.wxml
index 6aedbd8..9326a4b 100644
--- a/pages/personCenter/withdrawal/withdrawal.wxml
+++ b/pages/personCenter/withdrawal/withdrawal.wxml
@@ -2,11 +2,15 @@
提现账户
-
- 622031207006363442
+
+
+
+ {{withdrawalAccount}}
+
+
+
+
+
diff --git a/pages/personCenter/withdrawal/withdrawal.wxss b/pages/personCenter/withdrawal/withdrawal.wxss
index 5cd73e3..f46d25b 100644
--- a/pages/personCenter/withdrawal/withdrawal.wxss
+++ b/pages/personCenter/withdrawal/withdrawal.wxss
@@ -88,4 +88,12 @@
.text_6 {
color: #ffffff;
line-height: 28.36rpx;
-}
\ No newline at end of file
+}
+.add-btn {
+ background-color: #ff8d1a;
+ color: #ffffff;
+ font-size: 26.72rpx;
+ padding: 10rpx 20rpx;
+ border-radius: 10rpx;
+ border: none;
+}
diff --git a/pages/personCenter/withdrawalAccount/withdrawalAccount.js b/pages/personCenter/withdrawalAccount/withdrawalAccount.js
index 5de224d..f30401b 100644
--- a/pages/personCenter/withdrawalAccount/withdrawalAccount.js
+++ b/pages/personCenter/withdrawalAccount/withdrawalAccount.js
@@ -1,3 +1,5 @@
+import { baseUrl } from "../../../request";
+
// pages/personCenter/withdrawalAccount/withdrawalAccount.js
Page({
@@ -5,18 +7,58 @@ Page({
* 页面的初始数据
*/
data: {
-
+ cardHolder: '', // 姓名
+ idCardNumber: '', // 身份证号
+ phoneNumber: '', // 手机号
+ bankCardNumber: '', // 银行卡号
+ openBank: '' // 开户银行
},
+
+ // 获取当前账户信息
+ getAccountInfo() {
+ wx.request({
+ url: baseUrl + '/userAccount/queryById', // 替换为你的后端接口
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token'),
+ },
+ success: (res) => {
+ console.log('当前账户是---->',res.data);
+ if (res.data.code === 1) {
+ this.setData({
+ cardHolder: res.data.data.cardHolder,
+ idCardNumber: res.data.data.idCardNumber,
+ phoneNumber: res.data.data.phoneNumber,
+ bankCardNumber: res.data.data.bankCardNumber,
+ openBank: res.data.data.openBank
+ });
+ } else {
+ wx.showToast({
+ title: '获取数据失败',
+ icon: 'none'
+ });
+ }
+ },
+ fail: () => {
+ wx.showToast({
+ title: '请求失败',
+ icon: 'none'
+ });
+ }
+ });
+ },
+
gotoEditBankCardInfo() {
wx.navigateTo({
- url: '/pages/personCenter/bindBankCard/bindBankCard',
+ url: `/pages/personCenter/bindBankCard/bindBankCard?isUpdate=${true}`,
})
},
+
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
+ this.getAccountInfo()
},
/**
diff --git a/pages/personCenter/withdrawalAccount/withdrawalAccount.wxml b/pages/personCenter/withdrawalAccount/withdrawalAccount.wxml
index 191f536..9650685 100644
--- a/pages/personCenter/withdrawalAccount/withdrawalAccount.wxml
+++ b/pages/personCenter/withdrawalAccount/withdrawalAccount.wxml
@@ -6,28 +6,28 @@
姓名
- 陈新知
+ {{cardHolder}}
手机号
- 15888610253
+ {{phoneNumber}}
身份证号
- 33100420******50910
+ {{idCardNumber}}
开户银行
- 浙江省台州市中国工商银行台州蓬街支行
+ {{openBank}}
银行卡号
- 62220********363442
+ {{bankCardNumber}}
修改账户
-
\ No newline at end of file
+
diff --git a/pages/projectModule/settlement/settlement.js b/pages/projectModule/settlement/settlement.js
index b63aabc..ce962fc 100644
--- a/pages/projectModule/settlement/settlement.js
+++ b/pages/projectModule/settlement/settlement.js
@@ -1,3 +1,5 @@
+import { baseUrl } from "../../../request";
+
// pages/projectModule/settlement/settlement.js
Page({
@@ -5,14 +7,61 @@ Page({
* 页面的初始数据
*/
data: {
- items: [null, null],
+ pid: 0, // 项目id
+ projectSettlementList: [], // 项目结算列表
},
+ // 获取项目明细列表
+ getProjectSettlementList() {
+ const pid = this.data.pid
+ wx.request({
+ url: baseUrl + '/projectSettlement/query/all/settle',
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token')
+ },
+ data: {
+ id: pid
+ },
+ success: res =>{
+ console.log('---->',res.data);
+ if (res.data.code === 1) {
+
+ }
+ }
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
+ this.setData({ pid: options.id })
+ 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
+ });
+ }
},
/**
@@ -63,4 +112,4 @@ Page({
onShareAppMessage() {
}
-})
\ No newline at end of file
+});
diff --git a/pages/projectModule/settlement/settlement.wxml b/pages/projectModule/settlement/settlement.wxml
index 974ba6c..2d03ea0 100644
--- a/pages/projectModule/settlement/settlement.wxml
+++ b/pages/projectModule/settlement/settlement.wxml
@@ -1,14 +1,14 @@
项目：饿了么-超吃卡
-
+
- 美团神券包-春季活动
+ {{ projectSettlementList.projectDetailName}}
业务员：陈新知
@@ -20,22 +20,22 @@
- 3.6元购买券
- 10
- ￥3.00
+ {{ projectSettlementList.settlementQuantity }}元购买券
+ {{ projectSettlementList.settlementQuantity }}
+ ￥{{ projectSettlementList.settlementRevenue.toFixed(2) }}
作业时间：
- 2025-05-20
+ {{ projectSettlementList.workTime || '暂无' }}
结算时间：
- 2025-05-22
+ {{ projectSettlementList.settlementTime || '暂无' }}
-
\ No newline at end of file
+
diff --git a/pages/projectModule/userProject/userProject.js b/pages/projectModule/userProject/userProject.js
index 777770c..7de638e 100644
--- a/pages/projectModule/userProject/userProject.js
+++ b/pages/projectModule/userProject/userProject.js
@@ -1,3 +1,5 @@
+import { baseUrl } from "../../../request"
+
// pages/projectModule/userProject/userProject.js
Page({
@@ -6,18 +8,53 @@ Page({
*/
data: {
- items: [null, null, null],
+ userProjectList: [],
+ promotionCode: true // 推广码开启
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
+ this.getProgram();
},
- tiaozhuan(){
+
+ // 结算记录
+ gotoSubSettlement(e) {
+
+ const projectId = e.currentTarget.dataset.id;
+
wx.navigateTo({
- url: '/pages/projectModule/projectDetail/projectDetail',
+ url: `/pages/projectModule/settlement/settlement?id=${projectId}`,
+ })
+ },
+
+ // 获取项目列表
+ getProgram() {
+ wx.request({
+ url: baseUrl + '/project/query/card',
+ method: 'POST',
+ header: {
+ Authorization: wx.getStorageSync('token')
+ },
+ success: res => {
+ // console.log(res.data);
+ if(res.data.code === 1) {
+ this.setData({
+ userProjectList: res.data.data
+ })
+ }
+ }
+ })
+ },
+
+ // 跳转项目明细
+ gotoProjectDetail(e){
+ // 获取data-id中的值
+ const projectId = e.currentTarget.dataset.id;
+
+ wx.navigateTo({
+ url: `/pages/projectModule/projectDetail/projectDetail?id=${projectId}`,
})
},
/**
diff --git a/pages/projectModule/userProject/userProject.wxml b/pages/projectModule/userProject/userProject.wxml
index 0e602e4..f704c2d 100644
--- a/pages/projectModule/userProject/userProject.wxml
+++ b/pages/projectModule/userProject/userProject.wxml
@@ -16,18 +16,18 @@
class="image_2"
src="./images/yjt.png"
bind:tap="gotoProjectDetail"
- data-id="{{ item.projectId }}"
+ data-id="{{ item.id }}"
/>
-
+
推广码
-
+