diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index d25e0542..985927b7 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -619,7 +619,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -669,7 +669,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.25; + MARKETING_VERSION = 3.2.27; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -822,7 +822,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -872,7 +872,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.25; + MARKETING_VERSION = 3.2.27; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -916,7 +916,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -966,7 +966,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.2.25; + MARKETING_VERSION = 3.2.27; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/business_system/goods/reservation_ page.dart b/lib/business_system/goods/reservation_ page.dart index 662ecfd9..14b64e29 100644 --- a/lib/business_system/goods/reservation_ page.dart +++ b/lib/business_system/goods/reservation_ page.dart @@ -193,94 +193,99 @@ class _ReservationPage extends State { @override Widget build(BuildContext context) { - return Scaffold( - resizeToAvoidBottomInset: false, - appBar: MyAppBar( - title: "预约", - titleColor: Colors.black, - leadingColor: Colors.black, - background: Colors.white, - ), - body: networkStatus == -1 - ? noNetwork() - : Container( - color: Colors.white, - padding: EdgeInsets.symmetric(horizontal: 16.w), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (networkStatus == 1) - Row( - children: [ - Text( - "预约开关", - style: TextStyle( - fontSize: 14.sp, - color: Color(0xFF0D0D0D), - fontWeight: MyFontWeight.bold), - ), - SizedBox( - width: 24.w, - ), - GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - setState(() { - _subscribeSwitch = !_subscribeSwitch; - }); - }, - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 24.w), - child: _subscribeSwitch - ? Image.asset( - "assets/image/reservation_switch.webp", - width: 44.w, - height: 24.h, - fit: BoxFit.fill, - ) - : Image.asset( - "assets/image/reservation_unswitch.webp", - width: 44.w, - height: 24.h, - fit: BoxFit.fill, - ), - ), - ), - ], + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap:(){ + FocusScope.of(context).requestFocus(FocusNode());}, + child: Scaffold( + resizeToAvoidBottomInset: false, + appBar: MyAppBar( + title: "预约", + titleColor: Colors.black, + leadingColor: Colors.black, + background: Colors.white, + ), + body: networkStatus == -1 + ? noNetwork() + : Container( + color: Colors.white, + padding: EdgeInsets.symmetric(horizontal: 16.w), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (networkStatus == 1) + Row( + children: [ + Text( + "预约开关", + style: TextStyle( + fontSize: 14.sp, + color: Color(0xFF0D0D0D), + fontWeight: MyFontWeight.bold), + ), + SizedBox( + width: 24.w, ), - if (networkStatus == 1) - Expanded( - child: - (storeTimeInfoList?.posType ?? "") == "FAST_SERVICE" - ? timeIntervalType() - : universalType()), - if (networkStatus == 1) GestureDetector( behavior: HitTestBehavior.opaque, onTap: () { - updateSubscribeInfo(); + setState(() { + _subscribeSwitch = !_subscribeSwitch; + }); }, - child: Container( - width: double.infinity, - alignment: Alignment.center, - margin: EdgeInsets.only(bottom: 55.h, top: 15.h), - padding: EdgeInsets.symmetric(vertical: 16.h), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(27), - color: Color(0xFF30415B)), - child: Text( - S.of(context).baocun, - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize: 16.sp, - color: Colors.white, - ), + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 24.w), + child: _subscribeSwitch + ? Image.asset( + "assets/image/reservation_switch.webp", + width: 44.w, + height: 24.h, + fit: BoxFit.fill, + ) + : Image.asset( + "assets/image/reservation_unswitch.webp", + width: 44.w, + height: 24.h, + fit: BoxFit.fill, ), ), - ) - ], - ), - ), + ), + ], + ), + if (networkStatus == 1) + Expanded( + child: + (storeTimeInfoList?.posType ?? "") == "FAST_SERVICE" + ? timeIntervalType() + : universalType()), + if (networkStatus == 1) + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + updateSubscribeInfo(); + }, + child: Container( + width: double.infinity, + alignment: Alignment.center, + margin: EdgeInsets.only(bottom: 55.h, top: 15.h), + padding: EdgeInsets.symmetric(vertical: 16.h), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(27), + color: Color(0xFF30415B)), + child: Text( + S.of(context).baocun, + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize: 16.sp, + color: Colors.white, + ), + ), + ), + ) + ], + ), + ), + ), ); }