1、增加位置账号异常的返回；

2、修复党员属性无法更新的问题；
3、调整个人信息表单顺序；

miniprogram/pages/formid/formid.wxml

@@ -54,15 +54,6 @@
                 <input confirm-type="next" bindblur="bindWorkUnitInput" bindinput="bindWorkUnitInput" value="{{form.workUnit}}" placeholder-class="placeholder-style" placeholder="请输入" />
             </view>
         </view>
-        <view class="list-item gray">
-            <view class="left">
-                <text class="must">*</text>
-                <view class="title">专业特长</view>
-            </view>
-            <view class="right">
-                <input confirm-type="next" bindblur="bindWorkIndustryInput" bindinput="bindWorkIndustryInput" value="{{form.workIndustry}}" placeholder-class="placeholder-style" placeholder="请输入" />
-            </view>
-        </view>
         <view class="list-item ">
             <view class="left">
                 <!-- <text class="must">*</text> -->
@@ -74,6 +65,15 @@
                 </picker>
             </view>
         </view>
+        <view class="list-item gray">
+            <view class="left">
+                <text class="must">*</text>
+                <view class="title">专业特长</view>
+            </view>
+            <view class="right">
+                <input confirm-type="next" bindblur="bindWorkIndustryInput" bindinput="bindWorkIndustryInput" value="{{form.workIndustry}}" placeholder-class="placeholder-style" placeholder="请输入" />
+            </view>
+        </view>
         <view class="list-item" wx:if="{{form.workType == '其他'}}">
             <view class="left">
                 <!-- <text class="must">*</text> -->

miniprogram/pages/login/login.js

@@ -97,20 +97,27 @@ Page({
                         wxCode: code
                     };
                     api.getToken(params).then((res) => {
-                        console.log(res);
                         if (res.code == 0) {
-                            wx.setStorageSync('token', res.data.token);
+                            if(res.data.userState == '4'){
-                            wx.setStorageSync('userId', res.data.userId);
+                                wx.showToast({
-                            wx.setStorageSync('userTagKey', res.data.userTagKey);
+                                    title: '请确认账号密码是否正确或联系管理员！',
-                            wx.setStorageSync('deptDataScopeList', JSON.stringify(res.data.deptDataScopeList));
+                                    icon: 'none',
-                            wx.switchTab({
+                                    duration: 3000
-                                url: '/pages/home/home'
+                                });
-                            });
+                            }else {
+                                wx.setStorageSync('token', res.data.token);
+                                wx.setStorageSync('userId', res.data.userId);
+                                wx.setStorageSync('userTagKey', res.data.userTagKey);
+                                wx.setStorageSync('deptDataScopeList', JSON.stringify(res.data.deptDataScopeList));
+                                wx.switchTab({
+                                    url: '/pages/home/home'
+                                });
+                            }
                         } else {
                             wx.showToast({
                                 title: res.msg,
                                 icon: 'none',
-                                duration: 2000
+                                duration: 3000
                             });
                         }
                         wx.hideLoading();