报事报修新增页面跳转逻辑变更，应用点击跳转登陆逻辑变更

lib/pages/things_page/fixed_submit_page.dart

@@ -1,4 +1,5 @@
 // Flutter imports:
+import 'package:akuCommunity/widget/buttons/bottom_button.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -104,17 +105,13 @@ class _FixedSubmitPageState extends State<FixedSubmitPage> {
                 padding: EdgeInsets.fromLTRB(24.w, 24.w, 24.w, 0),
                 child: Row(
                   children: [
-                    BeeMap
+                    BeeMap.fixTag[model.type].text
-                        .fixTag[model.type]
-                        .text
                         .color(ktextPrimary)
                         .bold
                         .size(32.sp)
                         .make(),
                     Spacer(),
-                    BeeMap
+                    BeeMap.fixState[model.status].text
-                        .fixState[model.status]
-                        .text
                         .color(_getColor(model.status))
                         .size(24.sp)
                         .make(),
@@ -233,9 +230,7 @@ class _FixedSubmitPageState extends State<FixedSubmitPage> {
               setState(() {});
             })
       ],
-      body: Column(
+      body: BeeListView(
-        children: [
-          BeeListView(
         controller: _easyRefreshController,
         path: API.manager.fixedSubmit,
         convert: (model) {
@@ -259,37 +254,21 @@ class _FixedSubmitPageState extends State<FixedSubmitPage> {
               },
               itemCount: items.length);
         },
-          ).expand(),
+      ),
-          MaterialButton(
+      bottomNavi: BottomButton(
-            disabledColor: Colors.white.withOpacity(0.5),
-            disabledTextColor: ktextSubColor.withOpacity(0.8),
-            textColor: ktextPrimary,
         onPressed: _isEdit
             ? _selected.isEmpty
                 ? null
                 : () {
                     Get.dialog(_showDeletDialog());
                   }
-                : () {
+            : () async {
-                    userProvider.isLogin
+                bool needRefresh = await Get.to(AddFixedSubmitPage());
-                        ? AddFixedSubmitPage().to()
+                if (needRefresh == null) _easyRefreshController.callRefresh();
-                        : BotToast.showText(text: '请先登录！');
               },
         child: _isEdit
             ? '删除订单'.text.bold.size(32.sp).make()
             : '新增'.text.bold.size(32.sp).make(),
-            minWidth: double.infinity,
-            height: 98.w,
-            elevation: 0,
-            materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
-            padding: EdgeInsets.zero,
-          )
-              .box
-              .padding(EdgeInsets.only(
-                  bottom: MediaQuery.of(context).padding.bottom))
-              .color(kPrimaryColor)
-              .make(),
-        ],
       ),
     );
   }

lib/pages/things_page/widget/add_fixed_submit_page.dart

@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
 // Package imports:
 import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:velocity_x/velocity_x.dart';
 
@@ -201,7 +202,7 @@ class _AddFixedSubmitPageState extends State<AddFixedSubmitPage> {
   }
 
   bool _canSubmit(int seletType, String text) {
-    if (seletType.isNull) {
+    if (seletType == null) {
       return false;
     } else if (text.isEmpty) {
       return false;
@@ -213,7 +214,8 @@ class _AddFixedSubmitPageState extends State<AddFixedSubmitPage> {
   @override
   Widget build(BuildContext context) {
     UserProvider userProvider = Provider.of<UserProvider>(context);
-    return BeeScaffold(
+    return WillPopScope(
+      child: BeeScaffold(
         title: '报事报修',
         body: Column(
           children: [
@@ -245,7 +247,7 @@ class _AddFixedSubmitPageState extends State<AddFixedSubmitPage> {
                       _textEditingController.text,
                       urls);
                   if (baseModel.status) {
-                  FinishFixedSubmitPage().to();
+                    Get.off(FinishFixedSubmitPage());
                   } else
                     BotToast.showText(text: baseModel.message);
                   cancel();
@@ -255,6 +257,11 @@ class _AddFixedSubmitPageState extends State<AddFixedSubmitPage> {
                 },
           child: '确认提交'.text.black.bold.size(32.sp).make(),
         ),
+      ),
+      onWillPop: () async {
+        Get.back(result: true);
+        return false;
+      },
     );
   }
 }

lib/widget/views/application_view.dart

@@ -1,4 +1,7 @@
 // Flutter imports:
+import 'package:akuCommunity/pages/sign/sign_in_page.dart';
+import 'package:akuCommunity/provider/user_provider.dart';
+import 'package:bot_toast/bot_toast.dart';
 import 'package:flutter/material.dart';
 
 // Package imports:
@@ -29,10 +32,18 @@ class ApplicationView extends StatefulWidget {
 
 class _ApplicationViewState extends State<ApplicationView> {
   _buildTile(AO object) {
+    final userProvider = Provider.of<UserProvider>(context);
     return MaterialButton(
       shape: StadiumBorder(),
       padding: EdgeInsets.zero,
-      onPressed: () => Get.to(object.page),
+      onPressed: () {
+        if (userProvider.isLogin)
+          Get.to(object.page);
+        else {
+          BotToast.showText(text: '请先登陆');
+          Get.to(SignInPage());
+        }
+      },
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [