From b02b7fdbb8e23b074b3245b56503548cbb952976 Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Sat, 8 May 2021 15:43:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8C=85=E8=A3=B9?= =?UTF-8?q?=E4=BB=A3=E6=94=B6card?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/generated_plugin_registrant.dart | 3 +- .../express_package_card.dart | 49 ++++++++++++------- 2 files changed, 32 insertions(+), 20 deletions(-) diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart index 8e0b1cb0..222a4e7a 100644 --- a/lib/generated_plugin_registrant.dart +++ b/lib/generated_plugin_registrant.dart @@ -6,12 +6,13 @@ import 'package:device_info_plus_web/device_info_plus_web.dart'; import 'package:firebase_core_web/firebase_core_web.dart'; -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; import 'package:image_picker_for_web/image_picker_for_web.dart'; import 'package:package_info_plus_web/package_info_plus_web.dart'; import 'package:shared_preferences_web/shared_preferences_web.dart'; import 'package:url_launcher_web/url_launcher_web.dart'; +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; + // ignore: public_member_api_docs void registerPlugins(Registrar registrar) { DeviceInfoPlusPlugin.registerWith(registrar); diff --git a/lib/pages/express_packages/express_package_card.dart b/lib/pages/express_packages/express_package_card.dart index e5912f2a..55a530e0 100644 --- a/lib/pages/express_packages/express_package_card.dart +++ b/lib/pages/express_packages/express_package_card.dart @@ -65,25 +65,36 @@ class _ExpressPackageCardState extends State { .color(ktextSubColor) .make()), ].sepWidget(separate: 12.w.heightBox), - 40.w.heightBox, - Row( - children: [ - Spacer(), - MaterialButton( - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(74.w)), - padding: EdgeInsets.symmetric(vertical: 8.w, horizontal: 24.w), - height: 50.w, - color: kPrimaryColor, - elevation: 0, - focusElevation: 0, - hoverElevation: 0, - disabledElevation: 0, - highlightElevation: 0, - onPressed: () {}, - child: '确认领取'.text.size(24.sp).bold.color(ktextPrimary).make(), - ) - ], - ), + ...widget.index == 1 + ? [SizedBox()] + : [ + 40.w.heightBox, + Row( + children: [ + Spacer(), + MaterialButton( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(74.w)), + padding: EdgeInsets.symmetric( + vertical: 8.w, horizontal: 24.w), + height: 50.w, + color: kPrimaryColor, + elevation: 0, + focusElevation: 0, + hoverElevation: 0, + disabledElevation: 0, + highlightElevation: 0, + onPressed: () {}, + child: '确认领取' + .text + .size(24.sp) + .bold + .color(ktextPrimary) + .make(), + ) + ], + ), + ] ], ), );