diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 337e6dbd..033c5d16 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -596,7 +596,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -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 = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.6; + MARKETING_VERSION = 3.2.8; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -747,7 +747,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; "MTL_ENABLE_DEBUG_INFO[arch=*]" = YES; ONLY_ACTIVE_ARCH = YES; @@ -798,7 +798,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -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 = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.6; + MARKETING_VERSION = 3.2.8; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -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 = 4; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.6; + MARKETING_VERSION = 3.2.8; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index a9fac982..3ab468b7 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -167,7 +167,9 @@ class _OrderDetailPage extends State { controller: refreshController, enablePullDown: true, enablePullUp: false, - header: MyHeader(), + header: MyHeader( + color: Colors.white, + ), footer: CustomFooter( builder: (context, mode) { return MyFooter(mode); diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index c01378a2..ba569006 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -535,7 +535,7 @@ class _Settlement extends State { this.downOrder = DownOrder.fromJson(baseData.data); querySettlement(); } else { - orderButton = false; + // orderButton = false; SmartDialog.showToast(baseData?.msg, alignment: Alignment.center); } } else { @@ -562,7 +562,7 @@ class _Settlement extends State { }); } } - orderButton = false; + // orderButton = false; if (baseData != null && baseData.isSuccess) { placeOrder = true; this.downOrder = DownOrder.fromJson(baseData.data); @@ -570,7 +570,7 @@ class _Settlement extends State { queryOrderDetails(parentId); setState(() {}); } else { - orderButton = false; + // orderButton = false; SmartDialog.showToast(baseData?.msg, alignment: Alignment.center); } } @@ -597,7 +597,7 @@ class _Settlement extends State { .catchError((error) { print(error); }); - orderButton = false; + // orderButton = false; if (baseData != null && baseData.isSuccess) { WxPay wxPay = baseData.data; await registerWxApi( @@ -621,7 +621,7 @@ class _Settlement extends State { .catchError((error) { print(error); }); - orderButton = false; + // orderButton = false; if (baseData != null && baseData.isSuccess) { SmartDialog.showToast(baseData.data, alignment: Alignment.center); toOrderDetails(placeOrderFirst.id); @@ -895,12 +895,12 @@ class _Settlement extends State { vertical: 5.h, ), callback: () { - if (orderButton) { - SmartDialog.showToast("订单正在提交中...", - alignment: Alignment.center); - return; - } else - orderButton = true; + // if (orderButton) { + // SmartDialog.showToast("订单正在提交中...", + // alignment: Alignment.center); + // return; + // } else + // orderButton = true; pageType != null ? bargainOrderId != null ? activityPay() diff --git a/lib/settlement/settlement_view/activity_coupon_remarks.dart b/lib/settlement/settlement_view/activity_coupon_remarks.dart index 7538970f..8a0fc875 100644 --- a/lib/settlement/settlement_view/activity_coupon_remarks.dart +++ b/lib/settlement/settlement_view/activity_coupon_remarks.dart @@ -126,7 +126,7 @@ class _ActivityCouponRemarks extends State { padding: EdgeInsets.only(bottom: 18.w), alignment: Alignment.center, child: Image.asset( - vipSelect + ((widget.coupons != null && widget.coupons != ""||widget.promotions != null && widget.promotions != "") ? false : vipSelect) ? "assets/image/vip_price.webp" : "assets/image/vip_unprice.webp", width: 38.w,