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

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,
           })
         }
       },