Commit 7c85e881 authored by 朱翠翠's avatar 朱翠翠

Merge branch 'zcc/flutter' into 'test'

Zcc/flutter

See merge request !26
parents e4a4ead0 e8dca8aa
...@@ -33,7 +33,7 @@ class _PlansCompareFeedItemViewState ...@@ -33,7 +33,7 @@ class _PlansCompareFeedItemViewState
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
getItem(), getItem(),
Divider(height: 0.5, color: Color(0xFF979797)) Divider(height: 0.5, color: Color(0x99979797))
], ],
)); ));
} }
...@@ -138,13 +138,13 @@ class _PlansCompareFeedItemViewState ...@@ -138,13 +138,13 @@ class _PlansCompareFeedItemViewState
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () => onClickCheckBox(_icon), onTap: () => onClickCheckBox(_icon),
child: Container( child: Container(
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
_icon, _icon,
width: 17, width: 17,
height: 17, height: 17,
), fit: BoxFit.fill,
)), ))),
), ),
Expanded( Expanded(
child: Column( child: Column(
......
...@@ -56,9 +56,9 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage> ...@@ -56,9 +56,9 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
title: "方案对比", title: "方案对比",
centerTitle: true, centerTitle: true,
backClick: () { backClick: () {
if(RouterCenterImpl().findMainRouter().isWithNative()){ if (RouterCenterImpl().findMainRouter().isWithNative()) {
FlutterBoost.singleton.closeCurrent(); FlutterBoost.singleton.closeCurrent();
}else{ } else {
Navigator.of(context).pop(); Navigator.of(context).pop();
} }
}), }),
...@@ -107,7 +107,7 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage> ...@@ -107,7 +107,7 @@ class _PlansCompareFeedState extends BaseState<PlansCompareFeedPage>
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
Divider(height: 0.5, color: Color(0xFF979797)), Divider(height: 0.5, color: Color(0x99979797)),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
left: 15, right: 15, top: 7.5, bottom: 7.5), left: 15, right: 15, top: 7.5, bottom: 7.5),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment