权限过滤显示

lib/pages/goods_deto_page/deto_create_page/deto_create_page.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 
 import 'package:akuCommunity/constants/app_values.dart';
 import 'package:akuCommunity/provider/app_provider.dart';
+import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -90,7 +91,7 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
           ),
           GestureDetector(
             onTap: () {
-              MyHousePage().to();
+              Get.to(() => PickMyHousePage());
             },
             child: Row(
               mainAxisAlignment: MainAxisAlignment.start,

lib/pages/life_pay/life_pay_page.dart

@@ -1,8 +1,11 @@
 import 'package:akuCommunity/constants/app_values.dart';
+import 'package:akuCommunity/provider/app_provider.dart';
+import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
 import 'package:flutter_easyrefresh/easy_refresh.dart';
+import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:velocity_x/velocity_x.dart';
 
@@ -53,6 +56,7 @@ class _LifePayPageState extends State<LifePayPage> {
 
   Widget _buildHouseCard() {
     UserProvider userProvider = Provider.of<UserProvider>(context);
+    AppProvider appProvider = Provider.of<AppProvider>(context);
     return Material(
       color: kForeGroundColor,
       child: Padding(
@@ -64,9 +68,7 @@ class _LifePayPageState extends State<LifePayPage> {
             32.w.heightBox,
             GestureDetector(
               onTap: () {
-                MyHousePage(
+                Get.to(() => PickMyHousePage());
-                  needFindPayTag: true,
-                ).to();
               },
               child: Row(
                 children: [
@@ -82,7 +84,7 @@ class _LifePayPageState extends State<LifePayPage> {
                       children: [
                         AppValues.plotName.text.black.size(32.sp).bold.make(),
                         10.w.heightBox,
-                        userProvider.currentHouse.text.black
+                        appProvider.selectedHouse.roomName.text.black
                             .size(32.sp)
                             .bold
                             .make()

lib/pages/things_page/widget/add_fixed_submit_page.dart

@@ -1,6 +1,9 @@
 import 'dart:io';
 
 import 'package:akuCommunity/constants/app_values.dart';
+import 'package:akuCommunity/provider/app_provider.dart';
+import 'package:akuCommunity/ui/profile/house/house_owners_page.dart';
+import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -65,7 +68,7 @@ class _AddFixedSubmitPageState extends State<AddFixedSubmitPage> {
           32.w.heightBox,
           GestureDetector(
             onTap: () {
-              MyHousePage().to();
+              Get.to(() => PickMyHousePage());
             },
             child: Row(
               children: [
@@ -211,25 +214,20 @@ class _AddFixedSubmitPageState extends State<AddFixedSubmitPage> {
   @override
   Widget build(BuildContext context) {
     UserProvider userProvider = Provider.of<UserProvider>(context);
+    AppProvider appProvider = Provider.of<AppProvider>(context);
     return WillPopScope(
       child: BeeScaffold(
         title: '报事报修',
-        body: Column(
+        body: ListView(
-          children: [
-            ListView(
           children: [
             _buildHouseCard(
               AppValues.plotName,
-                    userProvider.userDetailModel.estateNames.isEmpty
+              appProvider.selectedHouse.roomName,
-                        ? ''
+            ),
-                        : BeeParse.getEstateName(
-                            userProvider.userDetailModel.estateNames[0])),
             _getType(),
             _buildReportCard(),
             _addImages(),
           ],
-            ).expand(),
-          ],
         ),
         bottomNavi: BottomButton(
           onPressed: _canSubmit(_selectType, _textEditingController.text)
@@ -238,8 +236,7 @@ class _AddFixedSubmitPageState extends State<AddFixedSubmitPage> {
                   List<String> urls = await NetUtil()
                       .uploadFiles(_files, API.upload.uploadRepair);
                   BaseModel baseModel = await ManagerFunc.reportRepairInsert(
-                      BeeParse.getEstateNameId(
+                      appProvider.selectedHouse.id,
-                          userProvider.userDetailModel.estateNames[0]),
                       _selectType + 1,
                       _textEditingController.text,
                       urls);

lib/pages/visitor_access_page/visitor_access_page.dart

@@ -1,4 +1,5 @@
 import 'package:akuCommunity/constants/app_values.dart';
+import 'package:akuCommunity/provider/app_provider.dart';
 import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -280,6 +281,7 @@ class _VisitorAccessPageState extends State<VisitorAccessPage> {
 
   Widget build(BuildContext context) {
     UserProvider userProvider = Provider.of<UserProvider>(context);
+    AppProvider appProvider = Provider.of<AppProvider>(context);
     return BeeScaffold(
       title: '访客通行',
       actions: [
@@ -305,19 +307,18 @@ class _VisitorAccessPageState extends State<VisitorAccessPage> {
                   children: [
                     _buildHouseCard(
                       AppValues.plotName,
-                        userProvider.userDetailModel.estateNames.isEmpty
+                      appProvider.selectedHouse.roomName,
-                            ? ''
+                    ),
-                            : BeeParse.getEstateName(
-                                userProvider.userDetailModel.estateNames[0])),
                     _input('访客姓名', '请输入访客姓名', _userName),
                     _sexSelect(),
                     _input('是否驾车', '请输入,例如浙A88888(没有驾车可不填)', _userCarNum),
                     _selectTime(),
                     SizedBox(height: 64.w),
                     _create(
-                        userProvider.userDetailModel.id,
+                      appProvider.selectedHouse.id,
                       userProvider.userDetailModel.type,
-                        userProvider.userDetailModel.tel),
+                      userProvider.userDetailModel.tel,
+                    ),
                     _tips(),
                   ],
                 ),

lib/ui/manager/advice/new_advice_page.dart

@@ -1,5 +1,7 @@
 import 'dart:io';
 
+import 'package:akuCommunity/constants/app_values.dart';
+import 'package:akuCommunity/provider/app_provider.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
@@ -7,6 +9,7 @@ import 'package:bot_toast/bot_toast.dart';
 import 'package:flustars/flustars.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:provider/provider.dart';
 import 'package:velocity_x/velocity_x.dart';
 
 import 'package:akuCommunity/const/resource.dart';
@@ -127,6 +130,7 @@ class _NewAdvicePageState extends State<NewAdvicePage> {
 
   @override
   Widget build(BuildContext context) {
+    final appProvider = Provider.of<AppProvider>(context);
     return BeeScaffold.white(
       title: title,
       body: ListView(
@@ -141,7 +145,12 @@ class _NewAdvicePageState extends State<NewAdvicePage> {
               width: 60.w,
             ),
             40.wb,
-            '宁波华茂悦峰\n1幢-1单元-702室'.text.size(32.sp).black.bold.make(),
+            '${AppValues.plotName}\n${appProvider.selectedHouse.roomName}'
+                .text
+                .size(32.sp)
+                .black
+                .bold
+                .make(),
           ].row(),
           Divider(height: 64.w),
           '您要选择的类型是？'.text.size(28.sp).make(),

pubspec.lock

@@ -1,13 +1,6 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  _fe_analyzer_shared:
-    dependency: transitive
-    description:
-      name: _fe_analyzer_shared
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "14.0.0"
   amap_flutter_base:
     dependency: "direct main"
     description:
@@ -31,13 +24,6 @@ packages:
       url: "http://159.75.73.143:8080/third_packages/amap_flutter_map"
     source: git
     version: "2.0.2-nullsafety"
-  analyzer:
-    dependency: transitive
-    description:
-      name: analyzer
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.41.2"
   animator:
     dependency: transitive
     description:
@@ -58,7 +44,7 @@ packages:
       name: args
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.6.0"
+    version: "2.0.0"
   async:
     dependency: transitive
     description:
@@ -128,7 +114,7 @@ packages:
       name: cli_util
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
   clock:
     dependency: transitive
     description:
@@ -143,13 +129,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.15.0"
-  colorize:
-    dependency: transitive
-    description:
-      name: colorize
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.0"
   common_utils:
     dependency: transitive
     description:
@@ -178,13 +157,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.2"
-  dart_style:
-    dependency: transitive
-    description:
-      name: dart_style
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.3.11"
   decimal:
     dependency: transitive
     description:
@@ -260,13 +232,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_asset_generator:
-    dependency: "direct dev"
-    description:
-      name: flutter_asset_generator
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.6.1"
   flutter_blurhash:
     dependency: transitive
     description:
@@ -379,14 +344,14 @@ packages:
       name: glob
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
+    version: "2.0.1"
   grinder:
     dependency: "direct dev"
     description:
       name: grinder
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.8.6"
+    version: "0.9.0"
   highlight:
     dependency: transitive
     description:
@@ -456,7 +421,7 @@ packages:
       name: import_sorter
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.4.1"
+    version: "4.4.2"
   intl:
     dependency: transitive
     description:
@@ -464,13 +429,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.17.0"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.3.4"
   jpush_flutter:
     dependency: "direct main"
     description:
@@ -515,20 +473,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
-  node_interop:
-    dependency: transitive
-    description:
-      name: node_interop
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.2.1"
-  node_io:
-    dependency: transitive
-    description:
-      name: node_io
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.1.1"
   octo_image:
     dependency: transitive
     description:
@@ -536,13 +480,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0-nullsafety.1"
-  package_config:
-    dependency: transitive
-    description:
-      name: package_config
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.9.3"
   package_info:
     dependency: "direct main"
     description:
@@ -662,13 +599,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "5.0.0"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.4.4"
   qr:
     dependency: transitive
     description:
@@ -851,6 +781,13 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.19"
+  tint:
+    dependency: transitive
+    description:
+      name: tint
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.0"
   transformer_page_view:
     dependency: transitive
     description:
@@ -935,13 +872,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.1"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.9.7+15"
   win32:
     dependency: transitive
     description:
@@ -969,7 +899,7 @@ packages:
       name: yaml
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.1"
+    version: "3.1.0"
 sdks:
   dart: ">=2.12.0 <3.0.0"
   flutter: ">=2.0.0"

pubspec.yaml

@@ -82,9 +82,8 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  import_sorter: ^4.4.1
+  import_sorter: ^4.4.2
-  flutter_asset_generator: ^0.6.1
+  grinder: ^0.9.0
-  grinder:
 
 flutter:
   uses-material-design: true