Merge remote-tracking branch 'origin/dev' into dev

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 =

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 "";
     }
   }
 

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(

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