Skip to content

B
book-app
提交 c567db1a authored 作者: yueweilu's avatar yueweilu
浏览文件
操作

Merge remote-tracking branch 'origin/test' into test

上级 ff01c6ce df070808
显示空白字符变更
内嵌 并排
正在显示 包含 65 行增加 和 2 行删除
lib/pages/user_order/widgets/awaiting.dart
浏览文件 @ c567db1a
...@@ -128,7 +128,8 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -128,7 +128,8 @@ class BuiltAwaiting extends StatelessWidget {
child: Align( child: Align(
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
'${31 - (DateTime.now().difference(DateTime.parse(model.createTime.toString()))).inMinutes}分钟', '${(30 - (DateTime.now().difference(DateTime.parse(model.createTime.toString()))).inMinutes)==0?
1:30 - (DateTime.now().difference(DateTime.parse(model.createTime.toString()))).inMinutes}分钟',
style: TextStyle( style: TextStyle(
color: Colours.cC31F4C, color: Colours.cC31F4C,
fontSize: 10.w, fontSize: 10.w,
...@@ -273,7 +274,8 @@ class BuiltAwaiting extends StatelessWidget { ...@@ -273,7 +274,8 @@ class BuiltAwaiting extends StatelessWidget {
child: Align( child: Align(
alignment: Alignment.center, alignment: Alignment.center,
child: Text( child: Text(
'29分钟', '${(30 - (DateTime.now().difference(DateTime.parse(model.createTime.toString()))).inMinutes)==0?
1:30 - (DateTime.now().difference(DateTime.parse(model.createTime.toString()))).inMinutes}分钟',
style: TextStyle( style: TextStyle(
color: Colours.cC31F4C, color: Colours.cC31F4C,
fontSize: 10.w, fontSize: 10.w,
......
lib/pages/user_order/widgets/coin.dart
浏览文件 @ c567db1a
...@@ -69,6 +69,7 @@ class BuiltCoin extends StatelessWidget { ...@@ -69,6 +69,7 @@ class BuiltCoin extends StatelessWidget {
), ),
Expanded( Expanded(
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Column( Column(
...@@ -93,6 +94,66 @@ class BuiltCoin extends StatelessWidget { ...@@ -93,6 +94,66 @@ class BuiltCoin extends StatelessWidget {
) )
], ],
), ),
model.status==1?
Align(
alignment: Alignment.topRight,
child: Container(
margin: EdgeInsets.only( right: 4.w,top: 8.w),
width: 110,
height: 20,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
// 左半部分的文字
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(180.w),
bottomLeft: Radius.circular(180.w)),
color: Colours.cC31F4C,
),
height: double.infinity,
width: 55,
child: Align(
alignment: Alignment.center,
child: Text(
'等待付款',
style: TextStyle(
color: Colors.white,
fontSize: 10.w,
fontWeight: Fonts.medium,
),
),
),
),
// 右半部分的文字
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
topRight: Radius.circular(180.w),
bottomRight: Radius.circular(180.w)),
color: Colours.cC31F4C2,
),
height: double.infinity,
width: 55,
child: Align(
alignment: Alignment.center,
child: Text(
'${(30 - (DateTime.now().difference(DateTime.parse(model.createTime.toString()))).inMinutes)==0?
1:30 - (DateTime.now().difference(DateTime.parse(model.createTime.toString()))).inMinutes}分钟',
style: TextStyle(
color: Colours.cC31F4C,
fontSize: 10.w,
fontWeight: Fonts.medium),
),
),
),
],
),
),
) :
const SizedBox(),
Container( Container(
margin: EdgeInsets.only(right: 15.w), margin: EdgeInsets.only(right: 15.w),
child: Column( child: Column(
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论