From eab5d4f7332a9958ca1ebce86d546bf0b6b5bafa Mon Sep 17 00:00:00 2001
From: laiiihz <laiiihz@outlook.com>
Date: Fri, 19 Mar 2021 16:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=BA=97=E9=93=BA=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8=EF=BC=8C=E7=91=9E=E5=B8=81=E6=B7=BB=E5=8A=A0=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/user/rui_coin_page.dart          |  4 +-
 lib/pages/user/user_page.dart              |  6 +--
 lib/pages/user/widget/shop_check_view.dart | 56 ++++++++++++++--------
 3 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/lib/pages/user/rui_coin_page.dart b/lib/pages/user/rui_coin_page.dart
index e83b172..c8fc979 100644
--- a/lib/pages/user/rui_coin_page.dart
+++ b/lib/pages/user/rui_coin_page.dart
@@ -41,7 +41,9 @@ class _RuiCoinPageState extends BaseStoreState<RuiCoinPage> {
     ClassifyType(name: '转出', sortType: "transfer"),
     ClassifyType(name: '导购收益', sortType: "share"),
     ClassifyType(name: '自购收益', sortType: "shopping"),
-    ClassifyType(name: '团队收益', sortType: "team"),
+    ClassifyType(name: '自营补贴', sortType: "team"),
+    ClassifyType(name: '分销补贴', sortType: "recommend"),
+    ClassifyType(name: '代理补贴', sortType: "reward"),
     ClassifyType(name: '瑞币退回', sortType: "coin_refund"),
   ];
   ClassifyType _selectType;
diff --git a/lib/pages/user/user_page.dart b/lib/pages/user/user_page.dart
index 9befa09..cbc4595 100644
--- a/lib/pages/user/user_page.dart
+++ b/lib/pages/user/user_page.dart
@@ -174,8 +174,8 @@ class _UserPageState extends BaseStoreState<UserPage> {
       {'month': DateUtil.formatDate(DateTime.now(), format: 'yyyy-MM')},
     );
     if (result.data != null && result.data['data'] != null) {
-      _amount = result.data['amount'] ?? 0;
-      _target = result.data['need_amount'] ?? 100;
+      _amount = (result.data['data']['amount'] ?? 0) + .0;
+      _target = (result.data['data']['needAmount'] ?? 100) + .0;
     }
   }
 
@@ -203,7 +203,7 @@ class _UserPageState extends BaseStoreState<UserPage> {
             // _shopBenefitKey.currentState.updateBenefit();
             _updateUserBriefInfo();
             _updateAllAmount();
-            _updateCheck();
+            await _updateCheck();
             _cardCount = await UserCardFunction.count();
             await _updateNewBenefit();
             setState(() {});
diff --git a/lib/pages/user/widget/shop_check_view.dart b/lib/pages/user/widget/shop_check_view.dart
index b8c8c86..88c290b 100644
--- a/lib/pages/user/widget/shop_check_view.dart
+++ b/lib/pages/user/widget/shop_check_view.dart
@@ -36,9 +36,15 @@ class _ShopCheckViewState extends State<ShopCheckView> {
   @override
   void initState() {
     super.initState();
-    _themeColor = sliverTheme;
-    _beginColor = sliverBegin;
-    _endColor = sliverEnd;
+    if (UserLevelTool.currentRoleLevelEnum() == UserRoleLevel.Gold) {
+      _themeColor = goldTheme;
+      _beginColor = goldBegin;
+      _endColor = goldEnd;
+    } else {
+      _themeColor = sliverTheme;
+      _beginColor = sliverBegin;
+      _endColor = sliverEnd;
+    }
   }
 
   double get _target => widget.target ?? 100;
@@ -46,22 +52,23 @@ class _ShopCheckViewState extends State<ShopCheckView> {
 
   DateTime get _now => DateTime.now();
 
-  String get title => _target <= _amount
-      ? '还需团队销售额\n${_target - _amount}元'
+  String get title => _amount <= _target
+      ? '还需团队销售额${_target - _amount}元'
       : '已满足${UserLevelTool.currentRoleLevel()}考核标准';
   double get percent {
-    if (_amount == 0)
-      return 100;
-    else
-      return _amount / _target * 100;
+    if (_target == 0) return 100;
+    if (_amount == 0) return 0;
+    return _amount / _target * 100;
   }
 
   @override
   Widget build(BuildContext context) {
-    DateTime date = DateTime(_now.year, _now.month + 1, -1);
-    DateTime limitDate = DateTime(_now.year, _now.month + 1, 22);
+    DateTime date = DateTime(_now.year, _now.month, 1);
+    DateTime limitDate = DateTime(_now.year, _now.month + 1, -1);
+    DateTime checkDate = DateTime(_now.year, _now.month + 1, 1);
     return VxBox(
         child: Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         <Widget>[
           15.wb,
@@ -84,19 +91,24 @@ class _ShopCheckViewState extends State<ShopCheckView> {
           Spacer(),
         ].row(),
         CustomImageButton(
+          padding: EdgeInsets.zero,
           onPressed: () {},
           child: [
-            '本考核期截止至${DateUtil.formatDate(
+            '本考核期${DateUtil.formatDate(
               date,
-              format: 'yyyy-MM-dd',
-            )},将于${DateUtil.formatDate(
+              format: 'MM月dd日',
+            )}至${DateUtil.formatDate(
               limitDate,
-              format: 'yyyy-MM-dd',
-            )}进行考核'
+              format: 'MM月dd日',
+            )},将于${DateUtil.formatDate(
+              checkDate,
+              format: 'MM月dd日',
+            )}考核。'
                 .text
                 .color(Colors.black45)
                 .size(12.sp)
-                .make(),
+                .make()
+                .pOnly(left: 16.w),
             2.wb,
             Image.asset(
               R.ASSETS_SHOP_HELPER_PNG,
@@ -105,6 +117,12 @@ class _ShopCheckViewState extends State<ShopCheckView> {
             ),
           ].row(),
         ),
+        '考核目标：店铺销售额${widget.target.toStringAsFixed(0)}元'
+            .text
+            .color(Colors.black45)
+            .size(12.sp)
+            .make()
+            .pSymmetric(h: 16.w),
         10.hb,
         Container(
           height: 68.w,
@@ -123,9 +141,9 @@ class _ShopCheckViewState extends State<ShopCheckView> {
               percentage: percent,
             ),
           ),
-        ),
+        ).centered(),
         5.hb,
-        title.text.size(12.sp).black.center.make(),
+        title.text.size(12.sp).black.center.make().centered(),
         15.hb,
       ],
     )).color(Colors.white).margin(EdgeInsets.only(bottom: 10)).make();