Merge branches 'master' and 'master' of http://192.168.2.201:8099/laiiihz/akuCommunity

lib/pages/home/home_page.dart

@@ -147,9 +147,13 @@ class _HomePageState extends State<HomePage>
     super.build(context);
     ScreenUtil.init(context,
         designSize: Size(750, 1334), allowFontScaling: true);
-    return BeeScaffold(
-      title: 'TEST',
-      bgColor: BaseStyle.colorffd000,
+    return Scaffold(
+      extendBodyBehindAppBar: true,
+      appBar: AppBar(
+        title: 'TEST'.text.make(),
+        backgroundColor: Colors.transparent,
+        elevation: 0,
+        centerTitle: true,
         leading: Container(
           margin: EdgeInsets.only(left: 32.w),
           child: Column(
@@ -186,6 +190,7 @@ class _HomePageState extends State<HomePage>
           ),
           16.wb,
         ],
+      ),
       body: RefreshConfiguration(
         child: SmartRefresher(
           controller: _refreshController,
@@ -211,7 +216,7 @@ class _HomePageState extends State<HomePage>
                       ),
                     ),
                     SingleAdSpace(
-                      imagePath: 'assets/example/guanggao2.png',
+                      imagePath: R.ASSETS_EXAMPLE_GUANGGAO2_PNG,
                     ),
                     HomeTagBar(
                       title: '物业收费标准请查收~',
@@ -225,7 +230,9 @@ class _HomePageState extends State<HomePage>
                           tag: '活动',
                           isShowImage: false,
                           fun: () {
-                            ActivitiesPage(bundle: Bundle()..putBool('isVote', false),).to;
+                            ActivitiesPage(
+                              bundle: Bundle()..putBool('isVote', false),
+                            ).to;
                           },
                         ),
                         HomeCard(

lib/pages/home/widget/home_search.dart

@@ -23,7 +23,7 @@ class _HomeSearchState extends State<HomeSearch> {
         ),
       ),
       padding: EdgeInsets.only(
-        top: 9.w,
+        top: 127.w + ScreenUtil().statusBarHeight,
         left: 32.w,
         right: 32.w,
         bottom: 17.w,
@@ -42,8 +42,7 @@ class _HomeSearchState extends State<HomeSearch> {
           ),
           decoration: BoxDecoration(
             color: Colors.white,
-            borderRadius:
-                BorderRadius.all(Radius.circular(36.w)),
+            borderRadius: BorderRadius.all(Radius.circular(36.w)),
           ),
           child: Row(children: [
             Icon(

lib/pages/total_application_page/total_applications_page.dart

@@ -31,7 +31,7 @@ class TotalApplicationsPage extends StatefulWidget {
 class _TotalApplicationsPageState extends State<TotalApplicationsPage> {
   int _currentIndex = 0;
   bool isEdit = false;
-  List<String> _leftNav = ['为您推荐', '智慧管家', '商城购物'];
+  List<String> _leftNav = ['为您推荐', '智慧管家'];
 
   Widget _myApp() {
     return Container(
@@ -324,7 +324,7 @@ class _TotalApplicationsPageState extends State<TotalApplicationsPage> {
                   width: 172.w,
                   child: ListView.builder(
                       shrinkWrap: true,
-                      itemCount: 3,
+                      itemCount: _leftNav.length,
                       itemBuilder: (BuildContext context, int index) {
                         return _leftInkWellNav(index);
                       }),