From 0de24ec4dfaeacc04bef9ea88111fd08467baf4f Mon Sep 17 00:00:00 2001 From: laiiihz Date: Mon, 14 Sep 2020 21:14:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E6=96=B0=E5=BA=97=E9=93=BA=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E7=94=9F=E6=88=90=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/static/shop_bg.png | Bin 0 -> 9154 bytes commands/resource_gen.sh | 1 + lib/const/resource.dart | 6 ++++++ .../home/classify/commodity_detail_page.dart | 4 ---- lib/pages/shop/shop_page_appbar_widget.dart | 15 ++++++++++++--- pubspec.yaml | 1 + 6 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 assets/static/shop_bg.png create mode 100755 commands/resource_gen.sh diff --git a/assets/static/shop_bg.png b/assets/static/shop_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..0a5f4da28c7736c5fe992d83249e207ed4266c0e GIT binary patch literal 9154 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 { if (!TextUtils.isEmpty(UserManager.instance.user.info.createdAt)) { createTime = DateTime.parse(UserManager.instance.user.info.createdAt); } - double cardWidth = MediaQuery.of(context).size.width - 30; - double cardHeight = 345 / cardWidth * 190; + double cardWidth = MediaQuery.of(context).size.width; + double cardHeight = cardWidth / 750 * 449; // UserLevelTool.cardImagePath(UserLevelTool.roleLevelEnum(_shopSummaryModel.data.roleLevel)); // percent = 0.3; progressGlobalkey?.currentState?.updateView(percent: percent); return Container( - margin: EdgeInsets.only(top: 30, bottom: 5), height: cardHeight, width: cardWidth, child: Stack( @@ -196,6 +195,16 @@ class _ShopPageAppbarWidgetState extends BaseStoreState { ), // child: Image.asset(UserLevelTool.currentCardImagePath(), fit: BoxFit.fill,), ), + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 0, + child: Image.asset( + R.ASSETS_STATIC_SHOP_BG_PNG, + width: cardWidth, + ), + ), Positioned( left: 10, right: 10, diff --git a/pubspec.yaml b/pubspec.yaml index d3d9907..feef7f7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -198,6 +198,7 @@ flutter: - assets/share_bottom/ - assets/json/ - assets/lottery/ + - assets/static/ fonts: - family: AppIcons fonts: