merge

lib/constants/api_v2.dart

@@ -88,6 +88,8 @@ class UserAPI {
 
   ///会员隐私开关
   String get securePhone => '/v2/app/user/secret';
+
+  String get userSaleAmount => '/v2/app/user/sale';
 }
 
 class BenefitAPI {

lib/pages/home/home_page.dart

@@ -1423,28 +1423,29 @@ class _HomePageState extends BaseStoreState<HomePage>
 
   //抽奖功能
   _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<double> animation,
-                  Animation<double> 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<double> animation,
+    //               Animation<double> secondaryAnimation) {
+    //             return LotteryPage(
+    //               cardIndex: lottery.data['data']['result'],
+    //             );
+    //           }),
+    //     );
+    //   }
+    // }
 
     //店铺角色变动
 
@@ -1553,6 +1554,8 @@ class _HomePageState extends BaseStoreState<HomePage>
   }
 
   _userCardNoticeList() async {
+    await Future.delayed(Duration(milliseconds: 300));
+
     ResultData resultData =
         await HttpManager.post(APIV2.userAPI.userCardNoticeList, {});
     if (resultData.data != null && resultData.data['data'] != null) {
@@ -1572,39 +1575,40 @@ class _HomePageState extends BaseStoreState<HomePage>
           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),
+                ),
               ),
             ),
           ),
-        )));
+        ));
       }
     }
   }

lib/pages/user/invite/my_group_page_v2.dart

@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:recook/constants/api_v2.dart';
+import 'package:recook/manager/http_manager.dart';
 import 'package:recook/manager/user_manager.dart';
 import 'package:recook/pages/user/functions/user_func.dart';
 import 'package:recook/pages/user/invite/group_invite_card.dart';
@@ -22,13 +24,15 @@ class _MyGroupPageV2State extends State<MyGroupPageV2> {
   List<UserCommonModel> _models = [];
   UsersMode usersMode = UsersMode.MY_GROUP;
   int get _allGroupCount {
-    int value = 0;
+    int value = 1;
     _models.forEach((element) {
       value += element.count;
     });
     return value;
   }
 
+  num _myPeopleCount = -1;
+
   GSRefreshController _refreshController = GSRefreshController.auto();
 
   _renderShitTab(String name, UsersMode mode) {
@@ -57,6 +61,7 @@ class _MyGroupPageV2State extends State<MyGroupPageV2> {
       case UsersMode.MY_REWARD:
         return '我的代理店铺';
     }
+    return '';
   }
 
   Widget get _renderShitVerticalLine => Container(
@@ -225,8 +230,8 @@ class _MyGroupPageV2State extends State<MyGroupPageV2> {
                                       UserManager.instance.user.info.wechatNo,
                                   userId: UserManager.instance.user.info.id,
                                   flag: 0,
-                                  amount: -1,
-                                  count: -1,
+                                  amount: _myPeopleCount,
+                                  count: 1,
                                   roleLevel:
                                       UserManager.instance.user.info.roleLevel,
                                 ),
@@ -250,6 +255,19 @@ class _MyGroupPageV2State extends State<MyGroupPageV2> {
     );
   }
 
+  @override
+  void initState() {
+    super.initState();
+    HttpManager.post(APIV2.userAPI.userSaleAmount, {}).then((resultData) {
+      if (resultData?.data != null &&
+          resultData.data['data'] != null &&
+          resultData.data['data'] != null) {
+        _myPeopleCount = resultData.data['data']['amount'];
+        setState(() {});
+      }
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return RecookScaffold(

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,