|
|
@@ -384,16 +384,15 @@ class OrderCardContainer extends StatefulWidget {
|
|
|
}
|
|
|
|
|
|
class _OrderCardContainerState extends State < OrderCardContainer > with SingleTickerProviderStateMixin {
|
|
|
- Animation < int > animation;
|
|
|
+ Animation < dynamic > animation;
|
|
|
AnimationController controller;
|
|
|
String str = "联系方式";
|
|
|
bool animationStatus = true;
|
|
|
@override
|
|
|
initState() {
|
|
|
super.initState();
|
|
|
- controller = new AnimationController(
|
|
|
- duration: const Duration(milliseconds: 200), vsync: this);
|
|
|
- animation = new Tween(begin: 0, end: 230).animate(controller);
|
|
|
+ controller = new AnimationController(duration: const Duration(milliseconds: 200), vsync: this);
|
|
|
+ animation = Tween(begin: 0, end: 230).animate(controller);
|
|
|
animation.addStatusListener((status) {
|
|
|
if (status == AnimationStatus.completed) {
|
|
|
//动画执行结束时反向执行动画
|
|
|
@@ -444,7 +443,7 @@ class _OrderCardContainerState extends State < OrderCardContainer > with SingleT
|
|
|
child: Row(
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
children: < Widget > [
|
|
|
- GestureDetector(
|
|
|
+ InkWell(
|
|
|
child: Container(
|
|
|
width: ScreenUtil.getInstance().setWidth(100),
|
|
|
height: ScreenUtil.getInstance().setHeight(48),
|
|
|
@@ -463,7 +462,7 @@ class _OrderCardContainerState extends State < OrderCardContainer > with SingleT
|
|
|
}
|
|
|
},
|
|
|
),
|
|
|
- GestureDetector(
|
|
|
+ InkWell(
|
|
|
child: Container(
|
|
|
width: ScreenUtil.getInstance().setWidth(94),
|
|
|
height: ScreenUtil.getInstance().setWidth(48),
|
|
|
@@ -509,12 +508,12 @@ class AnimatedOpen extends AnimatedWidget {
|
|
|
final OrderList openInfo;
|
|
|
AnimatedOpen({
|
|
|
Key key,
|
|
|
- Animation < int > animation,
|
|
|
+ Animation < dynamic > animation,
|
|
|
@required this.openInfo
|
|
|
}): super(key: key, listenable: animation);
|
|
|
|
|
|
Widget build(BuildContext context) {
|
|
|
- final Animation < int > animation = listenable;
|
|
|
+ final Animation < dynamic > animation = listenable;
|
|
|
return Container(
|
|
|
height: ScreenUtil.getInstance().setHeight(animation.value),
|
|
|
child: orderDetailInfo(openInfo),
|
|
|
@@ -522,13 +521,14 @@ class AnimatedOpen extends AnimatedWidget {
|
|
|
}
|
|
|
}
|
|
|
Widget orderNoRow(String orderNo, int createTime) { //订单号及时间
|
|
|
+ String date = fromatDate(createTime);
|
|
|
return Container(
|
|
|
margin: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(30)),
|
|
|
child: Row(
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
|
children: < Widget > [
|
|
|
Text("订单号:${orderNo}", style: TextStyle(color: Color.fromRGBO(153, 153, 153, 1), fontSize: ScreenUtil.getInstance().setSp(24)), ),
|
|
|
- Text('${createTime}', style: TextStyle(color: Color.fromRGBO(153, 153, 153, 1), fontSize: ScreenUtil.getInstance().setSp(24)), ),
|
|
|
+ Text('${date}', style: TextStyle(color: Color.fromRGBO(153, 153, 153, 1), fontSize: ScreenUtil.getInstance().setSp(24)), ),
|
|
|
],
|
|
|
),
|
|
|
);
|