From 6a923e64ac9ba1b6b171ba14829cbf3350de4e5f Mon Sep 17 00:00:00 2001
From: laiiihz <laiiihz@outlook.com>
Date: Tue, 30 Mar 2021 14:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=99=E9=A2=9D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=AF=B7=E6=B1=82=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98,=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/main.dart                                   | 12 ++++++------
 lib/pages/user/banlance/user_balance_page.dart  |  6 +++---
 lib/pages/user/functions/user_balance_func.dart |  7 ++++---
 lib/pages/user/user_history_benefit_page.dart   | 12 ++++++++----
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 0095e86..60422d4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -39,7 +39,6 @@ import 'utils/app_router.dart';
 
 // import 'package:sharesdk_plugin/sharesdk_plugin.dart';
 
-
 List<CameraDescription> cameras;
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -58,7 +57,7 @@ void main() async {
     // useEncrypt: true
   );
   // 设置当前是否为测试环境
-  bool isDebug = true;
+  bool isDebug = false;
   AppConfig.setDebug(isDebug);
 
   //持久化存储
@@ -74,11 +73,12 @@ void main() async {
   // 奔溃界面修改!!!!
   ErrorWidget.builder = (FlutterErrorDetails flutterErrorDetails) {
     print(flutterErrorDetails.toString());
-    return Center(
-      child: Container(
-        color: Colors.white,
+    if (isDebug) return ErrorWidget(flutterErrorDetails.exception);
+    return Material(
+      color: Colors.white,
+      child: Center(
         child: Text(
-          "app不小心奔溃了!请重新打开app!",
+          "服务器繁忙，请稍后再试！",
           style: TextStyle(color: Colors.black, fontSize: 18),
         ),
       ),
diff --git a/lib/pages/user/banlance/user_balance_page.dart b/lib/pages/user/banlance/user_balance_page.dart
index 737dc4e..a4dd331 100644
--- a/lib/pages/user/banlance/user_balance_page.dart
+++ b/lib/pages/user/banlance/user_balance_page.dart
@@ -159,7 +159,7 @@ class _UserBalancePageState extends State<UserBalancePage> {
                 [
                   '可使用(元)'.text.size(14.sp).color(Color(0xFF333333)).make(),
                   4.hb,
-                  _model.data.balance
+                  (_model?.data?.balance ?? 0.0)
                       .toStringAsFixed(2)
                       .text
                       .size(30)
@@ -170,7 +170,7 @@ class _UserBalancePageState extends State<UserBalancePage> {
                 [
                   '累计提现(元)'.text.size(14.sp).color(Color(0xFF333333)).make(),
                   4.hb,
-                  _model.data.totalWithdraw
+                  (_model?.data?.totalWithdraw ?? 0.0)
                       .toStringAsFixed(2)
                       .text
                       .size(30)
@@ -260,7 +260,7 @@ class _UserBalancePageState extends State<UserBalancePage> {
                   height: 1.w,
                   thickness: 1.w,
                 ),
-                itemCount: _historyModel.data.list.length,
+                itemCount: _historyModel?.data?.list?.length ?? 0,
               ),
             ).material(color: Color(0xFFF9F9FB)).expand(),
           ],
diff --git a/lib/pages/user/functions/user_balance_func.dart b/lib/pages/user/functions/user_balance_func.dart
index 03e8845..7944f4e 100644
--- a/lib/pages/user/functions/user_balance_func.dart
+++ b/lib/pages/user/functions/user_balance_func.dart
@@ -15,9 +15,10 @@ class UserBalanceFunc {
     @required String month,
     @required int status,
   }) async {
-    ResultData result = await HttpManager.post(APIV2.userAPI.balanceMonthHistory, {
-      'date':month,
-      'status':status,
+    ResultData result =
+        await HttpManager.post(APIV2.userAPI.balanceMonthHistory, {
+      'date': month,
+      'status': status,
     });
     return UserBalanceHistoryModel.fromJson(result.data);
   }
diff --git a/lib/pages/user/user_history_benefit_page.dart b/lib/pages/user/user_history_benefit_page.dart
index d6d3b4e..9fa0088 100644
--- a/lib/pages/user/user_history_benefit_page.dart
+++ b/lib/pages/user/user_history_benefit_page.dart
@@ -73,7 +73,11 @@ class _UserHistoryBenefitPageState extends State<UserHistoryBenefitPage> {
                   children: [
                     '累计总收益(瑞币)'.text.black.make(),
                     8.hb,
-                    _model.data.allAmount.text.black.size(34.sp).make(),
+                    (_model?.data?.allAmount?.toStringAsFixed(2) ?? '')
+                        .text
+                        .black
+                        .size(34.sp)
+                        .make(),
                   ],
                 ).expand(),
                 Image.asset(
@@ -88,11 +92,11 @@ class _UserHistoryBenefitPageState extends State<UserHistoryBenefitPage> {
             padding: EdgeInsets.symmetric(vertical: 8.w),
             child: Row(
               children: [
-                _renderColumn('自购收益', _model.data.purchaseAmountValue),
+                _renderColumn('自购收益', _model?.data?.purchaseAmountValue ?? ''),
                 _renderDivider(),
-                _renderColumn('导购收益', _model.data.guideAmountValue),
+                _renderColumn('导购收益', _model?.data?.guideAmountValue ?? ''),
                 _renderDivider(),
-                _renderColumn('店铺补贴', _model.data.trrValue),
+                _renderColumn('店铺补贴', _model?.data?.trrValue ?? ''),
               ],
             ),
           ),