From 6e6f02b3cfc5889f10c2514a632de98c459c8bab Mon Sep 17 00:00:00 2001
From: wurong <953969641@qq.com>
Date: Fri, 26 Jul 2024 13:41:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BD=AE=E6=92=AD=E9=97=B4?=
 =?UTF-8?q?=E9=9A=94=E9=80=9F=E5=BA=A6=E8=B0=83=E6=95=B4=EF=BC=9B=20?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=88=97=E8=A1=A80=E5=85=83=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=A4=84=E7=90=86=EF=BC=9B=20=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF0=E5=85=83=E6=98=BE=E7=A4=BA=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=9B=20=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD=E5=A4=84=E7=90=86=E9=97=B4=E9=9A=94=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/home/home_page.dart              |  4 ++--
 lib/mine/mine_page.dart              |  2 +-
 lib/store/store_view/store_info.dart | 17 ++++++++---------
 lib/union/union_list.dart            | 19 +++++++++----------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart
index 9498e6b6..ef10a954 100644
--- a/lib/home/home_page.dart
+++ b/lib/home/home_page.dart
@@ -582,7 +582,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                 ),
                 autoplay: true,
                 duration: 1000,
-                autoplayDelay: 100000,
+                autoplayDelay: 17000,
                 physics: BouncingScrollPhysics(),
                 itemBuilder: (context, position) {
                   return InkWell(
@@ -675,7 +675,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
               ),
               autoplay: true,
               duration: 1000,
-              autoplayDelay: 2000,
+              autoplayDelay: 10000,
               itemBuilder: (context, position) {
                 return InkWell(
                   onTap: () {
diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart
index 4c0e444b..73c7e73b 100644
--- a/lib/mine/mine_page.dart
+++ b/lib/mine/mine_page.dart
@@ -467,7 +467,7 @@ class MinePageState extends State<MinePage> with AutomaticKeepAliveClientMixin {
         ),
         autoplay: true,
         duration: 1000,
-        autoplayDelay: 2000,
+        autoplayDelay: 10000,
         itemBuilder: (context, position) {
           return InkWell(
             onTap: () {
diff --git a/lib/store/store_view/store_info.dart b/lib/store/store_view/store_info.dart
index 571ca431..8f279764 100644
--- a/lib/store/store_view/store_info.dart
+++ b/lib/store/store_view/store_info.dart
@@ -112,22 +112,21 @@ class _StoreInfoView extends State<StoreInfoView> {
                       ),
                       Row(
                         children: [
-                          Text(
+                          if( widget.storeInfo.perCapitaConsumption != null && ( widget.storeInfo?.perCapitaConsumption ?? "0") != "0")
+                          Padding(padding:EdgeInsets.only(right: 20.w),
+                          child: Text(
                             S.of(context).ren(
-                                  widget.storeInfo != null
-                                      ? widget.storeInfo.perCapitaConsumption
-                                      : "",
-                                ),
+                              widget.storeInfo != null
+                                  ? widget.storeInfo.perCapitaConsumption
+                                  : "",
+                            ),
                             overflow: TextOverflow.ellipsis,
                             style: TextStyle(
                               fontSize: 12.sp,
                               fontWeight: MyFontWeight.medium,
                               color: Color(0xFF353535),
                             ),
-                          ),
-                          SizedBox(
-                            width: 20.w,
-                          ),
+                          ),),
                         ]..addAll(itemServer(widget.storeInfo != null
                             ? widget.storeInfo.businessService
                             : "")),
diff --git a/lib/union/union_list.dart b/lib/union/union_list.dart
index 06987789..5feec663 100644
--- a/lib/union/union_list.dart
+++ b/lib/union/union_list.dart
@@ -5,7 +5,6 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:huixiang/generated/l10n.dart';
-import 'package:huixiang/retrofit/data/latlng.dart';
 import 'package:huixiang/retrofit/data/store.dart';
 import 'package:huixiang/utils/font_weight.dart';
 import 'package:huixiang/view_widget/custom_image.dart';
@@ -298,17 +297,17 @@ class _UnionList extends State<UnionList> with AutomaticKeepAliveClientMixin {
               SizedBox(height: 6.h),
               Row(
                 children: [
-                  Text(
-                    S.of(context).ren(
+                  if(store.perCapitaConsumption != null && (store?.perCapitaConsumption ?? "0") != "0")
+                      Padding(padding: EdgeInsets.only(right: 22.w),child:Text(
+                        S.of(context).ren(
                           store?.perCapitaConsumption ?? "",
                         ),
-                    style: TextStyle(
-                      color: Color(0xFF4D4D4D),
-                      fontSize: 12.sp,
-                      fontWeight: MyFontWeight.regular,
-                    ),
-                  ),
-                  SizedBox(width: 22.w),
+                        style: TextStyle(
+                          color: Color(0xFF4D4D4D),
+                          fontSize: 12.sp,
+                          fontWeight: MyFontWeight.regular,
+                        ),
+                      ),),
                   if (store.distance != null)
                   Image.asset(
                     "assets/image/icon_union_location_black.webp",