From 8761e5e94ce826f131283a5d0e60720a62a889d9 Mon Sep 17 00:00:00 2001 From: zsw Date: Thu, 14 Dec 2023 15:28:17 +0800 Subject: [PATCH] =?UTF-8?q?ios=20=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9D=BF=E5=9D=97=E5=88=97=E8=A1=A8bug=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 6 +- .../home/vip/balance_change_record.dart | 40 ++++---- .../home/vip/bus_vip_list.dart | 95 +++++++++---------- .../home/vip/vip_recharge_flow.dart | 45 ++++----- 4 files changed, 86 insertions(+), 100 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index ac5b707f..0be5dd24 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 = 6; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -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 = 6; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -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 = 6; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/lib/business_system/home/vip/balance_change_record.dart b/lib/business_system/home/vip/balance_change_record.dart index 49d04a29..89b2c9d1 100644 --- a/lib/business_system/home/vip/balance_change_record.dart +++ b/lib/business_system/home/vip/balance_change_record.dart @@ -243,27 +243,25 @@ class _BalanceChangeRecord extends State { iconHeight: 120.h, margin: EdgeInsets.all(50.h), ) - : Padding( - padding: EdgeInsets.only(top: 16.h), - child: Expanded( - child: ListView.builder( - itemCount: records?.length ?? 0, - physics: BouncingScrollPhysics(), - shrinkWrap: true, - itemBuilder: (context, position) { - return GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - if (isKeyBoardShow) - FocusScope.of(context) - .requestFocus(FocusNode()); - return; - }, - child: balanceChangeItem( - records[position], position), - ); - }, - ), + : Container( + padding:EdgeInsets.only(top: 16.h), + child: ListView.builder( + itemCount: records?.length ?? 0, + physics: BouncingScrollPhysics(), + shrinkWrap: true, + itemBuilder: (context, position) { + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + if (isKeyBoardShow) + FocusScope.of(context) + .requestFocus(FocusNode()); + return; + }, + child: balanceChangeItem( + records[position], position), + ); + }, ), ))), ), diff --git a/lib/business_system/home/vip/bus_vip_list.dart b/lib/business_system/home/vip/bus_vip_list.dart index e244382e..8a246180 100644 --- a/lib/business_system/home/vip/bus_vip_list.dart +++ b/lib/business_system/home/vip/bus_vip_list.dart @@ -126,9 +126,7 @@ class _BusVipList extends State { @override Widget build(BuildContext context) { - return Scaffold( - backgroundColor: Colors.white, - body: Column( + return Column( children: [ Container( width: double.infinity, @@ -163,7 +161,7 @@ class _BusVipList extends State { children: [ Padding( padding: EdgeInsets.only( - left: 20.w,top: 16.h + left: 20.w,top: 16.h,bottom: 16.h ), child: Row( children: [ @@ -189,56 +187,51 @@ class _BusVipList extends State { networkStatus == -1 ? noNetwork() : ((networkStatus == 0) - ? ListView.builder( - padding: EdgeInsets.zero, - itemCount: 10, - scrollDirection: Axis.vertical, - shrinkWrap: true, - physics: BouncingScrollPhysics(), - itemBuilder: (context, position) { - return vipListItemSm(); - }, - ) - : ((records == null || records.length == 0) - ? NoDataView( - src: - "assets/image/bs_no data_logo.webp", - isShowBtn: false, - text: "暂无数据", - fontSize: 16.sp, - iconHeight: 120.h, - margin: EdgeInsets.all(50.h), - ) - : Padding( - padding: EdgeInsets.only(top: 16.h), - child: Expanded( - child: ListView.builder( - itemCount: records?.length ?? 0, - physics: BouncingScrollPhysics(), - shrinkWrap: true, - itemBuilder: (context, position) { - return GestureDetector( - behavior: - HitTestBehavior.opaque, - onTap: () { - if (isKeyBoardShow) - FocusScope.of(context) - .requestFocus( - FocusNode()); - return; - }, - child: vipListItem( - records[position], - position), - ); - }, - ), - ), - ))), + ? ListView.builder( + padding: EdgeInsets.zero, + itemCount: 10, + scrollDirection: Axis.vertical, + shrinkWrap: true, + physics: BouncingScrollPhysics(), + itemBuilder: (context, position) { + return vipListItemSm(); + }, + ) + : ((records == null || records.length == 0) + ? NoDataView( + src: + "assets/image/bs_no data_logo.webp", + isShowBtn: false, + text: "暂无数据", + fontSize: 16.sp, + iconHeight: 120.h, + margin: EdgeInsets.all(50.h), + ) + : ListView.builder( + itemCount: records?.length ?? 0, + physics: BouncingScrollPhysics(), + shrinkWrap: true, + itemBuilder: (context, position) { + return GestureDetector( + behavior: + HitTestBehavior.opaque, + onTap: () { + if (isKeyBoardShow) + FocusScope.of(context) + .requestFocus( + FocusNode()); + return; + }, + child: vipListItem( + records[position], + position), + ); + }, + ))), ], )))), ], - )); + ); } /// 搜索框 diff --git a/lib/business_system/home/vip/vip_recharge_flow.dart b/lib/business_system/home/vip/vip_recharge_flow.dart index 0d8539ac..db080b87 100644 --- a/lib/business_system/home/vip/vip_recharge_flow.dart +++ b/lib/business_system/home/vip/vip_recharge_flow.dart @@ -163,7 +163,7 @@ class _VipRechargeFlow extends State { child: Column( children: [ Padding( - padding: EdgeInsets.only(left: 20.w, top: 16.h), + padding: EdgeInsets.only(left: 20.w, top: 16.h,bottom: 16.h), child: Row( children: [ Container( @@ -208,31 +208,26 @@ class _VipRechargeFlow extends State { iconHeight: 120.h, margin: EdgeInsets.all(50.h), ) - : Padding( - padding: EdgeInsets.only(top: 16.h), - child: Expanded( - child: ListView.builder( - itemCount: records?.length ?? 0, - physics: BouncingScrollPhysics(), - shrinkWrap: true, - itemBuilder: (context, position) { - return GestureDetector( - behavior: - HitTestBehavior.opaque, - onTap: () { - if (isKeyBoardShow) - FocusScope.of(context) - .requestFocus( - FocusNode()); - return; - }, - child: rechargeFlowItem( - records[position], - position), - ); + : ListView.builder( + itemCount: records?.length ?? 0, + physics: BouncingScrollPhysics(), + shrinkWrap: true, + itemBuilder: (context, position) { + return GestureDetector( + behavior: + HitTestBehavior.opaque, + onTap: () { + if (isKeyBoardShow) + FocusScope.of(context) + .requestFocus( + FocusNode()); + return; }, - ), - ), + child: rechargeFlowItem( + records[position], + position), + ); + }, ))), ], ))),