aaa

lib/models/app.dart

@@ -16,8 +16,13 @@ class AppController extends GetxController {
   final testInt = 1.obs;
 
   get locationStr {
-    if (null == location.value) return null;
+    if(location.value!.longitude==null){
+      return null;
+
+    }else{
     return location.value!.longitude.toString() + "," + location.value!.latitude.toString();
+
+    }
   }
 
   @override

lib/pages/ArticleInfo/ArticleInfo.dart

@@ -1,27 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-class ArticleInfo extends StatelessWidget {
-  const ArticleInfo({Key? key}) : super(key: key);
+import '../../widgets/layout/BasicPage.dart';
+
+class ArticleInfo extends BasicPage {
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      resizeToAvoidBottomInset: false,
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        title: Text(
-          '资讯详情',
-          style: TextStyle(
-              color: Colors.black,
-              fontSize: 17.sp,
-              letterSpacing: 2,
-              fontWeight: FontWeight.bold),
-        ),
-      ),
-        body: Container(
+  Widget builder(BuildContext context) {
+    naviTitle='资讯详情';
+    return  Container(
           padding: EdgeInsets.fromLTRB(15, 30, 15, 50),
 
           child: Column(
@@ -59,7 +46,6 @@ class ArticleInfo extends StatelessWidget {
               )
             ],
           ),
-        ),
     );
 
   }

lib/pages/TabBar/widgets/home/index.dart

@@ -9,42 +9,48 @@ import '../../../../models/entities/banner.dart';
 import '../../../../services/homeAPI.dart';
 import '../../../../widgets/CarsCard.dart';
 import 'package:farmer_client/models/app.dart';
-import '../../../../widgets/layout/BasicPage.dart';
 import '../../../MoreCars/index.dart';
 
+class HomePage extends StatefulWidget {
+  const HomePage({Key? key}) : super(key: key);
 
+  @override
+  State<HomePage> createState() => _HomePageState();
+}
 
-class HomePage extends BasicPage {
 
-  final bannerList = Rx<List<banner>>([]);
+class _HomePageState extends State<HomePage> {
+  final CarouselController _controller = CarouselController();
+  List<banner> BannerList = [];
 
   @override
-  void beforeShow() {
+  void initState() {
+    super.initState();
     final location = AppController.t.locationStr;
+    print('location+$location');
 
     getHomeBanner('banner').then((value) {
-      value.forEach((item) {
-        bannerList.value.add(banner.fromJson(item));
+      setState(() {
+        value.forEach((item) {
+          BannerList.add(banner.fromJson(item));
+        });
       });
     });
-  }
 
-  List<Widget>? _renderList() {
-    return bannerList.value.map((item) => Container(
-      child: Center(
-          child: Image.network(item.thumb.toString(),
-              fit: BoxFit.cover, width: 350.w)),
-    )).toList();
+    getMachinery(location).then((value) {
+      print('$value');
+    });
   }
 
   @override
-  Widget builder (BuildContext context) {
+  Widget build(BuildContext context) {
     return Container(
       alignment: Alignment.center,
       padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
-      child: Column(
+      child: ListView(
         children: [
           Container(
+            width: 20.w,
             child: TypeHeader(
               type: true,
             ),
@@ -52,8 +58,13 @@ class HomePage extends BasicPage {
           Container(
             margin: EdgeInsets.fromLTRB(0, 15, 0, 0),
             child:
-                Obx(() => CarouselSlider(
-              items: _renderList(),
+                // Text('asdasdas')
+                CarouselSlider(
+              items: BannerList.map((item) => Container(
+                    child: Center(
+                        child: Image.network(item.thumb.toString(),
+                            fit: BoxFit.cover, width: 350.w)),
+                  )).toList(),
               options: CarouselOptions(
                 autoPlay: true,
                 enlargeCenterPage: false, //图片中心放大
@@ -62,7 +73,7 @@ class HomePage extends BasicPage {
                 height: 214.w,
                 initialPage: 1, //初始页
               ),
-            )),
+            ),
           ),
           Container(
               margin: EdgeInsets.fromLTRB(0, 20, 0, 20),

lib/pages/TabBar/widgets/home/widgets/headers.dart

@@ -11,6 +11,7 @@ class TypeHeader extends StatefulWidget {
   State<TypeHeader> createState() => _TypeHeaderState();
 }
 
+
 class _TypeHeaderState extends State<TypeHeader> {
   @override
   Widget build(BuildContext context) {

lib/pages/login/login.dart

@@ -135,20 +135,25 @@ class _RouteLogin extends State<MyRouteLogin> {
             mainAxisAlignment: MainAxisAlignment.end,
             crossAxisAlignment: CrossAxisAlignment.start,
             children:[
-              const Text(
+              Padding(padding: EdgeInsets.fromLTRB(15, 0, 0, 5),
+              child:    const Text(
                 '您好!',
                 style: TextStyle(
                   fontWeight: FontWeight.bold,
-                  fontSize: 50,
+                  fontSize: 33,
                 ),
               ),
-              const Text(
-                '欢迎进入农户端应用！',
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 35,
+              ),
+              Padding(padding: EdgeInsets.fromLTRB(15, 0, 0, 0),
+                child:    const Text(
+                  '欢迎进入农户端应用!',
+                  style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    fontSize: 27,
+                  ),
                 ),
               ),
+
               Cell(
                 // margin: EdgeInsets.symmetric(horizontal: 13.w),
                   margin: const EdgeInsets.fromLTRB(13, 43, 10, 0),
@@ -178,7 +183,6 @@ class _RouteLogin extends State<MyRouteLogin> {
                     },
                   ),
                   footer: SizedBox(
-                    width: 300.w,
                     child: ElevatedButton(
                       onPressed: () => {
                         setState(() {
@@ -186,7 +190,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                         })
                       },
                       child: Text(
-                        '$buttonText',
+                        '$buttonText+86',
                         style: TextStyle(
                           fontSize: 15.sp,
                         ),

lib/pages/orderInfo/index.dart

@@ -5,59 +5,27 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
 import '../../widgets/OrderInfoCard.dart';
+import '../../widgets/layout/BasicPage.dart';
 
-class OrderPageInfo extends StatefulWidget {
-  const OrderPageInfo({Key? key}) : super(key: key);
+// class OrderPageInfo extends StatefulWidget {
+//   const OrderPageInfo({Key? key}) : super(key: key);
+//
+//   @override
+//   State<OrderPageInfo> createState() => _OrderPageInfoState();
+// }
 
+class OrderPageInfo extends BasicPage {
   @override
-  State<OrderPageInfo> createState() => _OrderPageInfoState();
-}
 
-class _OrderPageInfoState extends State<OrderPageInfo> {
+
   void onCancel() {
-    showDialog(
-        context: context,
-        builder: (context) {
-          return AlertDialog(content: Text("您确定要取消订单吗?"), actions: <Widget>[
-            TextButton(
-              child: Text("取消"),
-              onPressed: () {
-                print("取消");
-                Navigator.pop(context, 'Cancle');
-              },
-            ),
-            TextButton(
-                child: Text("确定"),
-                onPressed: () {
-                  // setState(() {
-                  //   addressList.remove(addressList[e]);
-                  // });
-                  Navigator.pop(context, "Ok");
-                  Fluttertoast.showToast(msg: '取消成功！');
-                  Get.offAllNamed('/');
-                })
-          ]);
-        });
+
   }
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      resizeToAvoidBottomInset: false,
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        title: Text(
-          '订单详情',
-          style: TextStyle(
-              color: Colors.black,
-              fontSize: 17.sp,
-              letterSpacing: 2,
-              fontWeight: FontWeight.bold),
-        ),
-      ),
-      body: Column(
+  Widget builder (BuildContext context) {
+    naviTitle= '订单详情';
+    return  Column(
         children: [
           OrderInfoCard(),
           Spacer(),
@@ -109,37 +77,8 @@ class _OrderPageInfoState extends State<OrderPageInfo> {
               ],
             ),
           ),
-          // Container(
-          //   height: 130.h,
-          //   margin: EdgeInsets.only(top: 20.0, bottom: 0.0),
-          //   alignment: Alignment.bottomCenter,
-          //   child: SizedBox(
-          //     width: 315.w,
-          //     height: 49.h,
-          //     child: ElevatedButton(
-          //       onPressed: () {
-          //         // _handelSubmit();
-          //         print('用户点击了支付啊阿松大撒地方');
-          //       },
-          //       child: const Text(
-          //         "支付",
-          //         style: TextStyle(
-          //             fontSize: 18,
-          //             color: Colors.white,
-          //             fontWeight: FontWeight.bold),
-          //       ),
-          //       style: ButtonStyle(
-          //         elevation: MaterialStateProperty.all(0),
-          //         backgroundColor:
-          //             MaterialStateProperty.all(const Color(0xFFFF703B)),
-          //         shape: MaterialStateProperty.all(const RoundedRectangleBorder(
-          //             borderRadius: BorderRadius.all(Radius.circular(24.4)))),
-          //       ),
-          //     ),
-          //   ),
-          // ),
         ],
-      ),
     );
+
   }
 }