From fc59965e19526bf3fa446747e397e13622b7b3ba Mon Sep 17 00:00:00 2001
From: "23028876916@qq.com" <fnuo123com>
Date: Wed, 13 Jan 2021 17:36:57 +0800
Subject: [PATCH] =?UTF-8?q?0113=20=20=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E6=94=B6=E7=9B=8A=E6=95=B0=E6=8D=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mine/mine_data/mine_data_widget.dart      | 10 ++--
 lib/widgets/mine/mine_nav/mine_nav.dart       | 47 ++++++++++++-------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/lib/widgets/mine/mine_data/mine_data_widget.dart b/lib/widgets/mine/mine_data/mine_data_widget.dart
index 416099b..a5b694f 100644
--- a/lib/widgets/mine/mine_data/mine_data_widget.dart
+++ b/lib/widgets/mine/mine_data/mine_data_widget.dart
@@ -118,7 +118,7 @@ class _MineDataWidgetState extends State<MineDataWidget> {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: <Widget>[
                           Text(
-                            _isiOSReview ? '' : '累计收益',
+                            _isiOSReview ? '' : widget?.profile?.gridViews[0]?.name ?? "累计收益",
                             style: TextStyle(
                               fontSize: 11,
                               fontWeight: FontWeight.w600,
@@ -126,7 +126,7 @@ class _MineDataWidgetState extends State<MineDataWidget> {
                             ),
                           ),
                           Text(
-                            '${widget.profile?.total ?? '0.00'}',
+                            widget?.profile?.gridViews[0]?.value ?? "¥0",
                             style: TextStyle(
                               fontSize: 18,
                               fontWeight: FontWeight.w800,
@@ -188,7 +188,7 @@ class _MineDataWidgetState extends State<MineDataWidget> {
       }
       List<Widget> rows = List();
       List<Widget> columns = List();
-      int i = 0;
+      int i = 1;
       for (; i < row; i++) {
         rows.add(
           _createrCenterItem(datas[i].name, datas[i].value, i),
@@ -250,7 +250,7 @@ class _MineDataWidgetState extends State<MineDataWidget> {
     return Expanded(
       child: GestureDetector(
         onTap: () {
-          RouterUtil.route(_style.listStyle[i + 1], _style.listStyle[i + 1].toJson(), context);
+          RouterUtil.route(_style.listStyle[i], _style.listStyle[i].toJson(), context);
         },
         behavior: HitTestBehavior.opaque,
         child: Container(
@@ -286,7 +286,7 @@ class _MineDataWidgetState extends State<MineDataWidget> {
     return Expanded(
       child: GestureDetector(
         onTap: () {
-          RouterUtil.route(_style.listStyle[i + 1], _style.listStyle[i + 1].toJson(), context);
+          RouterUtil.route(_style.listStyle[i], _style.listStyle[i].toJson(), context);
         },
         behavior: HitTestBehavior.opaque,
         child: Container(
diff --git a/lib/widgets/mine/mine_nav/mine_nav.dart b/lib/widgets/mine/mine_nav/mine_nav.dart
index 7f02c82..e77f820 100644
--- a/lib/widgets/mine/mine_nav/mine_nav.dart
+++ b/lib/widgets/mine/mine_nav/mine_nav.dart
@@ -12,6 +12,8 @@ class MineNavDelegate extends SliverPersistentHeaderDelegate {
   Color _color;
 
   List<Widget> _icons = List();
+  double marginTop;
+  double marginLeftRight;
 
   MineNavDelegate(this.data) : super() {
     _height = MediaQueryData.fromWindow(window).padding.top + 44;
@@ -29,13 +31,20 @@ class MineNavDelegate extends SliverPersistentHeaderDelegate {
         return MineNavIcon(icon['icon'], model);
       }).toList();
     }
+    marginTop = 0;
+    if (json.containsKey("is_top_margin") && json.containsKey("top_margin")) {
+      marginTop = json['is_top_margin'] == "1" ? double.parse(json['top_margin']) : 0;
+    }
+    marginLeftRight = 0;
+    if (json.containsKey("is_left_right_margin") && json.containsKey("left_right_margin")) {
+      marginLeftRight = json['is_left_right_margin'] == "1" ? double.parse(json['left_right_margin']) : 0;
+    }
   }
 
   @override
-  Widget build(
-      BuildContext context, double shrinkOffset, bool overlapsContent) {
+  Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) {
     double percent = shrinkOffset / _height;
-    return MineNav(_color.withOpacity(percent), _icons);
+    return MineNav(_color.withOpacity(percent), _icons, marginTop, marginLeftRight);
   }
 
   @override
@@ -45,19 +54,21 @@ class MineNavDelegate extends SliverPersistentHeaderDelegate {
   double get minExtent => _height;
 
   @override
-  bool shouldRebuild(SliverPersistentHeaderDelegate oldDelegate) =>
-      false; // 如果内容需要更新，设置为true
+  bool shouldRebuild(SliverPersistentHeaderDelegate oldDelegate) => false; // 如果内容需要更新，设置为true
 }
 
 class MineNav extends StatelessWidget {
   final Color color;
   final List<Widget> widgets;
+  double marginLeftRight;
+  double marginTop;
 
-  MineNav(this.color, this.widgets);
+  MineNav(this.color, this.widgets, this.marginTop, this.marginLeftRight);
 
   @override
   Widget build(BuildContext context) {
     return Container(
+        margin: EdgeInsets.only(top: marginTop, left: marginLeftRight, right: marginLeftRight),
         padding: EdgeInsets.only(left: 12, right: 12),
         color: color,
         child: Column(
@@ -78,23 +89,23 @@ class MineNav extends StatelessWidget {
 }
 
 class MineNavIcon extends StatelessWidget {
-final String imgUrl;
-final SkipModel skipModel;
+  final String imgUrl;
+  final SkipModel skipModel;
 
   const MineNavIcon(this.imgUrl, this.skipModel, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(child: Container(
-      width: 24,
-      height: 24,
-      margin: EdgeInsets.only(left: 6),
-      child: CachedNetworkImage(
-        imageUrl: imgUrl,
-      ),
-
-    ),
-        onTap:() {
+    return GestureDetector(
+        child: Container(
+          width: 24,
+          height: 24,
+          margin: EdgeInsets.only(left: 6),
+          child: CachedNetworkImage(
+            imageUrl: imgUrl,
+          ),
+        ),
+        onTap: () {
           RouterUtil.route(skipModel, skipModel.toJson(), context);
         });
   }