fix

lib/services/user.dart

@@ -0,0 +1,8 @@
+
+import 'package:dio/dio.dart';
+import 'package:farmer_client/utils/Request.dart';
+import 'package:flutter/foundation.dart';
+
+Future getSMSCaptch(String phone) async {
+  return request('/sms-captcha', options: Options(method: 'POST'), queryParameters: { 'phone': phone });
+}

lib/utils/Request.dart

@@ -1,7 +1,8 @@
-
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
+import 'package:get/get.dart';
 
 class Response {
   late int code;
@@ -14,56 +15,66 @@ class Response {
     this.data,
   });
 
-  factory Response.fromJson(dynamic str) => Response.fromMap(jsonDecode(str) as Map<String, dynamic>);
+  factory Response.fromJson(dynamic str) =>
+      Response.fromMap(jsonDecode(str) as Map<String, dynamic>);
 
   factory Response.fromMap(Map<String, dynamic> resp) => Response(
-    code: resp['code'],
-    message: resp['message'],
-    data: resp['data'],
-  );
+        code: resp['code'],
+        message: resp['message'],
+        data: resp['data'],
+      );
 }
 
+final client = GetPlatform.isAndroid ? 'android' : 'ios';
+
 Dio createRequest() {
   var options = BaseOptions(
-    baseUrl: 'https://www.xx.com/api',
+    baseUrl: 'https://machine.njyunzhi.com/api/' + client + '/farmer',
     connectTimeout: 5000,
     receiveTimeout: 3000,
   );
 
   var dio = Dio(options);
-  dio.interceptors.add(InterceptorsWrapper(
-      onRequest:(options, handler){
-        // Do something before request is sent
-        return handler.next(options); //continue
-        // If you want to resolve the request with some custom data，
-        // you can resolve a `Response` object eg: `handler.resolve(response)`.
-        // If you want to reject the request with a error message,
-        // you can reject a `DioError` object eg: `handler.reject(dioError)`
-      },
-      onResponse:(response,handler) {
-        Response resp = Response.fromJson(response.data['data']);
-        if (resp.code == 1000) {
-          response.data = resp.data;
-          return handler.next(response);
-        } else {
-          return handler.reject(response.data);
-        }
-      },
-      onError: (DioError e, handler) {
-        // Do something with response error
-        return  handler.next(e);//continue
-        // If you want to resolve the request with some custom data，
-        // you can resolve a `Response` object eg: `handler.resolve(response)`.
-      }
-  ));
+  dio.interceptors.add(InterceptorsWrapper(onRequest: (options, handler) {
+    // Do something before request is sent
+    return handler.next(options); //continue
+    // If you want to resolve the request with some custom data，
+    // you can resolve a `Response` object eg: `handler.resolve(response)`.
+    // If you want to reject the request with a error message,
+    // you can reject a `DioError` object eg: `handler.reject(dioError)`
+  }, onResponse: (response, handler) {
+    var resp = response.data as Map<String, dynamic>;
+    if (resp['code'] == 1000) {
+      response.data = resp['data'];
+      return handler.next(response);
+    } else {
+      return handler.reject(response.data);
+    }
+  }, onError: (DioError e, handler) {
+    // Do something with response error
+    return handler.next(e); //continue
+    // If you want to resolve the request with some custom data，
+    // you can resolve a `Response` object eg: `handler.resolve(response)`.
+  }));
 
   return dio;
 }
 
 var instance = createRequest();
 
