|
|
@@ -203,10 +203,10 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
|
|
|
child: Container(
|
|
|
width: ScreenUtil.getInstance().setWidth(350),
|
|
|
height: ScreenUtil.getInstance().setHeight(500),
|
|
|
- margin: EdgeInsets.fromLTRB(0, 1, 1, 0),
|
|
|
- padding: EdgeInsets.fromLTRB(1, 0, 1, 0),
|
|
|
+ margin: EdgeInsets.fromLTRB(0, 2, 8, 0),
|
|
|
+ padding: EdgeInsets.fromLTRB(15, 0, 0, 0),
|
|
|
decoration: BoxDecoration(
|
|
|
- color: Colors.white,
|
|
|
+ color: Color.fromRGBO(76,76,76,1),
|
|
|
borderRadius: BorderRadius.all(Radius.circular(4.0)),
|
|
|
boxShadow: [ //阴影
|
|
|
BoxShadow(
|
|
|
@@ -252,13 +252,23 @@ class _OrderTakingPageState extends State < OrderTakingPage > with AutomaticKeep
|
|
|
child: Row(
|
|
|
children: < Widget > [
|
|
|
Padding(
|
|
|
- padding: EdgeInsets.only(right: 5),
|
|
|
- child: checked ? Icon(Icons.check, color: Colors.black, ) : Icon(Icons.check, color: Color.fromRGBO(255, 255, 255, 0.0, )),
|
|
|
+ padding: EdgeInsets.fromLTRB(0, 0, 15, 0),
|
|
|
+ child: checked ? Image.asset('lib/images/icon_checked.png',
|
|
|
+ width: ScreenUtil.getInstance().setWidth(30),
|
|
|
+ height:ScreenUtil.getInstance().setWidth(30),
|
|
|
+ ) : Icon(Icons.check, color: Color.fromRGBO(255, 255, 255, 0.0, )),
|
|
|
),
|
|
|
Expanded(
|
|
|
flex: 1,
|
|
|
- child: Center(
|
|
|
- child: Text(lineObj.name, style: TextStyle(color: Colors.black))
|
|
|
+ child: Container(
|
|
|
+ padding: EdgeInsets.only(right: 15),
|
|
|
+ child: Row(
|
|
|
+ mainAxisAlignment: MainAxisAlignment.end,
|
|
|
+ children: <Widget>[
|
|
|
+ Text(lineObj.name,overflow: TextOverflow.ellipsis, style: TextStyle(color: Colors.white,fontSize:ScreenUtil.getInstance().setSp(30)))
|
|
|
+ ],
|
|
|
+ ),
|
|
|
+
|
|
|
)
|
|
|
)
|
|
|
],
|
|
|
@@ -424,9 +434,15 @@ class _OrderCardContainerState extends State < OrderCardContainer > with SingleT
|
|
|
|
|
|
@override
|
|
|
Widget build(BuildContext context) {
|
|
|
- return Card(
|
|
|
- color: Colors.white,
|
|
|
- elevation: 3.0,
|
|
|
+ return Container(
|
|
|
+ margin: EdgeInsets.all(4),
|
|
|
+ decoration: BoxDecoration(
|
|
|
+ color: Colors.white,
|
|
|
+ borderRadius: BorderRadius.all(Radius.circular(8)),
|
|
|
+ boxShadow: [
|
|
|
+ BoxShadow(color: Color.fromRGBO(217, 226, 233, 1),offset: Offset(0, 4),blurRadius: 3.0),
|
|
|
+ ]
|
|
|
+ ),
|
|
|
child: Container(
|
|
|
padding: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(30), 0),
|
|
|
child: Column(
|