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

lib/pages/user_order/widgets/completed.dart

@@ -164,13 +164,15 @@ class BuiltCompleted extends StatelessWidget {
                                   color: Colours.cC31F4C, width: 0.5.w)),
                           child: Center(
                             child: GestureDetector(
-                                onTap: () {
-                                  // print("保存昵称");
-                                  context.pushNamed(Routes.orderEvaluate,
+                                onTap: () async {
+                                  final result = await context.pushNamed(Routes.orderEvaluate,
                                       extra: OrderInfoModel(),
                                       queryParameters: {
                                         'orderNum': model.ordersnum
                                       });
+                                  if (result == true) {
+                                    controller.onRefresh();
+                                  }
                                 },
                                 child: Text(
                                   judgeComments() == 1 ? '去评价' : "继续评价",
@@ -304,12 +306,15 @@ class BuiltCompleted extends StatelessWidget {
                                 color: Colours.cC31F4C, width: 0.5.w)),
                         child: Center(
                           child: GestureDetector(
-                              onTap: () {
-                                context.pushNamed(Routes.orderEvaluate,
+                              onTap: () async {
+                              final result = await context.pushNamed(Routes.orderEvaluate,
                                     extra: OrderInfoModel(),
                                     queryParameters: {
                                       'orderNum': model.ordersnum
                                     });
+                                if (result == true) {
+                                  controller.onRefresh();
+                                }
                               },
                               child: Text(
                                 judgeComments() == 1 ? '去评价' : "继续评价",
@@ -331,10 +336,8 @@ class BuiltCompleted extends StatelessWidget {
 
   /// 判断图书是否已评价，全部评价返回0，全部未评价返回1，部分未评价返回2
   int judgeComments() {
-    Console.log('=============judgeComments 开始');
     // 无图书
     if (model.cartList == null || model.cartList!.isEmpty) {
-      Console.log('=============judgeComments null 1');
       return 1;
     } else {
       List<CartListModel>? cartList = model.cartList;
@@ -346,15 +349,12 @@ class BuiltCompleted extends StatelessWidget {
       }
       // 全部已评价
       if (i == 0) {
-        Console.log('=============judgeComments  0');
         return 0;
       }
       // 全部未评价
       if (model.cartList!.length == i) {
-        Console.log('=============judgeComments  1');
         return 1;
       } else {
-        Console.log('=============judgeComments  2');
         // 部分未评价
         return 2;
       }

lib/pages/user_order_evaluate/view.dart

@@ -79,13 +79,13 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
                 child: CustomGradientButton(
                   text: '提交评价',
                   isEnabled: controller.enable,
-                  onPressed: () {
+                  onPressed: () async {
                     controller.focusNodes[_index]!.unfocus();
-                    for(int i=0;i<orderEvaluates.length;i++){
-                      // orderEvaluates[i].comments=controllers[i].text.toString();
-                    }
                     print(jsonEncode(orderEvaluates));
-                    controller.UpOrderEvaluate(jsonEncode(orderEvaluates));
+                    Future<bool> result = controller.UpOrderEvaluate(jsonEncode(orderEvaluates));
+                    if(await result){
+                      context.pop(true);
+                    }
                   },
                 ),
               ),