Merge branch 'zcc/flutter' into 'test'

UI走查

See merge request !32

lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedItemView.dart

@@ -34,7 +34,7 @@ class _PlansCompareFeedItemViewState
         child: Column(
           children: <Widget>[
             getItem(),
-            Divider(height: 0.5, color: Color(0x99979797))
+            Divider(height: 0.5, color: Color(0xFFE5E5E5))
           ],
         ));
   }
@@ -50,7 +50,7 @@ class _PlansCompareFeedItemViewState
   getFirstLevelItem() {
     return Container(
       width: double.maxFinite,
-      height: 90,
+      height: 80,
       alignment: Alignment.centerLeft,
       padding: EdgeInsets.only(top: 15, bottom: 15),
       child: Row(
@@ -64,7 +64,7 @@ class _PlansCompareFeedItemViewState
             ),
           ),
           Container(
-            margin: EdgeInsets.only(left: 15, right: 15),
+            margin: EdgeInsets.only(left: 15, right: 12),
             child: ClipRRect(
               borderRadius: BorderRadius.circular(4.0),
               child: CachedNetworkImage(
@@ -101,7 +101,7 @@ class _PlansCompareFeedItemViewState
                         TextSpan(
                             text: "%",
                             style: TextStyle(
-                                fontSize: 11,
+                                fontSize: 10,
                                 color: Color(0xFFFF5963),
                                 fontWeight: FontWeight.w500))
                       ])),
@@ -113,8 +113,8 @@ class _PlansCompareFeedItemViewState
                   children: <Widget>[
                     baseText('￥${widget.plan.minPrice}-${widget.plan.maxPrice}',
                         13, Color(0xFFFF5963)),
-                    baseText(
-                        "销量${NumPlanUtil.getSale(widget.plan.salesCount)}", 11, Color(0xFF282828))
+                    baseText("销量${NumPlanUtil.getSale(widget.plan.salesCount)}",
+                        11, Color(0xFF666666))
                   ],
                 )
               ],
@@ -162,7 +162,7 @@ class _PlansCompareFeedItemViewState
                     baseText('￥${widget.plan.minPrice}-${widget.plan.maxPrice}',
                         13, Color(0xFFFF5963)),
                     baseText("指导价：￥${widget.plan.guidePrice}", 11,
-                        Color(0xFF282828)),
+                        Color(0xFF666666)),
                   ],
                 ),
               ],
@@ -178,7 +178,7 @@ class _PlansCompareFeedItemViewState
       _icon = _unchecked;
     } else {
       if (widget._setCompare.length == 2) {
-        NativeToast.showNativeToast("不许再选了两个够了！");
+        NativeToast.showNativeToast("请选择最多2个项目进行对比");
         return;
       }
       _icon = _checked;

lib/ClueModel/page/PlansCompareFeed/PlansCompareFeedPage.dart

@@ -107,7 +107,7 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: <Widget>[
-                Divider(height: 0.5, color: Color(0x99979797)),
+                Divider(height: 0.5, color: Color(0xFFE5E5E5)),
                 Container(
                   margin: EdgeInsets.only(
                       left: 15, right: 15, top: 7.5, bottom: 7.5),

lib/ClueModel/page/ProjectDetails/ProjectDetailsItemView.dart

@@ -30,7 +30,7 @@ class ProjectDetailsItemView extends StatelessWidget {
             padding: EdgeInsets.only(left: 15.0),
             margin: EdgeInsets.only(bottom: 16.0),
             alignment: Alignment.centerLeft,
-            height: 55,
+            height: 40,
             decoration: BoxDecoration(
                 image: DecorationImage(
                     image: AssetImage("assets/bg_project_detail_item.png"),
@@ -47,29 +47,25 @@ class ProjectDetailsItemView extends StatelessWidget {
   }
 
   getAttrItem(Attrs attrs) {
-    return Container(
-      width: double.maxFinite,
-      margin: EdgeInsets.only(bottom: 25, left: 15, right: 15),
-      child: Row(
-        children: <Widget>[
-          Container(
-              margin: EdgeInsets.only(right: 25.0),
-              alignment: Alignment.centerLeft,
-              width: 78,
-              child: baseText(attrs.attrName, 13, Color(0xFF999999),
-                  textAlign: TextAlign.left,
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: <Widget>[
+        Container(
+            margin: EdgeInsets.only(right: 25.0, left: 15, bottom: 25),
+            width: 78,
+            child: baseText(attrs.attrName, 13, Color(0xFF999999),
+                textAlign: TextAlign.start,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis)),
+        Expanded(
+          child: Container(
+              margin: EdgeInsets.only(right: 15, bottom: 25),
+              child: baseText(attrs.attrValue, 14, Color(0xFF282828),
+                  textAlign: TextAlign.start,
                   maxLines: 2,
                   overflow: TextOverflow.ellipsis)),
-          Expanded(
-            child: Container(
-                alignment: Alignment.centerLeft,
-                child: baseText(attrs.attrValue, 14, Color(0xFF282828),
-                    textAlign: TextAlign.left,
-                    maxLines: 2,
-                    overflow: TextOverflow.ellipsis)),
-          ),
-        ],
-      ),
+        ),
+      ],
     );
   }
 }