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

lib/pages/user_order/widgets/awaiting.dart

@@ -128,7 +128,8 @@ class BuiltAwaiting extends StatelessWidget {
                             child: Align(
                               alignment: Alignment.center,
                               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(
                                     color: Colours.cC31F4C,
                                     fontSize: 10.w,
@@ -273,7 +274,8 @@ class BuiltAwaiting extends StatelessWidget {
                     child: Align(
                       alignment: Alignment.center,
                       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(
                             color: Colours.cC31F4C,
                             fontSize: 10.w,

lib/pages/user_order/widgets/coin.dart

@@ -69,6 +69,7 @@ class BuiltCoin extends StatelessWidget {
             ),
             Expanded(
                 child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
                     Column(
@@ -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(
                       margin: EdgeInsets.only(right: 15.w),
                       child:  Column(