.

lib/pages/Login/index.dart

@@ -95,7 +95,13 @@ class _Login extends State<Login> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: SafeArea(
+      backgroundColor: Colors.transparent,
+      resizeToAvoidBottomInset: false,
+      body: GestureDetector(
+        behavior: HitTestBehavior.translucent,
+        onTap: () {
+          FocusScope.of(context).requestFocus(FocusNode());
+        },
         child: Container(
           padding: EdgeInsets.all(15.w),
           decoration: const BoxDecoration(

lib/pages/main/index.dart

@@ -20,7 +20,7 @@ class Main extends BasicPage {
   void loginOut() {
     modal.showAlert(
         title: '提示',
-        message: '确定要退出登陆吗？',
+        message: '确定要退出登录吗？',
         onConfirm: () {
           box.remove('token');
           Get.offAllNamed('/login');
@@ -346,7 +346,7 @@ class Main extends BasicPage {
                               loginOut();
                             },
                             child: Text(
-                              "退出登陆",
+                              "退出登录",
                               style: TextStyle(
                                 fontSize: 20.sp,
                                 fontWeight: FontWeight.bold,

lib/services/user.dart

@@ -12,7 +12,7 @@ Future getSMSCaptch(String phone) async {
   });
 }
 
-//登陆
+//登录
 Future userLogin(String userName, String password) async {
   return request(
     '/login',

lib/utils/Request.dart

@@ -28,10 +28,13 @@ class Response {
 final client = GetPlatform.isAndroid ? 'android' : 'ios';
 
 Dio createRequest() {
+  const isProd = bool.fromEnvironment('dart.vm.product');
+  const host =
+      isProd ? 'https://machine.njyunzhi.com' : 'http://192.168.89.147:7080';
+  final baseUrl = '$host/api/$client/worker';
+
   var options = BaseOptions(
-    // baseUrl: 'http://192.168.89.25:7080/api/' + client + '/worker',
-    // baseUrl: 'http://192.168.89.147:7080/api/' + client + '/worker',
-    baseUrl: 'https://machine.njyunzhi.com/api/' + client + '/worker',
+    baseUrl: baseUrl,
     connectTimeout: 5000,
     receiveTimeout: 3000,
   );

lib/widgets/amap/amap.dart

@@ -43,6 +43,8 @@ class AMap extends StatelessWidget {
             onTap: (e) {
               onClick(item);
             },
+            //这个东西在苹果手机上会有个默认气泡 false后就正常了
+            infoWindowEnable: false,
             clickable: true,
             position: LatLng(
                 double.parse(locationArea[0]), double.parse(locationArea[1])),

lib/widgets/layout/BasicPage.dart

@@ -104,9 +104,7 @@ class _BasicPageState extends State<BasicPage> {
     return Scaffold(
       resizeToAvoidBottomInset: widget.isPop == null ? false : true,
       appBar: _getAppBar(),
-      body: SafeArea(
-        child: widget.builder(context),
-      ),
+      body: widget.builder(context),
       bottomNavigationBar: widget.tabIndex == null
           ? null
           : BottomBar(list: BarList, current: widget.tabIndex!),