From cb03d57df27999b8c8c874d263f8253df3e26cfe Mon Sep 17 00:00:00 2001 From: laiiihz Date: Mon, 29 Mar 2021 10:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8A=BD=E5=A5=96=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/home_page.dart | 104 ++++++++++--------- lib/pages/user/invite/my_group_page_v2.dart | 3 +- lib/pages/user/widget/shop_manager_view.dart | 2 +- 3 files changed, 57 insertions(+), 52 deletions(-) diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 214be2a..54ac47b 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -1413,28 +1413,29 @@ class _HomePageState extends BaseStoreState //抽奖功能 _userLottery() async { - ResultData resultData = await HttpManager.post( - UserApi.user_lottery, - {'userID': UserManager.instance.user.info.id}, - ); - if (resultData.data != null && resultData.data['data'] != null) { - if (resultData.data['data']['result'] == 0) { - ResultData lottery = await HttpManager.post(UserApi.user_do_lottery, - {'userID': UserManager.instance.user.info.id}); - await Future.delayed(Duration(milliseconds: 500)); - await Navigator.push( - context, - PageRouteBuilder( - opaque: false, - pageBuilder: (BuildContext context, Animation animation, - Animation secondaryAnimation) { - return LotteryPage( - cardIndex: lottery.data['data']['result'], - ); - }), - ); - } - } + //TODO 暂时移除抽奖功能（大概率以后用不到） + // ResultData resultData = await HttpManager.post( + // UserApi.user_lottery, + // {'userID': UserManager.instance.user.info.id}, + // ); + // if (resultData.data != null && resultData.data['data'] != null) { + // if (resultData.data['data']['result'] == 0) { + // ResultData lottery = await HttpManager.post(UserApi.user_do_lottery, + // {'userID': UserManager.instance.user.info.id}); + // await Future.delayed(Duration(milliseconds: 500)); + // await Navigator.push( + // context, + // PageRouteBuilder( + // opaque: false, + // pageBuilder: (BuildContext context, Animation animation, + // Animation secondaryAnimation) { + // return LotteryPage( + // cardIndex: lottery.data['data']['result'], + // ); + // }), + // ); + // } + // } //店铺角色变动 @@ -1543,6 +1544,8 @@ class _HomePageState extends BaseStoreState } _userCardNoticeList() async { + await Future.delayed(Duration(milliseconds: 300)); + ResultData resultData = await HttpManager.post(APIV2.userAPI.userCardNoticeList, {}); if (resultData.data != null && resultData.data['data'] != null) { @@ -1562,39 +1565,40 @@ class _HomePageState extends BaseStoreState result = '$goldValue$silverValue'; } await Get.dialog(Center( - child: GestureDetector( - onTap: () async { - await HttpManager.post( - APIV2.userAPI.confirmUserCardChange, - {"noticeId": id}, - ); - await Get.to(UpgradeCardPageV2()); - Get.back(); - }, - child: Container( - margin: EdgeInsets.symmetric(horizontal: 50.w), - child: Center( - child: Material( - color: Colors.transparent, - child: Transform.translate( - offset: Offset(0, 20.w), - child: Text( - '您有$result已退至您的卡包', - style: TextStyle( - fontSize: 14.sp, - color: Colors.white, - fontWeight: FontWeight.bold, + child: GestureDetector( + onTap: () async { + await HttpManager.post( + APIV2.userAPI.confirmUserCardChange, + {"noticeId": id}, + ); + await Get.to(UpgradeCardPageV2()); + Get.back(); + }, + child: Container( + margin: EdgeInsets.symmetric(horizontal: 50.w), + child: Center( + child: Material( + color: Colors.transparent, + child: Transform.translate( + offset: Offset(0, 20.w), + child: Text( + '您有$result已退至您的卡包', + style: TextStyle( + fontSize: 14.sp, + color: Colors.white, + fontWeight: FontWeight.bold, + ), ), ), - ), - )), - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage(R.ASSETS_USER_NOTICE_CARD_PNG), + )), + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage(R.ASSETS_USER_NOTICE_CARD_PNG), + ), ), ), ), - ))); + )); } } } diff --git a/lib/pages/user/invite/my_group_page_v2.dart b/lib/pages/user/invite/my_group_page_v2.dart index fa44c06..900f374 100644 --- a/lib/pages/user/invite/my_group_page_v2.dart +++ b/lib/pages/user/invite/my_group_page_v2.dart @@ -57,6 +57,7 @@ class _MyGroupPageV2State extends State { case UsersMode.MY_REWARD: return '我的代理店铺'; } + return ''; } Widget get _renderShitVerticalLine => Container( @@ -226,7 +227,7 @@ class _MyGroupPageV2State extends State { userId: UserManager.instance.user.info.id, flag: 0, amount: -1, - count: -1, + count: 1, roleLevel: UserManager.instance.user.info.roleLevel, ), diff --git a/lib/pages/user/widget/shop_manager_view.dart b/lib/pages/user/widget/shop_manager_view.dart index 62f569b..0859826 100644 --- a/lib/pages/user/widget/shop_manager_view.dart +++ b/lib/pages/user/widget/shop_manager_view.dart @@ -84,7 +84,7 @@ class ShopManagerView extends StatelessWidget { _buildGridItem( title: '我的店铺', subTitle: '有福同享·真壕友', - onTap: () => Get.to(MyGroupPageV2()), + onTap: () => Get.to(() => MyGroupPageV2()), // CRoute.push(context, MyGroupPage(type: UsersMode.MY_GROUP)), path: R.ASSETS_SHOP_MY_GROUP_WEBP, show: showTop,