Merge branch 'zcc/flutter' into 'test'

Zcc/flutter

See merge request !50

lib/ClueModel/page/PlanCompareDetail/PlanCompareDetailPage.dart

@@ -4,7 +4,7 @@
  * @Last Modified by: zx
  * @Last Modified time: 2020-07-03 13:47:57
  */
-import 'dart:ffi';
+import 'dart:convert';
 import 'dart:math';
 
 import 'package:flutter/cupertino.dart';
@@ -17,10 +17,7 @@ import 'package:gm_flutter/ClueModel/view/FiveStarView.dart';
 import 'package:gm_flutter/commonModel/base/BaseComponent.dart';
 import 'package:gm_flutter/commonModel/base/BaseState.dart';
 import 'package:gm_flutter/commonModel/bean/Pair.dart';
-import 'package:gm_flutter/commonModel/net/DioUtil.dart';
 import 'package:gm_flutter/commonModel/util/DartUtil.dart';
-import 'dart:convert';
-
 import 'package:gm_flutter/main.mark.dart';
 
 class PlanCompareDetailPage extends StatefulWidget {
@@ -149,16 +146,16 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
         decoration: BoxDecoration(
           boxShadow: [
             BoxShadow(
-                color: Colors.black12,
+                color: Color(0x08000000),
                 offset: Offset(0.0, 2.0),
-                blurRadius: 0.5,
-                spreadRadius: 0.5)
+                blurRadius: 12,
+                spreadRadius: 0)
           ],
           color: Colors.white,
         ),
         // key: keyTop,
         width: screenWidth,
-        height: 98,
+        height: 93,
         alignment: Alignment.topLeft,
         child: Container(
           margin: EdgeInsets.only(left: 15, right: 15),
@@ -183,20 +180,17 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
         return Container(
             child: Stack(children: <Widget>[
           Positioned(
-              top: 8,
+              top: 3,
               left: index == 0 ? 0 : 5.5,
               child: Container(
                 height: 75,
                 width: (screenWidth - 30 - 11) / 2,
-                child: ClipRRect(
-                  borderRadius: BorderRadius.circular(7),
-                  child: Image.asset('assets/plan_compare_detail_info_bg.png',
-                      fit: BoxFit.cover),
-                ),
+                child: Image.asset('assets/plan_compare_detail_info_bg.png',
+                    fit: BoxFit.fill),
               )),
           Positioned(
-            left: 12,
-            top: 24,
+            left: index == 0 ? 12 : 17.5,
+            top: 16,
             child: Container(
               width: (screenWidth - 30 - 11) / 2,
               child: baseText(data.data[index].planName, 15, Color(0xff333333),
@@ -204,8 +198,8 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
             ),
           ),
           Positioned(
-            left: 12,
-            top: 56,
+            left: index == 0 ? 12 : 17.5,
+            top: 45,
             child: Row(
               mainAxisSize: MainAxisSize.min,
               crossAxisAlignment: CrossAxisAlignment.baseline,
@@ -250,7 +244,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
             ),
             Positioned(
               top: 0,
-              child: baseText(title, 21, Color(0xff282828), bold: true),
+              child: baseText(title, 20, Color(0xff282828), bold: true),
             )
           ],
         ),
@@ -291,12 +285,12 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
                   bold: true)),
           Positioned(
             right: 20,
-            top: 24,
+            top: 29,
             child: baseText('好评率', 12, Color(0xff666666), bold: false),
           ),
           Positioned(
             right: 20,
-            top: 46,
+            top: 56,
             child: FiveStarView(
               plan.planStart,
               5,
@@ -360,12 +354,12 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
                   bold: true)),
           Positioned(
             left: 20,
-            top: 24,
+            top: 29,
             child: baseText('好评率', 12, Color(0xff666666), bold: false),
           ),
           Positioned(
               left: 20,
-              top: 46,
+              top: 56,
               child: Container(
                 height: 13,
                 width: 81,
@@ -475,18 +469,18 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
     return Row(children: <Widget>[
       Expanded(
         flex: 1,
-        child: baseText(left.empty() ? "暂无" : left, 14,
+        child: baseText(left.empty() ? "暂无" : left, 12,
             isName ? Color(0xff666666) : Color(0xff3FB5AF),
-            bold: true, maxLines: 100, isWarp: true, textAlign: TextAlign.end),
+            bold: isName ? false : true, maxLines: 100, isWarp: true, textAlign: TextAlign.end),
       ),
       Container(
         width: 40,
       ),
       Expanded(
           flex: 1,
-          child: baseText(right.empty() ? "暂无" : right, 14,
+          child: baseText(right.empty() ? "暂无" : right, 12,
               isName ? Color(0xff666666) : Color(0xffF25874),
-              bold: true,
+              bold:  isName ? false : true,
               maxLines: 100,
               isWarp: true,
               textAlign: TextAlign.start))