Browse Source

Merge remote-tracking branch 'origin/dev' into remove_uniapp

ff_new
fmk 3 years ago
parent
commit
a70c1177ae
  1. 2
      lib/retrofit/data/login_info.dart
  2. 2
      lib/retrofit/retrofit_api.dart

2
lib/retrofit/data/login_info.dart

@ -6,7 +6,7 @@ class LoginInfo {
AuthInfo authInfo, AuthInfo authInfo,
List<CouponList> couponList,}){ List<CouponList> couponList,}){
_authInfo = authInfo; _authInfo = authInfo;
// _couponList = couponList; _couponList = couponList;
} }
LoginInfo.fromJson(dynamic json) { LoginInfo.fromJson(dynamic json) {

2
lib/retrofit/retrofit_api.dart

@ -74,7 +74,7 @@ abstract class ApiService {
BuildContext context, BuildContext context,
String token, String token,
bool showLoading = true, bool showLoading = true,
bool pay = true, bool pay = false,
}) { }) {
Map<String, dynamic> headers = Map<String, dynamic> headers =
(token == null || token == "") ? {} : {'token': "Bearer $token"}; (token == null || token == "") ? {} : {'token': "Bearer $token"};

Loading…
Cancel
Save