From 5784b55d27bf3d265cbf7d6f3d6e1a5f516db8de Mon Sep 17 00:00:00 2001 From: laiiihz Date: Mon, 21 Dec 2020 16:01:23 +0800 Subject: [PATCH] 1.3.22-20201221+215 --- .../home/classify/order_preview_page.dart | 24 +++++++++++++++++-- lib/pages/home/items/goods_item_order.dart | 4 ---- pubspec.lock | 2 +- pubspec.yaml | 2 +- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/lib/pages/home/classify/order_preview_page.dart b/lib/pages/home/classify/order_preview_page.dart index 7c01760..f850c3b 100644 --- a/lib/pages/home/classify/order_preview_page.dart +++ b/lib/pages/home/classify/order_preview_page.dart @@ -597,7 +597,8 @@ class _GoodsOrderPageState extends BaseStoreState { bool isOversea = false; for (var item in _orderModel.data.brands) { for (var childItem in item.goods) { - if (childItem.storehouse == 2||childItem.storehouse==3) isOversea = true; + if (childItem.storehouse == 2 || childItem.storehouse == 3) + isOversea = true; } } @@ -737,6 +738,17 @@ class _GoodsOrderPageState extends BaseStoreState { ); } + bool get _overseaNeedIdentifier { + for (var item in _orderModel.data.brands) { + for (var good in item.goods) { + if (good.storehouse == 2 || good.storehouse == 3) { + return true; + } + } + } + return false; + } + _allAmountTitle() { return Container( height: 55, @@ -873,7 +885,15 @@ class _GoodsOrderPageState extends BaseStoreState { onPressed: !canDeliver ? null : () { - _submit(context); + if (_overseaNeedIdentifier && + (!UserManager + .instance.user.info.realInfoStatus)) { + AppRouter.push( + context, + RouteName.USER_VERIFY, + ); + } else + _submit(context); }, ), ) diff --git a/lib/pages/home/items/goods_item_order.dart b/lib/pages/home/items/goods_item_order.dart index 4f5c52f..b508296 100644 --- a/lib/pages/home/items/goods_item_order.dart +++ b/lib/pages/home/items/goods_item_order.dart @@ -11,12 +11,8 @@ import 'package:flutter/material.dart'; import 'package:recook/constants/api.dart'; import 'package:recook/constants/header.dart'; import 'package:recook/models/order_preview_model.dart'; -import 'package:recook/widgets/alert.dart'; -import 'package:recook/widgets/bottom_sheet/action_sheet.dart'; -import 'package:recook/widgets/bottom_sheet/bottom_textfield_dialog.dart'; import 'package:recook/widgets/custom_cache_image.dart'; import 'package:recook/widgets/custom_image_button.dart'; -import 'package:recook/widgets/input_view.dart'; class GoodsOrderItem extends StatefulWidget { final Brands brand; diff --git a/pubspec.lock b/pubspec.lock index 91632f7..2b68501 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -479,7 +479,7 @@ packages: path: "/Users/akufe/AndroidStudioProjects/flutter_union_pay" relative: false source: path - version: "0.0.3" + version: "0.0.4" flutter_web_plugins: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index bff9a5b..307b53c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: recook description: Recook Market App. publish_to: "none" -version: 1.3.21-20201218+214 +version: 1.3.22-20201221+215 environment: sdk: ">=2.10.0 <3.0.0"