Merge branch 'master' of http://git.qniao.cn/dating-agency/dating_touchme_app

lib/controller/mine/mine_controller.dart

@@ -3,7 +3,10 @@ import 'package:dating_touchme_app/generated/assets.dart';
 import 'package:dating_touchme_app/model/mine/user_count_data.dart';
 import 'package:dating_touchme_app/network/user_api.dart';
 import 'package:dating_touchme_app/pages/mine/auth_center_page.dart';
+import 'package:dating_touchme_app/pages/mine/my_wallet_page.dart';
+import 'package:dating_touchme_app/pages/mine/rose_page.dart';
 import 'package:dating_touchme_app/pages/mine/user_help_center_page.dart';
+import 'package:dating_touchme_app/pages/setting/match_spread_page.dart';
 import 'package:get/get.dart';
 
 import '../../pages/setting/setting_page.dart';
@@ -13,11 +16,11 @@ class MineController extends GetxController {
 
 
   final blockList = <Map>[
-    // {"icon": Assets.imagesRose, "title": "我的玫瑰", "subTitle": "新人限时福利", "path": () => RosePage()},
-    // {"icon": Assets.imagesWallet, "title": "我的钱包", "subTitle": "提现无门槛", "path": () => MyWalletPage()},
+    {"icon": Assets.imagesRose, "title": "我的玫瑰", "subTitle": "新人限时福利", "path": () => RosePage()},
+    {"icon": Assets.imagesWallet, "title": "我的钱包", "subTitle": "提现无门槛", "path": () => MyWalletPage()},
     // {"icon": Assets.imagesShop, "title": "商城中心", "subTitle": "不定期更新商品", "path": () => null},
     {"icon": Assets.imagesCert, "title": "认证中心", "subTitle": GlobalData().userData?.identityCard == null || GlobalData().userData?.profilePhoto == null ? "未认证" : "已认证", "path": () => AuthCenterPage()},
-    // {"icon": Assets.imagesMatchmaker, "title": "红娘等级", "subTitle": "实习红娘", "path": () => MatchSpreadPage()},
+    {"icon": Assets.imagesMatchmaker, "title": "红娘等级", "subTitle": "实习红娘", "path": () => MatchSpreadPage()},
   ].obs;
 
   final settingList = <Map>[

lib/pages/mine/mine_page.dart

@@ -245,7 +245,7 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
                 ),
               ),
               SizedBox(height: 12.w,),
-              if(false) Stack(
+              Stack(
                 children: [
                   Image.asset(
                     Assets.imagesVipBanner,
@@ -266,7 +266,7 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
                   )
                 ],
               ),
-              if(false) SizedBox(height: 12.w,),
+              SizedBox(height: 12.w,),
               ClipRRect(
                 borderRadius: BorderRadius.all(Radius.circular(9.w)),
                 child: Column(