diff --git a/assets/static/shop_bg.png b/assets/static/shop_bg.png new file mode 100644 index 0000000..0a5f4da Binary files /dev/null and b/assets/static/shop_bg.png differ diff --git a/commands/resource_gen.sh b/commands/resource_gen.sh new file mode 100755 index 0000000..7ceab6c --- /dev/null +++ b/commands/resource_gen.sh @@ -0,0 +1 @@ +fgen -o ./lib/const/resource.dart \ No newline at end of file diff --git a/lib/const/resource.dart b/lib/const/resource.dart index af6c23f..41478db 100644 --- a/lib/const/resource.dart +++ b/lib/const/resource.dart @@ -2,6 +2,9 @@ /// PLEASE DO NOT EDIT MANUALLY. class R { + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/.DS_Store) + static const String ASSETS__DS_STORE = 'assets/.DS_Store'; + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/HomeRefreshHeader3.gif) static const String ASSETS_HOMEREFRESHHEADER3_GIF = 'assets/HomeRefreshHeader3.gif'; @@ -896,6 +899,9 @@ class R { /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/sound/recook_scan.mp3) static const String ASSETS_SOUND_RECOOK_SCAN_MP3 = 'assets/sound/recook_scan.mp3'; + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/static/shop_bg.png) + static const String ASSETS_STATIC_SHOP_BG_PNG = 'assets/static/shop_bg.png'; + /// ![preview](file:///Users/akufe/Desktop/recook_temp/assets/store_bg.png) static const String ASSETS_STORE_BG_PNG = 'assets/store_bg.png'; diff --git a/lib/pages/home/classify/commodity_detail_page.dart b/lib/pages/home/classify/commodity_detail_page.dart index 16bdac4..fe2b7cd 100644 --- a/lib/pages/home/classify/commodity_detail_page.dart +++ b/lib/pages/home/classify/commodity_detail_page.dart @@ -9,9 +9,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:fluwx/fluwx.dart'; import 'package:recook/base/base_store_state.dart'; -import 'package:recook/constants/api.dart'; import 'package:recook/constants/header.dart'; import 'package:recook/manager/http_manager.dart'; import 'package:recook/manager/user_manager.dart'; @@ -23,10 +21,8 @@ import 'package:recook/pages/home/classify/material_page.dart' as MP; import 'package:recook/pages/home/classify/mvp/goods_detail_model_impl.dart'; import 'package:recook/pages/home/widget/modify_detail_app_bar.dart'; import 'package:recook/pages/home/widget/modify_detail_bottom_bar.dart'; -import 'package:recook/third_party/wechat/wechat_utils.dart'; import 'package:recook/utils/share_tool.dart'; import 'package:recook/utils/user_level_tool.dart'; -import 'package:recook/widgets/bottom_sheet/bottom_share_dialog.dart'; import 'package:recook/widgets/cache_tab_bar_view.dart'; import 'package:recook/widgets/toast.dart'; diff --git a/lib/pages/shop/shop_page_appbar_widget.dart b/lib/pages/shop/shop_page_appbar_widget.dart index c2e6379..e23f115 100644 --- a/lib/pages/shop/shop_page_appbar_widget.dart +++ b/lib/pages/shop/shop_page_appbar_widget.dart @@ -176,14 +176,13 @@ class _ShopPageAppbarWidgetState extends BaseStoreState { 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: