From 83f5335a4a73ae259c1cdec21e315734dfa40da4 Mon Sep 17 00:00:00 2001 From: zsw Date: Tue, 21 Nov 2023 17:09:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AB=AF=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=96=87=E6=9C=AC=E6=9B=B4=E6=94=B9=EF=BC=9B?= =?UTF-8?q?=20=E5=95=86=E5=93=81=E6=9D=BF=E5=9D=97ui=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/business_system/goods/business_goods_page.dart | 2 +- lib/business_system/goods/goods_search_page.dart | 2 +- .../goods/off_shelf/off_shelf_page.dart | 2 +- lib/business_system/goods/on_sale/batch_shelf.dart | 2 +- lib/business_system/goods/on_sale/goods_assort.dart | 2 +- lib/business_system/goods/on_sale/goods_sort.dart | 2 +- lib/business_system/goods/on_sale/on_sale_page.dart | 2 +- lib/business_system/home/flow_page.dart | 2 +- lib/business_system/home/overview/trade_goods.dart | 2 +- lib/business_system/order/business_order_detail.dart | 2 +- lib/business_system/order/order_list.dart | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 18fbac52..4b5c82a5 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 = 3; + 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.24; + MARKETING_VERSION = 3.2.25; 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 = 3; + 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.24; + MARKETING_VERSION = 3.2.25; 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 = 3; + 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.24; + MARKETING_VERSION = 3.2.25; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/business_system/goods/business_goods_page.dart b/lib/business_system/goods/business_goods_page.dart index 5aed974d..7f2b92bc 100644 --- a/lib/business_system/goods/business_goods_page.dart +++ b/lib/business_system/goods/business_goods_page.dart @@ -44,7 +44,7 @@ class _BusinessGoodsPage extends State title:"", leading: false, background: Colors.white, - toolbarHeight: kToolbarHeight + MediaQuery.of(context).padding.top, + toolbarHeight: MediaQuery.of(context).size.height >= 750 ? (kToolbarHeight + 15.h) : kToolbarHeight, bottom: TabBar( // isScrollable: true, //可滚动 //去掉按钮阴影 diff --git a/lib/business_system/goods/goods_search_page.dart b/lib/business_system/goods/goods_search_page.dart index 358fa198..cb1c14eb 100644 --- a/lib/business_system/goods/goods_search_page.dart +++ b/lib/business_system/goods/goods_search_page.dart @@ -638,7 +638,7 @@ class _GoodsSearchPage extends State mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - networkError.substring(0, 4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D), diff --git a/lib/business_system/goods/off_shelf/off_shelf_page.dart b/lib/business_system/goods/off_shelf/off_shelf_page.dart index a703f49d..192c34bb 100644 --- a/lib/business_system/goods/off_shelf/off_shelf_page.dart +++ b/lib/business_system/goods/off_shelf/off_shelf_page.dart @@ -692,7 +692,7 @@ class _OffShelfPage extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - networkError.substring(0, 4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D), diff --git a/lib/business_system/goods/on_sale/batch_shelf.dart b/lib/business_system/goods/on_sale/batch_shelf.dart index 0a80a38d..30e9e571 100644 --- a/lib/business_system/goods/on_sale/batch_shelf.dart +++ b/lib/business_system/goods/on_sale/batch_shelf.dart @@ -653,7 +653,7 @@ class _BatchShelf extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - networkError.substring(0,4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D), diff --git a/lib/business_system/goods/on_sale/goods_assort.dart b/lib/business_system/goods/on_sale/goods_assort.dart index 2a445db6..239261ef 100644 --- a/lib/business_system/goods/on_sale/goods_assort.dart +++ b/lib/business_system/goods/on_sale/goods_assort.dart @@ -446,7 +446,7 @@ class _GoodsAssort extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - networkError.substring(0,4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D), diff --git a/lib/business_system/goods/on_sale/goods_sort.dart b/lib/business_system/goods/on_sale/goods_sort.dart index fd76e256..40f7e880 100644 --- a/lib/business_system/goods/on_sale/goods_sort.dart +++ b/lib/business_system/goods/on_sale/goods_sort.dart @@ -588,7 +588,7 @@ class _GoodsSort extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - networkError.substring(0,4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D), diff --git a/lib/business_system/goods/on_sale/on_sale_page.dart b/lib/business_system/goods/on_sale/on_sale_page.dart index 886c3ba2..e2a42ed0 100644 --- a/lib/business_system/goods/on_sale/on_sale_page.dart +++ b/lib/business_system/goods/on_sale/on_sale_page.dart @@ -844,7 +844,7 @@ class _OnSalePage extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - networkError.substring(0,4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D), diff --git a/lib/business_system/home/flow_page.dart b/lib/business_system/home/flow_page.dart index 391ab5a0..3e0f9726 100644 --- a/lib/business_system/home/flow_page.dart +++ b/lib/business_system/home/flow_page.dart @@ -446,7 +446,7 @@ class _FlowPage extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - networkError.substring(0,4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D), diff --git a/lib/business_system/home/overview/trade_goods.dart b/lib/business_system/home/overview/trade_goods.dart index 2ee1c981..aa11c726 100644 --- a/lib/business_system/home/overview/trade_goods.dart +++ b/lib/business_system/home/overview/trade_goods.dart @@ -1107,7 +1107,7 @@ class _TradeGoods extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - networkError.substring(0,4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D), diff --git a/lib/business_system/order/business_order_detail.dart b/lib/business_system/order/business_order_detail.dart index 0e46f8cc..c7ab9e2d 100644 --- a/lib/business_system/order/business_order_detail.dart +++ b/lib/business_system/order/business_order_detail.dart @@ -803,7 +803,7 @@ class _BusinessOrderDetail extends State { mainAxisAlignment: MainAxisAlignment.center, children: [ Text( - networkError.substring(0,4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D), diff --git a/lib/business_system/order/order_list.dart b/lib/business_system/order/order_list.dart index c3664894..7688c86b 100644 --- a/lib/business_system/order/order_list.dart +++ b/lib/business_system/order/order_list.dart @@ -425,7 +425,7 @@ class _OrderList extends State { fontSize: 12.sp, color: Colors.red, fontWeight: MyFontWeight.regular), - ) + ), ], ), ), @@ -718,7 +718,7 @@ class _OrderList extends State { children: [ Text( // "无法连接到网络", - networkError.substring(0,4), + networkError.substring(0, networkError.indexOf(",")), style: TextStyle( fontSize: 14.sp, color: Color(0xFF0D0D0D),