'.'

lib/models/app.dart

@@ -2,6 +2,7 @@
 import 'dart:io';
 
 import 'package:amap_flutter_location/amap_flutter_location.dart';
+import 'package:worker_client/services/user.dart';
 import '/models/entities/person.dart';
 import '/widgets/Modal.dart';
 import 'package:get/get.dart';
@@ -49,11 +50,11 @@ class AppController extends GetxController {
     });
 
     // // 尝试获取一次人员信息
-    // getCurrent().then((person) {
-    //   user(person);
-    // }).catchError((e) {
-    //   print(e);
-    // });
+    getCurrent().then((person) {
+      user(Person.fromJson(person));
+    }).catchError((e) {
+      print(e);
+    });
   }
 
   @override

lib/models/entities/person.dart

@@ -1,15 +1,60 @@
+// class Person {
+//   String? personId;
+//   String? appId;
+//   String? openid;
+//   String? nickName;
+//   String? userName;
+//   String? avatar;
+//   int? sex;
+//   String? phone;
+//   String? userId;
+//   int? status;
+//   String? createDate;
+//
+//   Person();
+//
+//   Person.fromJson(Map<String, dynamic> json)
+//       : personId = json["personId"],
+//         appId = json["appId"],
+//         openid = json["openid"],
+//         nickName = json["nickName"],
+//         userName = json["userName"],
+//         avatar = json["avatar"],
+//         sex = json["sex"],
+//         phone = json["phone"],
+//         userId = json["userId"],
+//         status = json["status"],
+//         createDate = json["createDate"];
+//
+//   Map<String, dynamic> toJson() => {
+//         'personId': personId,
+//         'appId': appId,
+//         'openid': openid,
+//         'nickName': nickName,
+//         'userName': userName,
+//         'avatar': avatar,
+//         'sex': sex,
+//         'phone': phone,
+//         'userId': userId,
+//         'status': status,
+//         'createDate': createDate,
+//       };
+// }
+
+
 class Person {
   String? personId;
   String? appId;
   String? openid;
   String? nickName;
-  String? userName;
   String? avatar;
-  int? sex;
+  num? sex;
   String? phone;
   String? userId;
-  int? status;
+  num? status;
   String? createDate;
+  String? identity;
+  bool? isOrgManager;
 
   Person();
 
@@ -18,25 +63,28 @@ class Person {
         appId = json["appId"],
         openid = json["openid"],
         nickName = json["nickName"],
-        userName = json["userName"],
         avatar = json["avatar"],
         sex = json["sex"],
         phone = json["phone"],
         userId = json["userId"],
         status = json["status"],
-        createDate = json["createDate"];
+        createDate = json["createDate"],
+        isOrgManager = json["isOrgManager"],
+        identity = json["identity"];
 
   Map<String, dynamic> toJson() => {
-        'personId': personId,
-        'appId': appId,
-        'openid': openid,
-        'nickName': nickName,
-        'userName': userName,
-        'avatar': avatar,
-        'sex': sex,
-        'phone': phone,
-        'userId': userId,
-        'status': status,
-        'createDate': createDate,
-      };
+    'personId': personId,
+    'appId': appId,
+    'openid': openid,
+    'nickName': nickName,
+    'avatar': avatar,
+    'sex': sex,
+    'phone': phone,
+    'userId': userId,
+    'status': status,
+    'createDate': createDate,
+    'isOrgManager': isOrgManager,
+    'identity': identity,
+
+  };
 }

lib/pages/Login/index.dart

@@ -85,7 +85,9 @@ class _Login extends State<Login> {
             userInfo(Person.fromJson(res['person']));
             Fluttertoast.showToast(msg: '登录成功！');
             Get.offNamed('/home');
+            // print(userInfo);
           }).catchError((err) {
+            print(err);
             Fluttertoast.showToast(msg: err);
           });
         } else {

lib/pages/main/index.dart

@@ -13,7 +13,7 @@ class Main extends BasicPage {
     tabIndex = 2;
     naviTitle = '我的';
   }
-  var store = AppController.t;
+  AppController store = AppController.t;
   GetStorage box = GetStorage();
 
   void loginOut() {
@@ -34,12 +34,15 @@ class Main extends BasicPage {
 
   @override
   Widget builder(BuildContext context) {
+    print(store.user);
+
     return Container(
       decoration: const BoxDecoration(color: Colors.white),
       child: ListView(
         children: [
           Stack(
             children: [
+              Obx(()=>
               Positioned(
                 top: 0,
                 child: Container(
@@ -110,6 +113,7 @@ class Main extends BasicPage {
                   ),
                 ),
               ),
+              ),
               Positioned(
                 right: 0,
                 top: 0,