Browse Source

ios更新

ff_new
fmk 3 years ago
parent
commit
26761ca05e
  1. 37
      ios/Podfile.lock
  2. 132
      ios/Runner.xcodeproj/project.pbxproj
  3. 2
      lib/community/release_dynamic.dart
  4. 2
      lib/integral/integral_detailed_page.dart
  5. 2
      lib/integral/intergra_view/integral_task.dart
  6. 2
      lib/mine/vip_card_page.dart
  7. 2
      lib/mine/vip_detail_page.dart
  8. 2
      lib/order/write_off_page.dart
  9. 10
      lib/retrofit/data/base_data.g.dart
  10. 8
      lib/retrofit/min_api.dart
  11. 2
      lib/retrofit/min_api.g.dart
  12. 11
      lib/retrofit/retrofit_api.dart
  13. 80
      lib/retrofit/retrofit_api.g.dart
  14. 33
      lib/store/store_order.dart
  15. 2
      lib/store/store_view/store_info.dart
  16. 2
      lib/view_widget/new_coupon_widget.dart

37
ios/Podfile.lock

@ -140,6 +140,9 @@ PODS:
- mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
@ -167,7 +170,7 @@ PODS:
- SDWebImage (5.12.1):
- SDWebImage/Core (= 5.12.1)
- SDWebImage/Core (5.12.1)
- shared_preferences_ios (0.0.1):
- shared_preferences (0.0.1):
- Flutter
- sharesdk_plugin (1.1.2):
- Flutter
@ -201,12 +204,12 @@ PODS:
- mob_sharesdk/ShareSDKPlatforms/Twitter
- mob_sharesdk/ShareSDKPlatforms/VKontakte
- mob_sharesdk/ShareSDKPlatforms/WatermelonVideo
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite
- mob_sharesdk/ShareSDKPlatforms/WhatsApp
- mob_sharesdk/ShareSDKPlatforms/Yixin
- mob_sharesdk/ShareSDKPlatforms/YouDaoNote
- mob_sharesdk/ShareSDKRestoreScene
- mob_sharesdk/ShareSDKUI
- WechatOpenSDK_Fuck (~> 1.9.2)
- SSZipArchive (2.4.2)
- thumbnails (0.0.1):
- Flutter
@ -216,7 +219,7 @@ PODS:
- TPNS-iOS (= 1.3.3.0)
- url_launcher (0.0.1):
- Flutter
- video_player_avfoundation (0.0.1):
- video_player (0.0.1):
- Flutter
- wakelock (0.0.1):
- Flutter
@ -239,13 +242,13 @@ DEPENDENCIES:
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- permission_handler (from `.symlinks/plugins/permission_handler/ios`)
- scan (from `.symlinks/plugins/scan/ios`)
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- sharesdk_plugin (from `.symlinks/plugins/sharesdk_plugin/ios`)
- SSZipArchive (~> 2.4.2)
- thumbnails (from `.symlinks/plugins/thumbnails/ios`)
- tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
- video_player (from `.symlinks/plugins/video_player/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
@ -287,8 +290,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/permission_handler/ios"
scan:
:path: ".symlinks/plugins/scan/ios"
shared_preferences_ios:
:path: ".symlinks/plugins/shared_preferences_ios/ios"
shared_preferences:
:path: ".symlinks/plugins/shared_preferences/ios"
sharesdk_plugin:
:path: ".symlinks/plugins/sharesdk_plugin/ios"
thumbnails:
@ -297,8 +300,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/tpns_flutter_plugin/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
video_player_avfoundation:
:path: ".symlinks/plugins/video_player_avfoundation/ios"
video_player:
:path: ".symlinks/plugins/video_player/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
webview_flutter:
@ -308,13 +311,13 @@ SPEC CHECKSUMS:
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
BaiduMapKit: 907c6d9b74f66c3ff4741fc4b568ae0b339917f8
BMKLocationKit: 097814ef672b1e57e86e6c1968d7892fb78002bf
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
flutter_baidu_mapapi_base: 90fddba11ec4435406a7211d6ee905b4311c31db
flutter_baidu_mapapi_map: 771bf00671832b1fcddb17733518cd631529df16
flutter_baidu_mapapi_search: 4cffaa74e739a4114595c4f82f790e1783bb612d
flutter_baidu_mapapi_utils: a5bd582b91ecd35be1bc45558b38f49d5684f70a
flutter_bmflocation: 12f1ba91bae4b16d78d4f475023e0254ed351f1c
fluwx: 02670633ce7509206f62b366e9734e7dda81e100
fluwx: c192ef1ea3617badb813fa1a761ffc5c9c12208a
image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451
mob_sharesdk: c771f001e00739d24301a9fa250247601efe7a3c
MOBFoundation: 2abd23c80c33d1337d30dc4b0018ed914cef8f8e
@ -323,16 +326,16 @@ SPEC CHECKSUMS:
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86
SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
sharesdk_plugin: eda37b6eee2c0af21d3ee5e9c56f85ac538a9884
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
sharesdk_plugin: 5a59e49d2d5e55c8e8f67cc9ddf05172c2494a6b
SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
thumbnails: df4b2db0d4030d134e7665da9c3060b0d78726fe
thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad
TPNS-iOS: 57a146496858ba2fb5d43e5f240feb19243b69cb
tpns_flutter_plugin: ee51c5d85993cee1dba9a1caa0eb22270a71f988
tpns_flutter_plugin: a366649c8ad71f19dfb864d3c994ed0480b69daa
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232
webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
WechatOpenSDK_Fuck: aa8f4b0af902837e887a1d40c62f06c060c1dc98
ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736

132
ios/Runner.xcodeproj/project.pbxproj

@ -211,6 +211,76 @@
path = Class;
sourceTree = SOURCE_ROOT;
};
6EE8F2E42695813500237A5E /* UniMPSDK */ = {
isa = PBXGroup;
children = (
6EE8F2EC2695815C00237A5E /* Headers */,
6EE8F3382695816000237A5E /* Libs */,
6EE8F2E52695815A00237A5E /* Resources */,
);
path = UniMPSDK;
sourceTree = SOURCE_ROOT;
};
6EE8F2E52695815A00237A5E /* Resources */ = {
isa = PBXGroup;
children = (
89319A6726E237A5001EFBD7 /* Resources */,
);
path = Resources;
sourceTree = "<group>";
};
6EE8F2EC2695815C00237A5E /* Headers */ = {
isa = PBXGroup;
children = (
6EE8F2F12695815C00237A5E /* weexHeader */,
);
path = Headers;
sourceTree = "<group>";
};
6EE8F2F12695815C00237A5E /* weexHeader */ = {
isa = PBXGroup;
children = (
);
path = weexHeader;
sourceTree = "<group>";
};
6EE8F3382695816000237A5E /* Libs */ = {
isa = PBXGroup;
children = (
);
path = Libs;
sourceTree = "<group>";
};
89319A6726E237A5001EFBD7 /* Resources */ = {
isa = PBXGroup;
children = (
);
name = Resources;
sourceTree = "<group>";
};
89A626A826A7FFF30004A8F0 /* wx */ = {
isa = PBXGroup;
children = (
89A626AA26A8000C0004A8F0 /* Headers */,
89A626A926A800010004A8F0 /* Libs */,
);
path = wx;
sourceTree = SOURCE_ROOT;
};
89A626A926A800010004A8F0 /* Libs */ = {
isa = PBXGroup;
children = (
);
path = Libs;
sourceTree = "<group>";
};
89A626AA26A8000C0004A8F0 /* Headers */ = {
isa = PBXGroup;
children = (
);
path = Headers;
sourceTree = "<group>";
};
9740EEB11CF90186004384FC /* Flutter */ = {
isa = PBXGroup;
children = (
@ -246,7 +316,9 @@
isa = PBXGroup;
children = (
05C5426126BBE82E00D26AC2 /* baidu */,
89A626A826A7FFF30004A8F0 /* wx */,
89847A4826A14482008C8077 /* Runner.entitlements */,
6EE8F2E42695813500237A5E /* UniMPSDK */,
6EE8F2E32695806400237A5E /* Class */,
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */,
7AFFD8EE1D35381100E5BB4D /* AppDelegate.mm */,
@ -544,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 = 62;
CURRENT_PROJECT_VERSION = 75;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -594,11 +666,27 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 1.0.62;
MARKETING_VERSION = 1.0.75;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-l\"c++\"",
"-l\"image_pickers\"",
"-l\"path_provider\"",
"-l\"flutter_bmflocation\"",
"-l\"flutter_baidu_mapapi_utils\"",
"-l\"flutter_baidu_mapapi_search\"",
"-l\"flutter_baidu_mapapi_map\"",
"-l\"flutter_baidu_mapapi_base\"",
"-l\"permission_handler\"",
"-l\"sqlite3\"",
"-l\"video_player\"",
"-l\"wakelock\"",
"-l\"webview_flutter\"",
"-l\"z\"",
"-fcxx-modules",
"-fmodules",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
PRODUCT_NAME = "$(TARGET_NAME)";
@ -728,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 = 62;
CURRENT_PROJECT_VERSION = 75;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -778,11 +866,27 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 1.0.62;
MARKETING_VERSION = 1.0.75;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-l\"c++\"",
"-l\"image_pickers\"",
"-l\"path_provider\"",
"-l\"flutter_bmflocation\"",
"-l\"flutter_baidu_mapapi_utils\"",
"-l\"flutter_baidu_mapapi_search\"",
"-l\"flutter_baidu_mapapi_map\"",
"-l\"flutter_baidu_mapapi_base\"",
"-l\"permission_handler\"",
"-l\"sqlite3\"",
"-l\"video_player\"",
"-l\"wakelock\"",
"-l\"webview_flutter\"",
"-l\"z\"",
"-fcxx-modules",
"-fmodules",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
PRODUCT_NAME = "$(TARGET_NAME)";
@ -803,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 = 62;
CURRENT_PROJECT_VERSION = 75;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -853,11 +957,27 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 1.0.62;
MARKETING_VERSION = 1.0.75;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-l\"c++\"",
"-l\"image_pickers\"",
"-l\"path_provider\"",
"-l\"flutter_bmflocation\"",
"-l\"flutter_baidu_mapapi_utils\"",
"-l\"flutter_baidu_mapapi_search\"",
"-l\"flutter_baidu_mapapi_map\"",
"-l\"flutter_baidu_mapapi_base\"",
"-l\"permission_handler\"",
"-l\"sqlite3\"",
"-l\"video_player\"",
"-l\"wakelock\"",
"-l\"webview_flutter\"",
"-l\"z\"",
"-fcxx-modules",
"-fmodules",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
PRODUCT_NAME = "$(TARGET_NAME)";

2
lib/community/release_dynamic.dart

@ -110,7 +110,7 @@ class _ReleaseDynamic extends State<ReleaseDynamic> {
style: TextStyle(
fontWeight: MyFontWeight.medium,
fontSize: 14.sp,
color: Color(0xFFA0A0A0),
color: Colors.black,
),
),)
],

2
lib/integral/integral_detailed_page.dart

@ -246,7 +246,7 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
),
Expanded(
child: Container(
height: 34.h,
// height: 34.h,
alignment: Alignment.centerLeft,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,

2
lib/integral/intergra_view/integral_task.dart

@ -59,7 +59,7 @@ class _IntegralTask extends State<IntegralTask> {
child: Container(
child: ListView.builder(
padding: EdgeInsets.only(left: 10.w, top: 20.h),
physics: NeverScrollableScrollPhysics(),
physics: BouncingScrollPhysics(),
// loop: false,
// pagination: SwiperPagination(
// alignment: Alignment.bottomCenter,

2
lib/mine/vip_card_page.dart

@ -166,7 +166,7 @@ class _VipCardPage extends State<VipCardPage> {
),
Expanded(
child: Container(
height: 54.h,
// height: 54.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
crossAxisAlignment: CrossAxisAlignment.start,

2
lib/mine/vip_detail_page.dart

@ -49,7 +49,7 @@ class _VipDetailPage extends State<VipDetailPage> {
}
startLocation() async {
EasyLoading.show(status: S.current.zhengzaijiazai);
// EasyLoading.show(status: S.current.zhengzaijiazai);
Location.getInstance()
.aMapFlutterLocation
.onResultCallback()

2
lib/order/write_off_page.dart

@ -201,7 +201,7 @@ class _WriteOffPage extends State<WriteOffPage> {
),
Expanded(
child: Container(
padding: EdgeInsets.fromLTRB(20.w, 15.h, 20.w, 24.h),
padding: EdgeInsets.fromLTRB(20.w, 15.h, 20.w, 15.h),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,

10
lib/retrofit/data/base_data.g.dart

@ -10,16 +10,6 @@ BaseData<T> _$BaseDataFromJson<T>(
Map<String, dynamic> json,
T Function(Object json) fromJsonT,
) {
if(!(json['isSuccess'] as bool))
return BaseData<T>()
..code = json['code'] as int
..data = null
..extra = json['extra']
..isError = json['isError'] as bool
..isSuccess = json['isSuccess'] as bool
..msg = json['msg'] as String
..path = json['path'] as String
..timestamp = json['timestamp'] as String;
return BaseData<T>()
..code = json['code'] as int
..data = fromJsonT(json['data'])

8
lib/retrofit/min_api.dart

@ -21,15 +21,15 @@ import 'data/shoppingCart.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
// const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
const base_url = "http://192.168.10.236:8765/app/";///
const baseUrl = "http://192.168.10.236:8765/app/";///
// const base_url = "http://192.168.10.236:8765/app/";///
// const baseUrl = "http://192.168.10.236:8765/app/";///
// const base_url = "http://192.168.10.88:8765/app/";///

2
lib/retrofit/min_api.g.dart

@ -9,7 +9,7 @@ part of 'min_api.dart';
class _MinApiService implements MinApiService {
_MinApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
baseUrl ??= 'http://192.168.10.236:8765/app/';
baseUrl ??= 'https://pos.api.lotus-wallet.com/app/';
}
final Dio _dio;

11
lib/retrofit/retrofit_api.dart

@ -56,14 +56,17 @@ 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
const base_url = "http://192.168.10.236:8766/app/"; ///
const baseUrl = "http://192.168.10.236:8766/app/"; ///
// const base_url = "http://192.168.10.236:8766/app/"; ///
// const baseUrl = "http://192.168.10.236:8766/app/"; ///
// const base_url = "http://192.168.10.159:8766/app/"; ///
// const baseUrl = "http://192.168.10.159:8766/app/"; ///
// const base_url = "http://192.168.10.37:8766/app/";
// const baseUrl = "http://192.168.10.37:8766/app/";

80
lib/retrofit/retrofit_api.g.dart

@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
class _ApiService implements ApiService {
_ApiService(this._dio, {this.baseUrl}) {
ArgumentError.checkNotNull(_dio, '_dio');
baseUrl ??= 'http://192.168.10.236:8766/app/';
baseUrl ??= 'https://pos.platform.lotus-wallet.com/app/';
}
final Dio _dio;
@ -74,28 +74,6 @@ class _ApiService implements ApiService {
return value;
}
// @override
// Future<BaseData<dynamic>> memberLogin(param) async {
// ArgumentError.checkNotNull(param, 'param');
// const _extra = <String, dynamic>{};
// final queryParameters = <String, dynamic>{};
// final _data = <String, dynamic>{};
// _data.addAll(param ?? <String, dynamic>{});
// final _result = await _dio.request<Map<String, dynamic>>(
// '/auth/platform/memberLogin',
// queryParameters: queryParameters,
// options: RequestOptions(
// method: 'POST',
// headers: <String, dynamic>{},
// extra: _extra,
// baseUrl: baseUrl),
// data: _data);
// final value = BaseData<dynamic>.fromJson(
// _result.data,
// (json) => json as dynamic,
// );
// return value;
// }
@override
Future<BaseData<LoginInfo>> memberLogin(param) async {
ArgumentError.checkNotNull(param, 'param');
@ -374,15 +352,13 @@ class _ApiService implements ApiService {
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
final _headers = <String, dynamic>{};
_headers.addAll({"Environment":"app"});
_data.addAll(param ?? <String, dynamic>{});
final _result = await _dio.request<Map<String, dynamic>>(
'/creditOrder/create',
queryParameters: queryParameters,
options: RequestOptions(
method: 'POST',
headers: _headers,
headers: <String, dynamic>{},
extra: _extra,
baseUrl: baseUrl),
data: _data);
@ -1037,8 +1013,7 @@ class _ApiService implements ApiService {
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
final _result = await _dio.request<Map<String, dynamic>>(
'/app-msg/stats',
final _result = await _dio.request<Map<String, dynamic>>('/app-msg/stats',
queryParameters: queryParameters,
options: RequestOptions(
method: 'GET',
@ -1415,7 +1390,8 @@ class _ApiService implements ApiService {
final value = BaseData<List<CategorySelectList>>.fromJson(
_result.data,
(json) => (json as List<dynamic>)
.map<CategorySelectList>((i) => CategorySelectList.fromJson(i as Map<String, dynamic>))
.map<CategorySelectList>(
(i) => CategorySelectList.fromJson(i as Map<String, dynamic>))
.toList());
return value;
}
@ -1450,8 +1426,7 @@ class _ApiService implements ApiService {
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
_data.addAll(map ?? <String, dynamic>{});
final _result = await _dio.request<Map<String, dynamic>>(
'/course/list',
final _result = await _dio.request<Map<String, dynamic>>('/course/list',
queryParameters: queryParameters,
options: RequestOptions(
method: 'POST',
@ -1486,7 +1461,8 @@ class _ApiService implements ApiService {
final value = BaseData<List<CollectClassList>>.fromJson(
_result.data,
(json) => (json as List<dynamic>)
.map<CollectClassList>((i) => CollectClassList.fromJson(i as Map<String, dynamic>))
.map<CollectClassList>(
(i) => CollectClassList.fromJson(i as Map<String, dynamic>))
.toList());
return value;
}
@ -1509,7 +1485,8 @@ class _ApiService implements ApiService {
final value = BaseData<List<CourseList>>.fromJson(
_result.data,
(json) => (json as List<dynamic>)
.map<CourseList>((i) => CourseList.fromJson(i as Map<String, dynamic>))
.map<CourseList>(
(i) => CourseList.fromJson(i as Map<String, dynamic>))
.toList());
return value;
}
@ -1520,8 +1497,7 @@ class _ApiService implements ApiService {
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
final _result = await _dio.request<Map<String, dynamic>>(
'/course/$id',
final _result = await _dio.request<Map<String, dynamic>>('/course/$id',
queryParameters: queryParameters,
options: RequestOptions(
method: 'GET',
@ -1559,13 +1535,14 @@ class _ApiService implements ApiService {
}
@override
Future<BaseData<List<VipBadgesList>>> findBadges(param) async {
ArgumentError.checkNotNull(param, 'param');
Future<BaseData<List<VipBadgesList>>> findBadges(map) async {
ArgumentError.checkNotNull(map, 'map');
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
_data.addAll(param ?? <String, dynamic>{});
final _result = await _dio.request<Map<String, dynamic>>('/app-memberAchievement/findBadges',
_data.addAll(map ?? <String, dynamic>{});
final _result = await _dio.request<Map<String, dynamic>>(
'/app-memberAchievement/findBadges',
queryParameters: queryParameters,
options: RequestOptions(
method: 'POST',
@ -1576,13 +1553,15 @@ class _ApiService implements ApiService {
final value = BaseData<List<VipBadgesList>>.fromJson(
_result.data,
(json) => (json as List<dynamic>)
.map<VipBadgesList>((i) => VipBadgesList.fromJson(i as Map<String, dynamic>))
.map<VipBadgesList>(
(i) => VipBadgesList.fromJson(i as Map<String, dynamic>))
.toList());
return value;
}
@override
Future<BaseData<List<AchievementDetailList>>> getAchievementDetail(achievementCategoryId) async {
Future<BaseData<List<AchievementDetailList>>> getAchievementDetail(
achievementCategoryId) async {
ArgumentError.checkNotNull(achievementCategoryId, 'achievementCategoryId');
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
@ -1599,7 +1578,8 @@ class _ApiService implements ApiService {
final value = BaseData<List<AchievementDetailList>>.fromJson(
_result.data,
(json) => (json as List<dynamic>)
.map<AchievementDetailList>((i) => AchievementDetailList.fromJson(i as Map<String, dynamic>))
.map<AchievementDetailList>((i) =>
AchievementDetailList.fromJson(i as Map<String, dynamic>))
.toList());
return value;
}
@ -1621,7 +1601,8 @@ class _ApiService implements ApiService {
final value = BaseData<List<VipBenefitList>>.fromJson(
_result.data,
(json) => (json as List<dynamic>)
.map<VipBenefitList>((i) => VipBenefitList.fromJson(i as Map<String, dynamic>))
.map<VipBenefitList>(
(i) => VipBenefitList.fromJson(i as Map<String, dynamic>))
.toList());
return value;
}
@ -1631,8 +1612,7 @@ class _ApiService implements ApiService {
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
final _result = await _dio.request<Map<String, dynamic>>(
'/home/vipBenefit',
final _result = await _dio.request<Map<String, dynamic>>('/home/vipBenefit',
queryParameters: queryParameters,
options: RequestOptions(
method: 'GET',
@ -1664,7 +1644,8 @@ class _ApiService implements ApiService {
final value = BaseData<List<SecondCardList>>.fromJson(
_result.data,
(json) => (json as List<dynamic>)
.map<SecondCardList>((i) => SecondCardList.fromJson(i as Map<String, dynamic>))
.map<SecondCardList>(
(i) => SecondCardList.fromJson(i as Map<String, dynamic>))
.toList());
return value;
}
@ -1774,7 +1755,8 @@ class _ApiService implements ApiService {
final value = BaseData<List<HeadlinesList>>.fromJson(
_result.data,
(json) => (json as List<dynamic>)
.map<HeadlinesList>((i) => HeadlinesList.fromJson(i as Map<String, dynamic>))
.map<HeadlinesList>(
(i) => HeadlinesList.fromJson(i as Map<String, dynamic>))
.toList());
return value;
}
@ -1855,8 +1837,7 @@ class _ApiService implements ApiService {
const _extra = <String, dynamic>{};
final queryParameters = <String, dynamic>{};
final _data = <String, dynamic>{};
final _result = await _dio.request<Map<String, dynamic>>(
'coupon/detail/$memberCouponId',
final _result = await _dio.request<Map<String, dynamic>>('coupon/detail/',
queryParameters: queryParameters,
options: RequestOptions(
method: 'GET',
@ -1870,5 +1851,4 @@ class _ApiService implements ApiService {
);
return value;
}
}

33
lib/store/store_order.dart

@ -206,17 +206,19 @@ 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(
// WillPopScope(
// onWillPop: () async {
// if (dialogShowing) {
// debugPrint("ssssasdadsasdadasd");
// SmartDialog.dismiss();
// return false;
// } else {
// return true;
// }
// },
// child: ,
// );
return Container(
color: Colors.white,
child: Stack(
children: [
@ -238,8 +240,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
sliver: SliverAppBar(
expandedHeight: (storeInfo != null &&
storeInfo.couponVOList != null)
? 470.h
: 365.h,
? 495.h
: 395.h,
floating: false,
snap: false,
pinned: true,
@ -321,7 +323,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
],
),
),
top: 100.h,
top:105.h,
bottom: 0,
left: 0,
right: 0,
@ -492,7 +494,6 @@ class _StoreOrderPage extends State<StoreOrderPage>
),
],
),
),
);
}
@ -505,6 +506,8 @@ class _StoreOrderPage extends State<StoreOrderPage>
}
}
///
showAlertDialog() {
//

2
lib/store/store_view/store_info.dart

@ -30,7 +30,7 @@ class _StoreInfoView extends State<StoreInfoView> {
top: 5.h,
bottom: 6.h,
),
height: 143.h,
height: 154.h,
padding: EdgeInsets.all(12.w),
decoration: BoxDecoration(
color: Colors.white,

2
lib/view_widget/new_coupon_widget.dart

@ -28,7 +28,7 @@ class NewCouponWidget extends StatelessWidget {
// }
return Container(
height: (coupon != null && coupon.isEx) ? 152.h : 140.h,
height: (coupon != null && coupon.isEx) ? 156.h : 145.h,
width: double.infinity,
margin: EdgeInsets.fromLTRB(14.w, 6.h, 14.w, 6.h),
decoration: BoxDecoration(

Loading…
Cancel
Save