Browse Source

ios更改

zyh
fmk 3 years ago
parent
commit
c0c62a1bde
  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

@ -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 = 5; CURRENT_PROJECT_VERSION = 6;
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.5; MARKETING_VERSION = 2.0.6;
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 = 5; CURRENT_PROJECT_VERSION = 6;
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.5; MARKETING_VERSION = 2.0.6;
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 = 5; CURRENT_PROJECT_VERSION = 6;
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.5; MARKETING_VERSION = 2.0.6;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

87
lib/mine/mine_view/mine_item.dart

@ -228,29 +228,29 @@ class _MineItem extends State<MineItem> {
Row( Row(
children: [ children: [
/// ///
Expanded(child: // Expanded(child:
InkWell( // InkWell(
onTap: () { // onTap: () {
Navigator.of(context) // Navigator.of(context)
.pushNamed('/router/bargain_group_order', // .pushNamed('/router/bargain_group_order',
arguments: {"type":3}); // arguments: {"type":3});
}, // },
child: mineItem( // child: mineItem(
S.of(context).wodekanjia, // S.of(context).wodekanjia,
"assets/image/bargain.webp", // "assets/image/bargain.webp",
), // ),
),), // ),),
/// // ///
Expanded(child: InkWell( // Expanded(child: InkWell(
onTap: () { // onTap: () {
Navigator.of(context).pushNamed('/router/bargain_group_order', // Navigator.of(context).pushNamed('/router/bargain_group_order',
arguments: {"type":1}); // arguments: {"type":1});
}, // },
child: mineItem( // child: mineItem(
S.of(context).wodepintuan, // S.of(context).wodepintuan,
"assets/image/collage.webp", // "assets/image/collage.webp",
), // ),
),), // ),),
/// ///
Expanded(child: InkWell( Expanded(child: InkWell(
onTap: () { onTap: () {
@ -272,6 +272,27 @@ class _MineItem extends State<MineItem> {
"assets/image/fan_kui.webp", "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( // Expanded(child: InkWell(
// onTap: () { // onTap: () {
// Navigator.of(context).pushNamed('/router/qr_share', arguments: {}); // Navigator.of(context).pushNamed('/router/qr_share', arguments: {});
@ -308,16 +329,16 @@ class _MineItem extends State<MineItem> {
// "assets/image/bill_gl.webp", // "assets/image/bill_gl.webp",
// ), // ),
// ),), // ),),
/// // ///
Expanded(child: InkWell( // Expanded(child: InkWell(
onTap: () { // onTap: () {
showCallMobile(); // showCallMobile();
}, // },
child: mineItem( // child: mineItem(
"联系客服", // "联系客服",
"assets/image/icon_mine_online_service.webp", // "assets/image/icon_mine_online_service.webp",
), // ),
),), // ),),
Expanded(child:Container(),), Expanded(child:Container(),),
Expanded(child:Container(),), Expanded(child:Container(),),
Expanded(child:Container(),), Expanded(child:Container(),),

2
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 base_url = "http://192.168.10.37:8765/app/";
const localBaseUrl = "http://192.168.10.236: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

@ -72,7 +72,7 @@ part 'retrofit_api.g.dart';
// const base_url = "http://192.168.10.132:8766/app/";/// // const base_url = "http://192.168.10.132:8766/app/";///
const localBaseUrl = "http://192.168.10.236: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) @RestApi(baseUrl: localBaseUrl)
abstract class ApiService { abstract class ApiService {

535
lib/store/store_order.dart

@ -203,202 +203,192 @@ 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: (BuildContext context, bool innerScrolled) {
Positioned( return [
left: 0, SliverOverlapAbsorber(
right: 0, handle: NestedScrollView.sliverOverlapAbsorberHandleFor(
top: 0, context),
bottom: 54.h, sliver: SliverAppBar(
child: NestedScrollView( expandedHeight: (storeInfo != null &&
controller: controller, storeInfo.couponVOList != null)
dragStartBehavior: DragStartBehavior.start, ? 400.h
physics: BouncingScrollPhysics(), : 395.h,
headerSliverBuilder: (BuildContext context, bool innerScrolled) { floating: false,
return [ snap: false,
SliverOverlapAbsorber( pinned: true,
handle: NestedScrollView.sliverOverlapAbsorberHandleFor( stretch: false,
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 ? storeInfo.storeName : ''), title: Title(controller,
collapseMode: CollapseMode.pin, storeInfo != null ? storeInfo.storeName : ''),
stretchModes: [ collapseMode: CollapseMode.pin,
StretchMode.zoomBackground, stretchModes: [
StretchMode.fadeTitle, StretchMode.zoomBackground,
StretchMode.blurBackground, StretchMode.fadeTitle,
], StretchMode.blurBackground,
background: Container( ],
decoration: BoxDecoration( background: Container(
color: Colors.white, decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w), color: Colors.white,
), borderRadius: BorderRadius.circular(8.w),
child: Stack( ),
children: [ child: Stack(
Positioned( children: [
child: Column( Positioned(
children: [ child: Column(
buildSwiper(), children: [
Expanded( buildSwiper(),
child: Container( Expanded(
color: Colors.transparent, child: Container(
), color: Colors.transparent,
flex: 1,
), ),
], flex: 1,
), ),
top: 0, ],
bottom: 0,
left: 0,
right: 0,
), ),
Positioned( top: 0,
child: Container( bottom: 0,
decoration: BoxDecoration( left: 0,
right: 0,
),
Positioned(
child: Container(
decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(8.w), borderRadius: BorderRadius.circular(8.w),
), ),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
/// ///
StoreInfoView(storeInfo), StoreInfoView(storeInfo),
// Padding(padding:EdgeInsets.only(left: 14.w), // Padding(padding:EdgeInsets.only(left: 14.w),
// child: Text( // child: Text(
// S.of(context).diandan, // S.of(context).diandan,
// style: TextStyle( // style: TextStyle(
// fontWeight: MyFontWeight.bold, // fontWeight: MyFontWeight.bold,
// fontSize: 15.sp, // fontSize: 15.sp,
// color: Color(0xFF000000), // color: Color(0xFF000000),
// ), // ),
// ),), // ),),
// Container( // Container(
// width:22.w, // width:22.w,
// height: 3.h, // height: 3.h,
// color: Color(0xFF32A060), // color: Color(0xFF32A060),
// margin: EdgeInsets.only(top: 5.h,left: 14.w), // margin: EdgeInsets.only(top: 5.h,left: 14.w),
// ), // ),
// /// // ///
// if (storeInfo != null && // if (storeInfo != null &&
// storeInfo.couponVOList != null) // storeInfo.couponVOList != null)
// UnionCoupon( // UnionCoupon(
// storeInfo, // storeInfo,
// _receiveCoupon, // _receiveCoupon,
// coupon: true, // coupon: true,
// ), // ),
// //
// if (storeInfo == null || // if (storeInfo == null ||
// storeInfo.couponVOList == null) // storeInfo.couponVOList == null)
// SizedBox( // SizedBox(
// height: 8, // height: 8,
// ), // ),
// //
// ///VIP信息 // ///VIP信息
// Vip(storeInfo, () {}, false), // 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, backgroundColor: Color(0x33FAFAFA),
elevation: 0, centerTitle: false,
bottom: PreferredSize( elevation: 0,
preferredSize: Size( bottom: PreferredSize(
MediaQuery.of(context).size.width, preferredSize: Size(
38.h, MediaQuery.of(context).size.width,
), 38.h,
child: Container( ),
padding: EdgeInsets.symmetric(horizontal: 10.w), child: Container(
width: MediaQuery.of(context).size.width, padding: EdgeInsets.symmetric(horizontal: 10.w),
child: TabBar( width: MediaQuery.of(context).size.width,
controller: tabcontroller, child: TabBar(
automaticIndicatorColorAdjustment: true, controller: tabcontroller,
isScrollable: true, automaticIndicatorColorAdjustment: true,
indicatorWeight: 3, isScrollable: true,
indicatorColor: Color(0xFF32A060), indicatorWeight: 3,
labelPadding: EdgeInsets.only( indicatorColor: Color(0xFF32A060),
left: 8.w, labelPadding: EdgeInsets.only(
right: 8.w, left: 8.w,
), right: 8.w,
indicatorSize: TabBarIndicatorSize.label, ),
unselectedLabelStyle: TextStyle( indicatorSize: TabBarIndicatorSize.label,
fontSize: 15.sp, unselectedLabelStyle: TextStyle(
fontWeight: FontWeight.w400, 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: },
/// body:
TabBarView( ///
physics: NeverScrollableScrollPhysics(), TabBarView(
children: [ physics: NeverScrollableScrollPhysics(),
/// children: [
StoreOrderListPage( ///
StoreOrderListPage(
widget.arguments, widget.arguments,
activitys, activitys,
storeInfo, storeInfo,
@ -407,23 +397,23 @@ class _StoreOrderPage extends State<StoreOrderPage>
minToken, minToken,
tenant, tenant,
_queryMiNiDetail, _queryMiNiDetail,
(){ (){
queryShopCar().then((value) { queryShopCar().then((value) {
this.shopCarGoods = value; this.shopCarGoods = value;
setState(() {}); setState(() {});
}); });
} }
), ),
///, ///,
// StoreActivity( // StoreActivity(
// widget.arguments, // widget.arguments,
// activitys, // activitys,
// ), // ),
], ],
controller: tabcontroller, controller: tabcontroller,
), ),
), /*SmartRefresher( ), /*SmartRefresher(
controller: refreshController = controller: refreshController =
RefreshController(initialRefresh: false), RefreshController(initialRefresh: false),
enablePullDown: true, enablePullDown: true,
@ -435,82 +425,82 @@ 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,),
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),
),
),
],
),
), ),
Stack( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.center,
children: [ 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: () { onTap: () {
if(count() != 0) toDownOrder();
showShoppingCart();
}, },
child: Image.asset( child: RoundButton(
"assets/image/shopping_bag.webp", width: 103.w,
width: 66, height: 54.h,
height: 66, text: S.current.jiesuan,
fit: BoxFit.fitWidth, 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( Positioned(
right: 5, right: 5,
// top: 14, // top: 14,
@ -525,15 +515,14 @@ class _StoreOrderPage extends State<StoreOrderPage>
radius: 100, radius: 100,
), ),
), ),
], ],
), ),
], ],
),
), ),
], ),
), ],
), ),
); );
} }
/// ///

31
lib/union/union_list.dart

@ -55,21 +55,22 @@ class _UnionList extends State<UnionList> {
itemBuilder: (context, position) { itemBuilder: (context, position) {
return InkWell( return InkWell(
onTap: () { onTap: () {
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 ==
"RETAILSTORE" && // "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(
'/router/store_order', '/router/store_order',
arguments: { arguments: {

Loading…
Cancel
Save