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

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',