From 169dd77a209fa27f9da12faba5032bb228c758e2 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Tue, 16 Mar 2021 14:22:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B2=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E7=9C=8B=E7=9B=B4=E6=92=AD=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E4=BA=86=E8=B4=AD=E4=B9=B0=EF=BC=8C=E4=BC=9A=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=20=E7=99=BB=E5=BD=95=EF=BC=8C=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E4=BA=86=E4=BB=A5=E5=90=8E=EF=BC=8C=E5=9B=9E=E5=88=B0=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E4=BD=86=E6=98=AF=E7=9B=B4=E6=92=AD=E7=9A=84?= =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E8=BF=98=E6=98=AF=E4=BC=9A=E6=9C=89=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E8=BF=9B=E7=9B=B4=E6=92=AD=E9=97=B4=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E6=9C=892=E4=B8=AA=E5=A3=B0=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/live/live_stream/show_goods_list.dart | 9 ++++++--- pubspec.lock | 7 +++++++ pubspec.yaml | 1 + 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/pages/live/live_stream/show_goods_list.dart b/lib/pages/live/live_stream/show_goods_list.dart index 9ab5b26..964c398 100644 --- a/lib/pages/live/live_stream/show_goods_list.dart +++ b/lib/pages/live/live_stream/show_goods_list.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:get/get.dart'; import 'package:oktoast/oktoast.dart'; import 'package:recook/constants/api.dart'; import 'package:recook/constants/header.dart'; @@ -15,7 +16,7 @@ import 'package:recook/pages/live/live_stream/live_sku_widget.dart'; import 'package:recook/pages/live/live_stream/small_window/small_window_page.dart'; import 'package:recook/pages/live/models/live_stream_info_model.dart' show GoodsLists; -import 'package:recook/pages/user/user_page.dart'; +import 'package:recook/pages/login/login_page.dart'; import 'package:recook/utils/custom_route.dart'; import 'package:recook/widgets/toast.dart'; import 'package:tencent_live_fluttify/tencent_live_fluttify.dart'; @@ -58,7 +59,7 @@ class _GoodsListDialogState extends State { return DraggableScrollableSheet( minChildSize: 0.5, maxChildSize: 0.9, - initialChildSize: 0.5, + initialChildSize: 0.7, expand: false, builder: (context, scrollController) { return Column( @@ -422,7 +423,9 @@ class _GoodsListDialogState extends State { } } else { showToast('未登陆，请先登陆'); - CRoute.push(context, UserPage()); + Get.back(); + Get.back(); + Get.to(LoginPage()); } }, child: Text('马上抢'), diff --git a/pubspec.lock b/pubspec.lock index 1aa9b3c..873d489 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -545,6 +545,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.1.19" + get: + dependency: "direct main" + description: + name: get + url: "https://pub.flutter-io.cn" + source: hosted + version: "3.26.0" glob: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index e88fdb5..2a5b66a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -227,6 +227,7 @@ dependencies: url: http://159.75.73.143:8080/laiiihz/power_logger.git bot_toast: ^3.0.5 + get: ^3.26.0 dev_dependencies: flutter_test: