fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ios商家端代码合并； 

预约键盘输入优化更改
wr_2023_business
zsw 1 year ago
parent
aa54c46755
commit
83cee909fa
2 changed files with 92 additions and 87 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ios/Runner.xcodeproj/project.pbxproj
  2. 167
      lib/business_system/goods/reservation_ page.dart

12
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -619,7 +619,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -669,7 +669,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.2.25; MARKETING_VERSION = 3.2.27;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -822,7 +822,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -872,7 +872,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.2.25; MARKETING_VERSION = 3.2.27;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -916,7 +916,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -966,7 +966,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.2.25; MARKETING_VERSION = 3.2.27;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

167
lib/business_system/goods/reservation_ page.dart
Unescape View File

@ -193,94 +193,99 @@ class _ReservationPage extends State<ReservationPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return GestureDetector(
resizeToAvoidBottomInset: false, behavior: HitTestBehavior.opaque,
appBar: MyAppBar( onTap:(){
title: "预约", FocusScope.of(context).requestFocus(FocusNode());},
titleColor: Colors.black, child: Scaffold(
leadingColor: Colors.black, resizeToAvoidBottomInset: false,
background: Colors.white, appBar: MyAppBar(
), title: "预约",
body: networkStatus == -1 titleColor: Colors.black,
? noNetwork() leadingColor: Colors.black,
: Container( background: Colors.white,
color: Colors.white, ),
padding: EdgeInsets.symmetric(horizontal: 16.w), body: networkStatus == -1
child: Column( ? noNetwork()
crossAxisAlignment: CrossAxisAlignment.start, : Container(
children: [ color: Colors.white,
if (networkStatus == 1) padding: EdgeInsets.symmetric(horizontal: 16.w),
Row( child: Column(
children: [ crossAxisAlignment: CrossAxisAlignment.start,
Text( children: [
"预约开关", if (networkStatus == 1)
style: TextStyle( Row(
fontSize: 14.sp, children: [
color: Color(0xFF0D0D0D), Text(
fontWeight: MyFontWeight.bold), "预约开关",
), style: TextStyle(
SizedBox( fontSize: 14.sp,
width: 24.w, color: Color(0xFF0D0D0D),
), fontWeight: MyFontWeight.bold),
GestureDetector( ),
behavior: HitTestBehavior.opaque, SizedBox(
onTap: () { width: 24.w,
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,
),
),
),
],
), ),
if (networkStatus == 1)
Expanded(
child:
(storeTimeInfoList?.posType ?? "") == "FAST_SERVICE"
? timeIntervalType()
: universalType()),
if (networkStatus == 1)
GestureDetector( GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
onTap: () { onTap: () {
updateSubscribeInfo(); setState(() {
_subscribeSwitch = !_subscribeSwitch;
});
}, },
child: Container( child: Padding(
width: double.infinity, padding: EdgeInsets.symmetric(horizontal: 24.w),
alignment: Alignment.center, child: _subscribeSwitch
margin: EdgeInsets.only(bottom: 55.h, top: 15.h), ? Image.asset(
padding: EdgeInsets.symmetric(vertical: 16.h), "assets/image/reservation_switch.webp",
decoration: BoxDecoration( width: 44.w,
borderRadius: BorderRadius.circular(27), height: 24.h,
color: Color(0xFF30415B)), fit: BoxFit.fill,
child: Text( )
S.of(context).baocun, : Image.asset(
style: TextStyle( "assets/image/reservation_unswitch.webp",
fontWeight: MyFontWeight.semi_bold, width: 44.w,
fontSize: 16.sp, height: 24.h,
color: Colors.white, 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,
),
),
),
)
],
),
),
),
); );
} }

Write Preview
Loading…
Cancel
Save