Skip to content

G
gm_flutter
Commit b9fd2799 authored by 朱璇's avatar 朱璇
Browse files
Options

conflict fix

parents 720dac2d 9794779b
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 20 deletions
lib/ClueModel/page/levelOne/LevelOneItem.dart
View file @ b9fd2799
...@@ -104,7 +104,7 @@ class LevelOneItem extends StatelessWidget { ...@@ -104,7 +104,7 @@ class LevelOneItem extends StatelessWidget {
top: 18, top: 18,
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
baseText(cards.doctor.name, 15, Color(0xff333333), baseText(cards.doctor.name, 15, Color(0xff333333),
bold: true), bold: true),
......
lib/ClueModel/page/plan/PlanItem.dart
View file @ b9fd2799
...@@ -78,38 +78,47 @@ class PlanItem extends StatelessWidget { ...@@ -78,38 +78,47 @@ class PlanItem extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
baseText(plans.name, 14, Color(0xff282828), bold: true),
Container( Container(
margin: EdgeInsets.only(left: 4), constraints: BoxConstraints(maxWidth: 110),
child: Container( child: baseText(plans.name, 14, Color(0xff282828),
width: 28, bold: true),
height: 15, ),
decoration: BoxDecoration( plans.operation_type.empty()
borderRadius: BorderRadius.circular(2), ? Container(
color: Color(0xffF0F9F7)), width: 0,
alignment: Alignment.center, height: 0,
child: baseText( )
"${plans.operation_type}", 11, Color(0xff3FB5AF), : Container(
bold: true), constraints: BoxConstraints(maxWidth: 60),
), margin: EdgeInsets.only(left: 4),
) child: Container(
padding: EdgeInsets.only(
top: 2, bottom: 2, left: 3, right: 3),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(2),
color: Color(0xffF0F9F7)),
alignment: Alignment.center,
child: baseText("${plans.operation_type}", 11,
Color(0xff3FB5AF),
bold: true),
),
)
], ],
), ),
), ),
Positioned( Positioned(
top: 14, top: 15,
right: 10, right: 10,
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
// crossAxisAlignment: CrossAxisAlignment.end, // crossAxisAlignment: CrossAxisAlignment.end,
verticalDirection: VerticalDirection.down, verticalDirection: VerticalDirection.down,
children: <Widget>[ children: <Widget>[
baseText("好评率", 11, Color(0xff282828)), baseText("好评率", 11, Color(0xff282828)),
Container( Container(
width: 4, width: 4,
), ),
baseText("${rate}", 14, Color(0xffFF5963)), baseText("${rate}", 14, Color(0xffFF5963), bold: true),
baseText("%", 10, Color(0xffFF5963)), baseText("%", 10, Color(0xffFF5963)),
], ],
), ),
...@@ -117,8 +126,8 @@ class PlanItem extends StatelessWidget { ...@@ -117,8 +126,8 @@ class PlanItem extends StatelessWidget {
Positioned( Positioned(
bottom: 14, bottom: 14,
right: 10, right: 10,
child: baseText("销量${plans.salesCount}", child:
11, Color(0xff282828)), baseText("销量${plans.salesCount}", 11, Color(0xff282828)),
), ),
Positioned( Positioned(
left: 91, left: 91,
......
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