resource 冲突

packages/cpt_property/lib/modules/property/page/property_page.dart

@@ -1,7 +1,3 @@
-import 'package:cpt_property/modules/ioan/page/property_ioan_page.dart';
-import 'package:cpt_property/modules/news/page/property_news_page.dart';
-import 'package:cpt_property/modules/rent/page/property_rent_page.dart';
-import 'package:cpt_property/modules/sale/page/property_sale_page.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_route/auto_route.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -26,8 +22,6 @@ class PropertyPage extends HookConsumerWidget {
     }
   }
 
-
-
   // 顶部tab 切换
   Widget _buildTopSection(BuildContext context, WidgetRef ref, _vm) {
     final topSectionsData = _vm.topSectionsData;
@@ -42,48 +36,36 @@ class PropertyPage extends HookConsumerWidget {
             return Container(
               child: Column(
                 children: [
-                  MyAssetImage(item['icon'], width: 70, height: 70,).onTap((){
-                      Log.d("fdjskfds${item['title']}");
+                  MyAssetImage(
+                    item['icon'],
+                    width: 70,
+                    height: 70,
+                  ).onTap(
+                    () {
                       _vm.switchPage(index, context);
-                      switch(index){
-                         case 0:
-                           PropertySalePage.startInstance(context: context);
-                           break;
-                         case 1:
-                           PropertyRentPage.startInstance(context: context);
-                           break;
-                         case 2:
-                           PropertyIoanPage.startInstance(context: context);
-                           break;
-                         case 3:
-                           PropertyNewsPage.startInstance(context: context);
-                           break;
-                      }
                     },
                     type: ClickType.throttle,
                   ),
                   TextButton(
                     onPressed: () {
-                      // _vm.selectTab(index);
                     },
                     child: Text(item['title']),
                   ),
                 ],
               ),
-            ).marginOnly(left:18,right:18,top: 10,bottom: 10);
+            ).marginOnly(left: 18, right: 18, top: 10, bottom: 10);
           }),
         ),
       ),
     );
   }
 
-
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final _vm = ref.read(propertyVmProvider.notifier);
     return DefaultTabController(
-        length: 4,
-        child: Scaffold(
+      length: 4,
+      child: Scaffold(
           appBar: AppBar(
             title: Text("Property"),
             bottomOpacity: 0.0, // 取消下横线
@@ -102,8 +84,7 @@ class PropertyPage extends HookConsumerWidget {
                 ),
               )
             ],
-          )
-        ),
+          )),
     );
   }
 }

packages/cs_resources/pubspec.yaml

@@ -27,11 +27,8 @@ flutter:
     - assets/
     - assets/base_lib/
     - assets/base_service/
-<<<<<<< HEAD
     - assets/property/
-=======
     - assets/auth/
->>>>>>> 5aa4bec8cb4b6dcf57ae73e59b3f8b7688c4ed35
 
 
 flutter_intl: