Merge branch 'master' into dev

# Conflicts:
#	lib/mine/vip_card_page.dart

lib/home/home_page.dart

@@ -446,8 +446,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
   Widget integralStore() {
     return GridView.builder(
       itemCount: gooods != null ? gooods.length : 0,
-      padding:
+      padding: EdgeInsets.all(13.w),
-          EdgeInsets.only(left: 13.w, right: 13.w, top: 13.h, bottom: 13.h),
       shrinkWrap: true,
       physics: NeverScrollableScrollPhysics(),
       gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
@@ -635,7 +634,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
           );
         },
         itemCount:
-            (brandData != null && brandData.length > 0) ? brandData.length : 1,
+            (brandData != null && brandData.length > 0) ? brandData.length : 0,
       ),
       // child: ListView.builder(
       //   padding: EdgeInsets.only(left: 10.w, right: 10.w),