Merge branch 'master' of http://git.ycjcjy.com/nanyang/farmer_client

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

@@ -9,42 +9,42 @@ 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 _HomePageState extends State<HomePage> {
-  final CarouselController _controller = CarouselController();
-  List<banner> BannerList = [];
+class HomePage extends BasicPage {
+
+  final bannerList = Rx<List<banner>>([]);
 
   @override
-  void initState() {
-    super.initState();
+  void beforeShow() {
     final location = AppController.t.locationStr;
 
     getHomeBanner('banner').then((value) {
-      setState(() {
-        value.forEach((item) {
-          BannerList.add(banner.fromJson(item));
-        });
+      value.forEach((item) {
+        bannerList.value.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();
+  }
+
   @override
-  Widget build(BuildContext context) {
+  Widget builder (BuildContext context) {
     return Container(
       alignment: Alignment.center,
       padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
-      child: ListView(
+      child: Column(
         children: [
           Container(
-            width: 20.w,
             child: TypeHeader(
               type: true,
             ),
@@ -52,13 +52,8 @@ class _HomePageState extends State<HomePage> {
           Container(
             margin: EdgeInsets.fromLTRB(0, 15, 0, 0),
             child:
-                // Text('asdasdas')
-                CarouselSlider(
-              items: BannerList.map((item) => Container(
-                    child: Center(
-                        child: Image.network(item.thumb.toString(),
-                            fit: BoxFit.cover, width: 350.w)),
-                  )).toList(),
+                Obx(() => CarouselSlider(
+              items: _renderList(),
               options: CarouselOptions(
                 autoPlay: true,
                 enlargeCenterPage: false, //图片中心放大
@@ -67,7 +62,7 @@ class _HomePageState extends State<HomePage> {
                 height: 214.w,
                 initialPage: 1, //初始页
               ),
-            ),
+            )),
           ),
           Container(
               margin: EdgeInsets.fromLTRB(0, 20, 0, 20),

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

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
-
 class TypeHeader extends StatefulWidget {
   TypeHeader({Key? key, required this.type}) : super(key: key);
 
@@ -14,10 +13,11 @@ class TypeHeader extends StatefulWidget {
 
 class _TypeHeaderState extends State<TypeHeader> {
   @override
-  Widget build (BuildContext context) {
+  Widget build(BuildContext context) {
     if (widget.type) {
       return Container(
         child: Row(
+          // mainAxisAlignment: MainAxisAlignment.start,
           children: [
             Container(
               height: 32.w,
@@ -41,10 +41,10 @@ class _TypeHeaderState extends State<TypeHeader> {
                       ),
                     ),
                   ),
-        Container(
-          padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
-          child: Icon(Icons.arrow_drop_down),
-        ),
+                  Container(
+                    padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
+                    child: Icon(Icons.arrow_drop_down),
+                  ),
                   _initWidget(),
                 ],
               ),
@@ -54,15 +54,11 @@ class _TypeHeaderState extends State<TypeHeader> {
       );
     } else {
       return _initWidget();
-
     }
-
-
   }
 }
 //
 
-
 class _initWidget extends StatelessWidget {
   const _initWidget({Key? key}) : super(key: key);
 
@@ -76,7 +72,6 @@ class _initWidget extends StatelessWidget {
             onTap: () {
               print('点击了搜索');
               Get.toNamed('/searchPage');
-
             },
             child: Container(
               decoration: const BoxDecoration(
@@ -85,9 +80,9 @@ class _initWidget extends StatelessWidget {
                 borderRadius: BorderRadius.all(Radius.circular(25)),
               ),
               child: Row(
-                children: [
+                children: const [
                   Padding(
-                    padding: EdgeInsets.fromLTRB(15, 0, 5, 0),
+                    padding: EdgeInsets.fromLTRB(5, 0, 5, 0),
                     child: Icon(
                       Icons.search,
                       size: 19,
@@ -101,10 +96,7 @@ class _initWidget extends StatelessWidget {
                 ],
               ),
             )
-          // Search(),
-        ));
-
+            // Search(),
+            ));
   }
 }
-
-

lib/routes/middleWares.dart

@@ -9,9 +9,9 @@ void routingCallback (routing) {
   bool isSplashScreen = routing?.current == '/splash';
   bool isLoginPage = routing?.current == '/login';
   bool isAgreementPage = routing?.current == '/agreement';
-  // if (!isLogin && !isSplashScreen && !isLoginPage&&!isAgreementPage) {
-  //   // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
-  //   // https://github.com/jonataslaw/getx/issues/262
-  //   SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
-  // }
+  if (!isLogin && !isSplashScreen && !isLoginPage&&!isAgreementPage) {
+    // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
+    // https://github.com/jonataslaw/getx/issues/262
+    SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
+  }
 }