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

lib/pages/user_order/widgets/awaiting.dart

@@ -157,7 +157,7 @@ class BuiltAwaiting extends StatelessWidget {
                           text: TextSpan(
                             children: [
                               TextSpan(
-                                text: model.cartList![0].introduction ?? '',
+                                text: model.cartList![0].name ?? '',
                                 style: TextStyle(
                                   color: Colours.c3,
                                   fontWeight: Fonts.medium,

lib/pages/user_order/widgets/canceled.dart

@@ -118,7 +118,7 @@ class BuiltCanceled extends StatelessWidget {
                       text: TextSpan(
                         children: [
                           TextSpan(
-                            text: model.cartList![0].introduction ?? '',
+                            text: model.cartList![0].name ?? '',
                             style: TextStyle(
                               color: Colours.c3,
                               fontWeight: Fonts.medium,

lib/pages/user_order/widgets/completed.dart

@@ -111,7 +111,7 @@ class BuiltCompleted extends StatelessWidget {
                       text: TextSpan(
                         children: [
                           TextSpan(
-                            text: model.cartList![0].introduction ?? '',
+                            text: model.cartList![0].name ?? '',
                             style: TextStyle(
                               color: Colours.c3,
                               fontWeight: Fonts.medium,

lib/pages/user_order/widgets/refunded.dart

@@ -106,7 +106,7 @@ class BuiltRefunded extends StatelessWidget {
                         text: TextSpan(
                       children: [
                         TextSpan(
-                          text: model.cartList![0].introduction ?? '',
+                          text: model.cartList![0].name ?? '',
                           style: TextStyle(
                             color: Colours.c3,
                             fontWeight: Fonts.medium,

lib/pages/user_order/widgets/search_controller.dart

@@ -30,7 +30,6 @@ class UserSearchController extends GetxController
 
   /// 获取订单列表
   Future<void> _getOrders({bool isRefresh = false, String keys ='',}) async {
-    // 网路请求
     final result = await MineAPI.orderList(
         page: _page, limit: _limit, status: 0, keys: keys);
     orderList.clear();

lib/pages/user_order_awaiting/view.dart

@@ -90,7 +90,7 @@ class _UserOrderAwaitingState extends State<UserOrderAwaitingPage> {
                                             CrossAxisAlignment.end, // 下面的Text靠左
                                         children: [
                                           Text(
-                                            controller.model.bookList?[0].introduction??'',
+                                            controller.model.bookList?[0].name??'',
                                             style: TextStyle(
                                               color: Colours.c3,
                                               fontWeight: Fonts.bold,

lib/pages/user_order_completed/view.dart

@@ -82,7 +82,7 @@ class _UserOrderCompletedState extends State<UserOrderCompletedPage> {
                                       height: 47.5.w,
                                       child: Text(
                                         controller.model.bookList==null?'':
-                                        controller.model.bookList![0].introduction??'',
+                                        controller.model.bookList![0].name??'',
                                         style: TextStyle(
                                           color: Colours.c3,
                                           fontWeight: Fonts.bold,

lib/pages/user_order_evaluate/view.dart

@@ -213,7 +213,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> {
                   Gaps.hGaps10,
                   Expanded(
                     child: Text(
-                      bookListModel.introduction.toString(),
+                      bookListModel.name.toString(),
                       style: TextStyle(
                           fontSize: 13.w,
                           height: 1.5,

lib/pages/user_order_refunded/view.dart

@@ -75,7 +75,7 @@ class _UserOrderRefundedState extends State<UserOrderRefundedPage> {
                                       Container(
                                         height: 62.5.w,
                                         child:  Text(
-                                          controller.model?.bookList?[0].introduction??'',
+                                          controller.model?.bookList?[0].name??'',
                                           style: TextStyle(
                                             color: Colours.c3,
                                             fontWeight: Fonts.bold,