1:修复订单列表点击查看详情与列表项不一致问题

lib/models/order.dart

@@ -164,6 +164,11 @@ class OrderListModel {
     }
     return map;
   }
+
+  @override
+  String toString() {
+    return 'OrderListModel{id: $id, ordersnum: $ordersnum, totalPrice: $totalPrice, finalTotalPrice: $finalTotalPrice, num_: $num_, status: $status, payType: $payType, types: $types, createTime: $createTime, cartList: $cartList}';
+  }
 }
 
 /// 书籍列表

lib/pages/login/view.dart

@@ -195,26 +195,26 @@ class _LoginPageState extends State<LoginPage> {
                                 child: Row(
                                   children: [
                                     SizedBox(
-                                      width: 10.w,
-                                      height: 10.w,
+                                      width: 14.w,
+                                      height: 14.w,
                                       // color: AppTheme.primary,
                                       child: Image.asset(
                                         controller.agree?'assets/images/check_box_select.png':'assets/images/uncheck.png',
                                       ),
                                     ),
                                     Gaps.hGaps5,
-                                    Text('我已阅读并同意',style: TextStyle(color: Colours.c9,fontSize:10.w,height: 1.4)),
+                                    Text('我已阅读并同意',style: TextStyle(color: Colours.c9,fontSize:14.w,height: 1.4)),
                                   ],
                                 ),
                               ),
                               GestureDetector(
-                                child: Text('《用户协议》',style: TextStyle(color: Colours.cBlue,fontSize:10.w,height: 1.4)),
+                                child: Text('《用户协议》',style: TextStyle(color: Colours.cBlue,fontSize:14.w,height: 1.4)),
                                 onTap: (){
                                   context.pushNamed(Routes.terms);
                                 },
                               ),
                               GestureDetector(
-                                child: Text('《隐私政策》',style: TextStyle(color: Colours.cBlue,fontSize:10.w,height: 1.4)),
+                                child: Text('《隐私政策》',style: TextStyle(color: Colours.cBlue,fontSize:14.w,height: 1.4)),
                                 onTap: (){
                                   context.pushNamed(Routes.terms);
                                 },

lib/pages/user_order/controller.dart

@@ -29,16 +29,9 @@ class UserOrderController extends GetxController
   int _page = 1;
   bool _noMore = false;
 
-
-
-  @override
-  void onInit() {
-    super.onInit();
-  }
-
   @override
   void onReady() {
-    onRefresh();
+    // onRefresh();
     super.onReady();
   }
 
@@ -68,6 +61,7 @@ class UserOrderController extends GetxController
   void onRefresh() async {
     try {
       await _getOrders(isRefresh:true);
+
       refreshController.finishRefresh(IndicatorResult.success);
       refreshController.resetFooter();
     } catch (error) {

lib/pages/user_order_awaiting/controller.dart

@@ -2,10 +2,10 @@ part of user_order_awaiting;
 
 /// 等待付款订单
 class UserOrderAwaitingController extends GetxController {
-  final String orderNum;
+  late String _orderNum;
   final BuildContext context;
 
-  UserOrderAwaitingController(this.orderNum,this.context); // 订单编号
+  UserOrderAwaitingController(this.context); // 订单编号
 
   late OrderInfoModel model;
   // 应付款、订单编号等
@@ -18,6 +18,12 @@ class UserOrderAwaitingController extends GetxController {
 
   late PayOrderModel payOrderModel;
 
+  String get orderNum => _orderNum; // 获取订单编号的方法
+
+  // 更新订单编号的方法
+  void updateOrderNum(String newOrderNum) {
+    _orderNum = newOrderNum;
+  }
 
   @override
   void onReady() {

lib/pages/user_order_coin_awaiting/controller.dart

@@ -2,10 +2,14 @@ part of user_order_coin_awaiting;
 
 /// 紫荆币等待付款订单
 class UserOrderCoinAwaitingController extends GetxController {
-  final String orderNum;
-
-  UserOrderCoinAwaitingController(this.orderNum); // 订单编号
+  late String _orderNum;
 
+  String get orderNum => _orderNum; // 获取订单编号的方法
+  UserOrderCoinAwaitingController();
+  // 更新订单编号的方法
+  void updateOrderNum(String newOrderNum) {
+    _orderNum = newOrderNum;
+  }
   late OrderInfoModel model;
   // 应付款、订单编号等
   List<OrderCompletedModel> orderAwaitings = [];
@@ -33,9 +37,6 @@ class UserOrderCoinAwaitingController extends GetxController {
     }
   }
 
-
-
-
   /// 获取订单信息
   Future<void> getOrderInfo() async {
     model = await MineAPI.getOrderInfo(orderNum: orderNum);
@@ -91,7 +92,6 @@ class UserOrderCoinAwaitingController extends GetxController {
 
   // 支付宝支付
   void requestAliPay(){
-
     print('================================================================${payOrderModel.encryptionOrder!}');
     tobias.pay(payOrderModel.encryptionOrder!).then((payResult){
       if (payResult['resultStatus'] == '9000') {

lib/pages/user_set/view.dart

@@ -259,11 +259,6 @@ class _UserSetPageState extends State<UserSetPage> {
             // 去除操作按钮区域的内边距
             actionsPadding: EdgeInsets.zero,
             actions: <Widget>[
-              Wrap(
-                children: [
-
-                ],
-              ),
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
@@ -312,12 +307,18 @@ class _UserSetPageState extends State<UserSetPage> {
                           if (!forcedUpgrade)
                             Padding(padding: EdgeInsets.only(right: 28.w),
                             child:  GestureDetector(
-                              child: const Text(
-                                '稍后再说',
-                                style: TextStyle(
-                                    color: Colours.c6,
-                                    fontSize: 12,
-                                    fontWeight: Fonts.medium),
+                              child:
+                              Container(
+                                width: 85.w,
+                                color: Colours.cFF,
+                                alignment: Alignment.center,
+                                child:  const Text(
+                                  '稍后再说',
+                                  style: TextStyle(
+                                      color: Colours.c6,
+                                      fontSize: 12,
+                                      fontWeight: Fonts.medium),
+                                ),
                               ),
                               onTap: () => Navigator.of(context).pop(),
                             ),),
@@ -329,12 +330,17 @@ class _UserSetPageState extends State<UserSetPage> {
                           ),
                           Padding(padding: EdgeInsets.only(left: 28.w),
                             child:   GestureDetector(
-                              child: const Text(
-                                '立即更新',
-                                style: TextStyle(
-                                    color: Colours.cAB1941,
-                                    fontSize: 12,
-                                    fontWeight: Fonts.medium),
+                              child: Container(
+                                width: 85.w,
+                                color: Colours.cFF,
+                                alignment: Alignment.center,
+                                child:  const Text(
+                                  '立即更新',
+                                  style: TextStyle(
+                                      color: Colours.cAB1941,
+                                      fontSize: 12,
+                                      fontWeight: Fonts.medium),
+                                ),
                               ),
                               onTap: () {
                                 _appUpdate();