diff --git a/lib/mine/mine_view/mine_item.dart b/lib/mine/mine_view/mine_item.dart index 03954eae..a6db740e 100644 --- a/lib/mine/mine_view/mine_item.dart +++ b/lib/mine/mine_view/mine_item.dart @@ -170,7 +170,7 @@ class _MineItem extends State { ),), Expanded(child: Text("")), ], - ),), + ), Expanded(child:InkWell( onTap: () { Navigator.of(context).pushNamed('/router/qr_share', arguments: {}); @@ -180,30 +180,28 @@ class _MineItem extends State { "assets/image/icon_mine_promotion_code.png", ), ),), + Row( + children: [ + Expanded(child:InkWell( + onTap: () { + Navigator.of(context).pushNamed('/router/invitation_record', arguments: {}); + }, + child: mineItem( + "邀请记录", + "assets/image/yao_q.png", + ), + ),), + Expanded(child:Container()), + Expanded(child:Container()), + Expanded(child:Container()) ], ), - Row( - children: [ - Expanded(child:InkWell( - onTap: () { - Navigator.of(context).pushNamed('/router/invitation_record', arguments: {}); - }, - child: mineItem( - "邀请记录", - "assets/image/yao_q.png", - ), - ),), - Expanded(child:Container()), - Expanded(child:Container()), - Expanded(child:Container()) - ], + ], ), // mineItem( // S.of(context).bangzhuyufankui, // "assets/image/icon_mine_feedback.png", // ), - ], - ), ); } diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 2ea6780f..01814054 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -28,8 +28,8 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式 -const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式 +// const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式 +// const baseUrl = "https://pos.api.lotus-wallet.com/app/"; ///正式 // const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 1b2f7162..04e5cada 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -58,8 +58,8 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 -const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 +// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式 +// const baseUrl = "https://pos.platform.lotus-wallet.com/app/"; ///正式 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222 diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index a86440f7..1dbe7473 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/lib/retrofit/retrofit_api.g.dart @@ -1189,7 +1189,7 @@ class _ApiService implements ApiService { } @override - Future> orderCancel(id) async { + Future> orderCancel(id) async { ArgumentError.checkNotNull(id, 'id'); const _extra = {}; final queryParameters = {}; @@ -1203,9 +1203,9 @@ class _ApiService implements ApiService { extra: _extra, baseUrl: baseUrl), data: _data); - final value = BaseData.fromJson( + final value = BaseData.fromJson( _result.data, - (json) => json as dynamic, + (json) => json as bool, ); return value; } diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index dcd83b2a..f891dc1d 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -488,6 +488,7 @@ class _StoreOrderPage extends State ), ], ), + ), ); }