'.'

lib/models/app.dart

@@ -2,6 +2,7 @@
 import 'dart:io';
 
 import 'package:amap_flutter_location/amap_flutter_location.dart';
+import 'package:get_storage/get_storage.dart';
 import 'package:worker_client/services/user.dart';
 import '/models/entities/person.dart';
 import '/widgets/Modal.dart';
@@ -11,7 +12,7 @@ import '../utils/location.dart';
 class AppController extends GetxController {
   // 有了这句, 可以直接 AppController.t 调用
   static AppController t = Get.find();
-
+  GetStorage box = GetStorage();
   final user = Rx<Person>(Person());
   final location = Rxn<Map<String, Object>>();
   final testInt = 1.obs;
@@ -35,7 +36,6 @@ class AppController extends GetxController {
   @override
   void onInit() {
     super.onInit();
-
     //尝试获取 location
     requireLocation(onLocationChange).then((loc) {
       _location = loc;
@@ -49,12 +49,14 @@ class AppController extends GetxController {
       );
     });
 
-    // // 尝试获取一次人员信息
-    getCurrent().then((person) {
-      user(Person.fromJson(person));
-    }).catchError((e) {
-      print(e);
-    });
+    if(box.read('token')!=null) {
+      // 尝试获取一次人员信息
+      getCurrent().then((person) {
+        user(Person.fromJson(person));
+      }).catchError((e) {
+        print(e);
+      });
+    }
   }
 
   @override

lib/pages/Login/index.dart

@@ -85,9 +85,7 @@ 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/home/index.dart

@@ -1,3 +1,5 @@
+import 'dart:math';
+
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -127,10 +129,15 @@ class Home extends BasicPage {
                               itemCount: 1,
                               itemBuilder:
                                   (BuildContext context, int position) {
-                                jobList([
-                                  ...jobList.value,
-                                  ...GetList(data.records)
-                                ]);
+                                if (jobList.value.isNotEmpty &&
+                                    jobList.value[0].jobId !=
+                                        GetList(data.records)[0].jobId) {
+                                  jobList([
+                                    ...jobList.value,
+                                    ...GetList(data.records)
+                                  ]);
+                                }
+
                                 return Obx(() {
                                   if (jobList.value != []) {
                                     return Column(

lib/pages/main/index.dart

@@ -38,15 +38,12 @@ 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(
@@ -64,10 +61,16 @@ class Main extends BasicPage {
                       Container(
                         margin: EdgeInsets.fromLTRB(40.w, 0, 10.w, 0),
                         child: store.user().avatar != null
-                            ? Image.network(
-                                store.user().avatar.toString(),
-                                width: 63.w,
-                                height: 63.w,
+                            ? Container(
+                                clipBehavior: Clip.hardEdge,
+                                decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.all(
+                                        Radius.circular(31.5.w))),
+                                child: Image.network(
+                                  store.user().avatar.toString(),
+                                  width: 63.w,
+                                  height: 63.w,
+                                ),
                               )
                             : Image.asset(
                                 'images/main/defaultAvatar.png',
@@ -80,7 +83,9 @@ class Main extends BasicPage {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           Text(
-                            store.user().nickName != null?store.user().nickName.toString():'',
+                            store.user().nickName != null
+                                ? store.user().nickName.toString()
+                                : '',
                             style: TextStyle(
                                 color: Colors.white,
                                 fontWeight: FontWeight.w500,
@@ -96,8 +101,9 @@ class Main extends BasicPage {
                           Container(
                             margin: EdgeInsets.fromLTRB(0, 19.h, 0, 0),
                             child: Text(
-                                store.user().nickName != null?
-                              store.user().phone.toString():'',
+                              store.user().nickName != null
+                                  ? store.user().phone.toString()
+                                  : '',
                               style: TextStyle(
                                   color: Colors.white,
                                   fontWeight: FontWeight.w500,
@@ -117,14 +123,13 @@ class Main extends BasicPage {
                   ),
                 ),
               ),
-              ),
               Positioned(
                 right: 0,
                 top: 0,
                 child: Container(
                   decoration: const BoxDecoration(color: Color(0xb2000000)),
                   child: Text(
-                    '该账号归${store.user().nickName!=null?store.user().nickName.toString():''}所属',
+                    '该账号归${store.user().nickName != null ? store.user().nickName.toString() : ''}所属',
                     style: TextStyle(color: Colors.white, fontSize: 12.sp),
                   ),
                 ),

lib/widgets/LoadMore.dart

@@ -1,4 +1,3 @@
-
 import 'package:flutter/widgets.dart';
 import '/models/entities/PagedResult.dart';
 
@@ -8,20 +7,20 @@ class LoadMore extends StatefulWidget {
     required this.builder,
     required this.fetch,
     this.onError,
-  }): super(key: key);
+  }) : super(key: key);
 
   Future Function(Map param) fetch;
   Function? onError;
 
   Widget Function({
-  required BuildContext context,
-  required ScrollController scrollController,
-  required PagedResult data,
-  required bool haveMore,
+    required BuildContext context,
+    required ScrollController scrollController,
+    required PagedResult data,
+    required bool haveMore,
   }) builder;
 
   @override
-  State<StatefulWidget> createState () => _LoadMoreState();
+  State<StatefulWidget> createState() => _LoadMoreState();
 }
 
 class _LoadMoreState extends State<LoadMore> {
@@ -53,7 +52,7 @@ class _LoadMoreState extends State<LoadMore> {
   Future fetchData() {
     final pageNum = result.current + 1;
     final pageSize = result.size == 0 ? 10 : result.size;
-    Map<String, dynamic> params = { "pageNum": pageNum, "pageSize": pageSize };
+    Map<String, dynamic> params = {"pageNum": pageNum, "pageSize": pageSize};
     return Future.value(widget.fetch(params).then((res) {
       setState(() {
         result = PagedResult.fromJson(res);