连接了我的项目，我的抽成

# Conflicts:
#	pages/personCenter/mine/mine.wxml

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",
@@ -19,7 +18,8 @@
     "pages/projectModule/applyCode/applyCode",
     "pages/projectModule/userProject/userProject",
     "pages/loginModule/forgetPwd/forgetPwd",
-    "pages/personCenter/commissionSetting/commissionSetting"
+    "pages/personCenter/commissionSetting/commissionSetting",
+    "pages/personCenter/resetPwd/resetPwd"
   ],
   "window": {
     "navigationBarTextStyle": "black",

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;

pages/loginModule/register/register.js

@@ -51,6 +51,7 @@ Page({
     });
   },
 
+  // 验证码开始
   startCountdown() {
     this.setData({ sending: true, count: 60 });
     const timer = setInterval(() => {

pages/personCenter/accountSetting/accountSetting.js

@@ -12,6 +12,12 @@ Page({
     phoneNumber: ""
   },
 
+  gotoResetPwd() {
+    wx.navigateTo({
+      url: '/pages/personCenter/resetPwd/resetPwd',
+    })
+  },
+
   logOut() {
     wx.request({
       url: baseUrl + '/userInfo/mini/logout',

pages/personCenter/billingDetails/billingDetails.wxml

@@ -3,14 +3,16 @@
     <view class="flex-col section_2">
       <text class="self-start text">账单明细</text>
       <view class="flex-col self-stretch">
-        <view class="flex-col list-item" wx:for="{{items}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+        <view class="flex-col list-item" wx:for="{{withdrawalList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
           <view class="flex-row justify-between items-baseline">
             <text class="font text_2">银行卡</text>
-            <text class="font_2">￥2.00</text>
+            <text class="font_2">￥{{ item.withdrawnAmount }}</text>
           </view>
           <view class="flex-row justify-between items-center group mt-15">
             <text class="font_4 text_3">2025-10-20 18:45:15</text>
-            <text class="font_3">待审核</text>
+            <text class="font_3" wx:if="{{ item.withdrawalStatus === 'processing' }}">{{ withdrawalStatus[0] }}</text>
+            <text class="font_3" wx:if="{{ item.withdrawalStatus === 'success' }}">{{ withdrawalStatus[1] }}</text>
+            <text class="font_3" wx:if="{{ item.withdrawalStatus === 'failed' }}">{{ withdrawalStatus[2] }}</text>
           </view>
         </view>
       </view>

pages/personCenter/bindBankCard/bindBankCard.js

@@ -1,66 +0,0 @@
-// pages/personCenter/bindBankCard/bindBankCard.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/personCenter/bindBankCard/bindBankCard.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/personCenter/bindBankCard/bindBankCard.wxml

@@ -1,44 +0,0 @@
-<view class="flex-col page">
-  <text class="self-center font text">绑定银行卡</text>
-  <text class="self-center font_2 text_2">请绑定持卡人本人的银行卡</text>
-  <view class="flex-col self-stretch group">
-    <view class="self-start group_2">
-      <text class="font_2">持卡人</text>
-      <text class="font_3">*</text>
-    </view>
-    <view class="flex-col justify-start items-start self-stretch text-wrapper mt-11">
-      <input class="text_3 font" placeholder="请输入持卡人" />
-    </view>
-    <view class="self-start group_3 mt-11">
-      <text class="font_2 text_4">身份证号</text>
-      <text class="font_3">*</text>
-    </view>
-    <view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
-      <input class="text_12 font_4" placeholder="请输入持卡人身份证号" />
-    </view>
-    <view class="self-start group_4 mt-11">
-      <text class="font_2">手机号</text>
-      <text class="font_3">*</text>
-    </view>
-    <view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
-      <input class="text_1 font_4" placeholder="请输入持卡人绑定的手机号" />
-    </view>
-    <view class="self-start group_5 mt-11">
-      <text class="font_2 text_6">银行卡号</text>
-      <text class="font_3">*</text>
-    </view>
-    <view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
-      <input class="text_5 font_4" placeholder="请输入持卡人银行卡号" />
-    </view>
-    <view class="self-start group_6 mt-11">
-      <text class="font_2 text_7">开户银行</text>
-      <text class="font_3">*</text>
-    </view>
-    <view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11">
-      <input class="text_1 font_4" placeholder="请输入开户银行" />
-    </view>
-  </view>
-  <view class="flex-col justify-start items-center self-center text-wrapper_3">
-    <text class="font_2 text_8">保存</text>
-  </view>
-</view>

pages/personCenter/bindBankCard/bindBankCard.wxss

@@ -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;
-}

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,  // 控制弹窗显隐
+    projectList: []
-    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 });
   },
 
-  // 关闭弹窗（包括遮罩点击和取消按钮）
+  // 获取项目列表
-  closeCommissionRatePop() {
+  getProjectList() {
-    this.setData({ showCommissionRatePop: false });
+    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()
   },
 
   /**

pages/personCenter/commissionSetting/commissionSetting.json

@@ -1,6 +1,3 @@
 {
-  "usingComponents": {
+  "usingComponents": {}
-    "commissionPop": "/pages/personCenter/component/commissionPop/commissionPop",
-    "commissionRatePop": "/pages/personCenter/component/commissionRatePop/commissionRatePop"
-  }
 }

pages/personCenter/commissionSetting/commissionSetting.wxml

@@ -12,28 +12,28 @@
     </view>
     <image
       class="image_2"
-      src="https://ide.code.fun/api/image?token=68368d354ae84d001230f4d1&name=f9ca835233e2714bc2418ea181ce0f10.png"
+      src="./images/rightBlack.png"
     />
   </view>
   <view class="flex-col mt-19">
-    <view class="flex-col list-item mt-20" wx:for="{{items}}" wx:for-item="item" wx:for-index="index" wx:key="index">
+    <view class="flex-col list-item mt-20" wx:for="{{projectList}}" wx:for-item="item" wx:for-index="index" wx:key="index">
       <view class="flex-row group_2">
         <view class="flex-row flex-1 self-center">
           <image
             class="shrink-0 image_3"
-            src="https://ide.code.fun/api/image?token=68368d354ae84d001230f4d1&name=141f260ce084d8ec42e28b353cae9b11.png"
+            src="{{ item.projectImage }}"
           />
           <view class="flex-col items-start flex-1 group_3 ml-13">
-            <text class="font">美团神券包-春季活动</text>
+            <text class="font">{{ item.projectName }}</text>
             <view class="flex-col justify-start items-center text-wrapper mt-14">
-              <text class="font_3 text_4">结算T+2</text>
+              <text class="font_3 text_4">结算T+{{ item.projectSettlementCycle }}</text>
             </view>
           </view>
         </view>
         <view class="flex-row shrink-0 self-start section_2 ml-21" bind:tap="gotoSubCommission">
           <image
             class="image_4 image_5"
-            src="https://ide.code.fun/api/image?token=68368d354ae84d001230f4d1&name=3e6ca90e00849d7326816d816878d186.png"
+            src="./images/right.png"
           />
           <text class="font_2 text_3">下级单价</text>
         </view>
@@ -47,13 +47,13 @@
         <view class="flex-col mt-16">
           <view
             class="flex-row justify-center items-center relative list-item_2 mt-14"
-            wx:for="{{items_1}}"
+            wx:for="{{item.projectDetailCommissionVOList}}"
-            wx:for-item="item"
+            wx:for-item="commission"
             wx:for-index="index"
             wx:key="index"
           >
-            <text class="font_6 text_6 pos">3.6元购买</text>
+            <text class="font_6 text_6 pos">{{ commission.projectDetailName }}</text>
-            <text class="font_7 text_9">0.30/0.30/0.00%</text>
+            <text class="font_7 text_9">{{ commission.myUnitPrice }}/{{ commission.agentUnitPrice }}/{{ commission.currentCommissionRate }}%</text>
             <view class="flex-row group_5 pos_2" bindtap="showCommissionRatePop">
               <image
                 class="image_4 image_6"

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],  // 预览图片
-      });
-    }
   }
-});
+})

pages/personCenter/component/commissionPop/commissionPop.js

@@ -1,57 +1,24 @@
+// 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');
-      }
-   }
 })

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', {/*数据*/});
-    },
   }
 })
