Browse Source

商家端网络异常文本更改;

商品板块ui适配更改;
wr_2023_business
zsw 1 year ago
parent
commit
83f5335a4a
  1. 12
      ios/Runner.xcodeproj/project.pbxproj
  2. 2
      lib/business_system/goods/business_goods_page.dart
  3. 2
      lib/business_system/goods/goods_search_page.dart
  4. 2
      lib/business_system/goods/off_shelf/off_shelf_page.dart
  5. 2
      lib/business_system/goods/on_sale/batch_shelf.dart
  6. 2
      lib/business_system/goods/on_sale/goods_assort.dart
  7. 2
      lib/business_system/goods/on_sale/goods_sort.dart
  8. 2
      lib/business_system/goods/on_sale/on_sale_page.dart
  9. 2
      lib/business_system/home/flow_page.dart
  10. 2
      lib/business_system/home/overview/trade_goods.dart
  11. 2
      lib/business_system/order/business_order_detail.dart
  12. 4
      lib/business_system/order/order_list.dart

12
ios/Runner.xcodeproj/project.pbxproj

@ -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 = 3; 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.24; MARKETING_VERSION = 3.2.25;
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 = 3; 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.24; MARKETING_VERSION = 3.2.25;
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 = 3; 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.24; MARKETING_VERSION = 3.2.25;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

2
lib/business_system/goods/business_goods_page.dart

@ -44,7 +44,7 @@ class _BusinessGoodsPage extends State<BusinessGoodsPage>
title:"", title:"",
leading: false, leading: false,
background: Colors.white, background: Colors.white,
toolbarHeight: kToolbarHeight + MediaQuery.of(context).padding.top, toolbarHeight: MediaQuery.of(context).size.height >= 750 ? (kToolbarHeight + 15.h) : kToolbarHeight,
bottom: TabBar( bottom: TabBar(
// isScrollable: true, // // isScrollable: true, //
// //

2
lib/business_system/goods/goods_search_page.dart

@ -638,7 +638,7 @@ class _GoodsSearchPage extends State<GoodsSearchPage>
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
networkError.substring(0, 4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

2
lib/business_system/goods/off_shelf/off_shelf_page.dart

@ -692,7 +692,7 @@ class _OffShelfPage extends State<OffShelfPage> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
networkError.substring(0, 4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

2
lib/business_system/goods/on_sale/batch_shelf.dart

@ -653,7 +653,7 @@ class _BatchShelf extends State<BatchShelf> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
networkError.substring(0,4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

2
lib/business_system/goods/on_sale/goods_assort.dart

@ -446,7 +446,7 @@ class _GoodsAssort extends State<GoodsAssort> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
networkError.substring(0,4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

2
lib/business_system/goods/on_sale/goods_sort.dart

@ -588,7 +588,7 @@ class _GoodsSort extends State<GoodsSort> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
networkError.substring(0,4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

2
lib/business_system/goods/on_sale/on_sale_page.dart

@ -844,7 +844,7 @@ class _OnSalePage extends State<OnSalePage> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
networkError.substring(0,4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

2
lib/business_system/home/flow_page.dart

@ -446,7 +446,7 @@ class _FlowPage extends State<FlowPage> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
networkError.substring(0,4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

2
lib/business_system/home/overview/trade_goods.dart

@ -1107,7 +1107,7 @@ class _TradeGoods extends State<TradeGoods> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
networkError.substring(0,4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

2
lib/business_system/order/business_order_detail.dart

@ -803,7 +803,7 @@ class _BusinessOrderDetail extends State<BusinessOrderDetail> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Text( Text(
networkError.substring(0,4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

4
lib/business_system/order/order_list.dart

@ -425,7 +425,7 @@ class _OrderList extends State<OrderList> {
fontSize: 12.sp, fontSize: 12.sp,
color: Colors.red, color: Colors.red,
fontWeight: MyFontWeight.regular), fontWeight: MyFontWeight.regular),
) ),
], ],
), ),
), ),
@ -718,7 +718,7 @@ class _OrderList extends State<OrderList> {
children: [ children: [
Text( Text(
// "无法连接到网络", // "无法连接到网络",
networkError.substring(0,4), networkError.substring(0, networkError.indexOf(",")),
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),

Loading…
Cancel
Save