-Future request (RequestOptions options) async {
-  var resp = await instance.fetch(options);
+Future request(String path,
+    {data,
+    Map<String, dynamic>? queryParameters,
+    CancelToken? cancelToken,
+    Options? options,
+    ProgressCallback? onSendProgress,
+    ProgressCallback? onReceiveProgress}) async {
+
+  var resp = await instance.request(path,
+      data: data,
+      queryParameters: queryParameters,
+      cancelToken: cancelToken,
+      options: options);
 
   if (resp.data.runtimeType == String) {
     String dt = resp.data as String;

lib/widgets/Cell.dart

@@ -0,0 +1,54 @@
+
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class Cell extends StatelessWidget {
+  const Cell ({
+    Key? key,
+    this.header,
+    required this.child,
+    this.footer,
+    this.margin,
+  }) : super(key: key);
+
+  final Widget? header;
+  final Widget child;
+  final Widget? footer;
+  final EdgeInsetsGeometry? margin;
+
+  @override
+  Widget build(BuildContext context) {
+
+    return Container(
+      margin: margin,
+      padding: EdgeInsets.symmetric(vertical: 10.h, horizontal: 0.0),
+      decoration: const BoxDecoration(
+        border: Border(
+          bottom: BorderSide(width: 1.0, color: Color(0x1F000000)),
+        )
+      ),
+      child: Row(
+        children: [
+          if (null != header) SizedBox(
+            width: 53.w,
+            child: Container(
+              decoration: const BoxDecoration(
+                border: Border(
+                  right: BorderSide(width: 1, color: Color(0xFF333333))
+                )
+              ),
+              child: header,
+            ),
+          ),
+          Expanded(child: child,),
+          if (null != footer) ConstrainedBox (
+            constraints: BoxConstraints(maxWidth: 94.w),
+            child: footer,
+          )
+        ],
+      ),
+    );
+  }
+  
+}

lib/widgets/GradientButton.dart

@@ -0,0 +1,88 @@
+
+
+import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
+
+class GradientButton extends StatelessWidget {
+  const GradientButton({
+    Key? key,
+    this.colors,
+    this.linearStart,
+    this.linearEnd,
+    required this.onPressed,
+    required this.child,
+    this.padding,
+    this.borderRadius = const BorderRadius.all(Radius.circular(2)),
+    this.textColor,
+    this.splashColor,
+    this.disabledColor,
+    this.disabledTextColor,
+    this.onHighlightChanged,
+  }) : super(key: key);
+
+  // 渐变色数组
+  final List<Color>? colors;
+  final Color? textColor;
+  final Color? splashColor;
+  final Color? disabledTextColor;
+  final Color? disabledColor;
+  final EdgeInsetsGeometry? padding;
+  final Alignment? linearStart;
+  final Alignment? linearEnd;
+
+  final Widget child;
+  final BorderRadius? borderRadius;
+
+  final GestureTapCallback? onPressed;
+  final ValueChanged<bool>? onHighlightChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    ThemeData theme = Theme.of(context);
+    //确保colors数组不空
+    List<Color> _colors =
+        colors ?? [theme.primaryColor, theme.primaryColorDark];
+    final radius = borderRadius;
+    bool disabled = onPressed == null;
+
+    return DecoratedBox(
+      decoration: BoxDecoration(
+        gradient: disabled ? null : LinearGradient(begin: linearStart??Alignment.topCenter, end: linearEnd??Alignment.bottomCenter, colors: _colors),
+        color: disabled ? disabledColor ?? theme.disabledColor : null,
+        borderRadius: radius,
+      ),
+      child: Material(
+        type: MaterialType.transparency,
+        borderRadius: radius,
+        clipBehavior: Clip.hardEdge,
+        child: ConstrainedBox(
+          constraints: const BoxConstraints(minWidth: 88.0, minHeight: 36.0),
+          child: InkWell(
+            splashColor: splashColor ?? _colors.last,
+            highlightColor: Colors.transparent,
+            onHighlightChanged: onHighlightChanged,
+            onTap: onPressed,
+            child: Padding(
+              padding: padding ?? theme.buttonTheme.padding,
+              child: DefaultTextStyle(
+                style: const TextStyle(fontWeight: FontWeight.bold),
+                child: Center(
+                  child: DefaultTextStyle(
+                    style: theme.textTheme.button!.copyWith(
+                      color: disabled
+                          ? disabledTextColor ?? Colors.black38
+                          : textColor ?? Colors.white,
+                    ),
+                    child: child,
+                  ),
+                  widthFactor: 1,
+                  heightFactor: 1,
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

pubspec.lock

@@ -5,133 +5,133 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "38.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.4.1"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.3.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.2.1"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.15.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.2.2"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.6"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.2"
   flutter:
@@ -143,14 +143,14 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.4"
   flutter_screenutil:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: flutter_screenutil
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.3.1"
   flutter_test:
@@ -162,98 +162,98 @@ packages:
     dependency: "direct main"
     description:
       name: get
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.6.1"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.2"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.4.0"
   json_serializable:
     dependency: "direct main"
     description:
       name: json_serializable
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.5"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.7.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.2"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.0"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   sky_engine:
@@ -265,84 +265,84 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.1"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.1"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.1.1"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.1"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.0"
 sdks:

pubspec.yaml

@@ -37,6 +37,7 @@ dependencies:
   json_serializable: ^6.1.5
   get: ^4.6.1
   dio: ^4.0.6
+  flutter_screenutil: ^5.3.1
 
 dev_dependencies:
   flutter_test: