Browse Source

Merge remote-tracking branch 'origin/master'

null_safety
fmk 3 years ago
parent
commit
630694fa9d
  1. 12
      ios/Runner.xcodeproj/project.pbxproj
  2. 2
      lib/address/address_map_page.dart
  3. 6
      lib/generated/intl/messages_en.dart
  4. 6
      lib/generated/intl/messages_zh_CN.dart
  5. 6
      lib/generated/intl/messages_zh_Hans_CN.dart
  6. 6
      lib/generated/intl/messages_zh_Hant_CN.dart
  7. 6
      lib/generated/intl/messages_zh_TW.dart
  8. 60
      lib/generated/l10n.dart
  9. 2
      lib/home/home_page.dart
  10. 4
      lib/integral/integral_page.dart
  11. 9
      lib/l10n/intl_en.arb
  12. 6
      lib/l10n/intl_zh_CN.arb
  13. 6
      lib/l10n/intl_zh_Hans_CN.arb
  14. 6
      lib/l10n/intl_zh_Hant_CN.arb
  15. 6
      lib/l10n/intl_zh_TW.arb
  16. 2
      lib/login/login_page.dart
  17. 2
      lib/mine/mine_page.dart
  18. 8
      lib/mine/vip_card_page.dart
  19. 8
      lib/mine/vip_detail_page.dart
  20. 2
      lib/order/store_selector_page.dart
  21. 20
      lib/retrofit/data/PosTypeBean.dart
  22. 148
      lib/retrofit/data/StoreListBean.dart
  23. 285
      lib/retrofit/data/vip_card.dart
  24. 12
      lib/setting/help_feedback_page.dart
  25. 2
      lib/union/union_page.dart

12
ios/Runner.xcodeproj/project.pbxproj

@ -876,7 +876,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 32;
CURRENT_PROJECT_VERSION = 33;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -917,7 +917,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 1.0.32;
MARKETING_VERSION = 1.0.33;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",
@ -1103,7 +1103,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 32;
CURRENT_PROJECT_VERSION = 33;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -1144,7 +1144,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 1.0.32;
MARKETING_VERSION = 1.0.33;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -1223,7 +1223,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 32;
CURRENT_PROJECT_VERSION = 33;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -1264,7 +1264,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 1.0.32;
MARKETING_VERSION = 1.0.33;
ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"$(inherited)",

2
lib/address/address_map_page.dart

@ -199,7 +199,7 @@ class _AddressMapPage extends State<AddressMapPage> {
if (await Permission.location.isPermanentlyDenied) {
requestDialog();
} else if (await Permission.location.isGranted) {
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai);
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai, animationDurationTemp: Duration(seconds: 1));
aMapFlutterLocation.startLocation();
Future.delayed(Duration(seconds: 6), () {
SmartDialog.dismiss();

6
lib/generated/intl/messages_en.dart

@ -363,6 +363,12 @@ class MessageLookup extends MessageLookupByLibrary {
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"),
"resend_in_seconds" : m22,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼,进入积分商城,点击你想兑换的领商品,进入商品详情后点击下方兑换,即可兑换哦~"),
"ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何领取优惠券?"),
"ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("点击我的,进入我页面后,点击下方的领劵中心,进入后即可领取优惠券哦~"),
"ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何签到?"),
"ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。"),
"send_code" : MessageLookupByLibrary.simpleMessage("发送验证"),
"shanchudingdan" : MessageLookupByLibrary.simpleMessage("删除一单"),
"shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"),

6
lib/generated/intl/messages_zh_CN.dart

@ -362,6 +362,12 @@ class MessageLookup extends MessageLookupByLibrary {
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"),
"resend_in_seconds" : m22,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼,进入积分商城,点击你想兑换的领商品,进入商品详情后点击下方兑换,即可兑换哦~"),
"ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何领取优惠券?"),
"ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("点击我的,进入我页面后,点击下方的领劵中心,进入后即可领取优惠券哦~"),
"ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何签到?"),
"ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。"),
"send_code" : MessageLookupByLibrary.simpleMessage("发送验证"),
"shanchudingdan" : MessageLookupByLibrary.simpleMessage("删除一单"),
"shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"),

6
lib/generated/intl/messages_zh_Hans_CN.dart

@ -362,6 +362,12 @@ class MessageLookup extends MessageLookupByLibrary {
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"),
"resend_in_seconds" : m22,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼,进入积分商城,点击你想兑换的领商品,进入商品详情后点击下方兑换,即可兑换哦~"),
"ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何领取优惠券?"),
"ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("点击我的,进入我页面后,点击下方的领劵中心,进入后即可领取优惠券哦~"),
"ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何签到?"),
"ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。"),
"send_code" : MessageLookupByLibrary.simpleMessage("发送验证"),
"shanchudingdan" : MessageLookupByLibrary.simpleMessage("删除一单"),
"shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"),

6
lib/generated/intl/messages_zh_Hant_CN.dart

@ -362,6 +362,12 @@ class MessageLookup extends MessageLookupByLibrary {
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任務中心"),
"resend_in_seconds" : m22,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼,進入積分商城,點擊你想兌換的領商品,進入商品詳情後點擊下方兌換,即可兌換哦~"),
"ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何領取優惠券?"),
"ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("點擊我的,進入我的頁面後,點擊下方的領取中心,進入后即可領取優惠券哦~"),
"ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何簽到?"),
"ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.點擊淨弼,進入首頁,點擊上方的去簽到。\n2.點擊我的,進入我的頁面,點擊上方的積分詳情,進入後即可簽到。"),
"send_code" : MessageLookupByLibrary.simpleMessage("發送驗證碼"),
"shanchudingdan" : MessageLookupByLibrary.simpleMessage("刪除訂單"),
"shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"),

6
lib/generated/intl/messages_zh_TW.dart

@ -362,6 +362,12 @@ class MessageLookup extends MessageLookupByLibrary {
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任務中心"),
"resend_in_seconds" : m22,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼,進入積分商城,點擊你想兌換的領商品,進入商品詳情後點擊下方兌換,即可兌換哦~"),
"ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("如何領取優惠券?"),
"ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("點擊我的,進入我的頁面後,點擊下方的領取中心,進入后即可領取優惠券哦~"),
"ruheqiandao" : MessageLookupByLibrary.simpleMessage("如何簽到?"),
"ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.點擊淨弼,進入首頁,點擊上方的去簽到。\n2.點擊我的,進入我的頁面,點擊上方的積分詳情,進入後即可簽到。"),
"send_code" : MessageLookupByLibrary.simpleMessage("發送驗證碼"),
"shanchudingdan" : MessageLookupByLibrary.simpleMessage("刪除訂單"),
"shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"),

60
lib/generated/l10n.dart

@ -4495,6 +4495,66 @@ class S {
);
}
/// `?`
String get ruhelingquyouhuiquan {
return Intl.message(
'如何领取优惠券?',
name: 'ruhelingquyouhuiquan',
desc: '',
args: [],
);
}
/// `~`
String get ruhelingquyouhuiquan1 {
return Intl.message(
'点击我的,进入我页面后,点击下方的领劵中心,进入后即可领取优惠券哦~',
name: 'ruhelingquyouhuiquan1',
desc: '',
args: [],
);
}
/// ``
String get ruhedihuanjifen {
return Intl.message(
'如何兑换积分',
name: 'ruhedihuanjifen',
desc: '',
args: [],
);
}
/// `~`
String get ruhedihuanjifen1 {
return Intl.message(
'点击净弼,进入积分商城,点击你想兑换的领商品,进入商品详情后点击下方兑换,即可兑换哦~',
name: 'ruhedihuanjifen1',
desc: '',
args: [],
);
}
/// `?`
String get ruheqiandao {
return Intl.message(
'如何签到?',
name: 'ruheqiandao',
desc: '',
args: [],
);
}
/// `1.\n2.`
String get ruheqiandao1 {
return Intl.message(
'1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。',
name: 'ruheqiandao1',
desc: '',
args: [],
);
}
/// `使`
String get privacy_policy4 {
return Intl.message(

2
lib/home/home_page.dart

@ -83,7 +83,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
Founder founder;
queryHome() async {
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai);
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai, animationDurationTemp: Duration(seconds: 1));
BaseData baseData = await apiService.queryBanner({
"model": {"type": "HOME_PAGE"},
}).catchError((onError) {

4
lib/integral/integral_page.dart

@ -43,7 +43,7 @@ class _IntegralPage extends State<IntegralPage> {
token: value.getString("token"),
showLoading: false);
userinfo = UserInfo.fromJson(jsonDecode(value.getString("user")));
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai);
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai, animationDurationTemp: Duration(seconds: 1));
querySignInfo();
});
}
@ -511,6 +511,8 @@ class _IntegralPage extends State<IntegralPage> {
SmartDialog.show(
widget: SignInWidget("${signInfo.signInList.length + 1}",
"${signInfo.rewardList[signInfo.signInList.length]}"));
} else {
SmartDialog.dismiss();
}
}

9
lib/l10n/intl_en.arb

@ -466,9 +466,12 @@
"zanwuxianshangjindian": "暂无线上进店",
"fankuilizi": "您可以在这里输入反馈内容,例如产品建议,功能异常等",
"qingshuruyouxiaoshoujihaoma": "请输入您的有效手机号",
"ruhelingquyouhuiquan": "如何领取优惠券?",
"ruhelingquyouhuiquan1": "点击我的,进入我页面后,点击下方的领劵中心,进入后即可领取优惠券哦~",
"ruhedihuanjifen":"如何兑换积分",
"ruhedihuanjifen1": "点击净弼,进入积分商城,点击你想兑换的领商品,进入商品详情后点击下方兑换,即可兑换哦~",
"ruheqiandao": "如何签到?",
"ruheqiandao1": "1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。",

6
lib/l10n/intl_zh_CN.arb

@ -467,6 +467,12 @@
"zanwuxianshangjindian": "暂无线上进店",
"fankuilizi": "您可以在这里输入反馈内容,例如产品建议,功能异常等",
"qingshuruyouxiaoshoujihaoma": "请输入您的有效手机号",
"ruhelingquyouhuiquan": "如何领取优惠券?",
"ruhelingquyouhuiquan1": "点击我的,进入我页面后,点击下方的领劵中心,进入后即可领取优惠券哦~",
"ruhedihuanjifen":"如何兑换积分",
"ruhedihuanjifen1": "点击净弼,进入积分商城,点击你想兑换的领商品,进入商品详情后点击下方兑换,即可兑换哦~",
"ruheqiandao": "如何签到?",
"ruheqiandao1": "1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。",

6
lib/l10n/intl_zh_Hans_CN.arb

@ -467,6 +467,12 @@
"zanwuxianshangjindian": "暂无线上进店",
"fankuilizi": "您可以在这里输入反馈内容,例如产品建议,功能异常等",
"qingshuruyouxiaoshoujihaoma": "请输入您的有效手机号",
"ruhelingquyouhuiquan": "如何领取优惠券?",
"ruhelingquyouhuiquan1": "点击我的,进入我页面后,点击下方的领劵中心,进入后即可领取优惠券哦~",
"ruhedihuanjifen":"如何兑换积分",
"ruhedihuanjifen1": "点击净弼,进入积分商城,点击你想兑换的领商品,进入商品详情后点击下方兑换,即可兑换哦~",
"ruheqiandao": "如何签到?",
"ruheqiandao1": "1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。",

6
lib/l10n/intl_zh_Hant_CN.arb

@ -461,6 +461,12 @@
"zanwuxianshangjindian": "暫無綫上進店",
"fankuilizi": "您可以在這裡輸入迴響內容,例如產品建議,功能异常等",
"qingshuruyouxiaoshoujihaoma": "請輸入您的有效手機號",
"ruhelingquyouhuiquan": "如何領取優惠券?",
"ruhelingquyouhuiquan1": "點擊我的,進入我的頁面後,點擊下方的領取中心,進入后即可領取優惠券哦~",
"ruhedihuanjifen":"如何兌換積分",
"ruhedihuanjifen1": "點擊淨弼,進入積分商城,點擊你想兌換的領商品,進入商品詳情後點擊下方兌換,即可兌換哦~",
"ruheqiandao": "如何簽到?",
"ruheqiandao1": "1.點擊淨弼,進入首頁,點擊上方的去簽到。\n2.點擊我的,進入我的頁面,點擊上方的積分詳情,進入後即可簽到。",

6
lib/l10n/intl_zh_TW.arb

@ -459,6 +459,12 @@
"zanwuxianshangjindian": "暫無綫上進店",
"fankuilizi": "您可以在這裡輸入迴響內容,例如產品建議,功能异常等",
"qingshuruyouxiaoshoujihaoma": "請輸入您的有效手機號",
"ruhelingquyouhuiquan": "如何領取優惠券?",
"ruhelingquyouhuiquan1": "點擊我的,進入我的頁面後,點擊下方的領取中心,進入后即可領取優惠券哦~",
"ruhedihuanjifen":"如何兌換積分",
"ruhedihuanjifen1": "點擊淨弼,進入積分商城,點擊你想兌換的領商品,進入商品詳情後點擊下方兌換,即可兌換哦~",
"ruheqiandao": "如何簽到?",
"ruheqiandao1": "1.點擊淨弼,進入首頁,點擊上方的去簽到。\n2.點擊我的,進入我的頁面,點擊上方的積分詳情,進入後即可簽到。",

2
lib/login/login_page.dart

@ -274,7 +274,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
"capcha": code,
"mobile": mobile,
};
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai);
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai, animationDurationTemp: Duration(seconds: 1));
BaseData value = await client.memberLogin(param).catchError((error) {
print(error);
SmartDialog.showToast("$error", alignment: Alignment.center);

2
lib/mine/mine_page.dart

@ -99,7 +99,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
List<Rank> ranks = [];
queryUserInfo() async {
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai);
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai, animationDurationTemp: Duration(seconds: 1));
BaseData rankData = await apiService.rankList();
if (rankData != null && rankData.isSuccess) {
ranks.clear();

8
lib/mine/vip_card_page.dart

@ -46,7 +46,7 @@ class _VipCardPage extends State<VipCardPage> {
if (baseData != null && baseData.isSuccess) {
coupons.clear();
coupons.addAll(
(baseData.data as List<dynamic>).map((e) => VipCard.fromJson(e)));
(baseData.data as List<dynamic>).map((e) => VipCard.fromMap(e)));
setState(() {
_refreshController.refreshCompleted();
});
@ -126,7 +126,7 @@ class _VipCardPage extends State<VipCardPage> {
child: ClipRRect(
borderRadius: BorderRadius.circular(8.w),
child: Image.asset(
assetsByName(vipCard.storeName),
assetsByName(vipCard.tenantName),
fit: BoxFit.cover, //
height: 170.h,
),
@ -145,7 +145,7 @@ class _VipCardPage extends State<VipCardPage> {
Row(
children: [
MImage(
vipCard.storeLogo,
vipCard.tenantLogo,
width: 54.w,
height: 54.h,
fit: BoxFit.cover,
@ -168,7 +168,7 @@ class _VipCardPage extends State<VipCardPage> {
children: [
Expanded(
child: Text(
vipCard.storeName ?? "",
vipCard.tenantName ?? "",
overflow: TextOverflow.ellipsis,
maxLines: 1,
style: TextStyle(

8
lib/mine/vip_detail_page.dart

@ -55,13 +55,13 @@ class _VipDetailPage extends State<VipDetailPage> {
.vipDetail(widget.arguments["id"])
.catchError((onError) {});
if (baseData != null && baseData.isSuccess) {
vipCard = VipCard.fromJson(baseData.data);
vipCard = VipCard.fromMap(baseData.data);
setState(() {});
}
BaseData order = await apiService.orderList({
"current": current,
"model": {"status": 0, "storeId": vipCard.storeId},
"model": {"status": 0, "storeId": vipCard.tenantCode},
"order": "descending",
"size": 10,
"sort": "id"
@ -192,7 +192,7 @@ class _VipDetailPage extends State<VipDetailPage> {
Row(
children: [
MImage(
vipCard != null ? vipCard.storeLogo : "",
vipCard != null ? vipCard.tenantLogo : "",
width: 40.w,
height: 40.h,
fit: BoxFit.cover,
@ -215,7 +215,7 @@ class _VipDetailPage extends State<VipDetailPage> {
children: [
Expanded(
child: Text(
vipCard != null ? vipCard.storeName ?? "" : "",
vipCard != null ? vipCard.tenantName : "",
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,

2
lib/order/store_selector_page.dart

@ -119,7 +119,7 @@ class _StoreSelectorPage extends State<StoreSelectorPage> {
if (await Permission.location.isPermanentlyDenied) {
requestDialog();
} else if (await Permission.location.isGranted) {
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai);
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai, animationDurationTemp: Duration(seconds: 1));
aMapFlutterLocation.startLocation();
Future.delayed(Duration(seconds: 6), () {
SmartDialog.dismiss();

20
lib/retrofit/data/PosTypeBean.dart

@ -0,0 +1,20 @@
/// desc : "快消餐饮"
/// code : "FASTSTORE"
class PosTypeBean {
String desc;
String code;
static PosTypeBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
PosTypeBean posTypeBean = PosTypeBean();
posTypeBean.desc = map['desc'];
posTypeBean.code = map['code'];
return posTypeBean;
}
Map toJson() => {
"desc": desc,
"code": code,
};
}

148
lib/retrofit/data/StoreListBean.dart

@ -0,0 +1,148 @@
import 'PosTypeBean.dart';
/// id : "1381798825072525312"
/// createTime : "2021-04-13 10:38:07"
/// createUser : "1"
/// updateTime : "2021-06-12 21:20:22"
/// updateUser : "1381798824988639232"
/// tenantCode : "1\nI/flutter ( 6658): 180"
/// useErp : false
/// openStartTime : "09:30:00"
/// openEndTime : "18:30:00"
/// storeName : "稻田里的书店"
/// nickName : ""
/// logo : "https://pos.upload.gznl.top/1180/2021/07/574aaeff-df3c-451a-b34f-67f9b3552427.png"
/// shipAddress : "上海市崇明区东风农场东风公路833弄1-22号C2-C3"
/// remark : ""
/// mobile : "13554204268"
/// longitude : "121.4789730000"
/// latitude : "31.7092220000"
/// refundAddress : null
/// refundTel : null
/// refundContact : null
/// isAutoSendRefundAddress : 1
/// province : "上海市"
/// city : "上海市"
/// district : "崇明区"
/// address : "上海市崇明区稻田里的书店咖啡茶饮区东平镇东风公路833号东风农场C2"
/// headName : ""
/// headMobile : "18672789329"
/// businessService : "WIFI,免费停车"
/// businessType : ""
/// deliveryInfo : null
/// miniParam : null
/// is_delete : 0
/// posType : {"desc":"快消餐饮","code":"FASTSTORE"}
class StoreListBean {
String id;
String createTime;
String createUser;
String updateTime;
String updateUser;
String tenantCode;
bool useErp;
String openStartTime;
String openEndTime;
String storeName;
String nickName;
String logo;
String shipAddress;
String remark;
String mobile;
String longitude;
String latitude;
dynamic refundAddress;
dynamic refundTel;
dynamic refundContact;
int isAutoSendRefundAddress;
String province;
String city;
String district;
String address;
String headName;
String headMobile;
String businessService;
String businessType;
dynamic deliveryInfo;
dynamic miniParam;
int isDelete;
PosTypeBean posType;
static StoreListBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
StoreListBean storeListBean = StoreListBean();
storeListBean.id = map['id'];
storeListBean.createTime = map['createTime'];
storeListBean.createUser = map['createUser'];
storeListBean.updateTime = map['updateTime'];
storeListBean.updateUser = map['updateUser'];
storeListBean.tenantCode = map['tenantCode'];
storeListBean.useErp = map['useErp'];
storeListBean.openStartTime = map['openStartTime'];
storeListBean.openEndTime = map['openEndTime'];
storeListBean.storeName = map['storeName'];
storeListBean.nickName = map['nickName'];
storeListBean.logo = map['logo'];
storeListBean.shipAddress = map['shipAddress'];
storeListBean.remark = map['remark'];
storeListBean.mobile = map['mobile'];
storeListBean.longitude = map['longitude'];
storeListBean.latitude = map['latitude'];
storeListBean.refundAddress = map['refundAddress'];
storeListBean.refundTel = map['refundTel'];
storeListBean.refundContact = map['refundContact'];
storeListBean.isAutoSendRefundAddress = map['isAutoSendRefundAddress'];
storeListBean.province = map['province'];
storeListBean.city = map['city'];
storeListBean.district = map['district'];
storeListBean.address = map['address'];
storeListBean.headName = map['headName'];
storeListBean.headMobile = map['headMobile'];
storeListBean.businessService = map['businessService'];
storeListBean.businessType = map['businessType'];
storeListBean.deliveryInfo = map['deliveryInfo'];
storeListBean.miniParam = map['miniParam'];
storeListBean.isDelete = map['is_delete'];
storeListBean.posType = PosTypeBean.fromMap(map['posType']);
return storeListBean;
}
Map toJson() => {
"id": id,
"createTime": createTime,
"createUser": createUser,
"updateTime": updateTime,
"updateUser": updateUser,
"tenantCode": tenantCode,
"useErp": useErp,
"openStartTime": openStartTime,
"openEndTime": openEndTime,
"storeName": storeName,
"nickName": nickName,
"logo": logo,
"shipAddress": shipAddress,
"remark": remark,
"mobile": mobile,
"longitude": longitude,
"latitude": latitude,
"refundAddress": refundAddress,
"refundTel": refundTel,
"refundContact": refundContact,
"isAutoSendRefundAddress": isAutoSendRefundAddress,
"province": province,
"city": city,
"district": district,
"address": address,
"headName": headName,
"headMobile": headMobile,
"businessService": businessService,
"businessType": businessType,
"deliveryInfo": deliveryInfo,
"miniParam": miniParam,
"is_delete": isDelete,
"posType": posType,
};
}

285
lib/retrofit/data/vip_card.dart

@ -1,183 +1,132 @@
/// id : "1412664861531308032"
/// createTime : "2021-07-07 14:48:44"
/// createUser : "1405494095400402944"
/// updateTime : "2021-07-07 14:48:44"
/// updateUser : "1405494095400402944"
/// mid : "1405494095400402944"
/// openid : ""
/// nickname : ""
/// headimg : ""
import 'StoreListBean.dart';
/// id : "1393457755217461248"
/// createTime : "2021-05-15 14:46:33"
/// createUser : null
/// updateTime : "2021-05-15 14:46:33"
/// updateUser : "1393457755217461248"
/// mid : "1394132265126068224"
/// openid : "o3DjK5P66kDzkeW3biAx1LQSMLn4"
/// nickname : "˹<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
/// headimg : "https://thirdwx.qlogo.cn/mmopen/vi_32/DYAIOgq83erTf2Lbo2ztbicMtreEdr7xtrnvtTL5Qr31cicZVoKicdN3EEej13sRMLxLlq3qHThI4V8Pmau5Rps8A/132"
/// balance : "0.00"
/// realRecharge : "0.00"
/// sex : "0"
/// status : true
/// onCredit : false
/// loginTime : "2021-07-12 17:45:35"
/// loginNum : 33
/// tenantCode : "1166"
/// loginTime : "2021-05-20 13:48:03"
/// loginNum : 9
/// tenantCode : "1180"
/// source : 1
/// expendAmount : "0.00"
/// buyTimes : 0
/// lastBuyTime : null
/// storeName : "百年川椒火锅店(光谷店)"
/// storeLogo : "https://pos.upload.gznl.top/1166/2021/07/4165050b-1b26-4303-9809-6f3f8e91de52.jpg"
/// vip_no : null
/// expireTime : null
/// integral : 0
/// level : 1
/// vipRegStore : null
/// tenantName : "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
/// tenantLogo : ""
/// storeList : [{"id":"1381798825072525312","createTime":"2021-04-13 10:38:07","createUser":"1","updateTime":"2021-06-12 21:20:22","updateUser":"1381798824988639232","tenantCode":"1\nI/flutter ( 6658): 180","useErp":false,"openStartTime":"09:30:00","openEndTime":"18:30:00","storeName":"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","nickName":"","logo":"https://pos.upload.gznl.top/1180/2021/07/574aaeff-df3c-451a-b34f-67f9b3552427.png","shipAddress":"<EFBFBD>Ϻ<EFBFBD><EFBFBD>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ũ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>繫·833Ū1-22<EFBFBD><EFBFBD>C2-C3","remark":"","mobile":"13554204268","longitude":"121.4789730000","latitude":"31.7092220000","refundAddress":null,"refundTel":null,"refundContact":null,"isAutoSendRefundAddress":1,"province":"<EFBFBD>Ϻ<EFBFBD><EFBFBD><EFBFBD>","city":"<EFBFBD>Ϻ<EFBFBD><EFBFBD><EFBFBD>","district":"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","address":"<EFBFBD>Ϻ<EFBFBD><EFBFBD>г<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ȳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƽ<EFBFBD>򶫷繫·833<EFBFBD>Ŷ<EFBFBD><EFBFBD><EFBFBD>ũ<EFBFBD><EFBFBD>C2","headName":"","headMobile":"18672789329","businessService":"WIFI,<EFBFBD><EFBFBD><EFBFBD>ͣ<EFBFBD><EFBFBD>","businessType":"<EFBFBD><EFBFBD>","deliveryInfo":null,"miniParam":null,"is_delete":0,"posType":{"desc":"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>","code":"FASTSTORE"}}]
class VipCard {
String _id;
String _createTime;
String _createUser;
String _updateTime;
String _updateUser;
String _mid;
String _openid;
String _nickname;
String _headimg;
String _balance;
String _realRecharge;
String _sex;
bool _status;
bool _onCredit;
String _loginTime;
int _loginNum;
String _tenantCode;
int _source;
String _expendAmount;
int _buyTimes;
dynamic _lastBuyTime;
String _storeId;
String _storeName;
String _storeLogo;
String get id => _id;
String get createTime => _createTime;
String get createUser => _createUser;
String get updateTime => _updateTime;
String get updateUser => _updateUser;
String get mid => _mid;
String get openid => _openid;
String get nickname => _nickname;
String get headimg => _headimg;
String get balance => _balance;
String get realRecharge => _realRecharge;
String get sex => _sex;
bool get status => _status;
bool get onCredit => _onCredit;
String get loginTime => _loginTime;
int get loginNum => _loginNum;
String get tenantCode => _tenantCode;
int get source => _source;
String get expendAmount => _expendAmount;
int get buyTimes => _buyTimes;
dynamic get lastBuyTime => _lastBuyTime;
String get storeName => _storeName;
String get storeId => _storeId;
String get storeLogo => _storeLogo;
VipCard({
String id,
String createTime,
String createUser,
String updateTime,
String updateUser,
String mid,
String openid,
String nickname,
String headimg,
String balance,
String realRecharge,
String sex,
bool status,
bool onCredit,
String loginTime,
int loginNum,
String tenantCode,
int source,
String expendAmount,
int buyTimes,
dynamic lastBuyTime,
String storeName,
String storeId,
String storeLogo}){
_id = id;
_createTime = createTime;
_createUser = createUser;
_updateTime = updateTime;
_updateUser = updateUser;
_mid = mid;
_openid = openid;
_nickname = nickname;
_headimg = headimg;
_balance = balance;
_realRecharge = realRecharge;
_sex = sex;
_status = status;
_onCredit = onCredit;
_loginTime = loginTime;
_loginNum = loginNum;
_tenantCode = tenantCode;
_source = source;
_expendAmount = expendAmount;
_buyTimes = buyTimes;
_lastBuyTime = lastBuyTime;
_storeId = storeId;
_storeName = storeName;
_storeLogo = storeLogo;
}
VipCard.fromJson(dynamic json) {
_id = json["id"];
_createTime = json["createTime"];
_createUser = json["createUser"];
_updateTime = json["updateTime"];
_updateUser = json["updateUser"];
_mid = json["mid"];
_openid = json["openid"];
_nickname = json["nickname"];
_headimg = json["headimg"];
_balance = json["balance"];
_realRecharge = json["realRecharge"];
_sex = json["sex"];
_status = json["status"];
_onCredit = json["onCredit"];
_loginTime = json["loginTime"];
_loginNum = json["loginNum"];
_tenantCode = json["tenantCode"];
_source = json["source"];
_expendAmount = json["expendAmount"];
_buyTimes = json["buyTimes"];
_lastBuyTime = json["lastBuyTime"];
_storeId = json["storeId"];
_storeName = json["storeName"];
_storeLogo = json["storeLogo"];
}
String id;
String createTime;
dynamic createUser;
String updateTime;
String updateUser;
String mid;
String openid;
String nickname;
String headimg;
String balance;
String realRecharge;
String sex;
bool status;
bool onCredit;
String loginTime;
int loginNum;
String tenantCode;
int source;
String expendAmount;
int buyTimes;
dynamic lastBuyTime;
dynamic vipNo;
dynamic expireTime;
int integral;
int level;
dynamic vipRegStore;
String tenantName;
String tenantLogo;
List<StoreListBean> storeList;
Map<String, dynamic> toJson() {
var map = <String, dynamic>{};
map["id"] = _id;
map["createTime"] = _createTime;
map["createUser"] = _createUser;
map["updateTime"] = _updateTime;
map["updateUser"] = _updateUser;
map["mid"] = _mid;
map["openid"] = _openid;
map["nickname"] = _nickname;
map["headimg"] = _headimg;
map["balance"] = _balance;
map["realRecharge"] = _realRecharge;
map["sex"] = _sex;
map["status"] = _status;
map["onCredit"] = _onCredit;
map["loginTime"] = _loginTime;
map["loginNum"] = _loginNum;
map["tenantCode"] = _tenantCode;
map["source"] = _source;
map["expendAmount"] = _expendAmount;
map["buyTimes"] = _buyTimes;
map["lastBuyTime"] = _lastBuyTime;
map["storeId"] = _storeId;
map["storeName"] = _storeName;
map["storeLogo"] = _storeLogo;
return map;
static VipCard fromMap(Map<String, dynamic> map) {
if (map == null) return null;
VipCard vipCardBean = VipCard();
vipCardBean.id = map['id'];
vipCardBean.createTime = map['createTime'];
vipCardBean.createUser = map['createUser'];
vipCardBean.updateTime = map['updateTime'];
vipCardBean.updateUser = map['updateUser'];
vipCardBean.mid = map['mid'];
vipCardBean.openid = map['openid'];
vipCardBean.nickname = map['nickname'];
vipCardBean.headimg = map['headimg'];
vipCardBean.balance = map['balance'];
vipCardBean.realRecharge = map['realRecharge'];
vipCardBean.sex = map['sex'];
vipCardBean.status = map['status'];
vipCardBean.onCredit = map['onCredit'];
vipCardBean.loginTime = map['loginTime'];
vipCardBean.loginNum = map['loginNum'];
vipCardBean.tenantCode = map['tenantCode'];
vipCardBean.source = map['source'];
vipCardBean.expendAmount = map['expendAmount'];
vipCardBean.buyTimes = map['buyTimes'];
vipCardBean.lastBuyTime = map['lastBuyTime'];
vipCardBean.vipNo = map['vip_no'];
vipCardBean.expireTime = map['expireTime'];
vipCardBean.integral = map['integral'];
vipCardBean.level = map['level'];
vipCardBean.vipRegStore = map['vipRegStore'];
vipCardBean.tenantName = map['tenantName'];
vipCardBean.tenantLogo = map['tenantLogo'];
vipCardBean.storeList = List()..addAll(
(map['storeList'] as List ?? []).map((o) => StoreListBean.fromMap(o))
);
return vipCardBean;
}
Map toJson() => {
"id": id,
"createTime": createTime,
"createUser": createUser,
"updateTime": updateTime,
"updateUser": updateUser,
"mid": mid,
"openid": openid,
"nickname": nickname,
"headimg": headimg,
"balance": balance,
"realRecharge": realRecharge,
"sex": sex,
"status": status,
"onCredit": onCredit,
"loginTime": loginTime,
"loginNum": loginNum,
"tenantCode": tenantCode,
"source": source,
"expendAmount": expendAmount,
"buyTimes": buyTimes,
"lastBuyTime": lastBuyTime,
"vip_no": vipNo,
"expireTime": expireTime,
"integral": integral,
"level": level,
"vipRegStore": vipRegStore,
"tenantName": tenantName,
"tenantLogo": tenantLogo,
"storeList": storeList,
};
}

12
lib/setting/help_feedback_page.dart

@ -98,15 +98,15 @@ class _HelpFeedbackPage extends State<HelpFeedbackPage> {
),
child: Column(
children: [
_commonProblem('如何领取优惠券?',
"点击我的,进入我页面后,点击下方的领劵中心,进入后即可领取优惠券哦~", 0),
_commonProblem(S.of(context).ruhelingquyouhuiquan,
S.of(context).ruhelingquyouhuiquan1, 0),
_commonProblem(
'如何兑换积分?',
"点击净弼,进入积分商城,点击你想兑换的领商品,进入商品详情后点击下方兑换,即可兑换哦~",
S.of(context).ruhedihuanjifen,
S.of(context).ruhedihuanjifen1,
1),
_commonProblem(
'如何签到?',
"1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。",
S.of(context).ruheqiandao,
S.of(context).ruheqiandao1,
2),
],
),

2
lib/union/union_page.dart

@ -365,7 +365,7 @@ class _UnionPage extends State<UnionPage>
requestDialog();
refreshController.refreshCompleted();
} else if (await Permission.location.isGranted) {
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai);
SmartDialog.showLoading(msg: S.of(context).zhengzaijiazai, animationDurationTemp: Duration(seconds: 1));
aMapFlutterLocation.startLocation();
Future.delayed(Duration(seconds: 6), () {
SmartDialog.dismiss();

Loading…
Cancel
Save