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

ios更改

zyh
fmk 3 years ago
parent
97399ce718
commit
c0c62a1bde
6 changed files with 340 additions and 329 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      ios/Runner.xcodeproj/project.pbxproj
  2. 87
      lib/mine/mine_view/mine_item.dart
  3. 2
      lib/retrofit/min_api.dart
  4. 2
      lib/retrofit/retrofit_api.dart
  5. 535
      lib/store/store_order.dart
  6. 31
      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_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -666,7 +666,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 2.0.5;
MARKETING_VERSION = 2.0.6;
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 = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -866,7 +866,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 2.0.5;
MARKETING_VERSION = 2.0.6;
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 = 5;
CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -957,7 +957,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 2.0.5;
MARKETING_VERSION = 2.0.6;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",

87
lib/mine/mine_view/mine_item.dart
Unescape View File

@ -228,29 +228,29 @@ class _MineItem extends State<MineItem> {
Row(
children: [
///我的砍价
Expanded(child:
InkWell(
onTap: () {
Navigator.of(context)
.pushNamed('/router/bargain_group_order',
arguments: {"type":3});
},
child: mineItem(
S.of(context).wodekanjia,
"assets/image/bargain.webp",
),
),),
///我的拼团
Expanded(child: InkWell(
onTap: () {
Navigator.of(context).pushNamed('/router/bargain_group_order',
arguments: {"type":1});
},
child: mineItem(
S.of(context).wodepintuan,
"assets/image/collage.webp",
),
),),
// Expanded(child:
// InkWell(
// onTap: () {
// Navigator.of(context)
// .pushNamed('/router/bargain_group_order',
// arguments: {"type":3});
// },
// child: mineItem(
// S.of(context).wodekanjia,
// "assets/image/bargain.webp",
// ),
// ),),
// ///我的拼团
// Expanded(child: InkWell(
// onTap: () {
// Navigator.of(context).pushNamed('/router/bargain_group_order',
// arguments: {"type":1});
// },
// child: mineItem(
// S.of(context).wodepintuan,
// "assets/image/collage.webp",
// ),
// ),),
///商户入驻
Expanded(child: InkWell(
onTap: () {
@ -272,6 +272,27 @@ class _MineItem extends State<MineItem> {
"assets/image/fan_kui.webp",
),
),),
///联系客服
Expanded(child: InkWell(
onTap: () {
showCallMobile();
},
child: mineItem(
"联系客服",
"assets/image/icon_mine_online_service.webp",
),
),),
Expanded(child:Container(),),
// ///帮助反馈
// Expanded(child: InkWell(
// onTap: () {
// Navigator.of(context).pushNamed('/router/help_feedback_page');
// },
// child: mineItem(
// S.of(context).bangzhuyufankui,
// "assets/image/fan_kui.webp",
// ),
// ),),
// Expanded(child: InkWell(
// onTap: () {
// Navigator.of(context).pushNamed('/router/qr_share', arguments: {});
@ -308,16 +329,16 @@ class _MineItem extends State<MineItem> {
// "assets/image/bill_gl.webp",
// ),
// ),),
///联系客服
Expanded(child: InkWell(
onTap: () {
showCallMobile();
},
child: mineItem(
"联系客服",
"assets/image/icon_mine_online_service.webp",
),
),),
// ///联系客服
// Expanded(child: InkWell(
// onTap: () {
// showCallMobile();
// },
// child: mineItem(
// "联系客服",
// "assets/image/icon_mine_online_service.webp",
// ),
// ),),
Expanded(child:Container(),),
Expanded(child:Container(),),
Expanded(child:Container(),),

2
lib/retrofit/min_api.dart
Unescape View File

@ -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 = "http://192.168.10.236:8765/app/";///线上
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
///调用小程序的接口

2
lib/retrofit/retrofit_api.dart
Unescape View File

@ -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 = "http://192.168.10.236:8766/app/";///线上
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
@RestApi(baseUrl: localBaseUrl)
abstract class ApiService {

535
lib/store/store_order.dart
Unescape View File

@ -203,202 +203,192 @@ class _StoreOrderPage extends State<StoreOrderPage>
@override
Widget build(BuildContext context) {
return WillPopScope(
onWillPop: () async {
if (dialogShowing) {
debugPrint("ssssasdadsasdadasd");
SmartDialog.dismiss();
return false;
} else {
return true;
}
},
child: Container(
color: Colors.white,
child: Stack(
children: [
Positioned(
left: 0,
right: 0,
top: 0,
bottom: 54.h,
child: NestedScrollView(
controller: controller,
dragStartBehavior: DragStartBehavior.start,
physics: BouncingScrollPhysics(),
headerSliverBuilder: (BuildContext context, bool innerScrolled) {
return [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(
context),
sliver: SliverAppBar(
expandedHeight: (storeInfo != null &&
storeInfo.couponVOList != null)
? 400.h
: 395.h,
floating: false,
snap: false,
pinned: true,
stretch: false,
brightness: Brightness.light,
leading: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
Navigator.of(context).pop();
},
child: Container(
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,
),
return Container(
color: Colors.white,
child: Stack(
children: [
Positioned(
left: 0,
right: 0,
top: 0,
bottom: 54.h,
child: NestedScrollView(
controller: controller,
dragStartBehavior: DragStartBehavior.start,
physics: BouncingScrollPhysics(),
headerSliverBuilder: (BuildContext context, bool innerScrolled) {
return [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(
context),
sliver: SliverAppBar(
expandedHeight: (storeInfo != null &&
storeInfo.couponVOList != null)
? 400.h
: 395.h,
floating: false,
snap: false,
pinned: true,
stretch: false,
brightness: Brightness.light,
leading: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
Navigator.of(context).pop();
},
child: Container(
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,
storeInfo != null ? storeInfo.storeName : ''),
collapseMode: CollapseMode.pin,
stretchModes: [
StretchMode.zoomBackground,
StretchMode.fadeTitle,
StretchMode.blurBackground,
],
background: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8.w),
),
child: Stack(
children: [
Positioned(
child: Column(
children: [
buildSwiper(),
Expanded(
child: Container(
color: Colors.transparent,
),
flex: 1,
),
flexibleSpace: FlexibleSpaceBar(
title: Title(controller,
storeInfo != null ? storeInfo.storeName : ''),
collapseMode: CollapseMode.pin,
stretchModes: [
StretchMode.zoomBackground,
StretchMode.fadeTitle,
StretchMode.blurBackground,
],
background: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8.w),
),
child: Stack(
children: [
Positioned(
child: Column(
children: [
buildSwiper(),
Expanded(
child: Container(
color: Colors.transparent,
),
],
),
top: 0,
bottom: 0,
left: 0,
right: 0,
flex: 1,
),
],
),
Positioned(
child: Container(
decoration: BoxDecoration(
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),
],
),
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,
),
],
),
top:233.h,
bottom: 0,
left: 0,
right: 0,
),
],
),
),
backgroundColor: Color(0x33FAFAFA),
centerTitle: false,
elevation: 0,
bottom: PreferredSize(
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,
),
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: ""),
],
),
backgroundColor: Color(0x33FAFAFA),
centerTitle: false,
elevation: 0,
bottom: PreferredSize(
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,
),
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: ""),
],
),
),
),
),
];
},
body:
///点餐
TabBarView(
physics: NeverScrollableScrollPhysics(),
children: [
///点餐
StoreOrderListPage(
),
];
},
body:
///点餐
TabBarView(
physics: NeverScrollableScrollPhysics(),
children: [
///点餐
StoreOrderListPage(
widget.arguments,
activitys,
storeInfo,
@ -407,23 +397,23 @@ class _StoreOrderPage extends State<StoreOrderPage>
minToken,
tenant,
_queryMiNiDetail,
(){
queryShopCar().then((value) {
this.shopCarGoods = value;
setState(() {});
});
}
),
(){
queryShopCar().then((value) {
this.shopCarGoods = value;
setState(() {});
});
}
),
///星店活动,
// StoreActivity(
// widget.arguments,
// activitys,
// ),
],
controller: tabcontroller,
),
), /*SmartRefresher(
///星店活动,
// StoreActivity(
// widget.arguments,
// activitys,
// ),
],
controller: tabcontroller,
),
), /*SmartRefresher(
controller: refreshController =
RefreshController(initialRefresh: false),
enablePullDown: true,
@ -435,82 +425,82 @@ class _StoreOrderPage extends State<StoreOrderPage>
},
child:
),*/
),
// if(count() != 0)
Positioned(
bottom: 30,
left: 0,
right: 0,
child: Stack(
alignment: Alignment.bottomLeft,
children: [
Container(
margin: EdgeInsets.symmetric(horizontal: 14),
height: 45.h,
// color: Color(0xFFFAFAFA),
decoration: BoxDecoration(
color: Color(0xFF383A38),
borderRadius: BorderRadius.circular(100),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(width:45.w,),
Text.rich(
TextSpan(children: [
TextSpan(
text: "￥ ",
style: TextStyle(
fontSize: 12.sp,
color: Color(0xFFFFFFFF),
fontWeight: MyFontWeight.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),
),
),
],
),
),
// if(count() != 0)
Positioned(
bottom: 30,
left: 0,
right: 0,
child: Stack(
alignment: Alignment.bottomLeft,
children: [
Container(
margin: EdgeInsets.symmetric(horizontal: 14),
height: 45.h,
// color: Color(0xFFFAFAFA),
decoration: BoxDecoration(
color: Color(0xFF383A38),
borderRadius: BorderRadius.circular(100),
),
Stack(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
InkWell(
SizedBox(width:45.w,),
Text.rich(
TextSpan(children: [
TextSpan(
text: "￥ ",
style: TextStyle(
fontSize: 12.sp,
color: Color(0xFFFFFFFF),
fontWeight: MyFontWeight.bold),
),
TextSpan(
text:
shopCarGoods != null ? shopCarGoods.cartSum : "0.0",
style: TextStyle(
fontSize: 20.sp,
color: Color(0xFFFFFFFF),
fontWeight: MyFontWeight.semi_bold),
),
]),
),
Spacer(),
GestureDetector(
onTap: () {
if(count() != 0)
showShoppingCart();
toDownOrder();
},
child: Image.asset(
"assets/image/shopping_bag.webp",
width: 66,
height: 66,
fit: BoxFit.fitWidth,
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),
),
),
if(count() != 0)
],
),
),
Stack(
children: [
InkWell(
onTap: () {
if(count() != 0)
showShoppingCart();
},
child: Image.asset(
"assets/image/shopping_bag.webp",
width: 66,
height: 66,
fit: BoxFit.fitWidth,
),
),
if(count() != 0)
Positioned(
right: 5,
// top: 14,
@ -525,15 +515,14 @@ class _StoreOrderPage extends State<StoreOrderPage>
radius: 100,
),
),
],
),
],
),
],
),
],
),
],
),
),
],
),
);
);
}
///领取优惠券

31
lib/union/union_list.dart
Unescape View File

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

Write Preview
Loading…
Cancel
Save