From baf4b4facd8aecc470a4cece36358dcc1af87bc8 Mon Sep 17 00:00:00 2001 From: fmk Date: Mon, 6 Jun 2022 18:59:10 +0800 Subject: [PATCH] =?UTF-8?q?ios=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/home/home_page.dart | 2 +- lib/home/home_view/discount_zone.dart | 14 +++++++------- lib/home/home_view/home_recommend_goods.dart | 1 - lib/home/home_view/top_selling_list.dart | 4 ++-- lib/mine/mine_page.dart | 2 +- lib/retrofit/min_api.dart | 2 +- lib/retrofit/retrofit_api.dart | 2 +- lib/union/union_list.dart | 10 +++++----- lib/view_widget/mine_vip_entry.dart | 8 ++++---- 10 files changed, 28 insertions(+), 29 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b1c16754..0b658fd3 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -616,7 +616,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2.0.2; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -666,7 +666,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.2; + MARKETING_VERSION = 2.0.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -816,7 +816,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2.0.2; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -866,7 +866,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.2; + MARKETING_VERSION = 2.0.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -907,7 +907,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 2.0.2; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -957,7 +957,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 2.0.2; + MARKETING_VERSION = 2.0.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index c1c7533a..94d6bc5e 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -513,7 +513,7 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { // }); // }), - ///特惠专区 + //特惠专区 DiscountZone(coupons), ///特惠专区-推荐商品展示 diff --git a/lib/home/home_view/discount_zone.dart b/lib/home/home_view/discount_zone.dart index 24c0df28..9f3967e3 100644 --- a/lib/home/home_view/discount_zone.dart +++ b/lib/home/home_view/discount_zone.dart @@ -51,12 +51,12 @@ class _DiscountZone extends State { )), if(widget.coupon.length != 0) Container( - height: 100, - margin: EdgeInsets.only(top: 10), + height: 100.h, + margin: EdgeInsets.only(top: 10.h), child: ListView.builder( scrollDirection: Axis.horizontal, physics: BouncingScrollPhysics(), - padding: EdgeInsets.symmetric(horizontal: 10), + padding: EdgeInsets.symmetric(horizontal: 10.w), itemBuilder: (context, position) { return GestureDetector( onTap: (){ @@ -91,7 +91,7 @@ class _DiscountZone extends State { Expanded( flex: 2, child: Container( - margin: EdgeInsets.only(top: 12,bottom: 12,left: 20,right: 27), + margin: EdgeInsets.only(top: 12.h,bottom: 12.h,left: 20.w,right: 27.w), child: Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, @@ -107,7 +107,7 @@ class _DiscountZone extends State { color: Color(0xFFFFA607), ), ), - SizedBox(height:5), + SizedBox(height:5.w), (coupon.useStartTime == null && coupon.useEndTime == null)? Text( @@ -135,13 +135,13 @@ class _DiscountZone extends State { Expanded( flex: 1, child:Container( - margin: EdgeInsets.only(top: 12,bottom: 12), + margin: EdgeInsets.only(top: 12.h,bottom: 12.h), child: Column( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ Expanded(child: Container( - padding: EdgeInsets.only(right: 5), + padding: EdgeInsets.only(right: 5.w), child:discountWidget(coupon), )), ], diff --git a/lib/home/home_view/home_recommend_goods.dart b/lib/home/home_view/home_recommend_goods.dart index 6e7e7f32..ffb11fef 100644 --- a/lib/home/home_view/home_recommend_goods.dart +++ b/lib/home/home_view/home_recommend_goods.dart @@ -12,7 +12,6 @@ import 'package:huixiang/utils/font_weight.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; class HomeRecommendGoods extends StatefulWidget { - // final List commodityZone; final HomeRank homeRank; HomeRecommendGoods(this.homeRank); diff --git a/lib/home/home_view/top_selling_list.dart b/lib/home/home_view/top_selling_list.dart index 9a96d0e2..86edbea9 100644 --- a/lib/home/home_view/top_selling_list.dart +++ b/lib/home/home_view/top_selling_list.dart @@ -32,7 +32,7 @@ class _TopSellingList extends State { @override Widget build(BuildContext context) { return Container( - height: 347.h, + height: 388.h, width: double.infinity, decoration: BoxDecoration( borderRadius: BorderRadius.circular(6), @@ -64,7 +64,7 @@ class _TopSellingList extends State { ), ), Container( - height: 280.h, + height: 330.h, child: ListView.builder( scrollDirection: Axis.horizontal, physics: BouncingScrollPhysics(), diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index 21a52263..90485ebb 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -245,7 +245,7 @@ class MinePageState extends State with AutomaticKeepAliveClientMixin { ), ), Container( - margin: EdgeInsets.only(top: 265), + margin: EdgeInsets.only(top: 285.h), child: Column( children: [ ///我的订单 diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index f22f0a70..21c9f8fa 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -40,7 +40,7 @@ part 'min_api.g.dart'; // const base_url = "http://192.168.10.37:8765/app/"; const localBaseUrl = "http://192.168.10.236:8765/app/";///本地 -const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 +const serviceBaseUrl = "http://192.168.10.236:8765/app/";///线上 ///调用小程序的接口 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index f2fd3a6b..169db12f 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -72,7 +72,7 @@ part 'retrofit_api.g.dart'; // const base_url = "http://192.168.10.132:8766/app/";///詹云久 const localBaseUrl = "http://192.168.10.236:8766/app/";///本地 -const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 +const serviceBaseUrl = "http://192.168.10.236:8766/app/";///线上 @RestApi(baseUrl: localBaseUrl) abstract class ApiService { diff --git a/lib/union/union_list.dart b/lib/union/union_list.dart index c898a799..ae35ef11 100644 --- a/lib/union/union_list.dart +++ b/lib/union/union_list.dart @@ -152,7 +152,7 @@ class _UnionList extends State { ) ]), width: double.infinity, - height: 228, + height: 228.h, child: Stack( children: [ Positioned( @@ -163,7 +163,7 @@ class _UnionList extends State { child: MImage( store.facade, width: double.infinity, - height: 140, + height: 140.h, fit: BoxFit.cover, errorSrc: "assets/image/default_1.webp", fadeSrc: "assets/image/default_1.webp", @@ -180,11 +180,11 @@ class _UnionList extends State { child: Container(), ), Positioned( - bottom: 16, - left: 12, + bottom: 16.h, + left: 12.w, right: 0, child: Container( - height: 100, + height: 100.h, child: Row( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/view_widget/mine_vip_entry.dart b/lib/view_widget/mine_vip_entry.dart index 129f7c1d..45d8e70e 100644 --- a/lib/view_widget/mine_vip_entry.dart +++ b/lib/view_widget/mine_vip_entry.dart @@ -70,9 +70,9 @@ class MineVipEntry extends StatelessWidget { Widget widget = Container( width: double.infinity, - padding: EdgeInsets.only(top: 12.h, bottom: 35.h, left: 12, right: 12), + padding: EdgeInsets.only(top: 12.h, bottom: 35.h, left: 12.w, right: 12.w), // margin: EdgeInsets.symmetric(horizontal: 14), - margin: EdgeInsets.only(top: 15,left: 14,right: 14,bottom:15), + margin: EdgeInsets.only(top: 15.h,left: 14.w,right: 14.w,bottom:15.h), decoration: BoxDecoration( color: Color(0xFF3D3D5D), borderRadius: BorderRadius.only( @@ -100,7 +100,7 @@ class MineVipEntry extends StatelessWidget { height: 24, ), SizedBox( - width: 4, + width: 4.w, ), Expanded( child: Text( @@ -128,7 +128,7 @@ class MineVipEntry extends StatelessWidget { ], ), SizedBox( - height: 14, + height: 14.h, ), Container( height: 4.h,