-

pages/personCenter/mine/mine.js

@@ -16,22 +16,7 @@ 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({

pages/personCenter/mine/mine.wxml

@@ -2,25 +2,25 @@
   <view class="flex-col relative section">
     <view class="flex-row justify-between items-center group">
       <view class="flex-col">
-        <text class="self-start font text">qingcheng</text>
+        <text class="self-start font text">{{ nickName }}</text>
         <view class="flex-row items-center self-stretch group_2 mt-9">
           <image
             class="image_3"
             src="./images/dianhua.png"
             mode="aspectFill"
           />
-          <text class="font_2 text_2 ml-7">15214547473</text>
+          <text class="font_2 text_2 ml-7">{{ phoneNumber }}</text>
         </view>
         <view class="flex-row items-center self-stretch section_2 mt-9">
-          <text class="font_3 text_3">邀请码：123445</text>
           <image
             class="shrink-0 image_4"
             src="./images/fuzhi.png"
             mode="aspectFill"
           />
+          <text class="font_3 text_3">邀请码：{{ invitationCode }}</text>
         </view>
       </view>
-      <view class="flex-col items-center">
+      <view class="flex-col items-center" bind:tap="erweima">
         <image
           class="image_2"
           src="./images/erweima.png"
@@ -34,7 +34,7 @@
       <view class="flex-row justify-between items-center group_4">
         <view class="group_5">
           <text class="font_2 text_6">当前金额：</text>
-          <text class="text_5">￥5.00</text>
+          <text class="text_5">￥{{ currentBalance }}</text>
         </view>
         <view class="flex-row items-center section_3" bind:tap="lijitixian">
           <image
@@ -47,15 +47,15 @@
       <view class="flex-row items-start equal-division section_4">
         <view class="flex-col items-center equal-division-item_8">
           <text class="font_2 text_8">提现中</text>
-          <text class="font_4 mt-15">￥0.00</text>
+          <text class="font_4 mt-15">￥{{ withdrawalAmount }}</text>
         </view>
         <view class="flex-col items-center group_6 equal-division-item">
           <text class="font_2 text_9">已提现</text>
-          <text class="font_4 mt-15">￥0.00</text>
+          <text class="font_4 mt-15">￥{{ withdrawnAmount }}</text>
         </view>
         <view class="flex-col items-center group_7 equal-division-item_8">
           <text class="font_2 text_10">累计收入</text>
-          <text class="font_4 mt-15">￥0.00</text>
+          <text class="font_4 mt-15">￥{{ totalIncome }}</text>
         </view>
       </view>
     </view>

pages/personCenter/resetPwd/resetPwd.js

@@ -1,3 +1,6 @@
+import { baseUrl } from "../../../request";
+import { formatPassword } from "../../../utils/util"
+
 // pages/personCenter/resetPwd/resetPwd.js
 Page({
 
@@ -5,14 +8,118 @@ Page({
    * 页面的初始数据
    */
   data: {
+    phone: '',   // 手机号
+    sending: false,  // 是否发送验证码
+    count: 60,
+    password: '',   // 第一次输入的密码
+    currentPwd: '',   // 再次确认密码
+    verificationCode: ''   // 验证码
+  },
 
+  resetPwd() {
+    const { phone, verificationCode, password, currentPwd } = this.data;
+    formatPassword(password,currentPwd);
+    wx.request({
+      url: baseUrl + '/userInfo/mini/in/reset/pwd',
+      method: 'POST',
+      header: {
+        Authorization: wx.getStorageSync('token')
+      },
+      data: {
+        phoneNumber: phone,
+        verificationCode: verificationCode,
+        userPassword: password,
+        userConfirmPassword: currentPwd
+      },
+      success: res => {
+        console.log('修改密码--->',res);
+        if (res.data.code === 1) {
+          wx.showToast({
+            title: '更改密码成功',
+            icon: 'success'
+          })
+          wx.reLaunch({
+            url: '/pages/loginModule/pwdLogin/pwdLogin',
+          })
+        } else {
+          wx.showModal({
+            title: '提示',
+            content: res.data.message
+          })
+        }
+      } 
+    })
+  },
+
+  // 获取验证码
+  getVerificationCode() {
+    const { phone } = this.data;
+    wx.request({
+      url: baseUrl + '/userInfo/code/pwd',
+      method: 'POST',
+      header: {
+        Authorization: wx.getStorageSync('token')
+      },
+      data: {
+        templateString: phone
+      },
+      success: res => {
+        if (res.data.code === 1) {
+          wx.showToast({  title: '验证码已发送'  });
+          this.startCountdown();
+        } else {
+          wx.showToast({
+            title: '发送失败',
+            icon: 'error'
+          })
+        }
+      }
+    })
+  },
+
+   // 验证码开始
+   startCountdown() {
+    this.setData({ sending: true, count: 60 });
+    const timer = setInterval(() => {
+      let { count } = this.data;
+      if (count <= 1) {
+        clearInterval(timer);
+        this.setData({ sending: false });
+      } else {
+        this.setData({ count: count - 1 });
+      }
+    }, 1000);
+  },
+
+  // 通用输入事件处理函数
+  onInput(e) {
+    const field = e.currentTarget.dataset.field;  // 获取字段名
+    console.log(field);
+    const value = e.detail.value;                 // 获取输入容
+    this.setData({
+      [field]: value                              // 动态更新应字段
+    });
   }, 
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    // 获取用户信息 —— 用于渲染手机号
+    wx.request({
+      url:  baseUrl + '/userInfo/get/jwt',
+      method: 'GET',
+      header: {
+        Authorization: wx.getStorageSync('token')
+      },
+      success: res => {
+        if (res.data.code === 1) {
+          this.setData({
+            phone: res.data.data.phoneNumber
+          })
+        }
+      }
+    })
   },
 
   /**

pages/personCenter/resetPwd/resetPwd.wxml

@@ -1,13 +1,33 @@
 <view class="flex-col page">
   <view class="flex-col section">
-    <text class="self-start font text">15888610253</text>
+    <view class="self-start font text">{{ phone }}</view>
     <view class="flex-row justify-between self-stretch group">
-      <input class="font text_2" placeholder="验证码" />
+      <input 
-      <text class="font text_3">获取验证码</text>
+        class="font text_2" 
+        placeholder="验证码" 
+        bindinput="onInput"
+        data-field="verificationCode"
+        value="{{ verificationCode }}"
+        />
+      <view bind:tap="{{ sending ? '' : 'getVerificationCode' }}">
+        <text class="font text_3">{{ sending ? count + 's后重发' : '发送验证码' }}</text>
+      </view>
     </view>
-    <input class="text_1 font" placeholder="密码" />
+    <input 
+      class="text_1 font" 
+      placeholder="密码" 
+      bindinput="onInput"
+      data-field="password"
+      value="{{ password }}"
+      />
     <view class="self-stretch divider"></view>
-    <input class="text_8 font text_4" placeholder="再输入密码" />
+    <input 
+      class="text_8 font text_4" 
+      placeholder="再输入密码" 
+      bindinput="onInput"
+      data-field="currentPwd"
+      value="{{ currentPwd }}"
+      />
   </view>
-  <view class="flex-col justify-start items-center text-wrapper mt-20"><text class="font text_5">重置密码</text></view>
+  <view class="flex-col justify-start items-center text-wrapper mt-20" bind:tap="resetPwd"><text class="font text_5">重置密码</text></view>
 </view>

pages/personCenter/subCommissionSetting/subCommissionSetting.js

@@ -7,24 +7,6 @@ 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();
   },
 
   /**

pages/personCenter/withdrawalAccount/withdrawalAccount.js

@@ -7,11 +7,7 @@ Page({
   data: {
 
   },
-  gotoEditBankCardInfo() {
+
-    wx.navigateTo({
-      url: '/pages/personCenter/bindBankCard/bindBankCard',
-    })
-  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/projectModule/userProject/userProject.wxml

@@ -1,20 +1,22 @@
 <view class="flex-col justify-start page">
   <view class="flex-col list">
-    <view class="flex-col list-item mt-15" wx:for="{{items}}" wx:for-item="item" wx:for-index="index" wx:key="index" bind:tap="tiaozhuan">
+    <view class="flex-col list-item mt-15" wx:for="{{ userProjectList }}" wx:for-item="item" wx:for-index="index" wx:key="index" >
       <view class="flex-row justify-between items-center self-stretch">
         <view class="flex-row items-center">
           <image
             class="shrink-0 image"
-            src="./images/xmtp.png"
+            src="{{ item.projectImage }}"
           />
           <view class="ml-18 flex-col shrink-0 group">
-            <text class="font">美团省钱包</text>
+            <text class="font">{{ item.projectName }}</text>
-            <text class="mt-12 font_2 text">结算T+1 实时数据</text>
+            <text class="mt-12 font_2 text">结算T+{{ item.projectSettlementCycle }} 实时数据</text>
           </view>
         </view>
         <image
           class="image_2"
           src="./images/yjt.png"
+          bind:tap="gotoProjectDetail" 
+          data-id="{{ item.projectId }}"
         />
       </view>
       <view class="mt-14 flex-row group_2 equal-division">
@@ -25,7 +27,7 @@
           />
           <text class="ml-4 font_3">推广码</text>
         </view>
-        <view class="ml-14 flex-row items-center section equal-division-item_2">
+        <view class="ml-14 flex-row items-center section equal-division-item_2" bind:tap="gotoSubSettlement">
           <image
             class="shrink-0 image_4"
             src="./images/jsmx.png"

utils/util.js

@@ -14,6 +14,38 @@ const formatNumber = n => {
   return n[1] ? n : `0${n}`
 }
 
-module.exports = {
+const formatPassword = (pwd , currentPwd)  => {
-  formatTime
+  if (pwd === '') {
+    wx.showToast({
+      title: '密码不能为空',
+      icon: 'error'
+    })
+    return;
+  }
+  if (pwd.length < 6) {
+    wx.showToast({
+      title: '密码不能小于6位',
+      icon: 'error'
+    })
+    return;
+  }
+  if (currentPwd === '') {
+    wx.showToast({
+      title: '请输入二次确认密码',
+      icon: 'error'
+    })
+    return;
+  }
+  if (currentPwd !== pwd) {
+    wx.showToast({
+      title: '两次密码不一致',
+      icon: 'error'
+    })
+    return;
+  }
+}
+
+module.exports = {
+  formatTime,
+  formatPassword
 }