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

lib/pages/user_order/index.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_book/theme.dart';
 import 'package:flutter_book/utils/index.dart';
 import 'package:flutter_book/widgets/index.dart';
+import 'package:get/get.dart';
 import 'package:get/get_state_manager/src/rx_flutter/rx_ticket_provider_mixin.dart';
 import 'package:get/get_state_manager/src/simple/get_controllers.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';

lib/pages/user_order/widgets/list.dart

@@ -20,11 +20,19 @@ class BuildListPage extends StatefulWidget {
 
 class _BuildListPageState extends State<BuildListPage>
     with AutomaticKeepAliveClientMixin {
+  late UserOrderController myController;
+
+  @override
+  void initState() {
+    myController =  Get.put(UserOrderController(widget.tag));
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
     return GetBuilder<UserOrderController>(
       tag: widget.tag.toString(),
-      init: UserOrderController(widget.tag),
+      init: myController,
       builder: (controller) => CustomPullScrollView(
         controller: controller.refreshController,
         onRefresh: controller.onRefresh,

lib/pages/user_order_awaiting/controller.dart

@@ -35,8 +35,9 @@ class UserOrderAwaitingController extends GetxController {
   void cancelPay() async {
     final result = await MineAPI.cancelPay(ordersnum: orderNum);
     if (result) {
+      Get.find<UserOrderController>().onRefresh();
       Toast.show('取消成功');
-      update();
+      context.pop(true);
     }
   }
 
@@ -135,6 +136,7 @@ class UserOrderAwaitingController extends GetxController {
   void requestOrderStatus() async {
     final result = await ShopAPI.orderStatus(orderNumber: payOrderModel.ordersnum??'',receipt: '');
     if (result.paySuccess == 1){
+      Get.find<UserOrderController>().onRefresh();
       Toast.show('订单支付完成');
       if(context.mounted){
         context.pop(true);

lib/pages/user_order_awaiting/view.dart

@@ -252,7 +252,7 @@ class _UserOrderAwaitingState extends State<UserOrderAwaitingPage> {
                               onTap: () {
                                 myController.cancelPay();
                                 Navigator.of(context).pop();
-                                Navigator.pop(context);
+                                // Navigator.pop(context);
                               },
                               child: Container(
                                 width: 105.w,

lib/pages/user_order_coin_awaiting/controller.dart

@@ -97,8 +97,10 @@ class UserOrderCoinAwaitingController extends GetxController {
   void cancelPay() async {
     final result = await MineAPI.cancelPay(ordersnum: orderNum);
     if (result) {
+      Get.find<UserOrderController>().onRefresh();
       Toast.show('取消成功');
-      update();
+      context.pop(true);
+      // update();
     }
   }
 
@@ -229,6 +231,7 @@ class UserOrderCoinAwaitingController extends GetxController {
     final result = await ShopAPI.orderStatus(orderNumber: model.ordersnum??'',receipt:_resultItem != null?_resultItem!.transactionReceipt.toString():'');
     if (result.paySuccess == 1){
       Toast.show('订单支付完成');
+      Get.find<UserOrderController>().onRefresh();
       if(context.mounted){
         context.pop(true);
       }

lib/pages/user_order_coin_awaiting/view.dart

@@ -272,7 +272,7 @@ class _UserOrderCoinAwaitingState extends State<UserOrderCoinAwaitingPage> {
                                     onTap: () {
                                       myController.cancelPay();
                                       Navigator.of(context).pop();
-                                      Navigator.pop(context);
+
                                     },
                                     child:Container(
                                       width: 105.w,