repair若干Bug

lib/pages/ArticleInfo/ArticleInfo.dart

@@ -37,11 +37,10 @@ class ArticleInfo extends BasicPage {
   Widget builder(BuildContext context) {
     naviTitle = '资讯详情';
     return Container(
-      padding: EdgeInsets.fromLTRB(15, 30, 15, 50),
-      child: Column(
+      padding: EdgeInsets.fromLTRB(15, 30, 15, 0),
+      child: ListView(
         children: [
           Container(
-            alignment: Alignment.center,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
@@ -49,13 +48,19 @@ class ArticleInfo extends BasicPage {
                   image: AssetImage('images/icons/decorate.png'),
                   width: 17,
                 ),
-                Obx(() => Text(
-                      newsInfoContent.value.title.toString(),
-                      style: TextStyle(
-                        fontSize: 17.sp,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    )),
+                Container(
+                  alignment: Alignment.center,
+
+                  width: 260.w,
+                  child:              Obx(() => Text(
+                    newsInfoContent.value.title.toString(),
+                    style: TextStyle(
+                      fontSize: 17.sp,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  )),
+                ),
+
                 Image(
                     image: AssetImage('images/icons/decorate.png'), width: 17),
               ],

lib/pages/OrderConfirmation/index.dart

@@ -81,140 +81,141 @@ class OrderConfirmation extends BasicPage {
       child: Form(
         key: _formKey, //设置globalKey，用于后面获取FormState
         autovalidateMode: AutovalidateMode.onUserInteraction,
-        child: Column(
-          children: <Widget>[
-            Container(
-              margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
-              alignment: Alignment.topLeft,
-              child: Text(
-                '作业面积/公顷',
-                style: TextStyle(
-                    color: Color(0xff222222),
-                    fontSize: 17.sp,
-                    fontWeight: FontWeight.bold),
-              ),
-            ),
-            TextFormField(
-              autofocus: false,
-              keyboardType: TextInputType.number,
-              controller: _unameController,
-              decoration: const InputDecoration(
-                isCollapsed: true,
-                contentPadding:
+        child:
+            Column(
+              children: [
+                Container(
+                  margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
+                  alignment: Alignment.topLeft,
+                  child: Text(
+                    '作业面积/公顷',
+                    style: TextStyle(
+                        color: Color(0xff222222),
+                        fontSize: 17.sp,
+                        fontWeight: FontWeight.bold),
+                  ),
+                ),
+                TextFormField(
+                  autofocus: false,
+                  keyboardType: TextInputType.number,
+                  controller: _unameController,
+                  decoration: const InputDecoration(
+                    isCollapsed: true,
+                    contentPadding:
                     EdgeInsets.symmetric(vertical: 8, horizontal: 16),
-                counterText: '', //去掉计数
-                ///   UnderlineInputBorder 只有下边框  默认使用的就是下边框
-                border: UnderlineInputBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(10)),
-                  borderSide: BorderSide(
-                    color: Color(0x30000000),
-                    width: 2.0,
+                    counterText: '', //去掉计数
+                    ///   UnderlineInputBorder 只有下边框  默认使用的就是下边框
+                    border: UnderlineInputBorder(
+                      borderRadius: BorderRadius.all(Radius.circular(10)),
+                      borderSide: BorderSide(
+                        color: Color(0x30000000),
+                        width: 2.0,
+                      ),
+                    ),
+                    floatingLabelBehavior: FloatingLabelBehavior.never,
+                    hintText: "请输入具体面积(公顷)",
                   ),
+                  onChanged: (e) {
+                    workingArea(int.parse(e));
+                  },
+                  // 校验用户名
+                  validator: (v) {
+                    return v!.trim().isNotEmpty ? null : "作业面积/公顷不能为空";
+                  },
                 ),
-                floatingLabelBehavior: FloatingLabelBehavior.never,
-                hintText: "请输入具体面积(公顷)",
-              ),
-              onChanged: (e) {
-                workingArea(int.parse(e));
-              },
-              // 校验用户名
-              validator: (v) {
-                return v!.trim().isNotEmpty ? null : "作业面积/公顷不能为空";
-              },
-            ),
-            Container(
-              margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
-              alignment: Alignment.topLeft,
-              child: Text(
-                '作业时间：',
-                style: TextStyle(
-                    color: Color(0xff222222),
-                    fontSize: 17.sp,
-                    fontWeight: FontWeight.bold),
-              ),
-            ),
-            Container(
-                width: 345.w,
-                padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
-                decoration: const BoxDecoration(
-                  border: Border(
-                      bottom: BorderSide(width: 1, color: Color(0x20000000)
-                          // 0x17000000
-                          )),
+                Container(
+                  margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
+                  alignment: Alignment.topLeft,
+                  child: Text(
+                    '作业时间：',
+                    style: TextStyle(
+                        color: Color(0xff222222),
+                        fontSize: 17.sp,
+                        fontWeight: FontWeight.bold),
+                  ),
                 ),
-                child: Row(
-                  children: [
-                    Image(
-                      image: AssetImage('images/icons/timeImage.png'),
-                      fit: BoxFit.cover,
-                      width: 18.w,
-                      height: 18.w,
-                    ),
-                    Padding(
-                      padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
-                      child: GestureDetector(
-                          onTap: () async {
-                            var handleChnage = await showDatePicker(
-                              context: context,
-                              helpText: '请选择作业开始时间',
-                              cancelText: '取消',
-                              confirmText: '确定',
-                              initialDate: selectDate() == null
-                                  ? DateTime.now()
-                                  : selectDate(),
-                              firstDate: DateTime.now(),
-                              lastDate: DateTime(2030),
-                            );
-                            selectDate(handleChnage!);
-                            print('${selectDate}+');
-                          },
-                          child: Obx(
-                            () => Text(selectDate == null
-                                ? '请选择日期'
-                                : '${DateFormat("yyyy-MM-dd").format(selectDate())}'),
+                Container(
+                    width: 345.w,
+                    padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
+                    decoration: const BoxDecoration(
+                      border: Border(
+                          bottom: BorderSide(width: 1, color: Color(0x20000000)
+                            // 0x17000000
                           )),
-                    )
-                  ],
-                )),
-            Container(
-              margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
-              alignment: Alignment.topLeft,
-              child: Text(
-                '作业位置：',
-                style: TextStyle(
-                    color: Color(0xff222222),
-                    fontSize: 17.sp,
-                    fontWeight: FontWeight.bold),
-              ),
-            ),
-            Container(
-              width: 345.w,
-              padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
-              decoration: BoxDecoration(
-                border: Border(
-                    bottom: BorderSide(width: 1, color: Color(0x20000000)
-                        // 0x17000000
+                    ),
+                    child: Row(
+                      children: [
+                        Image(
+                          image: AssetImage('images/icons/timeImage.png'),
+                          fit: BoxFit.cover,
+                          width: 18.w,
+                          height: 18.w,
+                        ),
+                        Padding(
+                          padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
+                          child: GestureDetector(
+                              onTap: () async {
+                                var handleChnage = await showDatePicker(
+                                  context: context,
+                                  helpText: '请选择作业开始时间',
+                                  cancelText: '取消',
+                                  confirmText: '确定',
+                                  initialDate: selectDate() == null
+                                      ? DateTime.now()
+                                      : selectDate(),
+                                  firstDate: DateTime.now(),
+                                  lastDate: DateTime(2030),
+                                );
+                                selectDate(handleChnage!);
+                                print('${selectDate}+');
+                              },
+                              child: Obx(
+                                    () => Text(selectDate == null
+                                    ? '请选择日期'
+                                    : '${DateFormat("yyyy-MM-dd").format(selectDate())}'),
+                              )),
+                        )
+                      ],
+                    )),
+                Container(
+                  margin: EdgeInsets.fromLTRB(15, 20, 0, 0),
+                  alignment: Alignment.topLeft,
+                  child: Text(
+                    '作业位置：',
+                    style: TextStyle(
+                        color: Color(0xff222222),
+                        fontSize: 17.sp,
+                        fontWeight: FontWeight.bold),
+                  ),
+                ),
+                Container(
+                  width: 345.w,
+                  padding: EdgeInsets.fromLTRB(0, 15, 0, 15),
+                  decoration: BoxDecoration(
+                    border: Border(
+                        bottom: BorderSide(width: 1, color: Color(0x20000000)
+                          // 0x17000000
                         )),
-              ),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.start,
-                children: [
-                  Image(
-                    image: AssetImage('images/gpsImgae.png'),
-                    fit: BoxFit.cover,
-                    width: 14.w,
-                    height: 17.h,
                   ),
-                  Padding(
-                      padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
-                      child: GestureDetector(
-                        onTap: () {
-                          Get.toNamed('/addressList',
-                              arguments: {'isBack': true});
-                        },
-                        child: Container(
-                          width: 290.w,
-                          child: Obx(() => Text(
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    children: [
+                      Image(
+                        image: AssetImage('images/gpsImgae.png'),
+                        fit: BoxFit.cover,
+                        width: 14.w,
+                        height: 17.h,
+                      ),
+                      Padding(
+                          padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
+                          child: GestureDetector(
+                            onTap: () {
+                              Get.toNamed('/addressList',
+                                  arguments: {'isBack': true});
+                            },
+                            child: Container(
+                              width: 290.w,
+                              child: Obx(() => Text(
                                 addressController.address.value.address
                                     .toString(),
                                 softWrap: true,
@@ -222,73 +223,76 @@ class OrderConfirmation extends BasicPage {
                                 textAlign: TextAlign.left,
                                 overflow: TextOverflow.ellipsis,
                               )),
-                        ),
-                      ))
-                ],
-              ),
-            ),
-            Spacer(),
-            Container(
-              alignment: Alignment.bottomCenter,
-              child: SizedBox(
-                width: 315.w,
-                height: 49.h,
-                child: ElevatedButton(
-                  onPressed: () {
-                    _orderSubmit();
-                  },
-                  child: const Text(
-                    "确定",
-                    style: TextStyle(
-                        fontSize: 18,
-                        color: Colors.white,
-                        fontWeight: FontWeight.bold),
+                            ),
+                          ))
+                    ],
                   ),
-                  style: ButtonStyle(
-                    elevation: MaterialStateProperty.all(0),
-                    backgroundColor:
+                ),
+                Spacer(),
+                Container(
+                  alignment: Alignment.bottomCenter,
+                  child: SizedBox(
+                    width: 315.w,
+                    height: 49.h,
+                    child: ElevatedButton(
+                      onPressed: () {
+                        _orderSubmit();
+                      },
+                      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:
+                        shape: MaterialStateProperty.all(
+                            const RoundedRectangleBorder(
+                                borderRadius:
                                 BorderRadius.all(Radius.circular(24.4)))),
+                      ),
+                    ),
                   ),
                 ),
-              ),
-            ),
-            Container(
-              margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
-              alignment: Alignment.bottomCenter,
-              child: SizedBox(
-                width: 315.w,
-                height: 49.h,
-                child: ElevatedButton(
-                  onPressed: () {
-                    Get.back();
-                  },
-                  child: const Text(
-                    "取消",
-                    style: TextStyle(
-                        fontSize: 18,
-                        color: Color(0xFFFF703B),
-                        fontWeight: FontWeight.bold),
-                  ),
-                  style: ButtonStyle(
-                    side: MaterialStateProperty.all(
-                        BorderSide(width: 1, color: Color(0xFFFF703B))), //边框
-                    elevation: MaterialStateProperty.all(0),
-                    backgroundColor: MaterialStateProperty.all(Colors.white),
-                    shape: MaterialStateProperty.all(
-                      RoundedRectangleBorder(
-                          borderRadius:
+                Container(
+                  margin: EdgeInsets.fromLTRB(0, 30.w, 0, 30.w),
+                  alignment: Alignment.bottomCenter,
+                  child: SizedBox(
+                    width: 315.w,
+                    height: 49.h,
+                    child: ElevatedButton(
+                      onPressed: () {
+                        Get.back();
+                      },
+                      child: const Text(
+                        "取消",
+                        style: TextStyle(
+                            fontSize: 18,
+                            color: Color(0xFFFF703B),
+                            fontWeight: FontWeight.bold),
+                      ),
+                      style: ButtonStyle(
+                        side: MaterialStateProperty.all(
+                            BorderSide(width: 1, color: Color(0xFFFF703B))), //边框
+                        elevation: MaterialStateProperty.all(0),
+                        backgroundColor: MaterialStateProperty.all(Colors.white),
+                        shape: MaterialStateProperty.all(
+                          RoundedRectangleBorder(
+                              borderRadius:
                               BorderRadius.all(Radius.circular(24.4))),
+                        ),
+                      ),
                     ),
                   ),
                 ),
-              ),
+              ],
             ),
-          ],
-        ),
+
+
+
       ),
     );
   }

lib/pages/addressList/index.dart

@@ -75,7 +75,7 @@ class AddressList extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     naviTitle = '地址管理';
-    return Column(
+    return ListView(
       children: [
         Container(
           padding: EdgeInsets.all(15.w),

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

@@ -15,43 +15,40 @@ class _TypeHeaderState extends State<TypeHeader> {
   @override
   Widget build(BuildContext context) {
     if (widget.type) {
-      return Container(
-        child: Row(
-          // mainAxisAlignment: MainAxisAlignment.start,
-          children: [
-            Container(
-              height: 32.w,
-              decoration: BoxDecoration(color: Colors.white),
-              child: Row(
-                children: [
-                  Image(
-                    image: AssetImage('images/gpsImgae.png'),
-                    fit: BoxFit.cover,
-                    width: 14.w,
-                    height: 17.h,
-                  ),
-                  Padding(
-                    padding: EdgeInsets.fromLTRB(5, 0, 0, 0),
-                    child: Text(
-                      '邓州市',
-                      style: TextStyle(
-                        color: Color(0xff202020),
-                        fontSize: 16.sp,
-                        fontWeight: FontWeight.bold,
-                      ),
+      return
+          Container(
+            height: 32.w,
+            decoration: BoxDecoration(color: Colors.white),
+            child: Row(
+              children: [
+                Image(
+                  image: AssetImage('images/gpsImgae.png'),
+                  fit: BoxFit.cover,
+                  width: 14.w,
+                  height: 17.h,
+                ),
+                Padding(
+                  padding: EdgeInsets.fromLTRB(5, 0, 0, 0),
+                  child: Text(
+                    '邓州市',
+                    style: TextStyle(
+                      color: Color(0xff202020),
+                      fontSize: 16.sp,
+                      fontWeight: FontWeight.bold,
                     ),
                   ),
-                  Container(
-                    padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
-                    child: Icon(Icons.arrow_drop_down),
-                  ),
-                  _initWidget(),
-                ],
-              ),
+                ),
+                Container(
+                  padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
+                  child: Icon(Icons.arrow_drop_down),
+                ),
+                Expanded(
+                  flex: 1,
+                  child:_initWidget(),
+                ),
+              ],
             ),
-          ],
-        ),
-      );
+          );
     } else {
       return _initWidget();
     }
@@ -65,7 +62,6 @@ class _initWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-        width: 250.w,
         height: 32.w,
         decoration: const BoxDecoration(color: Colors.white),
         child: GestureDetector(

lib/pages/home/widgets/home/widgets/searchBannerHeader.dart

@@ -42,9 +42,12 @@ class _searchBannerHeaderState extends State<searchBannerHeader> {
   Widget build(BuildContext context) {
     return  Column(
       children: [
-        TypeHeader(
-          type: true,
+        SizedBox(
+          child:  TypeHeader(
+            type: true,
+          ),
         ),
+
         Container(
           margin: EdgeInsets.fromLTRB(0, 15, 0, 0),
           child: CarouselSlider(

lib/pages/login/login.dart

@@ -122,9 +122,9 @@ class _RouteLogin extends State<MyRouteLogin> {
           ),
         ),
         child: Container(
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.end,
-            crossAxisAlignment: CrossAxisAlignment.start,
+          child: ListView(
+            // mainAxisAlignment: MainAxisAlignment.end,
+            // crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Padding(
                 padding: EdgeInsets.fromLTRB(15, 0, 0, 5),
@@ -260,7 +260,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                 ),
               ),
               Container(
-                  padding: EdgeInsets.fromLTRB(10.0, 10, 10.0, 10),
+                  padding: EdgeInsets.fromLTRB(10.0, 10, 0, 10),
                   child: Row(
                     children: <Widget>[
                       Radio<bool>(
@@ -272,25 +272,31 @@ class _RouteLogin extends State<MyRouteLogin> {
                               _newValue = value!;
                             });
                           }),
-                      RichText(
-                        text: TextSpan(children: <InlineSpan>[
-                          const TextSpan(
-                              text: '请认真查看',
-                              style: TextStyle(color: Color(0xff2a2a2a))),
-                          TextSpan(
-                            text: '文本协议/隐私政策，',
-                            style: TextStyle(color: Color(0xffce3800)),
-                            recognizer:
-                                TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
-                                  ..onTap = () {
-                                    Get.toNamed('/agreement');
-                                  },
-                          ),
-                          const TextSpan(
-                              text: '确认之后选择此项',
-                              style: TextStyle(color: Color(0xff2a2a2a))),
-                        ]),
-                      ),
+                      // SizedBox(
+                      //   child:Text('文本协议/隐私政策',style: TextStyle(fontSize:15.sp,color: Color(0xffce3800))),
+                      // ),
+                      Text('请认真查看',style: TextStyle(fontSize:14.sp,color: Color(0xff2a2a2a))),
+                      Text('文本协议/隐私政策',style: TextStyle(fontSize:14.sp,color: Color(0xffce3800))),
+                      Text('，确认之后选择此项',style: TextStyle(fontSize:14.sp,color: Color(0xff2a2a2a))),
+                      // RichText(
+                      //   text: TextSpan(children: <InlineSpan>[
+                      //     const TextSpan(
+                      //         text: '请认真查看',
+                      //         style: TextStyle(color: Color(0xff2a2a2a))),
+                      //     TextSpan(
+                      //       text: '文本协议/隐私政策，',
+                      //       style: TextStyle(color: Color(0xffce3800)),
+                      //       recognizer:
+                      //           TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
+                      //             ..onTap = () {
+                      //               Get.toNamed('/agreement');
+                      //             },
+                      //     ),
+                      //     const TextSpan(
+                      //         text: '确认之后选择此项',
+                      //         style: TextStyle(color: Color(0xff2a2a2a))),
+                      //   ]),
+                      // ),
                     ],
                   )),
             ],

lib/pages/main/widgets/main/index.dart

@@ -25,7 +25,7 @@ class MainPage extends StatelessWidget {
         onCancel: () => true,
         onConfirm: () => {
               box.remove('token'),
-              Get.offNamed('/login'),
+              Get.offAllNamed('/login'),
             });
   }
 
@@ -40,19 +40,27 @@ class MainPage extends StatelessWidget {
               UserInfo(), //头部，头像手机号姓名
               UserAddress(item: item), //用户地址
               OtherColumn(), //功能菜单栏
-              Container(
-                height: 70.h,
-                margin: EdgeInsets.only(top: 0, bottom: 40.0),
-                alignment: Alignment.bottomCenter,
-                decoration: BoxDecoration(
-                  boxShadow: [
-                    BoxShadow(
-                      blurRadius: 10, //阴影范围
-                      spreadRadius: 0.1, //阴影浓度
-                      color: Colors.grey.withOpacity(0.2), //阴影颜色
-                    ),
-                  ],
-                ),
+              Card(
+                //设置圆角
+                shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20.0)),
+                // 普通的边
+/*          shape: Border.all(
+              color: Colors.yellow,
+              width: 5.0
+          ),*/
+                elevation: 1,// 阴影大小
+                // height: 70.h,
+                margin: EdgeInsets.only(top: 10, bottom: 40.0),
+                // alignment: Alignment.bottomCenter,
+                // decoration: BoxDecoration(
+                //   boxShadow: [
+                //     BoxShadow(
+                //       blurRadius: 10, //阴影范围
+                //       spreadRadius: 0.1, //阴影浓度
+                //       color: Colors.grey.withOpacity(0.2), //阴影颜色
+                //     ),
+                //   ],
+                // ),
                 child: SizedBox(
                   width: 315.w,
                   height: 49.h,

lib/pages/main/widgets/main/widgets/UserAddress.dart

@@ -64,7 +64,6 @@ class UserAddress extends StatelessWidget {
                           ),
                         ),
                         Container(
-                          width: 260,
                           child: Text(
                             item != null ? item.address.toString() : '请设置详细地址！',
                             softWrap: true,
@@ -82,7 +81,7 @@ class UserAddress extends StatelessWidget {
                   ),
                   Container(
                     alignment: Alignment.center,
-                    padding: EdgeInsets.fromLTRB(0, 0, 30.w, 0),
+                    padding: EdgeInsets.fromLTRB(0, 0, 40.w, 0),
                     child: Text(
                       '>>',
                       style: TextStyle(

lib/widgets/layout/BasicPage.dart

@@ -100,7 +100,7 @@ class _BasicPageState extends State<BasicPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      resizeToAvoidBottomInset: true,
+      resizeToAvoidBottomInset: false,
 
       appBar: _getAppBar(),
       body: SafeArea(