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

ios更改

zyh
fmk 3 years ago
parent
dd82f183fa
commit
02eccbd103
3 changed files with 316 additions and 326 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. 604
      lib/store/store_order.dart
  3. 26
      lib/union/union_list.dart

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

@ -616,7 +616,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 = 21; CURRENT_PROJECT_VERSION = 23;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -666,7 +666,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 2.0.21; MARKETING_VERSION = 2.0.23;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -816,7 +816,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 = 21; CURRENT_PROJECT_VERSION = 23;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -866,7 +866,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 2.0.21; MARKETING_VERSION = 2.0.23;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -907,7 +907,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 = 21; CURRENT_PROJECT_VERSION = 23;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -957,7 +957,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 2.0.21; MARKETING_VERSION = 2.0.23;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

604
lib/store/store_order.dart
Unescape View File

@ -207,233 +207,223 @@ class _StoreOrderPage extends State<StoreOrderPage>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return WillPopScope( return Container(
onWillPop: () async { color: Colors.white,
if (dialogShowing) { child: Stack(
debugPrint("ssssasdadsasdadasd"); children: [
SmartDialog.dismiss(); Positioned(
return false; left: 0,
} else { right: 0,
return true; top: 0,
} bottom: 54.h,
}, child: NestedScrollView(
child:Container( controller: controller,
color: Colors.white, dragStartBehavior: DragStartBehavior.start,
child: Stack( physics: BouncingScrollPhysics(),
children: [ headerSliverBuilder:
Positioned( (BuildContext context, bool innerScrolled) {
left: 0, return [
right: 0, SliverOverlapAbsorber(
top: 0, handle: NestedScrollView
bottom: 54.h, .sliverOverlapAbsorberHandleFor(context),
child: NestedScrollView( sliver: SliverAppBar(
controller: controller, expandedHeight: (storeInfo != null &&
dragStartBehavior: DragStartBehavior.start, storeInfo.couponVOList != null)
physics: BouncingScrollPhysics(), ? 400.h
headerSliverBuilder: : 395.h,
(BuildContext context, bool innerScrolled) { floating: false,
return [ snap: false,
SliverOverlapAbsorber( pinned: true,
handle: NestedScrollView stretch: false,
.sliverOverlapAbsorberHandleFor(context), brightness: Brightness.light,
sliver: SliverAppBar( leading: GestureDetector(
expandedHeight: (storeInfo != null && behavior: HitTestBehavior.opaque,
storeInfo.couponVOList != null) onTap: () {
? 400.h Navigator.of(context).pop();
: 395.h, },
floating: false, child: Container(
snap: false, width: double.infinity,
pinned: true, height: double.infinity,
stretch: false, color: Colors.transparent,
brightness: Brightness.light, alignment: Alignment.centerRight,
leading: GestureDetector( margin: EdgeInsets.only(left: 10.w),
behavior: HitTestBehavior.opaque, padding: EdgeInsets.all(10.h),
onTap: () { child: Icon(
Navigator.of(context).pop(); Icons.arrow_back_ios,
}, color: Colors.black,
child: Container( size: 24,
width: double.infinity,
height: double.infinity,
color: Colors.transparent,
alignment: Alignment.centerRight,
margin: EdgeInsets.only(left: 10.w),
padding: EdgeInsets.all(10.h),
child: Icon(
Icons.arrow_back_ios,
color: Colors.black,
size: 24,
),
),
), ),
flexibleSpace: FlexibleSpaceBar( ),
title: Title( ),
controller, flexibleSpace: FlexibleSpaceBar(
storeInfo != null title: Title(
? storeInfo.storeName controller,
: ''), storeInfo != null
collapseMode: CollapseMode.pin, ? storeInfo.storeName
stretchModes: [ : ''),
StretchMode.zoomBackground, collapseMode: CollapseMode.pin,
StretchMode.fadeTitle, stretchModes: [
StretchMode.blurBackground, StretchMode.zoomBackground,
], StretchMode.fadeTitle,
background: Container( StretchMode.blurBackground,
decoration: BoxDecoration( ],
color: Colors.white, background: Container(
borderRadius: BorderRadius.circular(8.w), decoration: BoxDecoration(
), color: Colors.white,
child: Stack( borderRadius: BorderRadius.circular(8.w),
children: [ ),
Positioned( child: Stack(
child: Column( children: [
children: [ Positioned(
buildSwiper(), child: Column(
Expanded( children: [
child: Container( buildSwiper(),
color: Colors.transparent, Expanded(
), child: Container(
flex: 1, color: Colors.transparent,
),
],
),
top: 0,
bottom: 0,
left: 0,
right: 0,
),
Positioned(
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius:
BorderRadius.circular(8.w),
),
child: Column(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
///门店信息
StoreInfoView(storeInfo),
// Padding(padding:EdgeInsets.only(left: 14.w),
// child: Text(
// S.of(context).diandan,
// style: TextStyle(
// fontWeight: MyFontWeight.bold,
// fontSize: 15.sp,
// color: Color(0xFF000000),
// ),
// ),),
// Container(
// width:22.w,
// height: 3.h,
// color: Color(0xFF32A060),
// margin: EdgeInsets.only(top: 5.h,left: 14.w),
// ),
// ///门店对应优惠券
// if (storeInfo != null &&
// storeInfo.couponVOList != null)
// UnionCoupon(
// storeInfo,
// _receiveCoupon,
// coupon: true,
// ),
//
// if (storeInfo == null ||
// storeInfo.couponVOList == null)
// SizedBox(
// height: 8,
// ),
//
// ///门店对应VIP信息
// Vip(storeInfo, () {}, false),
],
), ),
flex: 1,
), ),
top: 233.h, ],
bottom: 0, ),
left: 0, top: 0,
right: 0, bottom: 0,
left: 0,
right: 0,
),
Positioned(
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius:
BorderRadius.circular(8.w),
),
child: Column(
mainAxisAlignment:
MainAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
///门店信息
StoreInfoView(storeInfo),
// Padding(padding:EdgeInsets.only(left: 14.w),
// child: Text(
// S.of(context).diandan,
// style: TextStyle(
// fontWeight: MyFontWeight.bold,
// fontSize: 15.sp,
// color: Color(0xFF000000),
// ),
// ),),
// Container(
// width:22.w,
// height: 3.h,
// color: Color(0xFF32A060),
// margin: EdgeInsets.only(top: 5.h,left: 14.w),
// ),
// ///门店对应优惠券
// if (storeInfo != null &&
// storeInfo.couponVOList != null)
// UnionCoupon(
// storeInfo,
// _receiveCoupon,
// coupon: true,
// ),
//
// if (storeInfo == null ||
// storeInfo.couponVOList == null)
// SizedBox(
// height: 8,
// ),
//
// ///门店对应VIP信息
// Vip(storeInfo, () {}, false),
],
), ),
], ),
top: 233.h,
bottom: 0,
left: 0,
right: 0,
), ),
), ],
), ),
backgroundColor: Color(0x33FAFAFA), ),
centerTitle: false, ),
elevation: 0, backgroundColor: Color(0x33FAFAFA),
bottom: PreferredSize( centerTitle: false,
preferredSize: Size( elevation: 0,
MediaQuery.of(context).size.width, bottom: PreferredSize(
38.h, preferredSize: Size(
MediaQuery.of(context).size.width,
38.h,
),
child: Container(
padding:
EdgeInsets.symmetric(horizontal: 10.w),
width: MediaQuery.of(context).size.width,
child: TabBar(
controller: tabcontroller,
automaticIndicatorColorAdjustment: true,
isScrollable: true,
indicatorWeight: 3,
indicatorColor: Color(0xFF32A060),
labelPadding: EdgeInsets.only(
left: 8.w,
right: 8.w,
), ),
child: Container( indicatorSize: TabBarIndicatorSize.label,
padding: unselectedLabelStyle: TextStyle(
EdgeInsets.symmetric(horizontal: 10.w), fontSize: 15.sp,
width: MediaQuery.of(context).size.width, fontWeight: FontWeight.w400,
child: TabBar(
controller: tabcontroller,
automaticIndicatorColorAdjustment: true,
isScrollable: true,
indicatorWeight: 3,
indicatorColor: Color(0xFF32A060),
labelPadding: EdgeInsets.only(
left: 8.w,
right: 8.w,
),
indicatorSize: TabBarIndicatorSize.label,
unselectedLabelStyle: TextStyle(
fontSize: 15.sp,
fontWeight: FontWeight.w400,
),
labelStyle: TextStyle(
color: Colors.black,
fontSize: 18.sp,
fontWeight: FontWeight.bold,
),
labelColor: Colors.black,
tabs: [
MyTab(text: S.of(context).diandan),
// MyTab(text: ""),
],
),
), ),
labelStyle: TextStyle(
color: Colors.black,
fontSize: 18.sp,
fontWeight: FontWeight.bold,
),
labelColor: Colors.black,
tabs: [
MyTab(text: S.of(context).diandan),
// MyTab(text: ""),
],
), ),
), ),
), ),
]; ),
},
body:
///点餐
TabBarView(
physics: NeverScrollableScrollPhysics(),
children: [
///点餐
StoreOrderListPage(
widget.arguments,
activitys,
storeInfo,
shopCarGoods,
controller,
minToken,
tenant,
_queryMiNiDetail, () {
queryShopCar().then((value) {
this.shopCarGoods = value;
setState(() {});
});
}),
///星店活动,
// StoreActivity(
// widget.arguments,
// activitys,
// ),
],
controller: tabcontroller,
), ),
), /*SmartRefresher( ];
},
body:
///点餐
TabBarView(
physics: NeverScrollableScrollPhysics(),
children: [
///点餐
StoreOrderListPage(
widget.arguments,
activitys,
storeInfo,
shopCarGoods,
controller,
minToken,
tenant,
_queryMiNiDetail, () {
queryShopCar().then((value) {
this.shopCarGoods = value;
setState(() {});
});
}),
///星店活动,
// StoreActivity(
// widget.arguments,
// activitys,
// ),
],
controller: tabcontroller,
),
), /*SmartRefresher(
controller: refreshController = controller: refreshController =
RefreshController(initialRefresh: false), RefreshController(initialRefresh: false),
enablePullDown: true, enablePullDown: true,
@ -445,106 +435,106 @@ class _StoreOrderPage extends State<StoreOrderPage>
}, },
child: child:
),*/ ),*/
), ),
// if(count() != 0) // if(count() != 0)
Positioned( Positioned(
bottom: 30, bottom: 30,
left: 0, left: 0,
right: 0, right: 0,
child: Stack( child: Stack(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
children: [ children: [
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 14), margin: EdgeInsets.symmetric(horizontal: 14),
height: 45.h, height: 45.h,
// color: Color(0xFFFAFAFA), // color: Color(0xFFFAFAFA),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0xFF383A38), color: Color(0xFF383A38),
borderRadius: BorderRadius.circular(100), borderRadius: BorderRadius.circular(100),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: 45.w,
), ),
child: Row( Text.rich(
mainAxisAlignment: MainAxisAlignment.spaceAround, TextSpan(children: [
crossAxisAlignment: CrossAxisAlignment.center, TextSpan(
children: [ text: "￥ ",
SizedBox( style: TextStyle(
width: 45.w, fontSize: 12.sp,
color: Color(0xFFFFFFFF),
fontWeight: MyFontWeight.bold),
), ),
Text.rich( TextSpan(
TextSpan(children: [ text: shopCarGoods != null
TextSpan( ? shopCarGoods.cartSum
text: "￥ ", : "0.0",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 20.sp,
color: Color(0xFFFFFFFF), color: Color(0xFFFFFFFF),
fontWeight: MyFontWeight.bold), fontWeight: MyFontWeight.semi_bold),
),
TextSpan(
text: shopCarGoods != null
? shopCarGoods.cartSum
: "0.0",
style: TextStyle(
fontSize: 20.sp,
color: Color(0xFFFFFFFF),
fontWeight: MyFontWeight.semi_bold),
),
]),
),
Spacer(),
GestureDetector(
onTap: () {
toDownOrder();
},
child: RoundButton(
width: 103.w,
height: 54.h,
text: S.current.jiesuan,
textColor: Colors.white,
fontWeight: MyFontWeight.bold,
backgroup: Color(0xFF32A060),
radius: 100,
fontSize: 16.sp,
padding:
EdgeInsets.symmetric(vertical: 5.h),
),
), ),
], ]),
), ),
), Spacer(),
Stack( GestureDetector(
children: [ onTap: () {
InkWell( toDownOrder();
onTap: () { },
if (count() != 0) showShoppingCart(); child: RoundButton(
}, width: 103.w,
child: Image.asset( height: 54.h,
"assets/image/shopping_bag.webp", text: S.current.jiesuan,
width: 66, textColor: Colors.white,
height: 66, fontWeight: MyFontWeight.bold,
fit: BoxFit.fitWidth, backgroup: Color(0xFF32A060),
), radius: 100,
fontSize: 16.sp,
padding:
EdgeInsets.symmetric(vertical: 5.h),
), ),
if (count() != 0) ),
Positioned( ],
right: 5, ),
// top: 14, ),
child: RoundButton( Stack(
width: 17.w, children: [
height: 17.h, InkWell(
text: "${count()}", onTap: () {
textColor: Colors.white, if (count() != 0) showShoppingCart();
fontWeight: MyFontWeight.regular, },
backgroup: Color(0xFFF65720), child: Image.asset(
fontSize: 12.sp, "assets/image/shopping_bag.webp",
radius: 100, width: 66,
), height: 66,
), fit: BoxFit.fitWidth,
], ),
), ),
if (count() != 0)
Positioned(
right: 5,
// top: 14,
child: RoundButton(
width: 17.w,
height: 17.h,
text: "${count()}",
textColor: Colors.white,
fontWeight: MyFontWeight.regular,
backgroup: Color(0xFFF65720),
fontSize: 12.sp,
radius: 100,
),
),
], ],
), ),
), ],
], ),
))); ),
],
));
} }
///领取优惠券 ///领取优惠券

26
lib/union/union_list.dart
Unescape View File

@ -58,19 +58,19 @@ class _UnionList extends State<UnionList> {
if (widget.storeList[position].posType.code == "NORMALSTORE") { if (widget.storeList[position].posType.code == "NORMALSTORE") {
showDeleteDialog(); showDeleteDialog();
} }
else if (widget.storeList[position].posType.code == // else if (widget.storeList[position].posType.code ==
"DIRECT" && // "RETAILSTORE" &&
widget.storeList[position].storeName == "一心回乡商城") { // widget.storeList[position].storeName == "一心回乡商城") {
Navigator.of(context).pushNamed( // Navigator.of(context).pushNamed(
'/router/shopping_mall_home', // '/router/shopping_mall_home',
arguments: { // arguments: {
"type": 0, // "type": 0,
"id": widget.storeList[position].id, // "id": widget.storeList[position].id,
"tenant": widget.storeList[position].tenantCode, // "tenant": widget.storeList[position].tenantCode,
"storeName": widget.storeList[position].storeName // "storeName": widget.storeList[position].storeName
}, // },
); // );
} // }
else else
{ {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(

Write Preview
Loading…
Cancel
Save