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

lib/pages/MoreCars/index.dart

@@ -1,6 +1,11 @@
+
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import '../../widgets/CarsCard.dart';
+import '../../widgets/Search.dart';
+import '../TabBar/widgets/home/widgets/headers.dart';
+
 
 class MoreCars extends StatefulWidget {
   const MoreCars({Key? key}) : super(key: key);
@@ -9,16 +14,33 @@ class MoreCars extends StatefulWidget {
   State<MoreCars> createState() => _MoreCarsState();
 }
 
-class _MoreCarsState extends State<MoreCars> {
+class _MoreCarsState extends State<MoreCars> with TickerProviderStateMixin  {
+
+  late TabController _controller = TabController(length: tabText.length, vsync: this);
+   List<String> tabText= [
+     '全部',
+     '播种机',
+     '收割机',
+     '挺长名字的农机选项分类',
+  ];
+
+
+
+  @override
+  void initState() {
+    // TODO: implement initState
+    super.initState();
+  }
   @override
   Widget build(BuildContext context) {
+    // _controller=TabController(length: tabText.length, vsync: this);
     return Scaffold(
       resizeToAvoidBottomInset: false,
       appBar: AppBar(
         elevation: 0,
         centerTitle: true,
         backgroundColor: Colors.white,
-        title: Text(
+        title:Text(
           '更多',
           style: TextStyle(
               color: Colors.black,
@@ -26,11 +48,81 @@ class _MoreCarsState extends State<MoreCars> {
               letterSpacing: 2,
               fontWeight: FontWeight.bold),
         ),
+
       ),
-      body: Container(
-        child: Text('wwwwwwwwwww'),
-      ),
+      body: ListView(
+          children: [Column(
+          children: [
+            Container(
+              padding: EdgeInsets.fromLTRB(20, 15, 20, 15),
+
+              decoration: BoxDecoration(
+                color: Colors.white
+              ),
+              // child:Search(),
+              child:          Container(
+                  height: 32.w,
+                  decoration: const BoxDecoration(
+                      color: Colors.white
+                  ),
+                  child: GestureDetector(
+                      onTap: (){
+                        print('点击了搜索');
+                      },
+                      child: Container(
+                        decoration: const BoxDecoration(
+                          // color: Colors.red,
+                          color: Color(0x30cccccc),
+                          borderRadius: BorderRadius.all(Radius.circular(25)),
+                        ),
+                        child: Row(
+                          children: [
+                            Padding(padding: EdgeInsets.fromLTRB(15, 0, 5, 0),
+                              child: Icon(Icons.search,size: 19,color:Color(0xff666666) ,),
+                            ),
+                            Text('请输入关键字查询',style: TextStyle(color: Color(0xff666666),fontSize: 14),)
+                          ],
+                        ),
+                      )
+                    // Search(),
+                  )
+              ),
+            ),
+            
+            TabBar(
+              labelStyle: TextStyle(fontSize: ScreenUtil().setSp(19),fontWeight: FontWeight.bold), //选中的样式
+              unselectedLabelStyle: TextStyle(fontSize:ScreenUtil().setSp(16)), //未选中的样式
+              controller: _controller,
+              isScrollable: true, //可滚动
+              indicatorColor: Colors.black, //指示器的颜色
+              labelColor: Colors.black, //选中文字颜色
+              unselectedLabelColor: Color(0xffadadad),
+              // indicatorSize: TabBarIndicatorSize.label, //指示器与文字等宽
+              tabs: tabText.map((e) => Tab(text: e)).toList(),
+              onTap: (int i) {
+                print('当前+${i}');
+              },
+
+            ),
+            Container(
+              child: Column(
+                children: [
+                  CarsCard(),
+                  CarsCard(),
+                  CarsCard(),
+                  CarsCard(),
+                ],
+              )
+              ,
+            )
+
+
+          ],
+        )]
+
+      )
 
     );
   }
 }
+

lib/pages/TabBar/widgets/main/widgets/OtherColumn.dart

@@ -117,33 +117,38 @@ class OtherColumn extends StatelessWidget {
                       ),
                     ),
                   ),
-                  Container(
-                    margin: EdgeInsets.fromLTRB(0, 10.w, 0, 20.w),
-                    width: 310.w,
-                    height: 45.w,
-                    decoration: const BoxDecoration(
-                        border: Border(
-                            bottom:
-                                BorderSide(width: 0.5, color: Color(0x20000000)
-                                    // 0x17000000
-                                    ))),
-                    child: ListTile(
-                      contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
-                      leading: Image(
-                        image: AssetImage('images/feedbacks.png'),
-                        width: 18.w,
-                        height: 21.w,
-                      ),
-                      title: Transform(
-                        transform: Matrix4.translationValues(-20, 0.0, 0.0),
-                        child: Text("意见反馈",
-                            style: TextStyle(
-                                fontSize: 17.sp, color: Color(0xff333333))),
-                      ),
-                      trailing: Image(
-                        image: AssetImage('images/userRight.png'),
-                        width: 10.w,
-                        height: 18.w,
+                  GestureDetector(
+                    onTap: () {
+                      Get.toNamed('/feedback');
+                    },
+                    child: Container(
+                      margin: EdgeInsets.fromLTRB(0, 10.w, 0, 20.w),
+                      width: 310.w,
+                      height: 45.w,
+                      decoration: const BoxDecoration(
+                          border: Border(
+                              bottom: BorderSide(
+                                  width: 0.5, color: Color(0x20000000)
+                                  // 0x17000000
+                                  ))),
+                      child: ListTile(
+                        contentPadding: EdgeInsets.symmetric(horizontal: 0.0),
+                        leading: Image(
+                          image: AssetImage('images/feedbacks.png'),
+                          width: 18.w,
+                          height: 21.w,
+                        ),
+                        title: Transform(
+                          transform: Matrix4.translationValues(-20, 0.0, 0.0),
+                          child: Text("意见反馈",
+                              style: TextStyle(
+                                  fontSize: 17.sp, color: Color(0xff333333))),
+                        ),
+                        trailing: Image(
+                          image: AssetImage('images/userRight.png'),
+                          width: 10.w,
+                          height: 18.w,
+                        ),
                       ),
                     ),
                   ),

lib/pages/feedback/index.dart

@@ -0,0 +1,117 @@
+import 'package:farmer_client/models/entities/Address.dart';
+import 'package:farmer_client/widgets/DefaultButton.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.dart';
+
+class Feedback extends StatefulWidget {
+  const Feedback({Key? key}) : super(key: key);
+
+  @override
+  _Feedback createState() => _Feedback();
+}
+
+class _Feedback extends State<Feedback> {
+  String text = '';
+  bool isEdit=false;
+  @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(
+        height: 700.h,
+        padding: EdgeInsets.all(15.w),
+        child: Stack(
+          children: [
+            Container(
+              margin: EdgeInsets.fromLTRB(0, 0, 0, 50.h),
+              padding: EdgeInsets.symmetric(vertical: 5.w, horizontal: 18.5.w),
+              decoration: BoxDecoration(
+                  color: const Color(0xFFfefefe),
+                  borderRadius: BorderRadius.all(Radius.circular(10.w)),
+                  border: Border.all(
+                      color: const Color(0xcc000000),
+                      width: 1.h,
+                      style: BorderStyle.solid)),
+              child: TextFormField(
+                minLines: 6,
+                maxLines: 6,
+                style: TextStyle(fontSize: 17.sp, height: 1.5),
+                decoration: const InputDecoration(
+                  isCollapsed: true,
+                  border: InputBorder.none,
+                  counterText: '', //去掉计数
+                  floatingLabelBehavior: FloatingLabelBehavior.never,
+                ),
+                onTap: () {
+                  setState(() {
+                    isEdit=true;
+                  });
+                },
+                onChanged: (e) {
+                  setState(() {
+                    text = e;
+                  });
+                },
+              ),
+            ),
+            if(!isEdit) Positioned(
+              left: 20.w,
+              top: 5.w,
+              child: Row(
+                children: [
+                  Image.asset(
+                    'images/icons/feedbackIcon.png',
+                    width: 15.w,
+                  ),
+                  Text(
+                    '请留下您宝贵的意见和建议！',
+                    style: TextStyle(
+                        fontSize: 17.sp,
+                        letterSpacing: 2,
+                        color: Color(0xFFBEBDBD)),
+                  ),
+                ],
+              ),
+            ),
+            Positioned(
+              bottom: 25.h,
+              child: DefaultButton(
+                color: const Color(0xffffffff),
+                backColor: const Color(0xFFFF703B),
+                width: 345.w,
+                height: 49.h,
+                text: '提交',
+                onPressed: () {
+                  if (text == '') {
+                    Fluttertoast.showToast(msg: '请输入内容哦');
+                  } else {
+                    Fluttertoast.showToast(msg: '提交成功！');
+                    Get.back();
+                  }
+                },
+                margin: const EdgeInsets.all(0),
+                fontSize: 20.sp,
+                radius: 24.5.w,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/pages/login/login.dart

@@ -289,7 +289,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                             recognizer:
                             TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
                               ..onTap = () {
-                                print('阅读已同意！！！');
+                                Get.toNamed('/agreement');
                               },
                           ),
                           const TextSpan(

lib/routes/middleWares.dart

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

lib/routes/pages.dart

@@ -4,15 +4,17 @@ import 'package:farmer_client/pages/aboutUs/index.dart';
 import 'package:farmer_client/pages/addAddress/index.dart';
 import 'package:farmer_client/pages/addressList/index.dart';
 import 'package:farmer_client/pages/agreement/index.dart';
+import 'package:farmer_client/pages/feedback/index.dart';
 import 'package:farmer_client/pages/userInfo/index.dart';
 import 'package:get/get.dart';
+import '../pages/MoreCars/index.dart';
 import '../pages/index.dart';
 
 
 List<GetPage> pages = [
   GetPage(name: '/', page: () =>  Home()),
   GetPage(name: '/ArticleInfo', page: () =>  ArticleInfo()),//资讯详情
-  GetPage(name: '/splash', page: () => MachineryDetailPage()),//SplashScreen
+  GetPage(name: '/splash', page: () => SplashScreen()),//SplashScreen
   GetPage(name: '/login', page: () =>  MyRouteLogin()),
   GetPage(name: '/addressList', page: () =>  AddressList()),
   GetPage(name: '/addAddress', page: () =>  AddAddress()),
@@ -21,4 +23,5 @@ List<GetPage> pages = [
   GetPage(name: '/machineryDetail', page: () =>  MachineryDetailPage()),
   GetPage(name: '/aboutUs', page: () =>  AboutUs()),
   GetPage(name: '/agreement', page: () =>  Agreement()),
+  GetPage(name: '/feedback', page: () =>  Feedback()),
 ];

lib/widgets/CarsCard.dart

@@ -5,7 +5,9 @@ import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
 
 import '../pages/OrderConfirmation/index.dart';
+import '../pages/machinery/detail/index.dart';
 import '../pages/machinery/map/index.dart';
+import 'LinearGradientText.dart';
 
 // class CarItem {
 //   late String name;
@@ -33,12 +35,19 @@ class CarsCard extends StatelessWidget {
       // height: 389.h,
       child: Column(
         children: [
-          Image.network(
-            "http://yz-shigongli.oss-accelerate.aliyuncs.com/2022-03/1648094119154-7b280bbf63105a8e90299e2d79c8c6ee.jpeg",
-            width: 345.w,
-            height: 230.h,
-            fit: BoxFit.cover,
+          GestureDetector(
+            onTap: (){
+              Get.to(MachineryDetailPage());
+
+            },
+            child:Image.network(
+              "http://yz-shigongli.oss-accelerate.aliyuncs.com/2022-03/1648094119154-7b280bbf63105a8e90299e2d79c8c6ee.jpeg",
+              width: 345.w,
+              height: 230.h,
+              fit: BoxFit.cover,
+            ),
           ),
+
           Container(
             padding: EdgeInsets.fromLTRB(15, 20, 0, 0),
             child: Row(
@@ -62,21 +71,35 @@ class CarsCard extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: <Widget>[
                 Container(
-                  child: RichText(
-                    text: const TextSpan(children: <InlineSpan>[
-                      TextSpan(
-                          text: '8555元/',
-                          style: TextStyle(
-                              color: Color(0xffce3800),
-                              fontSize: 22,
-                              fontWeight: FontWeight.bold)),
-                      TextSpan(
-                          text: '公顷',
-                          style: TextStyle(
-                              color: Color(0xffce3800),
-                              fontSize: 10,
-                              fontWeight: FontWeight.bold)),
-                    ]),
+                  child: LinearGradientText(
+                    colors: const <Color>[
+                      Color(0xFFFA7878),
+                      Color(0xFFB61515),
+                    ],
+                    child: RichText(
+                      text: TextSpan(
+                          children: <InlineSpan>[
+                            TextSpan(
+                                text: "4508",
+                                style: TextStyle(
+                                  fontSize: 22,
+                                  fontWeight: FontWeight.bold,
+                                )),
+                            TextSpan(
+                                text: "元/",
+                                style: TextStyle(
+                                  fontSize: 22,
+                                  fontWeight: FontWeight.bold,
+                                )),
+                            TextSpan(
+                                text: "公顷",
+                                style: TextStyle(
+                                  fontSize: 12,
+                                  fontWeight: FontWeight.bold,
+                                )),
+                          ]
+                      ),
+                    ),
                   ),
                 ),
                 Align(

lib/widgets/OrderInfoCard.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
+import 'LinearGradientText.dart';
+
 class OrderInfoCard extends StatelessWidget {
   const OrderInfoCard({Key? key}) : super(key: key);
 
@@ -136,7 +138,7 @@ class OrderInfoCard extends StatelessWidget {
                     Padding(
                       padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
                       child: RichText(
-                        text: TextSpan(children: <InlineSpan>[
+                        text: const TextSpan(children: <InlineSpan>[
                           TextSpan(
                               text: '订单状态：',
                               style: TextStyle(
@@ -165,25 +167,33 @@ class OrderInfoCard extends StatelessWidget {
                           children: [
                             Row(
                               mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                Text('费用：',
+                              children:  [
+                                const Text('费用：',
                                     style: TextStyle(
                                         color: Color(0xff666666),
                                         fontSize: 16,
                                         fontWeight: FontWeight.bold)),
-                                Text('8880',
-                                    style: TextStyle(
-                                        color: Color(0xffB61515),
-                                        fontSize: 16,
-                                        fontWeight: FontWeight.bold)),
+                                LinearGradientText(
+                                  colors: const <Color>[
+                                    Color(0xFFFA7878),
+                                    Color(0xFFB61515),
+                                  ],
+                                  child: const Text('8880',
+                                      style: TextStyle(
+                                          color: Color(0xffB61515),
+                                          fontSize: 16,
+                                          fontWeight: FontWeight.bold)),
+                                ),
+
+
                               ],
                             ),
                             Padding(
                               padding: EdgeInsets.fromLTRB(0, 30, 0, 0),
                               child: Row(
                                 mainAxisAlignment:
-                                    MainAxisAlignment.spaceBetween,
-                                children: [
+                                MainAxisAlignment.spaceBetween,
+                                children: const [
                                   Text('状态：',
                                       style: TextStyle(
                                           color: Color(0xff666666),

lib/widgets/OrderListCard.dart

@@ -4,6 +4,7 @@ import 'package:get/get.dart';
 
 import '../pages/OrderConfirmation/index.dart';
 import '../pages/orderInfo/index.dart';
+import 'LinearGradientText.dart';
 import 'OrderInfoCard.dart';
 
 class OrderListCard extends StatelessWidget {
@@ -194,22 +195,43 @@ class OrderListCard extends StatelessWidget {
                                   fontWeight: FontWeight.bold)),
                         ]),
                       ),
-                      RichText(
-                        text: const TextSpan(children: <InlineSpan>[
-                          TextSpan(
-                              text: '费用：',
-                              style: TextStyle(
-                                  color: Color(0xff666666),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                          TextSpan(
-                              text: '850元',
-                              style: TextStyle(
-                                  color: Color(0xffB61515),
-                                  fontSize: 16,
-                                  fontWeight: FontWeight.bold)),
-                        ]),
+                      Container(
+                        child: Row(
+                          children: [
+                            const Text('费用：',style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                            LinearGradientText(
+                              colors: const <Color>[
+                                Color(0xFFFA7878),
+                                Color(0xFFB61515),
+                              ],
+                              child: RichText(
+                                text: const TextSpan(
+                                    children: <InlineSpan>[
+                                      TextSpan(
+                                          text: "8808",
+                                          style: TextStyle(
+                                            fontSize: 16,
+                                            fontWeight: FontWeight.bold,
+                                          )),
+                                      TextSpan(
+                                          text: "元",
+                                          style: TextStyle(
+                                            fontSize: 16,
+                                            fontWeight: FontWeight.bold,
+                                          )),
+
+                                    ]
+                                ),
+                              ),
+                            ),
+
+                          ],
+                        ),
                       ),
+
                     ],
                   ),
                 ),