Commit b8a9aaee authored by 朱翠翠's avatar 朱翠翠

Merge branch 'zcc/flutter' into 'test'

Zcc/flutter

See merge request !55
parents 4494ae77 e56e58b0
...@@ -469,7 +469,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> { ...@@ -469,7 +469,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
return Row(children: <Widget>[ return Row(children: <Widget>[
Expanded( Expanded(
flex: 1, flex: 1,
child: baseText(left.empty() ? "暂无" : left, 12, child: baseText(left.empty() ? "暂无" : left, isName ? 12 : 14,
isName ? Color(0xff666666) : Color(0xff3FB5AF), isName ? Color(0xff666666) : Color(0xff3FB5AF),
bold: isName ? false : true, bold: isName ? false : true,
maxLines: 100, maxLines: 100,
...@@ -481,7 +481,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> { ...@@ -481,7 +481,7 @@ class PlanCompareDetailPageState extends BaseState<PlanCompareDetailPage> {
), ),
Expanded( Expanded(
flex: 1, flex: 1,
child: baseText(right.empty() ? "暂无" : right, 12, child: baseText(right.empty() ? "暂无" : right, isName ? 12 : 14,
isName ? Color(0xff666666) : Color(0xffF25874), isName ? Color(0xff666666) : Color(0xffF25874),
bold: isName ? false : true, bold: isName ? false : true,
maxLines: 100, maxLines: 100,
......
...@@ -29,7 +29,7 @@ AppBar baseAppBar( ...@@ -29,7 +29,7 @@ AppBar baseAppBar(
Widget titleWidget = null}) { Widget titleWidget = null}) {
return _baseAppBarChangeTitle( return _baseAppBarChangeTitle(
title: title:
title == null ? Container() : baseText(title, 16, Color(0xff323232)), title == null ? Container() : baseText(title, 18, Color(0xff323232)),
action: action, action: action,
centerTitle: centerTitle, centerTitle: centerTitle,
backClick: backClick, backClick: backClick,
......
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