From aed73137f64aa834e7bcc8dc811ef51502a9c68d Mon Sep 17 00:00:00 2001
From: wurong <953969641@qq.com>
Date: Tue, 18 Jul 2023 14:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=88=97=E8=A1=A8=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/home/home_page.dart                             | 4 ++--
 lib/home/points_mall_view/points_goods_view.dart    | 2 ++
 lib/home/welfare_exchange.dart                      | 6 +++---
 lib/integral_store/integral_store_details_page.dart | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart
index f17ab8ae..1730b133 100644
--- a/lib/home/home_page.dart
+++ b/lib/home/home_page.dart
@@ -200,7 +200,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
       "orderDesc": true,
       "orderType": 1,
       "pageNum": 1,
-      "pageSize": 10,
+      "pageSize": 100,
       "state": 1
     }).catchError((onError) {
       refreshController.refreshFailed();
@@ -238,7 +238,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
       "orderDesc": orderDesc,
       "orderType": orderType,
       "pageNum": pageNum,
-      "pageSize": 10,
+      "pageSize": 100,
       "state": 1
     };
     BaseData<PageInfo<Goods>> pageGoods =
diff --git a/lib/home/points_mall_view/points_goods_view.dart b/lib/home/points_mall_view/points_goods_view.dart
index 6bc20bb2..eac4013b 100644
--- a/lib/home/points_mall_view/points_goods_view.dart
+++ b/lib/home/points_mall_view/points_goods_view.dart
@@ -38,6 +38,8 @@ class _PointGoods extends State<PointGoods> {
               : " + ${AppUtils.calculateDouble(double.tryParse(goods?.money) ?? 0)}元");
     } else if (goods.oneMoney != null && goods.oneMoney != "0.00") {
       return "${AppUtils.calculateDouble(double.tryParse(goods.oneMoney) ?? 0)}元";
+    } else {
+      return "";
     }
   }
 
diff --git a/lib/home/welfare_exchange.dart b/lib/home/welfare_exchange.dart
index af27cb1c..4fa8ecaa 100644
--- a/lib/home/welfare_exchange.dart
+++ b/lib/home/welfare_exchange.dart
@@ -88,7 +88,7 @@ class _WelfareExchange extends State<WelfareExchange>
       "orderDesc": true,
       "orderType": 1,
       "pageNum": 1,
-      "pageSize": 10,
+      "pageSize": 100,
       "state": 1
     }).catchError((onError) {
       refreshController.refreshFailed();
@@ -126,7 +126,7 @@ class _WelfareExchange extends State<WelfareExchange>
       "orderDesc": orderDesc,
       "orderType": orderType,
       "pageNum": pageNum,
-      "pageSize": 10,
+      "pageSize": 100,
       "state": 1
     };
     BaseData<PageInfo<Goods>> pageGoods =
@@ -260,7 +260,7 @@ class _WelfareExchange extends State<WelfareExchange>
         body: SmartRefresher(
             controller: refreshController,
             enablePullDown: true,
-            enablePullUp: true,
+            enablePullUp: false,
             physics: ClampingScrollPhysics(),
             header: MyHeader(),
             footer: CustomFooter(
diff --git a/lib/integral_store/integral_store_details_page.dart b/lib/integral_store/integral_store_details_page.dart
index 7f0395ac..73d266e8 100644
--- a/lib/integral_store/integral_store_details_page.dart
+++ b/lib/integral_store/integral_store_details_page.dart
@@ -96,6 +96,7 @@ class _IntegralStoreDetailsPage extends State<IntegralStoreDetailsPage> {
     }else if(goods.oneMoney != null && goods.oneMoney != "0.00"){
       return "${AppUtils.calculateDouble(double.tryParse(goods?.oneMoney) ?? 0)}元";
     }
+    return "";
   }
 
   @override