From 511ad1f6aaa3dace64abe77d4a7a797fb7b49601 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Tue, 29 Sep 2020 13:28:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BD=A9=E7=A5=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/home_page.dart | 37 +++++++++++++++++------------------ pubspec.yaml | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index b9b5fe5..854c909 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -965,28 +965,27 @@ class _HomePageState extends BaseStoreState // AppRouter.push(context, RouteName.NEW_USER_DISCOUNT_PAGE); }), _buttonTitleRow( - R.ASSETS_LOTTERY_REDEEM_LOTTERY_ICON_PNG, - // AppConfig.getShowCommission() - // ? R.ASSETS_HOME_MENU_BB_PNG - // : R.ASSETS_LISTTEMP_HOMELIFE_ICON_PNG, - // AppConfig.getShowCommission() ? "我的店铺" : "家居生活", - '彩票兑换', + // R.ASSETS_LOTTERY_REDEEM_LOTTERY_ICON_PNG, + AppConfig.getShowCommission() + ? R.ASSETS_HOME_MENU_BB_PNG + : R.ASSETS_LISTTEMP_HOMELIFE_ICON_PNG, + AppConfig.getShowCommission() ? "我的店铺" : "家居生活", + // '彩票兑换', onPressed: - //TODO 下一版本彩票入口 + // () { + // AppRouter.push(context, RouteName.REDEEM_LOTTERY_PAGE); + // }, () { - AppRouter.push(context, RouteName.REDEEM_LOTTERY_PAGE); + if (AppConfig.getShowCommission()) { + bool value = UserManager.instance.selectTabbar.value; + UserManager.instance.selectTabbar.value = !value; + UserManager.instance.selectTabbarIndex = 2; + } else { + AppRouter.push(context, RouteName.GOODS_LIST_TEMP, + arguments: GoodsListTempPage.setArguments( + title: "家居生活", type: GoodsListTempType.homeLife)); + } }, - // () { - // if (AppConfig.getShowCommission()) { - // bool value = UserManager.instance.selectTabbar.value; - // UserManager.instance.selectTabbar.value = !value; - // UserManager.instance.selectTabbarIndex = 2; - // } else { - // AppRouter.push(context, RouteName.GOODS_LIST_TEMP, - // arguments: GoodsListTempPage.setArguments( - // title: "家居生活", type: GoodsListTempType.homeLife)); - // } - // }, ), _buttonTitleRow( AppConfig.getShowCommission() diff --git a/pubspec.yaml b/pubspec.yaml index 69d3aa8..ecd2b15 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: recook description: Recook Market App. publish_to: "none" -version: 1.2.2+163 +version: 1.2.4+165 environment: sdk: ">=2.1.0 <3.0.0"