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 { 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 { 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 { } 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) {