修改全部应用中的跳转拦截逻辑

pull/1/head
张萌 3 years ago
parent 196657627a
commit cc8a9bcdeb

@ -185,7 +185,7 @@ List<String> _recommendApp = [
'共享投屏', '共享投屏',
]; ];
/// ///线
List<AO> get recommendApp => _recommendApp.map((e) => AO.fromRaw(e)).toList(); List<AO> get recommendApp => _recommendApp.map((e) => AO.fromRaw(e)).toList();
/// original value /// original value

@ -210,8 +210,8 @@ class _AllApplicationPageState extends State<AllApplicationPage> {
child: ListView( child: ListView(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
children: [ children: [
_buildListTile('智慧管家', 1), _buildListTile('智慧管家', 0),
_buildListTile('暂未上线', 0), _buildListTile('暂未上线', 1),
// _buildListTile('商城购物', 2), // _buildListTile('商城购物', 2),
], ],
), ),

@ -1,8 +1,7 @@
import 'package:aku_new_community/pages/sign/login/other_login_page.dart'; import 'package:aku_new_community/pages/sign/login/other_login_page.dart';
import 'package:aku_new_community/provider/app_provider.dart';
import 'package:aku_new_community/provider/user_provider.dart'; import 'package:aku_new_community/provider/user_provider.dart';
import 'package:aku_new_community/ui/profile/house/add_house_page.dart'; import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart';
import 'package:aku_new_community/ui/profile/house/house_owners_page.dart'; import 'package:aku_new_community/widget/dialog/certification_dialog.dart';
import 'package:bot_toast/bot_toast.dart'; import 'package:bot_toast/bot_toast.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -34,17 +33,15 @@ class LoginUtil {
static bool haveRoom(String name) { static bool haveRoom(String name) {
if (!name.contains(RegExp('访客邀请|报事报修|建议咨询|生活缴费|物品出门|投诉表扬|我的访客|我的报修|我的缴费'))) if (!name.contains(RegExp('访客邀请|报事报修|建议咨询|生活缴费|物品出门|投诉表扬|我的访客|我的报修|我的缴费')))
return true; return true;
final appProvider = Provider.of<AppProvider>(Get.context!, listen: false); final userProvider = Provider.of<UserProvider>(Get.context!, listen: false);
if (appProvider.selectedHouse == null) { if (userProvider.userInfoModel!.name == null) {
BotToast.showText(text: '请先添加房屋'); BotToast.showText(text: '请先实名认证');
Get.to(() => AddHousePage()); Get.dialog(CertificationDialog());
return false; return false;
} }
if (appProvider.selectedHouse == null) { if (userProvider.defaultHouse == null) {
BotToast.showText(text: '房屋审核中或审核失败'); BotToast.showText(text: '请先选择默认房屋');
Get.to(() => HouseOwnersPage( Get.to(() => MyHousePage());
identify: 4,
));
return false; return false;
} }
return true; return true;

Loading…
Cancel
Save