1、修复修改头像的bug;2、修复个人信息无法修改的问题；3、修复修改个人信息丢失头像的问题；

miniprogram/pages/formid/formid.js

@@ -16,9 +16,11 @@ Page({
         address: '',
         idNo: '',
         form: {
+            userId:'',
             realName: '',
             identityNo: '',
             mobile: '',
+            faceImg: '',
             villageName: '', //居住小区名称
             workUnit: '', //工作单位
             workType: '', //单位性质
@@ -141,6 +143,7 @@ Page({
                 title: options.title,
             })
             let obj = JSON.parse(wx.getStorageSync('userInfo'))
+            this.data.form.faceImg = obj.faceImg;
             for (let key in obj) {
                 if (!this.data.form.hasOwnProperty(key)) {
                     delete obj[key];
@@ -603,10 +606,11 @@ Page({
             //     return false
             // }
         }
-
         const para = {
             ...this.data.form
         }
+        para.userId = wx.getStorageSync('userId')
+        console.log(para);
         delete para.couplingCommunityStr
         delete para.couplingCommunity
         if (this.data.workTypeText) {
@@ -616,10 +620,10 @@ Page({
             title: "提交中..."
         })
         let than = this
+       
         if (this.data.title) {
             wx.login({
                 success: (res) => {
-                    para.userId = wx.getStorageSync('userId')
                     para.wxCode = res.code;
                     if (res.code) {
                         api.userInfoUpdate(para).then(res => {
@@ -662,7 +666,6 @@ Page({
                 }
             })
         }
-        console.log(this.data.form);
     },
     onReady() {
         let _this = this;

miniprogram/pages/login/login.js

@@ -7,8 +7,8 @@ Page({
      * 页面的初始数据
      */
     data: {
-        mobile: '',//17637262085
+        mobile: '', //17637262085
-        password: ''//123456
+        password: '' //123456
     },
 
     /**
@@ -66,7 +66,7 @@ Page({
     onShareAppMessage() {
 
     },
-    handleLogin () {
+    handleLogin() {
         var that = this;
         if (that.data.mobile == '') {
             wx.showToast({
@@ -96,17 +96,17 @@ Page({
                         password: that.data.password,
                         wxCode: code
                     };
-                    api.getToken(params).then( (res) =>{
+                    api.getToken(params).then((res) => {
+                        console.log(res);
                         if (res.code == 0) {
                             wx.setStorageSync('token', res.data.token);
+                            wx.setStorageSync('userId', res.data.userId);
                             wx.setStorageSync('userTagKey', res.data.userTagKey);
-                            // this.getToken()
                             wx.setStorageSync('deptDataScopeList', JSON.stringify(res.data.deptDataScopeList));
                             wx.switchTab({
                                 url: '/pages/home/home'
                             });
-                        }
+                        } else {
-                        else {
                             wx.showToast({
                                 title: res.msg,
                                 icon: 'none',
@@ -127,20 +127,17 @@ Page({
             mobile: e.detail.value
         });
     },
-    getPassword (e) {
+    getPassword(e) {
         this.setData({
             password: e.detail.value
         });
     },
-    toRegister(){
+    toRegister() {
-        // wx.navigateTo({
-        //     url: `/subpages/home/pages/newsDetail/newsDetail`
-        // })
         wx.navigateTo({
             url: `/pages/formid/formid`
         })
     },
-    forgotPwd(){
+    forgotPwd() {
         wx.navigateTo({
             url: '/pages/forgotPwd/forgotPwd',
         })

miniprogram/pages/login/login.wxml

@@ -5,17 +5,11 @@
         <view class="info">
             <view class="info-bg">
                 <view class="name">
-                    <!-- <view class="name-pw-bg">
-        <image src="../../../../../../assets/images/name.png"></image>
-       </view> -->
                     <view class="info-input">
                         <input bindinput="getmobile" placeholder="请输入用户名" value="{{mobile}}"></input>
                     </view>
                 </view>
                 <view class="password">
-                    <!-- <view class="name-pw-bg">
-          <image src="../../../../../../assets/images/password.png"></image>
-        </view> -->
                     <view class="info-input">
                         <input bindinput="getPassword" password placeholder="请输入密码" value="{{password}}"></input>
                     </view>

miniprogram/pages/my/my.js

@@ -180,6 +180,7 @@ Page({
                                             api.userInfoUpdate(para).then(res => {
                                                 if (res.code == 0) {
                                                     wx.setStorageSync(para, 'userInfo')
+                                                    
                                                     _this.getUserInfo()
                                                 }
                                             }).catch(err => {