ios，

ios/Runner.xcodeproj/project.pbxproj

@@ -617,7 +617,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -819,7 +819,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -912,7 +912,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

lib/login/new_login_page.dart

@@ -416,7 +416,7 @@ class _NewLoginPage extends State<NewLoginPage> {
                             Container(
                               height: 30.h,
                               width: MediaQuery.of(context).size.width - 100.w,
-                              margin: EdgeInsets.only(bottom:5.h),
+                              margin: EdgeInsets.only(bottom:10.h),
                               child: TextField(
                                 style: TextStyle(
                                   height: 1.h,

lib/message/system_details.dart

@@ -243,7 +243,7 @@ class _SystemDetails extends State<SystemDetails> {
                         ? "assets/image/icon_system_message.webp"
                         : (message.typed == 2)
                             ? "assets/image/icon_system_message.webp"
-                            : "assets/image/c_z.webp",
+                            : "assets/image/icon_cz.webp",
                     width: 24.w,
                     height: 24.h,
                   ),
@@ -370,7 +370,7 @@ class _SystemDetails extends State<SystemDetails> {
                         ? "assets/image/icon_system_message.webp"
                         : (message.typed == 2)
                             ? "assets/image/icon_system_message.webp"
-                            : "assets/image/c_z.webp",
+                            : "assets/image/icon_cz.webp",
                     width: 24.w,
                     height: 24.h,
                   ),

lib/message/system_message.dart

@@ -154,6 +154,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
       //     ),
       //   ],
       // ),
+      backgroundColor: Colors.white,
       body: SmartRefresher(
         enablePullDown: true,
         enablePullUp: true,
@@ -363,6 +364,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
               ),
             ],
           ),
+          if(title != S.of(context).xitongxiaoxi)
           Container(
             margin: EdgeInsets.only(top: 12.h),
             width: double.infinity,
@@ -643,7 +645,7 @@ class _SystemMessagePage extends State<SystemMessagePage> {
                     ? "assets/image/icon_system_message.webp"
                     : (message.typed == 2)
                         ? "assets/image/icon_system_message.webp"
-                        : "assets/image/c_z.webp",
+                        : "assets/image/icon.webp",
                 width: 40.w,
                 height: 40.h,
               ),

lib/order/order_detail_page.dart

@@ -39,14 +39,17 @@ class _OrderDetailPage extends State<OrderDetailPage> {
   ApiService apiService;
   MinApiService minService;
   int jumpState;
-  final RefreshController refreshController = RefreshController();
 
   @override
   void initState() {
     super.initState();
     SharedPreferences.getInstance().then((value) {
-      apiService = ApiService(Dio(),
-          context: context, token: value.getString("token"), showLoading: true);
+      apiService = ApiService(
+          Dio(),
+          context: context,
+          token: value.getString("token"),
+          showLoading: true
+      );
       queryDetails();
     });
     jumpState = widget.arguments["jumpState"];
@@ -91,19 +94,16 @@ class _OrderDetailPage extends State<OrderDetailPage> {
   queryDetails() async {
     if (apiService == null) {
       SharedPreferences value = await SharedPreferences.getInstance();
-      apiService = ApiService(Dio(),
+      apiService = ApiService(
+          Dio(),
           context: context,
           token: value.getString("token"),
-          showLoading: false);
+          showLoading: false
+      );
     }
     BaseData<OrderInfo> baseData = await apiService
         .orderDetail(widget.arguments["id"])
-        .catchError((error) {
-      SmartDialog.showToast(AppUtils.dioErrorTypeToString(error.type),
-          alignment: Alignment.center);
-      refreshController.refreshFailed();
-      refreshController.loadFailed();
-    });
+        .catchError((error) {});
     if (baseData != null && baseData.isSuccess) {
       orderInfo = baseData.data;
       payStatus = orderInfo.payStatus;
@@ -123,12 +123,8 @@ class _OrderDetailPage extends State<OrderDetailPage> {
         setState(() {
           statusTitle();
         });
-      refreshController.refreshCompleted();
-      refreshController.loadComplete();
-    } else {
-      SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
-      refreshController.refreshFailed();
-      refreshController.loadFailed();
+    }else{
+      SmartDialog.showToast(baseData.msg,alignment: Alignment.center);
     }
   }
 
@@ -163,24 +159,7 @@ class _OrderDetailPage extends State<OrderDetailPage> {
               leadingColor: Colors.white,
               brightness: Brightness.dark,
             ),
-            body: SmartRefresher(
-              controller: refreshController,
-              enablePullDown: true,
-              enablePullUp: false,
-              header: MyHeader(),
-              footer: CustomFooter(
-                builder: (context, mode) {
-                  return MyFooter(mode);
-                },
-              ),
-              onRefresh:(){
-                setState(() {
-                  queryDetails();
-                });
-              },
-              physics: BouncingScrollPhysics(),
-              scrollController: ScrollController(),
-              child: Container(
+            body: Container(
               child: SingleChildScrollView(
                 physics: BouncingScrollPhysics(),
                 child: Container(
@@ -230,7 +209,6 @@ class _OrderDetailPage extends State<OrderDetailPage> {
                 ),
               ),
             ),
-            ),
           )
         ],
       ),

lib/settlement/settlement.dart

@@ -518,7 +518,7 @@ class _Settlement extends State<Settlement> {
     placeOrderFirst.storeId = storeInfo.id;
     placeOrderFirst.subcribeTime = null;
     placeOrderFirst.tableId = "$tableId";
-    for(int i = 0;i<placeOrderFirst.shoppingCartSkuItemList.length;i++){
+    for(int i = 0;i<shopCarGoods.shoppingCartSkuItemList.length;i++){
        placeOrderFirst.shoppingCartSkuItemList[i].setMealDataList = shopCarGoods.shoppingCartSkuItemList[i].setMealDataList;
     }
 

lib/utils/status_utils.dart

@@ -174,7 +174,7 @@ class StatusUtils {
               Expanded(
                 flex: 1,
                 child: Container(
-                  margin: EdgeInsets.only(left: 37.w),
+                  margin: EdgeInsets.only(left: 20.w),
                   alignment: Alignment.centerLeft,
                   child: Text(
                     S.of(context).qudanhao(dayFlowCode),

lib/view_widget/new_coupon_widget.dart

@@ -88,7 +88,7 @@ class NewCouponWidget extends StatelessWidget {
                   overflow: TextOverflow.ellipsis,
                   style: TextStyle(
                     fontSize: 15.sp,
-                    height: 1.2.h,
+                    height: 1.3.h,
                     fontWeight: MyFontWeight.semi_bold,
                     color: Color(0xFF0D0D0D),
                   ),