From f15165d6de393834996245244c6ea4354c26cd35 Mon Sep 17 00:00:00 2001
From: laiiihz <laiiihz@outlook.com>
Date: Thu, 3 Dec 2020 16:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=8F=A3=E5=95=86=E5=93=81=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E9=9C=80=E8=A6=81=E5=90=8C=E6=84=8F?=
 =?UTF-8?q?=E6=89=8D=E8=83=BD=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/home/classify/goods_page.dart         | 4 ++--
 lib/pages/home/classify/order_preview_page.dart | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/pages/home/classify/goods_page.dart b/lib/pages/home/classify/goods_page.dart
index 4a1db90..3868bbb 100644
--- a/lib/pages/home/classify/goods_page.dart
+++ b/lib/pages/home/classify/goods_page.dart
@@ -839,7 +839,7 @@ class _GoodsPageState extends BaseStoreState<GoodsPage> {
                             break;
                         }
                         return Image.asset(
-                          _address?.city == null ? text : text2,
+                          _address?.city == '' ? text : text2,
                           height: rSize(26),
                           width: rSize(26),
                         );
@@ -891,7 +891,7 @@ class _GoodsPageState extends BaseStoreState<GoodsPage> {
                 Column(
                   children: [
                     Image.asset(
-                      _address?.city == null
+                      _address?.city == ''
                           ? R.ASSETS_STATIC_OVERSEA_LOCATION_PNG
                           : R.ASSETS_STATIC_OVERSEA_LOCATION_ON_PNG,
                       height: rSize(26),
diff --git a/lib/pages/home/classify/order_preview_page.dart b/lib/pages/home/classify/order_preview_page.dart
index 12110ad..c739dbc 100644
--- a/lib/pages/home/classify/order_preview_page.dart
+++ b/lib/pages/home/classify/order_preview_page.dart
@@ -778,10 +778,19 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
   }
 
   Container _bottomBar(BuildContext context, int totalNum) {
+    bool isOversea = false;
+    for (var item in _orderModel.data.brands) {
+      for (var childItem in item.goods) {
+        if (childItem.isImport == 1) isOversea = true;
+      }
+    }
     // bool canDeliver = _orderModel.data.addr?.isDeliveryArea == 1 ||
     // (_orderModel.data.addr?.isDeliveryArea == 0 && _orderModel.data.shippingMethod == 1);
     bool canDeliver = _orderModel.data.addr?.isDeliveryArea == 1 ||
         (_orderModel.data.shippingMethod == 1);
+    if (isOversea) {
+      if (!_accept) canDeliver = false;
+    }
     double ruiCoin = 0;
     _orderModel.data.brands.forEach((brand) {
       brand.goods.forEach((good) {