'.'

lib/main.dart

@@ -1,5 +1,4 @@
 import 'package:farmer_client/theme.dart';
-import 'package:farmer_client/utils/location.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:fluwx/fluwx.dart';

lib/pages/userInfo/index.dart

@@ -20,10 +20,12 @@ class UserInfo extends BasicPage {
   @override
   void beforeShow() {
     super.beforeShow();
-    _cName = TextEditingController(text: userInfo.user().nickName.toString());
-    _cPhone = TextEditingController(text: userInfo.user().phone.toString());
-    name = userInfo.user().nickName.toString();
+    name = userInfo.user().nickName != null
+        ? userInfo.user().nickName.toString()
+        : '';
     phone = userInfo.user().phone.toString();
+    _cName = TextEditingController(text: name);
+    _cPhone = TextEditingController(text: phone);
   }
 
   bool disableLogin = false;
@@ -41,7 +43,6 @@ class UserInfo extends BasicPage {
     } else {
       data = {
         ...userInfo.user().toJson(),
-        'avatar': userInfo.user().avatar ?? '',
         'nickName': name,
         'phone': phone
       };
@@ -134,7 +135,7 @@ class UserInfo extends BasicPage {
                   Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        Container(
+                        SizedBox(
                           width: 327.w,
                           child: TextField(
                             controller: _cName,
@@ -158,6 +159,7 @@ class UserInfo extends BasicPage {
                           ),
                         ),
                         GestureDetector(
+                          behavior: HitTestBehavior.opaque,
                           onTap: () {
                             name = '';
                             _cName.clear();
@@ -223,6 +225,7 @@ class UserInfo extends BasicPage {
                           ),
                         ),
                         GestureDetector(
+                          behavior: HitTestBehavior.opaque,
                           onTap: () {
                             phone = '';
                             _cPhone.clear();

lib/services/user.dart

@@ -19,7 +19,7 @@ Future userLogin(String userName, String password) async {
     options: Options(method: 'POST'),
     data: {'userName': userName, 'password': password},
   ).catchError((error) => {
-        Fluttertoast.showToast(msg: error.error['message']),
+        Fluttertoast.showToast(msg: error['message']),
       });
 }
 

lib/utils/Request.dart

@@ -29,7 +29,7 @@ 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.25:7080';
+  const host = isProd ? 'https://machine.njyunzhi.com' : 'http://192.168.89.147:7080';
   final baseUrl = '$host/api/$client/farmer';
 
   var options = BaseOptions(

lib/widgets/layout/BasicPage.dart

@@ -96,19 +96,25 @@ class _BasicPageState extends State<BasicPage> {
     }
   }
 
+  final client = GetPlatform.isAndroid ? true : false;
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       resizeToAvoidBottomInset: false,
       appBar: _getAppBar(),
       body: SafeArea(
-        child: GestureDetector(
-          behavior: HitTestBehavior.translucent,
-          onTap: () {
-            FocusScope.of(context).requestFocus(FocusNode());
-          },
-          child: widget.builder(context),
-        ),
+        //判断是否是安卓手机  因为安卓手机键盘有收起功能所以普通就行
+        //如果是苹果系统 因为苹果键盘没有收起功能只能点击屏幕收起所以需要加一个代码
+        child: !client
+            ? widget.builder(context)
+            : GestureDetector(
+                behavior: HitTestBehavior.translucent,
+                onTap: () {
+                  FocusScope.of(context).requestFocus(FocusNode());
+                },
+                child: widget.builder(context),
+              ),
       ),
       bottomNavigationBar: widget.tabIndex == null
           ? null