张延森 3 jaren geleden
bovenliggende
commit
300c583add
3 gewijzigde bestanden met toevoegingen van 17 en 14 verwijderingen
  1. 1
    1
      lib/main.dart
  2. 10
    10
      lib/routes/middleWares.dart
  3. 6
    3
      lib/routes/pages.dart

+ 1
- 1
lib/main.dart Bestand weergeven

@@ -37,7 +37,7 @@ class MyApp extends StatelessWidget {
37 37
             Locale('en', ''),
38 38
           ],
39 39
           theme: getTheme(),
40
-          initialRoute: '/splash',
40
+          initialRoute: '/',
41 41
           defaultTransition: Transition.native,
42 42
           routingCallback: routingCallback,
43 43
           initialBinding: AppBindings(),

+ 10
- 10
lib/routes/middleWares.dart Bestand weergeven

@@ -4,14 +4,14 @@ import 'package:get/get.dart';
4 4
 import 'package:get_storage/get_storage.dart';
5 5
 
6 6
 void routingCallback (routing) {
7
-  GetStorage box = GetStorage();
8
-  bool isLogin = box.hasData('token');
9
-  bool isSplashScreen = routing?.current == '/splash';
10
-  bool isLoginPage = routing?.current == '/login';
11
-  bool isAgreementPage = routing?.current == '/agreement';
12
-  if (!isLogin && !isSplashScreen && !isLoginPage&&!isAgreementPage) {
13
-    // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
14
-    // https://github.com/jonataslaw/getx/issues/262
15
-    SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
16
-  }
7
+  // GetStorage box = GetStorage();
8
+  // bool isLogin = box.hasData('token');
9
+  // bool isSplashScreen = routing?.current == '/splash';
10
+  // bool isLoginPage = routing?.current == '/login';
11
+  // bool isAgreementPage = routing?.current == '/agreement';
12
+  // if (!isLogin && !isSplashScreen && !isLoginPage&&!isAgreementPage) {
13
+  //   // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
14
+  //   // https://github.com/jonataslaw/getx/issues/262
15
+  //   SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
16
+  // }
17 17
 }

+ 6
- 3
lib/routes/pages.dart Bestand weergeven

@@ -10,14 +10,17 @@ import 'package:farmer_client/pages/orderInfo/index.dart';
10 10
 import 'package:farmer_client/pages/search/index.jsx.dart';
11 11
 import 'package:farmer_client/pages/userInfo/index.dart';
12 12
 import 'package:get/get.dart';
13
+import 'package:get_storage/get_storage.dart';
13 14
 import '../pages/MoreCars/index.dart';
14 15
 import '../pages/index.dart';
15 16
 
16
-
17 17
 List<GetPage> pages = [
18
-  GetPage(name: '/', page: () =>  Home()),
18
+  GetPage(name: '/', page: () {
19
+    GetStorage box = GetStorage();
20
+    return box.hasData('token') ? Home() : MyRouteLogin();
21
+  }),
19 22
   GetPage(name: '/ArticleInfo', page: () =>  ArticleInfo()),//资讯详情
20
-  GetPage(name: '/splash', page: () => SplashScreen()),//SplashScreen
23
+  // GetPage(name: '/splash', page: () => SplashScreen()), // SplashScreen
21 24
   GetPage(name: '/login', page: () =>  MyRouteLogin()),
22 25
   GetPage(name: '/addressList', page: () =>  AddressList()),
23 26
   GetPage(name: '/addAddress', page: () =>  AddAddress()),