From f17226cc97310ba96d13f055654c49eedca80a97 Mon Sep 17 00:00:00 2001
From: yuanteng <1876787513@qq.com>
Date: Sun, 10 Aug 2025 11:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/course/homepage/homepage.wxml                 |  4 ++--
 pages/loginModule/forgetPwd/forgetPwd.js            |  3 +--
 pages/loginModule/pwdLogin/pwdLogin.js              |  9 ++++++---
 pages/personCenter/accountSetting/accountSetting.js | 10 +++++++---
 pages/personCenter/resetPwd/resetPwd.js             | 12 +++++++++---
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/pages/course/homepage/homepage.wxml b/pages/course/homepage/homepage.wxml
index 68c856c..6a265e1 100644
--- a/pages/course/homepage/homepage.wxml
+++ b/pages/course/homepage/homepage.wxml
@@ -13,9 +13,9 @@
     </swiper>
   </view>
   <view class="flex-row equal-division">
-    <view class="flex-col items-center group_2 group_1" bind:tap="gotoCourseList" data-type="{{ '考研' }}">
+    <view class="flex-col items-center group_2 group_1" bind:tap="gotoCourseList" data-type="{{ '考编' }}">
       <image class="image_3" src="./image/kgky.png" />
-      <text class="font text_1 mt-12">考研</text>
+      <text class="font text_1 mt-12">考编</text>
     </view>
     <view class="flex-col items-center group_2 group_3" bind:tap="gotoCourseList" data-type="{{ '考公' }}">
       <image class="image_3" src="./image/zmt.png" />
diff --git a/pages/loginModule/forgetPwd/forgetPwd.js b/pages/loginModule/forgetPwd/forgetPwd.js
index bf972fc..bbaf056 100644
--- a/pages/loginModule/forgetPwd/forgetPwd.js
+++ b/pages/loginModule/forgetPwd/forgetPwd.js
@@ -125,8 +125,7 @@ Page({
         verificationCode: code,
         userPassword: newPwd,
         userConfirmPassword: confirmPwd,
-        sourceToken: null,
-        role: role
+        userRole: role
       },
       success: res => {
         if (res.data.code === 1) {
diff --git a/pages/loginModule/pwdLogin/pwdLogin.js b/pages/loginModule/pwdLogin/pwdLogin.js
index 68ff0f2..59958e0 100644
--- a/pages/loginModule/pwdLogin/pwdLogin.js
+++ b/pages/loginModule/pwdLogin/pwdLogin.js
@@ -68,7 +68,7 @@ Page({
 
   // 获取验证码（仅校验手机号）
   getSmsCode() {
-    const { phone } = this.data;
+    const { phone, role } = this.data;
 
     // 1. 非空校验
     if (!validate(this.data, { phone: '请输入手机号' })) {
@@ -83,7 +83,10 @@ Page({
     wx.request({
       url: baseUrl + '/userInfo/code/pwd',
       method: 'POST',
-      data: { templateString: phone },
+      data: { 
+        phoneNumber: phone,
+        userRole: role
+      },
       success: (res) => {
         console.log('验证码发送--->',res.data);
         if (res.data.code === 1) {
@@ -163,7 +166,7 @@ Page({
       : baseUrl + '/userInfo/mini/vcd/login';
     const payload = loginType === 'password'
       ? { phoneNumber: phone, userPassword: credential, userRole: role }
-      : { phoneNumber: phone, verificationCode: credential };
+      : { phoneNumber: phone, verificationCode: credential, userRole: role };
 
     wx.request({
       url,
diff --git a/pages/personCenter/accountSetting/accountSetting.js b/pages/personCenter/accountSetting/accountSetting.js
index 9bfe118..eafee95 100644
--- a/pages/personCenter/accountSetting/accountSetting.js
+++ b/pages/personCenter/accountSetting/accountSetting.js
@@ -10,12 +10,14 @@ Page({
     nickName: "",
     userAvatar: "",
     phoneNumber: "",
-    globalImgUrl
+    globalImgUrl,
+    role: '',
   },
 
   gotoResetPwd() {
+    const { role } = this.data;
     wx.navigateTo({
-      url: '/pages/personCenter/resetPwd/resetPwd',
+      url: `/pages/personCenter/resetPwd/resetPwd?role=${ role }`,
     })
   },
 
@@ -64,12 +66,14 @@ Page({
         Authorization: token
       },
       success: res => {
+        console.log('用户信息---->',res.data.data);
         if (res.data.code === 1) {
           this.setData({
             nickName: res.data.data.nickName,
             userAvatar: res.data.data.userAvatar,
             phoneNumber: res.data.data.phoneNumber,
-            userAccount: res.data.data.userAccount
+            userAccount: res.data.data.userAccount,
+            role:res.data.data.userRole,
           })
         }
       },
diff --git a/pages/personCenter/resetPwd/resetPwd.js b/pages/personCenter/resetPwd/resetPwd.js
index 11072a8..8ca8a20 100644
--- a/pages/personCenter/resetPwd/resetPwd.js
+++ b/pages/personCenter/resetPwd/resetPwd.js
@@ -13,11 +13,12 @@ Page({
     count: 60,
     password: '',   // 第一次输入的密码
     currentPwd: '',   // 再次确认密码
-    verificationCode: ''   // 验证码
+    verificationCode: '',   // 验证码
+    role: '',
   },
 
   resetPwd() {
-    const { phone, verificationCode, password, currentPwd } = this.data;
+    const { phone, verificationCode, password, currentPwd, role } = this.data;
     if( !formatPassword(password,currentPwd) )  {
       return;
     }
@@ -32,7 +33,8 @@ Page({
         verificationCode: verificationCode,
         userPassword: password,
         userConfirmPassword: currentPwd,
-        sourceToken: wx.getStorageSync('token')
+        sourceToken: wx.getStorageSync('token'),
+        userRole: role,
       },
       success: res => {
         console.log('修改密码--->',res);
@@ -111,6 +113,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    console.log('---->',options);
+    this.setData({
+      role: options.role
+    })
     // 获取用户信息 —— 用于渲染手机号
     wx.request({
       url:  baseUrl + '/userInfo/get/jwt',