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

lib/controller/mine/mine_controller.dart

@@ -18,16 +18,16 @@ class MineController extends GetxController {
 
 
   final blockList = <Map>[
-    {"icon": Assets.imagesRose, "title": "我的玫瑰", "subTitle": "新人限时福利", "path": () => RosePage()},
+    // {"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>[
     {"icon": Assets.imagesSetting, "title": "设置", "path": () => SettingPage()},
-    {"icon": Assets.imagesCustomer, "title": "联系客服", "path": () => Null},
+    {"icon": Assets.imagesCustomer, "title": "联系客服", "path": () => null},
     {"icon": Assets.imagesMail, "title": "意见反馈", "path": () => UserHelpCenterPage()},
   ].obs;
 

lib/pages/home/user_information_page.dart

@@ -432,7 +432,7 @@ class UserInformationPage extends StatelessWidget {
                   children: [
                     TDButton(
                       text: '发消息',
-                      width: 240.w,
+                      width: 350.w,
                       size: TDButtonSize.medium,
                       type: TDButtonType.fill,
                       shape: TDButtonShape.round,
@@ -486,26 +486,26 @@ class UserInformationPage extends StatelessWidget {
                         }
                       },
                     ),
-                    const SizedBox(width: 10),
-                    TDButton(
-                      text: '关注',
-                      width: 90,
-                      size: TDButtonSize.medium,
-                      type: TDButtonType.fill,
-                      shape: TDButtonShape.round,
-                      textStyle: TextStyle(fontSize: 14, color: Colors.white),
-                      style: TDButtonStyle(
-                        textColor: Colors.white,
-                        backgroundColor: Color(0xFF7562F9),
-                      ),
-                      activeStyle: TDButtonStyle(
-                        textColor: Colors.white,
-                        backgroundColor: Color(0xC37562F9),
-                      ),
-                      onTap: (){
-                        // controller.tabIndex.value = 1;
-                      },
-                    )
+                    // const SizedBox(width: 10),
+                    // TDButton(
+                    //   text: '关注',
+                    //   width: 90,
+                    //   size: TDButtonSize.medium,
+                    //   type: TDButtonType.fill,
+                    //   shape: TDButtonShape.round,
+                    //   textStyle: TextStyle(fontSize: 14, color: Colors.white),
+                    //   style: TDButtonStyle(
+                    //     textColor: Colors.white,
+                    //     backgroundColor: Color(0xFF7562F9),
+                    //   ),
+                    //   activeStyle: TDButtonStyle(
+                    //     textColor: Colors.white,
+                    //     backgroundColor: Color(0xC37562F9),
+                    //   ),
+                    //   onTap: (){
+                    //     // controller.tabIndex.value = 1;
+                    //   },
+                    // )
                   ],
                 ),
               )

lib/pages/mine/mine_page.dart

@@ -245,7 +245,7 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
                 ),
               ),
               SizedBox(height: 12.w,),
-              Stack(
+              if(false) Stack(
                 children: [
                   Image.asset(
                     Assets.imagesVipBanner,
@@ -266,7 +266,7 @@ class _MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin{
                   )
                 ],
               ),
-              SizedBox(height: 12.w,),
+              if(false) SizedBox(height: 12.w,),
               ClipRRect(
                 borderRadius: BorderRadius.all(Radius.circular(9.w)),
                 child: Column(
@@ -488,6 +488,10 @@ class _SettingItemState extends State<SettingItem> {
   Widget build(BuildContext context) {
     return InkWell(
       onTap: (){
+        if(widget.path() == null){
+          SmartDialog.showToast('功能暂未开放');
+          return;
+        }
         // context.pushNamed(widget.path);
         Get.to(widget.path);
         // RouteGuardService.to.toWithAuth(widget.path, null);