Merge remote-tracking branch 'origin/dev' into dev

pages/dashboardModule/performanceRanking/performanceRanking.js

@@ -129,7 +129,7 @@ Page({
         fail: () => {
           // 请求失败后，隐藏loading
           wx.hideLoading();
-          
+          console.log('111');
           wx.showToast({
             title: '请求失败',
             icon: 'none'

pages/loginModule/forgetPwd/forgetPwd.js

@@ -125,8 +125,7 @@ Page({
         verificationCode: code,
         userPassword: newPwd,
         userConfirmPassword: confirmPwd,
-        sourceToken: null,
+        userRole: role
-        role: role
       },
       success: res => {
         if (res.data.code === 1) {

pages/loginModule/pwdLogin/pwdLogin.js

@@ -166,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,

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 }`,
     })
   },
 
@@ -65,12 +67,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,
           })
         }
       },

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);
@@ -112,6 +114,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    console.log('---->',options);
+    this.setData({
+      role: options.role
+    })
     // 获取用户信息 —— 用于渲染手机号
     wx.request({
       url:  baseUrl + '/userInfo/get/jwt',