diff --git a/assets/image/2x/rechargeBtn.webp b/assets/image/2x/rechargeBtn.webp
new file mode 100644
index 00000000..bc34ec28
Binary files /dev/null and b/assets/image/2x/rechargeBtn.webp differ
diff --git a/assets/image/3x/rechargeBtn.webp b/assets/image/3x/rechargeBtn.webp
new file mode 100644
index 00000000..32568b7c
Binary files /dev/null and b/assets/image/3x/rechargeBtn.webp differ
diff --git a/assets/image/rechargeBtn.webp b/assets/image/rechargeBtn.webp
new file mode 100644
index 00000000..e3b850db
Binary files /dev/null and b/assets/image/rechargeBtn.webp differ
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index a1097af4..d6ae8a59 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -143,6 +143,9 @@ PODS:
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
+ - mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.0):
+ - mob_sharesdk/ShareSDK
+ - MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.0):
- mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9)
@@ -171,7 +174,7 @@ PODS:
- SDWebImage (5.12.1):
- SDWebImage/Core (= 5.12.1)
- SDWebImage/Core (5.12.1)
- - shared_preferences (0.0.1):
+ - shared_preferences_ios (0.0.1):
- Flutter
- sharesdk_plugin (1.1.2):
- Flutter
@@ -206,6 +209,7 @@ PODS:
- mob_sharesdk/ShareSDKPlatforms/VKontakte
- mob_sharesdk/ShareSDKPlatforms/WatermelonVideo
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite
+ - mob_sharesdk/ShareSDKPlatforms/WeWork
- mob_sharesdk/ShareSDKPlatforms/WhatsApp
- mob_sharesdk/ShareSDKPlatforms/Yixin
- mob_sharesdk/ShareSDKPlatforms/YouDaoNote
@@ -220,7 +224,7 @@ PODS:
- TPNS-iOS (= 1.3.4.1)
- url_launcher (0.0.1):
- Flutter
- - video_player (0.0.1):
+ - video_player_avfoundation (0.0.1):
- Flutter
- wakelock (0.0.1):
- Flutter
@@ -242,13 +246,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 (from `.symlinks/plugins/shared_preferences/ios`)
+ - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/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 (from `.symlinks/plugins/video_player/ios`)
+ - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
@@ -290,8 +294,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/permission_handler/ios"
scan:
:path: ".symlinks/plugins/scan/ios"
- shared_preferences:
- :path: ".symlinks/plugins/shared_preferences/ios"
+ shared_preferences_ios:
+ :path: ".symlinks/plugins/shared_preferences_ios/ios"
sharesdk_plugin:
:path: ".symlinks/plugins/sharesdk_plugin/ios"
thumbnails:
@@ -300,8 +304,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/tpns_flutter_plugin/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
- video_player:
- :path: ".symlinks/plugins/video_player/ios"
+ video_player_avfoundation:
+ :path: ".symlinks/plugins/video_player_avfoundation/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
webview_flutter:
@@ -311,7 +315,7 @@ SPEC CHECKSUMS:
AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
BaiduMapKit: 907c6d9b74f66c3ff4741fc4b568ae0b339917f8
BMKLocationKit: 097814ef672b1e57e86e6c1968d7892fb78002bf
- Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+ Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
flutter_baidu_mapapi_base: 90fddba11ec4435406a7211d6ee905b4311c31db
flutter_baidu_mapapi_map: 771bf00671832b1fcddb17733518cd631529df16
flutter_baidu_mapapi_search: 4cffaa74e739a4114595c4f82f790e1783bb612d
@@ -327,16 +331,16 @@ SPEC CHECKSUMS:
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86
SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b
- shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
- sharesdk_plugin: 5a59e49d2d5e55c8e8f67cc9ddf05172c2494a6b
+ shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
+ sharesdk_plugin: dbe766efb15fdb2605133084da7a9144a1410d71
SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2
thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad
TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff
tpns_flutter_plugin: ed7fae92efde473d5cb9fd33ac92caa2d64530a2
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
- video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
+ video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
- webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
+ webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232
ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 944de1ed..59b6b6a6 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 51;
+ objectVersion = 52;
objects = {
/* Begin PBXBuildFile section */
@@ -18,8 +18,8 @@
6EE8F35C2695819500237A5E /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F35A2695819500237A5E /* CoreMedia.framework */; };
6EE8F35F269581A300237A5E /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F35D269581A300237A5E /* AVFoundation.framework */; };
6EE8F360269581A300237A5E /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F35E269581A300237A5E /* AVKit.framework */; };
- 6EE8F362269581AF00237A5E /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F361269581AF00237A5E /* GLKit.framework */; };
- 6EE8F364269581B600237A5E /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F363269581B600237A5E /* OpenGLES.framework */; };
+ 6EE8F362269581AF00237A5E /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F361269581AF00237A5E /* GLKit.framework */; platformFilter = ios; };
+ 6EE8F364269581B600237A5E /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F363269581B600237A5E /* OpenGLES.framework */; platformFilter = ios; };
6EE8F366269581BC00237A5E /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F365269581BC00237A5E /* CoreText.framework */; };
6EE8F368269581C300237A5E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F367269581C300237A5E /* QuartzCore.framework */; };
6EE8F36A269581CC00237A5E /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EE8F369269581CC00237A5E /* CoreGraphics.framework */; };
@@ -611,12 +611,13 @@
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 36;
+ CURRENT_PROJECT_VERSION = 42;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -666,7 +667,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
- MARKETING_VERSION = 2.0.36;
+ MARKETING_VERSION = 2.0.42;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@@ -681,7 +682,6 @@
"-l\"flutter_baidu_mapapi_base\"",
"-l\"permission_handler\"",
"-l\"sqlite3\"",
- "-l\"video_player\"",
"-l\"wakelock\"",
"-l\"webview_flutter\"",
"-l\"z\"",
@@ -691,8 +691,10 @@
PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+ SUPPORTS_MACCATALYST = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Profile;
@@ -811,12 +813,13 @@
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 36;
+ CURRENT_PROJECT_VERSION = 42;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -866,7 +869,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
- MARKETING_VERSION = 2.0.36;
+ MARKETING_VERSION = 2.0.42;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@@ -881,7 +884,6 @@
"-l\"flutter_baidu_mapapi_base\"",
"-l\"permission_handler\"",
"-l\"sqlite3\"",
- "-l\"video_player\"",
"-l\"wakelock\"",
"-l\"webview_flutter\"",
"-l\"z\"",
@@ -890,9 +892,11 @@
);
PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
PRODUCT_NAME = "$(TARGET_NAME)";
+ SUPPORTS_MACCATALYST = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
@@ -902,12 +906,13 @@
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
- CURRENT_PROJECT_VERSION = 36;
+ CURRENT_PROJECT_VERSION = 42;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@@ -957,7 +962,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
- MARKETING_VERSION = 2.0.36;
+ MARKETING_VERSION = 2.0.42;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@@ -972,7 +977,6 @@
"-l\"flutter_baidu_mapapi_base\"",
"-l\"permission_handler\"",
"-l\"sqlite3\"",
- "-l\"video_player\"",
"-l\"wakelock\"",
"-l\"webview_flutter\"",
"-l\"z\"",
@@ -982,8 +986,10 @@
PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
+ SUPPORTS_MACCATALYST = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
+ TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 1d5c98d9..f3eea2d8 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -126,6 +126,11 @@
打开相册
NSSpeechRecognitionUsageDescription
是否允许语音识别
+ UIApplicationSceneManifest
+
+ UIApplicationSupportsMultipleScenes
+
+
UIBackgroundModes
remote-notification
@@ -134,6 +139,10 @@
LaunchScreen
UIMainStoryboardFile
Main
+ UIRequiresFullScreen
+
+ UIStatusBarHidden
+
UISupportedInterfaceOrientations
UIInterfaceOrientationPortrait
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
index 2d6a8024..b61074f5 100644
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@@ -10,5 +10,21 @@
applinks:hx.lotus-wallet.com
applinks:huixiang.lotus-wallet.com
+ com.apple.security.app-sandbox
+
+ com.apple.security.device.audio-input
+
+ com.apple.security.device.camera
+
+ com.apple.security.network.client
+
+ com.apple.security.personal-information.addressbook
+
+ com.apple.security.personal-information.calendars
+
+ com.apple.security.personal-information.location
+
+ com.apple.security.personal-information.photos-library
+
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index 844c9ac8..12fc844b 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活动减免${yuan}元配送费";
- static m11(jifen) => "+ ${jifen} 积分";
+ static m11(yue) => "活动余额 ${yue}";
- static m12(jianjie) => "简介:${jianjie}";
+ static m12(jifen) => "+ ${jifen} 积分";
- static m13(jifen) => "${jifen}积分";
+ static m13(jianjie) => "简介:${jianjie}";
- static m14(jifen) => "${jifen}积分 到下一个等级";
+ static m14(jifen) => "${jifen}积分";
- static m15(date) => "开通日期:${date}";
+ static m15(jifen) => "${jifen}积分 到下一个等级";
- static m16(shijian) => "领取时间 ${shijian}";
+ static m16(date) => "开通日期:${date}";
- static m17(man, jian) => "满${man}元立减${jian}元代金券";
+ static m17(shijian) => "领取时间 ${shijian}";
- static m18(yuan) => "满${yuan}可用";
+ static m18(yue) => "绿币 ${yue}";
- static m19(mi) => "${mi}米";
+ static m19(man, jian) => "满${man}元立减${jian}元代金券";
- static m20(tian) => "您已连续签到${tian}天";
+ static m20(yuan) => "满${yuan}可用";
- static m21(pinglun) => "评论(${pinglun})";
+ static m21(mi) => "${mi}米";
- static m22(zhe) => "全场${zhe}折";
+ static m22(tian) => "您已连续签到${tian}天";
- static m23(num) => "取单号${num}";
+ static m23(pinglun) => "评论(${pinglun})";
- static m24(ren) => "¥${ren}/人";
+ static m24(zongyue) => "余额：${zongyue}";
- static m25(second) => "${second}s后重新发送";
+ static m25(zhe) => "全场${zhe}折";
- static m26(jifen) => "商品积分 ${jifen}积分";
+ static m26(num) => "取单号${num}";
- static m27(jifen) => "实付积分 ${jifen}积分";
+ static m27(ren) => "¥${ren}/人";
- static m28(sui) => "${sui}岁";
+ static m28(second) => "${second}s后重新发送";
- static m29(num) => "完成${num}";
+ static m29(jifen) => "商品积分 ${jifen}积分";
- static m30(time) => "下单时间:${time}";
+ static m30(jifen) => "实付积分 ${jifen}积分";
- static m31(xihuan) => "喜欢(${xihuan})";
+ static m31(sui) => "${sui}岁";
- static m32(shoujihao) => "邀请人手机号:${shoujihao}";
+ static m32(num) => "完成${num}";
- static m33(jian) => "已兑换${jian}件";
+ static m33(time) => "下单时间:${time}";
- static m34(time) => "营业时间: ${time}";
+ static m34(xihuan) => "喜欢(${xihuan})";
- static m35(date) => "有效期:${date}";
+ static m35(shoujihao) => "邀请人手机号:${shoujihao}";
- static m36(date) => "有效期至${date}";
+ static m36(jian) => "已兑换${jian}件";
- static m37(yuan) => "${yuan}元";
+ static m37(time) => "营业时间: ${time}";
- static m38(yue) => "余额${yue}";
+ static m38(date) => "有效期:${date}";
- static m39(zuozhe) => "作者:${zuozhe}";
+ static m39(date) => "有效期至${date}";
+
+ static m40(yuan) => "${yuan}元";
+
+ static m41(yue) => "余额${yue}";
+
+ static m42(yue) => "余额 ${yue}";
+
+ static m43(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => {
@@ -261,6 +269,7 @@ class MessageLookup extends MessageLookupByLibrary {
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
"huifu" : MessageLookupByLibrary.simpleMessage("回复"),
"huifu_" : m9,
+ "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
@@ -281,6 +290,8 @@ class MessageLookup extends MessageLookupByLibrary {
"huodongjianmianpeisongfei" : m10,
"huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"),
"huodongliebiao" : MessageLookupByLibrary.simpleMessage("活动列表"),
+ "huodongyue" : MessageLookupByLibrary.simpleMessage("活动余额"),
+ "huodongyue_" : m11,
"huodongzixun" : MessageLookupByLibrary.simpleMessage("活动资讯"),
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"),
"input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"),
@@ -289,18 +300,18 @@ class MessageLookup extends MessageLookupByLibrary {
"input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀请码输入错误"),
- "jiajifen" : m11,
+ "jiajifen" : m12,
"jian" : MessageLookupByLibrary.simpleMessage("件"),
"jiangli" : MessageLookupByLibrary.simpleMessage("奖励"),
"jiangshi" : MessageLookupByLibrary.simpleMessage("讲师"),
- "jianjie" : m12,
+ "jianjie" : m13,
"jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"),
"jiesuan" : MessageLookupByLibrary.simpleMessage("结算"),
"jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"),
"jifen" : MessageLookupByLibrary.simpleMessage("积分"),
- "jifen_" : m13,
+ "jifen_" : m14,
"jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的积分不足"),
- "jifendaoxiayidengji" : m14,
+ "jifendaoxiayidengji" : m15,
"jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"),
"jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"),
"jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"),
@@ -327,7 +338,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
- "kaitongriqi" : m15,
+ "kaitongriqi" : m16,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
"kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"),
"keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -351,27 +362,30 @@ class MessageLookup extends MessageLookupByLibrary {
"lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
"lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"),
"lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
- "lingqushijian" : m16,
+ "lingqushijian" : m17,
"linian" : MessageLookupByLibrary.simpleMessage("理念"),
"lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"),
"liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"),
"login" : MessageLookupByLibrary.simpleMessage("登录"),
"login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
+ "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"),
+ "lvbiyue_" : m18,
"main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
"main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
"main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
"main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
- "manlijiandaijinquan" : m17,
- "manyuankeyong" : m18,
+ "manlijiandaijinquan" : m19,
+ "manyuankeyong" : m20,
"meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"),
"meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"),
"meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"),
"meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
"mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
"menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
- "mi" : m19,
+ "mi" : m21,
"mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
"morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"),
+ "muqianwujilu" : MessageLookupByLibrary.simpleMessage("目前暂未记录哦"),
"muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"),
"nihaimeiyouchongzhihuoxiaofeijilu" : MessageLookupByLibrary.simpleMessage("你在这儿还没有消费或充值记录哦～"),
"nincunchuquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启存储权限，请点击开启"),
@@ -381,7 +395,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵，请在"),
- "ninyilianxuqiandaotian" : m20,
+ "ninyilianxuqiandaotian" : m22,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
"paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -392,9 +406,10 @@ class MessageLookup extends MessageLookupByLibrary {
"peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
"phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"),
"pinglun" : MessageLookupByLibrary.simpleMessage("评论"),
- "pinglun_" : m21,
+ "pinglun_" : m23,
"pingtaiyue" : MessageLookupByLibrary.simpleMessage("平台余额"),
"pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平台支付密码"),
+ "pingtaizongyue" : m24,
"pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
"pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"),
"privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"),
@@ -435,7 +450,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"),
"quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"),
"quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"),
- "quanchangzhe" : m22,
+ "quanchangzhe" : m25,
"quantian" : MessageLookupByLibrary.simpleMessage("全天"),
"quanxian" : MessageLookupByLibrary.simpleMessage("权限"),
"quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"),
@@ -443,7 +458,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanyishuoming" : MessageLookupByLibrary.simpleMessage("权益说明"),
"quanyixiangqing" : MessageLookupByLibrary.simpleMessage("权益详情"),
"qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"),
- "qudanhao" : m23,
+ "qudanhao" : m26,
"qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"),
"queding" : MessageLookupByLibrary.simpleMessage("确定"),
"quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("确定要删除这条动态？"),
@@ -466,9 +481,9 @@ class MessageLookup extends MessageLookupByLibrary {
"quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
"remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"),
"remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"),
- "ren" : m24,
+ "ren" : m27,
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"),
- "resend_in_seconds" : m25,
+ "resend_in_seconds" : m28,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
@@ -487,7 +502,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"),
"shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
"shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"),
- "shangpinjifen" : m26,
+ "shangpinjifen" : m29,
"shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"),
"shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等级"),
"shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"),
@@ -496,7 +511,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shezhi" : MessageLookupByLibrary.simpleMessage("设置"),
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"),
- "shifujifen" : m27,
+ "shifujifen" : m30,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -520,7 +535,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
- "sui" : m28,
+ "sui" : m31,
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
"tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
@@ -540,7 +555,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
- "wancheng_" : m29,
+ "wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
"wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
"wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
@@ -581,7 +596,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
- "xiadanshijian_" : m30,
+ "xiadanshijian_" : m33,
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
"xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
@@ -593,11 +608,12 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消费"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
+ "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消费记录"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
- "xihuan_" : m31,
+ "xihuan_" : m34,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
@@ -608,11 +624,11 @@ class MessageLookup extends MessageLookupByLibrary {
"xuanji" : MessageLookupByLibrary.simpleMessage("选集"),
"xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
"yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
- "yaoqingrenshoujihao_" : m32,
+ "yaoqingrenshoujihao_" : m35,
"yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"),
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
- "yiduihuanjian" : m33,
+ "yiduihuanjian" : m36,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
"yihuide" : MessageLookupByLibrary.simpleMessage("已获得"),
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
@@ -626,7 +642,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"),
"yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
- "yingyeshijian" : m34,
+ "yingyeshijian" : m37,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
@@ -655,14 +671,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"),
- "youxiaoqi" : m35,
+ "youxiaoqi" : m38,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
- "youxiaoqizhi" : m36,
+ "youxiaoqizhi" : m39,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
- "yuan_" : m37,
+ "yuan_" : m40,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原价"),
"yue" : MessageLookupByLibrary.simpleMessage("余额"),
- "yue_" : m38,
+ "yue_" : m41,
+ "yue__" : m42,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"),
"yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
@@ -702,9 +719,11 @@ class MessageLookup extends MessageLookupByLibrary {
"zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),
"zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"),
"zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"),
+ "zongzichan" : MessageLookupByLibrary.simpleMessage("总资产"),
+ "zongzichanyuan" : MessageLookupByLibrary.simpleMessage("总资产(元)"),
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
- "zuozhe" : m39
+ "zuozhe" : m43
};
}
diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart
index c76bed19..04986e59 100644
--- a/lib/generated/intl/messages_zh_CN.dart
+++ b/lib/generated/intl/messages_zh_CN.dart
@@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活动减免${yuan}元配送费";
- static m11(jifen) => "+ ${jifen} 积分";
+ static m11(yue) => "活动余额 ${yue}";
- static m12(jianjie) => "简介:${jianjie}";
+ static m12(jifen) => "+ ${jifen} 积分";
- static m13(jifen) => "${jifen}积分";
+ static m13(jianjie) => "简介:${jianjie}";
- static m14(jifen) => "${jifen}积分 到下一个等级";
+ static m14(jifen) => "${jifen}积分";
- static m15(date) => "开通日期:${date}";
+ static m15(jifen) => "${jifen}积分 到下一个等级";
- static m16(shijian) => "领取时间 ${shijian}";
+ static m16(date) => "开通日期:${date}";
- static m17(man, jian) => "满${man}元立减${jian}元代金券";
+ static m17(shijian) => "领取时间 ${shijian}";
- static m18(yuan) => "满${yuan}可用";
+ static m18(yue) => "绿币 ${yue}";
- static m19(mi) => "${mi}米";
+ static m19(man, jian) => "满${man}元立减${jian}元代金券";
- static m20(tian) => "您已连续签到${tian}天";
+ static m20(yuan) => "满${yuan}可用";
- static m21(pinglun) => "评论(${pinglun})";
+ static m21(mi) => "${mi}米";
- static m22(zhe) => "全场${zhe}折";
+ static m22(tian) => "您已连续签到${tian}天";
- static m23(num) => "取单号${num}";
+ static m23(pinglun) => "评论(${pinglun})";
- static m24(ren) => "¥${ren}/人";
+ static m24(zongyue) => "余额：${zongyue}";
- static m25(second) => "${second}s后重新发送";
+ static m25(zhe) => "全场${zhe}折";
- static m26(jifen) => "商品积分 ${jifen}积分";
+ static m26(num) => "取单号${num}";
- static m27(jifen) => "实付积分 ${jifen}积分";
+ static m27(ren) => "¥${ren}/人";
- static m28(sui) => "${sui}岁";
+ static m28(second) => "${second}s后重新发送";
- static m29(num) => "完成${num}";
+ static m29(jifen) => "商品积分 ${jifen}积分";
- static m30(time) => "下单时间:${time}";
+ static m30(jifen) => "实付积分 ${jifen}积分";
- static m31(xihuan) => "喜欢(${xihuan})";
+ static m31(sui) => "${sui}岁";
- static m32(shoujihao) => "邀请人手机号:${shoujihao}";
+ static m32(num) => "完成${num}";
- static m33(jian) => "已兑换${jian}件";
+ static m33(time) => "下单时间:${time}";
- static m34(time) => "营业时间: ${time}";
+ static m34(xihuan) => "喜欢(${xihuan})";
- static m35(date) => "有效期:${date}";
+ static m35(shoujihao) => "邀请人手机号:${shoujihao}";
- static m36(date) => "有效期至${date}";
+ static m36(jian) => "已兑换${jian}件";
- static m37(yuan) => "${yuan}元";
+ static m37(time) => "营业时间: ${time}";
- static m38(yue) => "余额${yue}";
+ static m38(date) => "有效期:${date}";
- static m39(zuozhe) => "作者:${zuozhe}";
+ static m39(date) => "有效期至${date}";
+
+ static m40(yuan) => "${yuan}元";
+
+ static m41(yue) => "余额${yue}";
+
+ static m42(yue) => "余额 ${yue}";
+
+ static m43(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => {
@@ -260,6 +268,7 @@ class MessageLookup extends MessageLookupByLibrary {
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
"huifu" : MessageLookupByLibrary.simpleMessage("回复"),
"huifu_" : m9,
+ "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
@@ -279,6 +288,8 @@ class MessageLookup extends MessageLookupByLibrary {
"huodongjianmianpeisongfei" : m10,
"huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"),
"huodongliebiao" : MessageLookupByLibrary.simpleMessage("活动列表"),
+ "huodongyue" : MessageLookupByLibrary.simpleMessage("活动余额"),
+ "huodongyue_" : m11,
"huodongzixun" : MessageLookupByLibrary.simpleMessage("活动资讯"),
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"),
"input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"),
@@ -287,18 +298,18 @@ class MessageLookup extends MessageLookupByLibrary {
"input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀请码输入错误"),
- "jiajifen" : m11,
+ "jiajifen" : m12,
"jian" : MessageLookupByLibrary.simpleMessage("件"),
"jiangli" : MessageLookupByLibrary.simpleMessage("奖励"),
"jiangshi" : MessageLookupByLibrary.simpleMessage("讲师"),
- "jianjie" : m12,
+ "jianjie" : m13,
"jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"),
"jiesuan" : MessageLookupByLibrary.simpleMessage("结算"),
"jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"),
"jifen" : MessageLookupByLibrary.simpleMessage("积分"),
- "jifen_" : m13,
+ "jifen_" : m14,
"jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的积分不足"),
- "jifendaoxiayidengji" : m14,
+ "jifendaoxiayidengji" : m15,
"jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"),
"jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"),
"jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"),
@@ -325,7 +336,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
- "kaitongriqi" : m15,
+ "kaitongriqi" : m16,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
"kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"),
"keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -349,27 +360,30 @@ class MessageLookup extends MessageLookupByLibrary {
"lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
"lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"),
"lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
- "lingqushijian" : m16,
+ "lingqushijian" : m17,
"linian" : MessageLookupByLibrary.simpleMessage("理念"),
"lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"),
"liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"),
"login" : MessageLookupByLibrary.simpleMessage("登录"),
"login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
+ "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"),
+ "lvbiyue_" : m18,
"main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
"main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
"main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
"main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
- "manlijiandaijinquan" : m17,
- "manyuankeyong" : m18,
+ "manlijiandaijinquan" : m19,
+ "manyuankeyong" : m20,
"meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"),
"meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"),
"meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"),
"meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
"mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
"menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
- "mi" : m19,
+ "mi" : m21,
"mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
"morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"),
+ "muqianwujilu" : MessageLookupByLibrary.simpleMessage("目前暂未记录哦"),
"muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"),
"nihaimeiyouchongzhihuoxiaofeijilu" : MessageLookupByLibrary.simpleMessage("你在这儿还没有消费或充值记录哦～"),
"nincunchuquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启存储权限，请点击开启"),
@@ -379,7 +393,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵，请在"),
- "ninyilianxuqiandaotian" : m20,
+ "ninyilianxuqiandaotian" : m22,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
"paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -390,9 +404,10 @@ class MessageLookup extends MessageLookupByLibrary {
"peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
"phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"),
"pinglun" : MessageLookupByLibrary.simpleMessage("评论"),
- "pinglun_" : m21,
+ "pinglun_" : m23,
"pingtaiyue" : MessageLookupByLibrary.simpleMessage("平台余额"),
"pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平台支付密码"),
+ "pingtaizongyue" : m24,
"pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
"pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"),
"privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"),
@@ -433,7 +448,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"),
"quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"),
"quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"),
- "quanchangzhe" : m22,
+ "quanchangzhe" : m25,
"quantian" : MessageLookupByLibrary.simpleMessage("全天"),
"quanxian" : MessageLookupByLibrary.simpleMessage("权限"),
"quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"),
@@ -441,7 +456,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanyishuoming" : MessageLookupByLibrary.simpleMessage("权益说明"),
"quanyixiangqing" : MessageLookupByLibrary.simpleMessage("权益详情"),
"qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"),
- "qudanhao" : m23,
+ "qudanhao" : m26,
"qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"),
"queding" : MessageLookupByLibrary.simpleMessage("确定"),
"quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("确定要删除这条动态？"),
@@ -464,9 +479,9 @@ class MessageLookup extends MessageLookupByLibrary {
"quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
"remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"),
"remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"),
- "ren" : m24,
+ "ren" : m27,
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"),
- "resend_in_seconds" : m25,
+ "resend_in_seconds" : m28,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
@@ -485,7 +500,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"),
"shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
"shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"),
- "shangpinjifen" : m26,
+ "shangpinjifen" : m29,
"shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"),
"shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等级"),
"shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"),
@@ -494,7 +509,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shezhi" : MessageLookupByLibrary.simpleMessage("设置"),
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"),
- "shifujifen" : m27,
+ "shifujifen" : m30,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -518,7 +533,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
- "sui" : m28,
+ "sui" : m31,
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
"tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
@@ -538,7 +553,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
- "wancheng_" : m29,
+ "wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
"wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
"wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
@@ -579,7 +594,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
- "xiadanshijian_" : m30,
+ "xiadanshijian_" : m33,
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
"xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
@@ -591,11 +606,12 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消费"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
+ "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消费记录"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
- "xihuan_" : m31,
+ "xihuan_" : m34,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
@@ -606,10 +622,10 @@ class MessageLookup extends MessageLookupByLibrary {
"xuanji" : MessageLookupByLibrary.simpleMessage("选集"),
"xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
"yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
- "yaoqingrenshoujihao_" : m32,
+ "yaoqingrenshoujihao_" : m35,
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
- "yiduihuanjian" : m33,
+ "yiduihuanjian" : m36,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
"yihuide" : MessageLookupByLibrary.simpleMessage("已获得"),
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
@@ -623,7 +639,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"),
"yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
- "yingyeshijian" : m34,
+ "yingyeshijian" : m37,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
@@ -652,14 +668,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"),
- "youxiaoqi" : m35,
+ "youxiaoqi" : m38,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
- "youxiaoqizhi" : m36,
+ "youxiaoqizhi" : m39,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
- "yuan_" : m37,
+ "yuan_" : m40,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原价"),
"yue" : MessageLookupByLibrary.simpleMessage("余额"),
- "yue_" : m38,
+ "yue_" : m41,
+ "yue__" : m42,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"),
"yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
@@ -697,9 +714,11 @@ class MessageLookup extends MessageLookupByLibrary {
"zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),
"zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"),
"zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"),
+ "zongzichan" : MessageLookupByLibrary.simpleMessage("总资产"),
+ "zongzichanyuan" : MessageLookupByLibrary.simpleMessage("总资产(元)"),
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
- "zuozhe" : m39
+ "zuozhe" : m43
};
}
diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart
index e683bd84..1376019c 100644
--- a/lib/generated/intl/messages_zh_Hans_CN.dart
+++ b/lib/generated/intl/messages_zh_Hans_CN.dart
@@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活动减免${yuan}元配送费";
- static m11(jifen) => "+ ${jifen} 积分";
+ static m11(yue) => "活动余额 ${yue}";
- static m12(jianjie) => "简介:${jianjie}";
+ static m12(jifen) => "+ ${jifen} 积分";
- static m13(jifen) => "${jifen}积分";
+ static m13(jianjie) => "简介:${jianjie}";
- static m14(jifen) => "${jifen}积分 到下一个等级";
+ static m14(jifen) => "${jifen}积分";
- static m15(date) => "开通日期:${date}";
+ static m15(jifen) => "${jifen}积分 到下一个等级";
- static m16(shijian) => "领取时间 ${shijian}";
+ static m16(date) => "开通日期:${date}";
- static m17(man, jian) => "满${man}元立减${jian}元代金券";
+ static m17(shijian) => "领取时间 ${shijian}";
- static m18(yuan) => "满${yuan}可用";
+ static m18(yue) => "绿币 ${yue}";
- static m19(mi) => "${mi}米";
+ static m19(man, jian) => "满${man}元立减${jian}元代金券";
- static m20(tian) => "您已连续签到${tian}天";
+ static m20(yuan) => "满${yuan}可用";
- static m21(pinglun) => "评论(${pinglun})";
+ static m21(mi) => "${mi}米";
- static m22(zhe) => "全场${zhe}折";
+ static m22(tian) => "您已连续签到${tian}天";
- static m23(num) => "取单号${num}";
+ static m23(pinglun) => "评论(${pinglun})";
- static m24(ren) => "¥${ren}/人";
+ static m24(zongyue) => "余额：${zongyue}";
- static m25(second) => "${second}s后重新发送";
+ static m25(zhe) => "全场${zhe}折";
- static m26(jifen) => "商品积分 ${jifen}积分";
+ static m26(num) => "取单号${num}";
- static m27(jifen) => "实付积分 ${jifen}积分";
+ static m27(ren) => "¥${ren}/人";
- static m28(sui) => "${sui}岁";
+ static m28(second) => "${second}s后重新发送";
- static m29(num) => "完成${num}";
+ static m29(jifen) => "商品积分 ${jifen}积分";
- static m30(time) => "下单时间:${time}";
+ static m30(jifen) => "实付积分 ${jifen}积分";
- static m31(xihuan) => "喜欢(${xihuan})";
+ static m31(sui) => "${sui}岁";
- static m32(shoujihao) => "邀请人手机号:${shoujihao}";
+ static m32(num) => "完成${num}";
- static m33(jian) => "已兑换${jian}件";
+ static m33(time) => "下单时间:${time}";
- static m34(time) => "营业时间: ${time}";
+ static m34(xihuan) => "喜欢(${xihuan})";
- static m35(date) => "有效期:${date}";
+ static m35(shoujihao) => "邀请人手机号:${shoujihao}";
- static m36(date) => "有效期至${date}";
+ static m36(jian) => "已兑换${jian}件";
- static m37(yuan) => "${yuan}元";
+ static m37(time) => "营业时间: ${time}";
- static m38(yue) => "余额${yue}";
+ static m38(date) => "有效期:${date}";
- static m39(zuozhe) => "作者:${zuozhe}";
+ static m39(date) => "有效期至${date}";
+
+ static m40(yuan) => "${yuan}元";
+
+ static m41(yue) => "余额${yue}";
+
+ static m42(yue) => "余额 ${yue}";
+
+ static m43(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => {
@@ -260,6 +268,7 @@ class MessageLookup extends MessageLookupByLibrary {
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
"huifu" : MessageLookupByLibrary.simpleMessage("回复"),
"huifu_" : m9,
+ "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于：一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
@@ -279,6 +288,8 @@ class MessageLookup extends MessageLookupByLibrary {
"huodongjianmianpeisongfei" : m10,
"huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活动进行中"),
"huodongliebiao" : MessageLookupByLibrary.simpleMessage("活动列表"),
+ "huodongyue" : MessageLookupByLibrary.simpleMessage("活动余额"),
+ "huodongyue_" : m11,
"huodongzixun" : MessageLookupByLibrary.simpleMessage("活动资讯"),
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("货品已送达"),
"input_code" : MessageLookupByLibrary.simpleMessage("手机验证码"),
@@ -287,18 +298,18 @@ class MessageLookup extends MessageLookupByLibrary {
"input_phone" : MessageLookupByLibrary.simpleMessage("输入手机号"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("请输入你的手机号"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀请码输入错误"),
- "jiajifen" : m11,
+ "jiajifen" : m12,
"jian" : MessageLookupByLibrary.simpleMessage("件"),
"jiangli" : MessageLookupByLibrary.simpleMessage("奖励"),
"jiangshi" : MessageLookupByLibrary.simpleMessage("讲师"),
- "jianjie" : m12,
+ "jianjie" : m13,
"jiazaishibai" : MessageLookupByLibrary.simpleMessage("加载失败"),
"jiesuan" : MessageLookupByLibrary.simpleMessage("结算"),
"jiesuanjine" : MessageLookupByLibrary.simpleMessage("结算金额"),
"jifen" : MessageLookupByLibrary.simpleMessage("积分"),
- "jifen_" : m13,
+ "jifen_" : m14,
"jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的积分不足"),
- "jifendaoxiayidengji" : m14,
+ "jifendaoxiayidengji" : m15,
"jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"),
"jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"),
"jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"),
@@ -325,7 +336,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
- "kaitongriqi" : m15,
+ "kaitongriqi" : m16,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
"kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"),
"keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -349,27 +360,30 @@ class MessageLookup extends MessageLookupByLibrary {
"lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
"lingqudaokabao" : MessageLookupByLibrary.simpleMessage("领取到卡包"),
"lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
- "lingqushijian" : m16,
+ "lingqushijian" : m17,
"linian" : MessageLookupByLibrary.simpleMessage("理念"),
"lishijilu" : MessageLookupByLibrary.simpleMessage("历史记录"),
"liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的评论吧"),
"login" : MessageLookupByLibrary.simpleMessage("登录"),
"login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
+ "lvbiyue" : MessageLookupByLibrary.simpleMessage("绿币余额"),
+ "lvbiyue_" : m18,
"main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
"main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
"main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
"main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
- "manlijiandaijinquan" : m17,
- "manyuankeyong" : m18,
+ "manlijiandaijinquan" : m19,
+ "manyuankeyong" : m20,
"meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"),
"meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"),
"meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"),
"meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
"mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
"menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"),
- "mi" : m19,
+ "mi" : m21,
"mingxi" : MessageLookupByLibrary.simpleMessage("明细"),
"morenpaixu" : MessageLookupByLibrary.simpleMessage("默认排序"),
+ "muqianwujilu" : MessageLookupByLibrary.simpleMessage("目前暂未记录哦"),
"muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暂无星店活动"),
"nihaimeiyouchongzhihuoxiaofeijilu" : MessageLookupByLibrary.simpleMessage("你在这儿还没有消费或充值记录哦～"),
"nincunchuquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启存储权限，请点击开启"),
@@ -379,7 +393,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功领取优惠劵，请在"),
- "ninyilianxuqiandaotian" : m20,
+ "ninyilianxuqiandaotian" : m22,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一个订单需要前往门店领取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一个新的订单"),
"paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -390,9 +404,10 @@ class MessageLookup extends MessageLookupByLibrary {
"peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
"phone_error" : MessageLookupByLibrary.simpleMessage("手机格式错误"),
"pinglun" : MessageLookupByLibrary.simpleMessage("评论"),
- "pinglun_" : m21,
+ "pinglun_" : m23,
"pingtaiyue" : MessageLookupByLibrary.simpleMessage("平台余额"),
"pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平台支付密码"),
+ "pingtaizongyue" : m24,
"pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
"pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介绍"),
"privacy_policy1" : MessageLookupByLibrary.simpleMessage("登录既同意"),
@@ -433,7 +448,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"),
"quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兑换"),
"quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全场通用"),
- "quanchangzhe" : m22,
+ "quanchangzhe" : m25,
"quantian" : MessageLookupByLibrary.simpleMessage("全天"),
"quanxian" : MessageLookupByLibrary.simpleMessage("权限"),
"quanxianshezhi" : MessageLookupByLibrary.simpleMessage("权限设置"),
@@ -441,7 +456,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanyishuoming" : MessageLookupByLibrary.simpleMessage("权益说明"),
"quanyixiangqing" : MessageLookupByLibrary.simpleMessage("权益详情"),
"qucanhao" : MessageLookupByLibrary.simpleMessage("取餐号"),
- "qudanhao" : m23,
+ "qudanhao" : m26,
"qudenglu" : MessageLookupByLibrary.simpleMessage("去登录"),
"queding" : MessageLookupByLibrary.simpleMessage("确定"),
"quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("确定要删除这条动态？"),
@@ -464,9 +479,9 @@ class MessageLookup extends MessageLookupByLibrary {
"quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
"remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("热门文章视频"),
"remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("热门文章视频列表"),
- "ren" : m24,
+ "ren" : m27,
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任务中心"),
- "resend_in_seconds" : m25,
+ "resend_in_seconds" : m28,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兑换积分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("点击净弼，进入积分商城，点击你想兑换的领商品，进入商品详情后点击下方兑换，即可兑换哦~"),
@@ -485,7 +500,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"),
"shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
"shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加载"),
- "shangpinjifen" : m26,
+ "shangpinjifen" : m29,
"shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品详情"),
"shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等级"),
"shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娱乐"),
@@ -494,7 +509,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shezhi" : MessageLookupByLibrary.simpleMessage("设置"),
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("释放加载更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("释放刷新"),
- "shifujifen" : m27,
+ "shifujifen" : m30,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("实名认证"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -518,7 +533,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
- "sui" : m28,
+ "sui" : m31,
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
"tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
@@ -538,7 +553,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外卖配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
- "wancheng_" : m29,
+ "wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
"wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
"wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
@@ -579,7 +594,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
- "xiadanshijian_" : m30,
+ "xiadanshijian_" : m33,
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
"xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
@@ -591,11 +606,12 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("线下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消费"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
+ "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消费记录"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
- "xihuan_" : m31,
+ "xihuan_" : m34,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系统通知"),
@@ -606,10 +622,10 @@ class MessageLookup extends MessageLookupByLibrary {
"xuanji" : MessageLookupByLibrary.simpleMessage("选集"),
"xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
"yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
- "yaoqingrenshoujihao_" : m32,
+ "yaoqingrenshoujihao_" : m35,
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
- "yiduihuanjian" : m33,
+ "yiduihuanjian" : m36,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
"yihuide" : MessageLookupByLibrary.simpleMessage("已获得"),
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
@@ -623,7 +639,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集团联盟店会员点餐"),
"yindaoye3" : MessageLookupByLibrary.simpleMessage("会员活动专区"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
- "yingyeshijian" : m34,
+ "yingyeshijian" : m37,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("饮食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隐私声明"),
@@ -652,14 +668,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("优惠券领取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("游客登录"),
- "youxiaoqi" : m35,
+ "youxiaoqi" : m38,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
- "youxiaoqizhi" : m36,
+ "youxiaoqizhi" : m39,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
- "yuan_" : m37,
+ "yuan_" : m40,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原价"),
"yue" : MessageLookupByLibrary.simpleMessage("余额"),
- "yue_" : m38,
+ "yue_" : m41,
+ "yue__" : m42,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("余额明细"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("预留电话"),
"yunfei" : MessageLookupByLibrary.simpleMessage("运费"),
@@ -697,9 +714,11 @@ class MessageLookup extends MessageLookupByLibrary {
"zitidizhi" : MessageLookupByLibrary.simpleMessage("自提地址"),
"zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("券类型：自提兑换券"),
"zitishijian" : MessageLookupByLibrary.simpleMessage("自提时间"),
+ "zongzichan" : MessageLookupByLibrary.simpleMessage("总资产"),
+ "zongzichanyuan" : MessageLookupByLibrary.simpleMessage("总资产(元)"),
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("钻石会员"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任务得积分"),
- "zuozhe" : m39
+ "zuozhe" : m43
};
}
diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart
index b99d36ed..e4c5e904 100644
--- a/lib/generated/intl/messages_zh_Hant_CN.dart
+++ b/lib/generated/intl/messages_zh_Hant_CN.dart
@@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活動減免${yuan}元配送費";
- static m11(jifen) => "+ ${jifen} 積分";
+ static m11(yue) => "活動餘額 ${yue}";
- static m12(jianjie) => "簡介:${jianjie}";
+ static m12(jifen) => "+ ${jifen} 積分";
- static m13(jifen) => "${jifen}積分";
+ static m13(jianjie) => "簡介:${jianjie}";
- static m14(jifen) => "${jifen}積分 到下一個等級";
+ static m14(jifen) => "${jifen}積分";
- static m15(date) => "開通日期:${date}";
+ static m15(jifen) => "${jifen}積分 到下一個等級";
- static m16(shijian) => "領取時間 ${shijian}";
+ static m16(date) => "開通日期:${date}";
- static m17(man, jian) => "滿${man}元立減${jian}元代金券";
+ static m17(shijian) => "領取時間 ${shijian}";
- static m18(yuan) => "滿${yuan}可用";
+ static m18(yue) => "綠幣餘額 ${yue}";
- static m19(mi) => "${mi}米";
+ static m19(man, jian) => "滿${man}元立減${jian}元代金券";
- static m20(tian) => "您已連續簽到${tian}天";
+ static m20(yuan) => "滿${yuan}可用";
- static m21(pinglun) => "評論(${pinglun})";
+ static m21(mi) => "${mi}米";
- static m22(zhe) => "全場${zhe}折";
+ static m22(tian) => "您已連續簽到${tian}天";
- static m23(num) => "取單號${num}";
+ static m23(pinglun) => "評論(${pinglun})";
- static m24(ren) => "¥${ren}/人";
+ static m24(zongyue, huodongyue, lvbiyue) => "平台總餘額：${zongyue}（活動餘額${huodongyue} 綠幣餘額${lvbiyue}） ";
- static m25(second) => "${second}s后重新發送";
+ static m25(zhe) => "全場${zhe}折";
- static m26(jifen) => "商品積分 ${jifen}積分";
+ static m26(num) => "取單號${num}";
- static m27(jifen) => "實付積分 ${jifen}積分";
+ static m27(ren) => "¥${ren}/人";
- static m28(sui) => "${sui}嵗";
+ static m28(second) => "${second}s后重新發送";
- static m29(num) => "完成${num}";
+ static m29(jifen) => "商品積分 ${jifen}積分";
- static m30(time) => "下單時間:${time}";
+ static m30(jifen) => "實付積分 ${jifen}積分";
- static m31(xihuan) => "喜歡(${xihuan})";
+ static m31(sui) => "${sui}嵗";
- static m32(shoujihao) => "邀请人手機號:${shoujihao}";
+ static m32(num) => "完成${num}";
- static m33(jian) => "已兌換${jian}件";
+ static m33(time) => "下單時間:${time}";
- static m34(time) => "營業時間: ${time}";
+ static m34(xihuan) => "喜歡(${xihuan})";
- static m35(date) => "有效期:${date}";
+ static m35(shoujihao) => "邀请人手機號:${shoujihao}";
- static m36(date) => "有效期至${date}";
+ static m36(jian) => "已兌換${jian}件";
- static m37(yuan) => "${yuan}元";
+ static m37(time) => "營業時間: ${time}";
- static m38(yue) => "餘額${yue}";
+ static m38(date) => "有效期:${date}";
- static m39(zuozhe) => "作者:${zuozhe}";
+ static m39(date) => "有效期至${date}";
+
+ static m40(yuan) => "${yuan}元";
+
+ static m41(yue) => "餘額${yue}";
+
+ static m42(yue) => "餘額 ${yue}";
+
+ static m43(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => {
@@ -277,6 +285,7 @@ class MessageLookup extends MessageLookupByLibrary {
"huodongjianmianpeisongfei" : m10,
"huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"),
"huodongliebiao" : MessageLookupByLibrary.simpleMessage("活動列表"),
+ "huodongyue" : m11,
"huodongzixun" : MessageLookupByLibrary.simpleMessage("活動資訊"),
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"),
"input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"),
@@ -285,18 +294,18 @@ class MessageLookup extends MessageLookupByLibrary {
"input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀請碼輸入錯誤"),
- "jiajifen" : m11,
+ "jiajifen" : m12,
"jian" : MessageLookupByLibrary.simpleMessage("件"),
"jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"),
"jiangshi" : MessageLookupByLibrary.simpleMessage("講師"),
- "jianjie" : m12,
+ "jianjie" : m13,
"jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"),
"jiesuan" : MessageLookupByLibrary.simpleMessage("結算"),
"jiesuanjine" : MessageLookupByLibrary.simpleMessage("結算金額"),
"jifen" : MessageLookupByLibrary.simpleMessage("積分"),
- "jifen_" : m13,
+ "jifen_" : m14,
"jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的積分不足"),
- "jifendaoxiayidengji" : m14,
+ "jifendaoxiayidengji" : m15,
"jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"),
"jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"),
"jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"),
@@ -323,7 +332,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"),
- "kaitongriqi" : m15,
+ "kaitongriqi" : m16,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
"kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可領取的卡券"),
"keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -347,25 +356,26 @@ class MessageLookup extends MessageLookupByLibrary {
"lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"),
"lingqudaokabao" : MessageLookupByLibrary.simpleMessage("領取到卡包"),
"lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
- "lingqushijian" : m16,
+ "lingqushijian" : m17,
"linian" : MessageLookupByLibrary.simpleMessage("理念"),
"lishijilu" : MessageLookupByLibrary.simpleMessage("歷史記錄"),
"liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的評論吧"),
"login" : MessageLookupByLibrary.simpleMessage("登錄"),
"login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"),
+ "lvbiyue" : m18,
"main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
"main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
"main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
"main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
- "manlijiandaijinquan" : m17,
- "manyuankeyong" : m18,
+ "manlijiandaijinquan" : m19,
+ "manyuankeyong" : m20,
"meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"),
"meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("沒有更多會員卡"),
"meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"),
"meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
"mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
"menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"),
- "mi" : m19,
+ "mi" : m21,
"mingxi" : MessageLookupByLibrary.simpleMessage("明細"),
"morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"),
"muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暫無星店活動"),
@@ -377,7 +387,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功領取優惠券，請在"),
- "ninyilianxuqiandaotian" : m20,
+ "ninyilianxuqiandaotian" : m22,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"),
"paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -388,9 +398,10 @@ class MessageLookup extends MessageLookupByLibrary {
"peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
"phone_error" : MessageLookupByLibrary.simpleMessage("手機格式錯誤"),
"pinglun" : MessageLookupByLibrary.simpleMessage("評論"),
- "pinglun_" : m21,
+ "pinglun_" : m23,
"pingtaiyue" : MessageLookupByLibrary.simpleMessage("平臺餘額"),
"pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平臺支付密碼"),
+ "pingtaizongyue" : m24,
"pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
"pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"),
"privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"),
@@ -431,7 +442,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部訂單"),
"quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兌換"),
"quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全場通用"),
- "quanchangzhe" : m22,
+ "quanchangzhe" : m25,
"quantian" : MessageLookupByLibrary.simpleMessage("全天"),
"quanxian" : MessageLookupByLibrary.simpleMessage("權限"),
"quanxianshezhi" : MessageLookupByLibrary.simpleMessage("權限設置"),
@@ -439,7 +450,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanyishuoming" : MessageLookupByLibrary.simpleMessage("權益説明"),
"quanyixiangqing" : MessageLookupByLibrary.simpleMessage("權益詳情"),
"qucanhao" : MessageLookupByLibrary.simpleMessage("取餐號"),
- "qudanhao" : m23,
+ "qudanhao" : m26,
"qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"),
"queding" : MessageLookupByLibrary.simpleMessage("確定"),
"quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("確定要刪除這條動態？"),
@@ -462,9 +473,9 @@ class MessageLookup extends MessageLookupByLibrary {
"quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
"remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("熱門文章視頻"),
"remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("熱門文章視頻清單"),
- "ren" : m24,
+ "ren" : m27,
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任務中心"),
- "resend_in_seconds" : m25,
+ "resend_in_seconds" : m28,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼，進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"),
@@ -483,7 +494,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已發貨"),
"shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
"shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加載"),
- "shangpinjifen" : m26,
+ "shangpinjifen" : m29,
"shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品詳情"),
"shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等級"),
"shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娛樂"),
@@ -492,7 +503,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shezhi" : MessageLookupByLibrary.simpleMessage("設置"),
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("釋放加載更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("釋放刷新"),
- "shifujifen" : m27,
+ "shifujifen" : m30,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -515,7 +526,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
- "sui" : m28,
+ "sui" : m31,
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
"tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
@@ -535,7 +546,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
- "wancheng_" : m29,
+ "wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"),
"wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "),
"wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "),
@@ -576,7 +587,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"),
- "xiadanshijian_" : m30,
+ "xiadanshijian_" : m33,
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相冊"),
"xiangji" : MessageLookupByLibrary.simpleMessage("相機"),
@@ -588,11 +599,12 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("線下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消費"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
+ "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消費記錄"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
- "xihuan_" : m31,
+ "xihuan_" : m34,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
@@ -603,10 +615,10 @@ class MessageLookup extends MessageLookupByLibrary {
"xuanji" : MessageLookupByLibrary.simpleMessage("選集"),
"xuni" : MessageLookupByLibrary.simpleMessage("虛擬"),
"yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"),
- "yaoqingrenshoujihao_" : m32,
+ "yaoqingrenshoujihao_" : m35,
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
- "yiduihuanjian" : m33,
+ "yiduihuanjian" : m36,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"),
"yihuide" : MessageLookupByLibrary.simpleMessage("已獲得"),
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"),
@@ -620,7 +632,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"),
"yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
- "yingyeshijian" : m34,
+ "yingyeshijian" : m37,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("飲食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"),
@@ -649,14 +661,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("遊客登錄"),
- "youxiaoqi" : m35,
+ "youxiaoqi" : m38,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
- "youxiaoqizhi" : m36,
+ "youxiaoqizhi" : m39,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
- "yuan_" : m37,
+ "yuan_" : m40,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原價"),
"yue" : MessageLookupByLibrary.simpleMessage("餘額"),
- "yue_" : m38,
+ "yue_" : m41,
+ "yue__" : m42,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("預留電話"),
"yunfei" : MessageLookupByLibrary.simpleMessage("運費"),
@@ -698,6 +711,6 @@ class MessageLookup extends MessageLookupByLibrary {
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"),
- "zuozhe" : m39
+ "zuozhe" : m43
};
}
diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart
index 35853b66..005db40f 100644
--- a/lib/generated/intl/messages_zh_TW.dart
+++ b/lib/generated/intl/messages_zh_TW.dart
@@ -41,63 +41,71 @@ class MessageLookup extends MessageLookupByLibrary {
static m10(yuan) => "活動減免${yuan}元配送費";
- static m11(jifen) => "+ ${jifen} 積分";
+ static m11(yue) => "活動餘額 ${yue}";
- static m12(jianjie) => "簡介:${jianjie}";
+ static m12(jifen) => "+ ${jifen} 積分";
- static m13(jifen) => "${jifen}積分";
+ static m13(jianjie) => "簡介:${jianjie}";
- static m14(jifen) => "${jifen}積分 到下一個等級";
+ static m14(jifen) => "${jifen}積分";
- static m15(date) => "開通日期:${date}";
+ static m15(jifen) => "${jifen}積分 到下一個等級";
- static m16(shijian) => "領取時間 ${shijian}";
+ static m16(date) => "開通日期:${date}";
- static m17(man, jian) => "滿${man}元立減${jian}元代金券";
+ static m17(shijian) => "領取時間 ${shijian}";
- static m18(yuan) => "滿${yuan}可用";
+ static m18(yue) => "綠幣餘額 ${yue}";
- static m19(mi) => "${mi}米";
+ static m19(man, jian) => "滿${man}元立減${jian}元代金券";
- static m20(tian) => "您已連續簽到${tian}天";
+ static m20(yuan) => "滿${yuan}可用";
- static m21(pinglun) => "評論(${pinglun})";
+ static m21(mi) => "${mi}米";
- static m22(zhe) => "全場${zhe}折";
+ static m22(tian) => "您已連續簽到${tian}天";
- static m23(num) => "取單號${num}";
+ static m23(pinglun) => "評論(${pinglun})";
- static m24(ren) => "¥${ren}/人";
+ static m24(zongyue, huodongyue, lvbiyue) => "平台總餘額：${zongyue}（活動餘額${huodongyue} 綠幣餘額${lvbiyue}） ";
- static m25(second) => "${second}s后重新發送";
+ static m25(zhe) => "全場${zhe}折";
- static m26(jifen) => "商品積分 ${jifen}積分";
+ static m26(num) => "取單號${num}";
- static m27(jifen) => "實付積分 ${jifen}積分";
+ static m27(ren) => "¥${ren}/人";
- static m28(sui) => "${sui}嵗";
+ static m28(second) => "${second}s后重新發送";
- static m29(num) => "完成${num}";
+ static m29(jifen) => "商品積分 ${jifen}積分";
- static m30(time) => "下單時間:${time}";
+ static m30(jifen) => "實付積分 ${jifen}積分";
- static m31(xihuan) => "喜歡(${xihuan})";
+ static m31(sui) => "${sui}嵗";
- static m32(shoujihao) => "邀请人手機號:${shoujihao}";
+ static m32(num) => "完成${num}";
- static m33(jian) => "已兌換${jian}件";
+ static m33(time) => "下單時間:${time}";
- static m34(time) => "營業時間: ${time}";
+ static m34(xihuan) => "喜歡(${xihuan})";
- static m35(date) => "有效期:${date}";
+ static m35(shoujihao) => "邀请人手機號:${shoujihao}";
- static m36(date) => "有效期至${date}";
+ static m36(jian) => "已兌換${jian}件";
- static m37(yuan) => "${yuan}元";
+ static m37(time) => "營業時間: ${time}";
- static m38(yue) => "餘額${yue}";
+ static m38(date) => "有效期:${date}";
- static m39(zuozhe) => "作者:${zuozhe}";
+ static m39(date) => "有效期至${date}";
+
+ static m40(yuan) => "${yuan}元";
+
+ static m41(yue) => "餘額${yue}";
+
+ static m42(yue) => "餘額 ${yue}";
+
+ static m43(zuozhe) => "作者:${zuozhe}";
final messages = _notInlinedMessages(_notInlinedMessages);
static _notInlinedMessages(_) => {
@@ -279,6 +287,7 @@ class MessageLookup extends MessageLookupByLibrary {
"huodongjianmianpeisongfei" : m10,
"huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("活動進行中"),
"huodongliebiao" : MessageLookupByLibrary.simpleMessage("活動列表"),
+ "huodongyue" : m11,
"huodongzixun" : MessageLookupByLibrary.simpleMessage("活動資訊"),
"huopinyisongda" : MessageLookupByLibrary.simpleMessage("貨品已送達"),
"input_code" : MessageLookupByLibrary.simpleMessage("手機驗證碼"),
@@ -287,18 +296,18 @@ class MessageLookup extends MessageLookupByLibrary {
"input_phone" : MessageLookupByLibrary.simpleMessage("輸入手機號"),
"input_phone_hide" : MessageLookupByLibrary.simpleMessage("請輸入你的手機號"),
"invite_code_error" : MessageLookupByLibrary.simpleMessage("邀請碼輸入錯誤"),
- "jiajifen" : m11,
+ "jiajifen" : m12,
"jian" : MessageLookupByLibrary.simpleMessage("件"),
"jiangli" : MessageLookupByLibrary.simpleMessage("獎勵"),
"jiangshi" : MessageLookupByLibrary.simpleMessage("講師"),
- "jianjie" : m12,
+ "jianjie" : m13,
"jiazaishibai" : MessageLookupByLibrary.simpleMessage("加載失敗"),
"jiesuan" : MessageLookupByLibrary.simpleMessage("結算"),
"jiesuanjine" : MessageLookupByLibrary.simpleMessage("結算金額"),
"jifen" : MessageLookupByLibrary.simpleMessage("積分"),
- "jifen_" : m13,
+ "jifen_" : m14,
"jifenbuzu" : MessageLookupByLibrary.simpleMessage("您的積分不足"),
- "jifendaoxiayidengji" : m14,
+ "jifendaoxiayidengji" : m15,
"jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("積分的計算説明"),
"jifendidaogao" : MessageLookupByLibrary.simpleMessage("積分從低到高"),
"jifengaodaodi" : MessageLookupByLibrary.simpleMessage("積分從高到低"),
@@ -325,7 +334,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("開啓權限"),
- "kaitongriqi" : m15,
+ "kaitongriqi" : m16,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
"kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可領取的卡券"),
"keshiyong" : MessageLookupByLibrary.simpleMessage("可使用"),
@@ -349,25 +358,26 @@ class MessageLookup extends MessageLookupByLibrary {
"lingquchenggong" : MessageLookupByLibrary.simpleMessage("領取成功"),
"lingqudaokabao" : MessageLookupByLibrary.simpleMessage("領取到卡包"),
"lingqufangshi" : MessageLookupByLibrary.simpleMessage("领取方式"),
- "lingqushijian" : m16,
+ "lingqushijian" : m17,
"linian" : MessageLookupByLibrary.simpleMessage("理念"),
"lishijilu" : MessageLookupByLibrary.simpleMessage("歷史記錄"),
"liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("留下您精彩的評論吧"),
"login" : MessageLookupByLibrary.simpleMessage("登錄"),
"login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"),
+ "lvbiyue" : m18,
"main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
"main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
"main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
"main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
- "manlijiandaijinquan" : m17,
- "manyuankeyong" : m18,
+ "manlijiandaijinquan" : m19,
+ "manyuankeyong" : m20,
"meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日簽到"),
"meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("沒有更多會員卡"),
"meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("沒有更多數據了"),
"meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"),
"mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"),
"menpaihao" : MessageLookupByLibrary.simpleMessage("請輸入門牌號"),
- "mi" : m19,
+ "mi" : m21,
"mingxi" : MessageLookupByLibrary.simpleMessage("明細"),
"morenpaixu" : MessageLookupByLibrary.simpleMessage("默認排序"),
"muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("目前暫無星店活動"),
@@ -379,7 +389,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启相机权限，请点击开启"),
"ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("您未开启消息通知权限，请点击开启"),
"ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("您已成功領取優惠券，請在"),
- "ninyilianxuqiandaotian" : m20,
+ "ninyilianxuqiandaotian" : m22,
"ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("您有一個訂單需要前往門店領取"),
"ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("您有一個新訂單"),
"paizhao" : MessageLookupByLibrary.simpleMessage("拍照"),
@@ -390,9 +400,10 @@ class MessageLookup extends MessageLookupByLibrary {
"peisongzhong" : MessageLookupByLibrary.simpleMessage("配送中"),
"phone_error" : MessageLookupByLibrary.simpleMessage("手機格式錯誤"),
"pinglun" : MessageLookupByLibrary.simpleMessage("評論"),
- "pinglun_" : m21,
+ "pinglun_" : m23,
"pingtaiyue" : MessageLookupByLibrary.simpleMessage("平臺餘額"),
"pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("平臺支付密碼"),
+ "pingtaizongyue" : m24,
"pinpai" : MessageLookupByLibrary.simpleMessage("品牌"),
"pinpaijieshao" : MessageLookupByLibrary.simpleMessage("品牌介紹"),
"privacy_policy1" : MessageLookupByLibrary.simpleMessage("登錄既同意"),
@@ -433,7 +444,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部訂單"),
"quanbuduihuan" : MessageLookupByLibrary.simpleMessage("全部兌換"),
"quanchangtongyong" : MessageLookupByLibrary.simpleMessage("全場通用"),
- "quanchangzhe" : m22,
+ "quanchangzhe" : m25,
"quantian" : MessageLookupByLibrary.simpleMessage("全天"),
"quanxian" : MessageLookupByLibrary.simpleMessage("權限"),
"quanxianshezhi" : MessageLookupByLibrary.simpleMessage("權限設置"),
@@ -441,7 +452,7 @@ class MessageLookup extends MessageLookupByLibrary {
"quanyishuoming" : MessageLookupByLibrary.simpleMessage("權益説明"),
"quanyixiangqing" : MessageLookupByLibrary.simpleMessage("權益詳情"),
"qucanhao" : MessageLookupByLibrary.simpleMessage("取餐號"),
- "qudanhao" : m23,
+ "qudanhao" : m26,
"qudenglu" : MessageLookupByLibrary.simpleMessage("去登錄"),
"queding" : MessageLookupByLibrary.simpleMessage("確定"),
"quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("確定要刪除這條動態？"),
@@ -464,9 +475,9 @@ class MessageLookup extends MessageLookupByLibrary {
"quzhifu" : MessageLookupByLibrary.simpleMessage("去支付"),
"remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("熱門文章視頻"),
"remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("熱門文章視頻清單"),
- "ren" : m24,
+ "ren" : m27,
"renwuzhongxin" : MessageLookupByLibrary.simpleMessage("任務中心"),
- "resend_in_seconds" : m25,
+ "resend_in_seconds" : m28,
"ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("日常分享"),
"ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("如何兌換積分"),
"ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("點擊淨弼，進入積分商城，點擊你想兌換的領商品，進入商品詳情後點擊下方兌換，即可兌換哦~"),
@@ -485,7 +496,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已發貨"),
"shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("商家正在配餐"),
"shanglajiazai" : MessageLookupByLibrary.simpleMessage("上拉加載"),
- "shangpinjifen" : m26,
+ "shangpinjifen" : m29,
"shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("商品詳情"),
"shangyidengji" : MessageLookupByLibrary.simpleMessage("上一等級"),
"shenghuoyule" : MessageLookupByLibrary.simpleMessage("生活娛樂"),
@@ -494,7 +505,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shezhi" : MessageLookupByLibrary.simpleMessage("設置"),
"shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("釋放加載更多"),
"shifangshuaxin" : MessageLookupByLibrary.simpleMessage("釋放刷新"),
- "shifujifen" : m27,
+ "shifujifen" : m30,
"shimingrenzheng" : MessageLookupByLibrary.simpleMessage("實名認證"),
"shixiaoquan" : MessageLookupByLibrary.simpleMessage("失效券"),
"shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("失效优惠券"),
@@ -518,7 +529,7 @@ class MessageLookup extends MessageLookupByLibrary {
"shuaxinzhong" : MessageLookupByLibrary.simpleMessage("刷新中...."),
"shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("請輸入收貨人地址"),
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("輸入支付密碼"),
- "sui" : m28,
+ "sui" : m31,
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特別聲明"),
"tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
@@ -538,7 +549,7 @@ class MessageLookup extends MessageLookupByLibrary {
"waimaipeisong" : MessageLookupByLibrary.simpleMessage("外賣配送"),
"waisong" : MessageLookupByLibrary.simpleMessage("外送"),
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
- "wancheng_" : m29,
+ "wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下單"),
"wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日資訊後自動生成 "),
"wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日資訊得專屬優惠劵 "),
@@ -579,7 +590,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuxinxi" : MessageLookupByLibrary.simpleMessage("物流信息"),
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流狀態:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下單時間"),
- "xiadanshijian_" : m30,
+ "xiadanshijian_" : m33,
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相冊"),
"xiangji" : MessageLookupByLibrary.simpleMessage("相機"),
@@ -591,11 +602,12 @@ class MessageLookup extends MessageLookupByLibrary {
"xianxiashiyong" : MessageLookupByLibrary.simpleMessage("線下使用"),
"xiaofei" : MessageLookupByLibrary.simpleMessage("消費"),
"xiaofeijifen" : MessageLookupByLibrary.simpleMessage("消费积分"),
+ "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("消費記錄"),
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等級"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加載完成"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回鄉用戶隱私協議"),
- "xihuan_" : m31,
+ "xihuan_" : m34,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活動"),
"xingming" : MessageLookupByLibrary.simpleMessage("姓名"),
"xitongtongzhi" : MessageLookupByLibrary.simpleMessage("系統通知"),
@@ -606,10 +618,10 @@ class MessageLookup extends MessageLookupByLibrary {
"xuanji" : MessageLookupByLibrary.simpleMessage("選集"),
"xuni" : MessageLookupByLibrary.simpleMessage("虛擬"),
"yanzhengma" : MessageLookupByLibrary.simpleMessage("驗證碼"),
- "yaoqingrenshoujihao_" : m32,
+ "yaoqingrenshoujihao_" : m35,
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已綁副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兌換"),
- "yiduihuanjian" : m33,
+ "yiduihuanjian" : m36,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已發貨"),
"yihuide" : MessageLookupByLibrary.simpleMessage("已獲得"),
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫騎手"),
@@ -623,7 +635,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yindaoye2" : MessageLookupByLibrary.simpleMessage("全新集團聯盟店會員點餐"),
"yindaoye3" : MessageLookupByLibrary.simpleMessage("會員活動專區"),
"yindaoye4" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
- "yingyeshijian" : m34,
+ "yingyeshijian" : m37,
"yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("银卡会员"),
"yinshi" : MessageLookupByLibrary.simpleMessage("飲食"),
"yinsishengming" : MessageLookupByLibrary.simpleMessage("隱私聲明"),
@@ -652,14 +664,15 @@ class MessageLookup extends MessageLookupByLibrary {
"youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("優惠券領取"),
"youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("優惠金額無法累積積分，訂單撤銷或其他原因造成的未成功支付的訂單，無法獲得對應的積分。"),
"youkedenglu" : MessageLookupByLibrary.simpleMessage("遊客登錄"),
- "youxiaoqi" : m35,
+ "youxiaoqi" : m38,
"youxiaoqixian" : MessageLookupByLibrary.simpleMessage("有效期限:"),
- "youxiaoqizhi" : m36,
+ "youxiaoqizhi" : m39,
"yuan" : MessageLookupByLibrary.simpleMessage("元"),
- "yuan_" : m37,
+ "yuan_" : m40,
"yuanjia" : MessageLookupByLibrary.simpleMessage("原價"),
"yue" : MessageLookupByLibrary.simpleMessage("餘額"),
- "yue_" : m38,
+ "yue_" : m41,
+ "yue__" : m42,
"yuemingxi" : MessageLookupByLibrary.simpleMessage("餘額明細"),
"yuliudianhua" : MessageLookupByLibrary.simpleMessage("預留電話"),
"yunfei" : MessageLookupByLibrary.simpleMessage("運費"),
@@ -701,6 +714,6 @@ class MessageLookup extends MessageLookupByLibrary {
"zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("鑽石會員"),
"zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("最新文章"),
"zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("做任務得積分"),
- "zuozhe" : m39
+ "zuozhe" : m43
};
}
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index a60c18c5..5b9554c1 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -6075,6 +6075,116 @@ class S {
);
}
+ /// `余额 {yue}`
+ String yue__(Object yue) {
+ return Intl.message(
+ '余额 $yue',
+ name: 'yue__',
+ desc: '',
+ args: [yue],
+ );
+ }
+
+ /// `绿币 {yue}`
+ String lvbiyue_(Object yue) {
+ return Intl.message(
+ '绿币 $yue',
+ name: 'lvbiyue_',
+ desc: '',
+ args: [yue],
+ );
+ }
+
+ /// `活动余额 {yue}`
+ String huodongyue_(Object yue) {
+ return Intl.message(
+ '活动余额 $yue',
+ name: 'huodongyue_',
+ desc: '',
+ args: [yue],
+ );
+ }
+
+ /// `绿币余额`
+ String get lvbiyue {
+ return Intl.message(
+ '绿币余额',
+ name: 'lvbiyue',
+ desc: '',
+ args: [],
+ );
+ }
+
+ /// `回乡钱包`
+ String get huixiangqianbao {
+ return Intl.message(
+ '回乡钱包',
+ name: 'huixiangqianbao',
+ desc: '',
+ args: [],
+ );
+ }
+
+ /// `总资产`
+ String get zongzichan {
+ return Intl.message(
+ '总资产',
+ name: 'zongzichan',
+ desc: '',
+ args: [],
+ );
+ }
+
+ /// `总资产(元)`
+ String get zongzichanyuan {
+ return Intl.message(
+ '总资产(元)',
+ name: 'zongzichanyuan',
+ desc: '',
+ args: [],
+ );
+ }
+
+ /// `活动余额`
+ String get huodongyue {
+ return Intl.message(
+ '活动余额',
+ name: 'huodongyue',
+ desc: '',
+ args: [],
+ );
+ }
+
+ /// `消费记录`
+ String get xiaofeijilu {
+ return Intl.message(
+ '消费记录',
+ name: 'xiaofeijilu',
+ desc: '',
+ args: [],
+ );
+ }
+
+ /// `目前暂未记录哦`
+ String get muqianwujilu {
+ return Intl.message(
+ '目前暂未记录哦',
+ name: 'muqianwujilu',
+ desc: '',
+ args: [],
+ );
+ }
+
+ /// `余额：{zongyue}`
+ String pingtaizongyue(Object zongyue) {
+ return Intl.message(
+ '余额：$zongyue',
+ name: 'pingtaizongyue',
+ desc: '',
+ args: [zongyue],
+ );
+ }
+
/// `并使用本机号码登录`
String get privacy_policy4 {
return Intl.message(
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 3bd012b3..de5383d1 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -634,6 +634,17 @@
"zhanghaoanquan": "账号安全",
"pingtaizhifumima": "平台支付密码",
"fasongduanxin": "发送短信",
+ "yue__": "余额 {yue}",
+ "lvbiyue_": "绿币 {yue}",
+ "huodongyue_": "活动余额 {yue}",
+ "lvbiyue": "绿币余额",
+ "huixiangqianbao": "回乡钱包",
+ "zongzichan": "总资产",
+ "zongzichanyuan": "总资产(元)",
+ "huodongyue": "活动余额",
+ "xiaofeijilu": "消费记录",
+ "muqianwujilu": "目前暂未记录哦",
+ "pingtaizongyue": "余额：{zongyue}",
diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb
index ce111ab1..8cb96b83 100644
--- a/lib/l10n/intl_zh_CN.arb
+++ b/lib/l10n/intl_zh_CN.arb
@@ -628,6 +628,17 @@
"zhanghaoanquan": "账号安全",
"pingtaizhifumima": "平台支付密码",
"fasongduanxin": "发送短信",
+ "yue__": "余额 {yue}",
+ "lvbiyue_": "绿币 {yue}",
+ "huodongyue_": "活动余额 {yue}",
+ "lvbiyue": "绿币余额",
+ "huixiangqianbao": "回乡钱包",
+ "zongzichan": "总资产",
+ "zongzichanyuan": "总资产(元)",
+ "huodongyue": "活动余额",
+ "xiaofeijilu": "消费记录",
+ "muqianwujilu": "目前暂未记录哦",
+ "pingtaizongyue": "余额：{zongyue}",
diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb
index 5058fd70..75a43ba3 100644
--- a/lib/l10n/intl_zh_Hans_CN.arb
+++ b/lib/l10n/intl_zh_Hans_CN.arb
@@ -628,6 +628,17 @@
"zhanghaoanquan": "账号安全",
"pingtaizhifumima": "平台支付密码",
"fasongduanxin": "发送短信",
+ "yue__": "余额 {yue}",
+ "lvbiyue_": "绿币 {yue}",
+ "huodongyue_": "活动余额 {yue}",
+ "lvbiyue": "绿币余额",
+ "huixiangqianbao": "回乡钱包",
+ "zongzichan": "总资产",
+ "zongzichanyuan": "总资产(元)",
+ "huodongyue": "活动余额",
+ "xiaofeijilu": "消费记录",
+ "muqianwujilu": "目前暂未记录哦",
+ "pingtaizongyue": "余额：{zongyue}",
diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb
index b952aa89..90af200c 100644
--- a/lib/l10n/intl_zh_Hant_CN.arb
+++ b/lib/l10n/intl_zh_Hant_CN.arb
@@ -620,6 +620,19 @@
"zhanghaoanquan": "賬號安全",
"pingtaizhifumima": "平臺支付密碼",
"fasongduanxin": "發送短信",
+ "lvbiyue_": "綠幣 {yue}",
+ "huodongyue_": "活動餘額 {yue}",
+ "lvbiyue": "綠幣餘額",
+ "huixiangqianbao": "回鄉錢包",
+ "zongzichan": "總資產",
+ "zongzichanyuan": "總資產(元)",
+ "huodongyue": "活動餘額",
+ "xiaofeijilu": "消費記錄",
+ "muqianwujilu": "目前暫無記錄哦",
+ "yue__": "餘額 {yue}",
+ "lvbiyue": "綠幣餘額 {yue}",
+ "huodongyue": "活動餘額 {yue}",
+ "pingtaizongyue": "餘額：{zongyue}",
diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb
index 65bde74b..6421858e 100644
--- a/lib/l10n/intl_zh_TW.arb
+++ b/lib/l10n/intl_zh_TW.arb
@@ -622,8 +622,19 @@
"zhanghaoanquan": "賬號安全",
"pingtaizhifumima": "平臺支付密碼",
"fasongduanxin": "發送短信",
-
-
+ "lvbiyue_": "綠幣 {yue}",
+ "huodongyue_": "活動餘額 {yue}",
+ "lvbiyue": "綠幣餘額",
+ "huixiangqianbao": "回鄉錢包",
+ "zongzichan": "總資產",
+ "zongzichanyuan": "總資產(元)",
+ "huodongyue": "活動餘額",
+ "xiaofeijilu": "消費記錄",
+ "muqianwujilu": "目前暫無記錄哦",
+ "yue__": "餘額 {yue}",
+ "lvbiyue": "綠幣餘額 {yue}",
+ "huodongyue": "活動餘額 {yue}",
+ "pingtaizongyue": "餘額：{zongyue}",
diff --git a/lib/login/login_page.dart b/lib/login/login_page.dart
index f1112d07..67bcc0ee 100644
--- a/lib/login/login_page.dart
+++ b/lib/login/login_page.dart
@@ -1078,69 +1078,70 @@ class _MyLoginPageState extends State with TickerProviderStateMixin {
Stack(
alignment: Alignment.bottomCenter,
children: [
- Container(
- alignment: Alignment.center,
- width: double.infinity,
- height: MediaQuery.of(context).size.width >= 650 ? 410.h :305.h,
- padding: EdgeInsets.only(left: 16.w, right: 16.w),
- decoration: new BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(8),
- ),
- child: Column(
- children: [
- Padding(
- padding: EdgeInsets.only(top: 24.h, bottom: 10.h),
- child: Text(
- S.of(context).xieyitanchuang,
- style: TextStyle(
- color: Color(0xff4D4D4D),
- fontSize: 18.sp,
- fontWeight: FontWeight.bold,
- ),
- ),
- ),
- Text.rich(
- TextSpan(children: [
- TextSpan(
- text: S.of(context).yinsizhengce1,
+ IntrinsicHeight(
+ child: Container(
+ alignment: Alignment.center,
+ width: double.infinity,
+ padding: EdgeInsets.only(left: 16.w, right: 16.w),
+ decoration: new BoxDecoration(
+ color: Colors.white,
+ borderRadius: BorderRadius.circular(8),
+ ),
+ child: Column(
+ children: [
+ Padding(
+ padding: EdgeInsets.only(top: 24.h, bottom: 10.h),
+ child: Text(
+ S.of(context).xieyitanchuang,
style: TextStyle(
- fontWeight: MyFontWeight.medium,
- fontSize: 14.sp,
- height: 1.2.h,
- color: Color(0xff727272),
+ color: Color(0xff4D4D4D),
+ fontSize: 18.sp,
+ fontWeight: FontWeight.bold,
),
),
- TextSpan(
- text: S.of(context).yinsixieyi,
- style: TextStyle(
+ ),
+ Text.rich(
+ TextSpan(children: [
+ TextSpan(
+ text: S.of(context).yinsizhengce1,
+ style: TextStyle(
fontWeight: MyFontWeight.medium,
fontSize: 14.sp,
- color: Color(0xff32A060)),
- recognizer: TapGestureRecognizer()
- ..onTap = () {
- Navigator.of(context)
- .popAndPushNamed('/router/treaty_page');
- },
+ height: 1.2.h,
+ color: Color(0xff727272),
+ ),
+ ),
+ TextSpan(
+ text: S.of(context).yinsixieyi,
+ style: TextStyle(
+ fontWeight: MyFontWeight.medium,
+ fontSize: 14.sp,
+ color: Color(0xff32A060)),
+ recognizer: TapGestureRecognizer()
+ ..onTap = () {
+ Navigator.of(context)
+ .popAndPushNamed('/router/treaty_page');
+ },
+ ),
+ ]),
+ ),
+ SizedBox(
+ height: 5.h,
+ ),
+ Text(
+ S.of(context).yinsizhengce2,
+ style: TextStyle(
+ color: Color(0xff727272),
+ fontSize: 14.sp,
+ height: 1.2.h,
+ fontWeight: MyFontWeight.medium,
),
- ]),
- ),
- SizedBox(
- height: 5.h,
- ),
- Text(
- S.of(context).yinsizhengce2,
- style: TextStyle(
- color: Color(0xff727272),
- fontSize: 14.sp,
- height: 1.2.h,
- fontWeight: MyFontWeight.medium,
),
- ),
- SizedBox(
- height: 16.h,
- ),
- ],
+ SizedBox(
+ height: 16.h,
+ ),
+ ],
+ ),
),
),
Row(
diff --git a/lib/mine/mine_view/mine_item.dart b/lib/mine/mine_view/mine_item.dart
index 4ac8e307..3bce18a5 100644
--- a/lib/mine/mine_view/mine_item.dart
+++ b/lib/mine/mine_view/mine_item.dart
@@ -165,7 +165,7 @@ class _MineItem extends State {
});
},
child: mineItem(
- S.of(context).pingtaiyue,
+ S.of(context).huixiangqianbao,
"assets/image/platform_yue.webp",
),
),),
diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart
index 7dcbcd4d..c05015f3 100644
--- a/lib/mine/mine_wallet_page.dart
+++ b/lib/mine/mine_wallet_page.dart
@@ -1,6 +1,7 @@
import 'dart:convert';
import 'package:dio/dio.dart';
+import 'package:flare_flutter/base/actor_ellipse.dart';
import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/base_data.dart';
@@ -26,8 +27,10 @@ class MineWalletPage extends StatefulWidget {
}
class _MineWalletPage extends State {
- dynamic mBalance = 0;
+ dynamic pBalance = 0; //平台总余额
+ dynamic mBalance = 0; // 余额
dynamic mgreenMoney = 0;
+ dynamic activityMoney = 0;
@override
void initState() {
@@ -45,8 +48,10 @@ class _MineWalletPage extends State {
SharedPreferences sharedPreferences = await SharedPreferences.getInstance();
userInfo =
UserInfo.fromJson(jsonDecode(sharedPreferences.getString('user')));
- mBalance = double.tryParse(userInfo.money);
mgreenMoney = double.tryParse(userInfo.greenMoney);
+ mBalance = double.tryParse(userInfo.money);
+ pBalance = mgreenMoney + mBalance;
+ activityMoney = double.tryParse(userInfo.activityMoney);
if (mounted) setState(() {});
String token = sharedPreferences.getString("token");
apiService = ApiService(Dio(), context: context, token: token);
@@ -63,7 +68,10 @@ class _MineWalletPage extends State {
await apiService.queryInfo().catchError((onError) {});
if (baseData != null && baseData.isSuccess) {
userInfo = baseData.data;
+ mgreenMoney = double.tryParse(userInfo.greenMoney);
+ activityMoney = double.tryParse(userInfo.activityMoney);
mBalance = double.tryParse(userInfo.money);
+ pBalance = mBalance + mgreenMoney;
if (mounted) setState(() {});
}
}
@@ -105,7 +113,7 @@ class _MineWalletPage extends State {
Widget build(BuildContext context) {
return Scaffold(
appBar: MyAppBar(
- title: S.of(context).pingtaiyue,
+ title: S.of(context).huixiangqianbao,
titleColor: Colors.black,
background: Color(0xFFF7F7F7),
leadingColor: Colors.black,
@@ -144,22 +152,23 @@ class _MineWalletPage extends State {
margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 0),
padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h),
decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.all(Radius.circular(8)),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withAlpha(25),
- offset: Offset(0, 3),
- blurRadius: 14,
- spreadRadius: 0,
- )
- ]),
+ color: Colors.white,
+ borderRadius: BorderRadius.all(Radius.circular(8)),
+ boxShadow: [
+ BoxShadow(
+ color: Colors.black.withAlpha(25),
+ offset: Offset(0, 3),
+ blurRadius: 14,
+ spreadRadius: 0,
+ )
+ ],
+ ),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
- "消费记录",
+ S.of(context).xiaofeijilu,
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black,
@@ -170,12 +179,11 @@ class _MineWalletPage extends State {
height: 16.h,
),
Container(
- margin: EdgeInsets.only(top: 14.h),
child: (userBills == null || userBills.length == 0)
? NoDataView(
src: "assets/image/xiao_fei.webp",
isShowBtn: false,
- text: "目前暂未记录哦",
+ text: S.of(context).muqianwujilu,
fontSize: 16.sp,
margin: EdgeInsets.only(top: 120.h),
)
@@ -186,7 +194,8 @@ class _MineWalletPage extends State {
physics: NeverScrollableScrollPhysics(),
itemBuilder: (context, position) {
return historyItem(userBills[position], position);
- }),
+ },
+ ),
),
],
),
@@ -196,74 +205,224 @@ class _MineWalletPage extends State {
Widget historyItem(UserBill userBill, position) {
return Container(
margin: EdgeInsets.only(top: 10.h, bottom: 10.h),
- child: Row(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.spaceAround,
+ crossAxisAlignment: CrossAxisAlignment.start,
children: [
- Image.asset(
- userBill.pm == 0
- ? "assets/image/icon_wallet_withdrawal.webp"
- : "assets/image/icon_wallet_recharge.webp",
- width: 34.w,
- height: 34.h,
- ),
- SizedBox(
- width: 12.w,
- ),
- Expanded(
- flex: 1,
- child: Container(
- // height: 34.h,
- child: Column(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: [
- Text(
+ Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Expanded(
+ flex: 7,
+ child: Text(
userBill.name,
style: TextStyle(
color: Colors.black,
fontSize: 12.sp,
),
- ),
- Text(
- userBill.createTime,
- style: TextStyle(
- color: Color(0xFF727272),
- fontSize: 10.sp,
- ),
- )
- ],
+ )),
+ Expanded(
+ flex: 4,
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: calculateBalance(userBill, 0)
+ .map(
+ (e) => e == S.of(context).yue
+ ? Container(
+ width: e == S.of(context).yue
+ ? (12.sp * 4)
+ : double.infinity,
+ alignment: Alignment.centerRight,
+ child: Text(
+ e,
+ style: TextStyle(
+ color: Color(0xFF20662A),
+ fontWeight: FontWeight.bold,
+ fontSize: 12.sp,
+ ),
+ ),
+ )
+ : Text(
+ e,
+ style: TextStyle(
+ color: Color(0xFF20662A),
+ fontWeight: FontWeight.bold,
+ fontSize: 12.sp,
+ ),
+ ),
+ )
+ .toList(),
+ ),
),
- ),
+ ],
),
- Container(
- child: Column(
- mainAxisAlignment: MainAxisAlignment.spaceAround,
- crossAxisAlignment: CrossAxisAlignment.end,
- children: [
- Text(
- userBill.pm == 0
- ? "-${userBill.number}"
- : "+${userBill.number}",
+ Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Expanded(
+ flex: 7,
+ child: Text(
+ userBill.createTime,
style: TextStyle(
- color: Color(0xFF20662A),
- fontWeight: FontWeight.bold,
- fontSize: 12.sp,
+ color: Color(0xFF727272),
+ fontSize: 10.sp,
+ ),
+ ),
+ ),
+ if (calculateBalance(userBill, 1).isNotEmpty)
+ Expanded(
+ flex: 4,
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: calculateBalance(userBill, 1)
+ .map(
+ (e) => e == S.of(context).yue
+ ? Container(
+ width: e == S.of(context).yue
+ ? (12.sp * 4)
+ : double.infinity,
+ alignment: Alignment.centerRight,
+ child: Text(
+ e,
+ style: TextStyle(
+ color: Color(0xFF20662A),
+ fontWeight: FontWeight.bold,
+ fontSize: 12.sp,
+ ),
+ ),
+ )
+ : Text(
+ e,
+ style: TextStyle(
+ color: Color(0xFF20662A),
+ fontWeight: FontWeight.bold,
+ fontSize: 12.sp,
+ ),
+ ),
+ )
+ .toList(),
),
),
- Text(
- S.of(context).yue_(userBill.balance),
+ ],
+ ),
+ SizedBox(
+ height: 4,
+ ),
+ Row(
+ children: [
+ Expanded(
+ flex: 7,
+ child: Text(
+ S.of(context).pingtaizongyue(userBill.balance),
style: TextStyle(
color: Color(0xFF727272),
fontSize: 10.sp,
),
- )
- ],
- ),
- )
+ ),
+ ),
+ if (calculateBalance(userBill, 2).isNotEmpty)
+ Expanded(
+ flex: 4,
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: calculateBalance(userBill, 2)
+ .map(
+ (e) => e == S.of(context).yue
+ ? Container(
+ width: e == S.of(context).yue
+ ? (12.sp * 4)
+ : double.infinity,
+ alignment: Alignment.centerRight,
+ child: Text(
+ e,
+ style: TextStyle(
+ color: Color(0xFF20662A),
+ fontWeight: FontWeight.bold,
+ fontSize: 12.sp,
+ ),
+ ),
+ )
+ : Text(
+ e,
+ style: TextStyle(
+ color: Color(0xFF20662A),
+ fontWeight: FontWeight.bold,
+ fontSize: 12.sp,
+ ),
+ ),
+ )
+ .toList(),
+ ),
+ ),
+ ],
+ ),
],
),
);
}
+ bool isZero(String money) {
+ if (money == null || money.isEmpty) return true;
+ double zero = double.tryParse(money);
+ return zero == 0;
+ }
+
+ List calculateBalance(UserBill userBill, int index) {
+ double tbalance = double.tryParse(userBill.number ?? "0");
+
+ /// 总余额
+ String surplusGreenMoney = userBill.surplusGreenMoney;
+ String surplusActivityMoney = userBill.surplusActivityMoney;
+ double surplusMoney = double.tryParse(surplusGreenMoney ?? "0");
+ double surplusActivity = double.tryParse(surplusActivityMoney ?? "0");
+
+ // double balance = tbalance - (surplusMoney ?? 0) - (surplusActivity ?? 0);
+ String greenMoney = userBill.greenMoney;
+ String activityMoney = userBill.activityMoney;
+
+ double money = double.tryParse(greenMoney ?? "0");
+ double activity = double.tryParse(activityMoney ?? "0");
+ if (index == 0) {
+ if (money > 0) {
+ return [S.of(context).lvbiyue, "${userBill.pm == 0 ? '-' : '+'}$money"];
+ }
+ if (activity > 0) {
+ return [
+ S.of(context).huodongyue,
+ "${userBill.pm == 0 ? '-' : '+'}$activity"
+ ];
+ }
+ if (tbalance > 0) {
+ return [S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}$tbalance"];
+ }
+ return [];
+ } else if (index == 1) {
+ if (money > 0 && activity > 0) {
+ return [
+ S.of(context).huodongyue,
+ "${userBill.pm == 0 ? '-' : '+'}$activity"
+ ];
+ }
+ if (money > 0 && (tbalance - money) > 0) {
+ return [
+ S.of(context).yue,
+ "${userBill.pm == 0 ? '-' : '+'}${(tbalance - money)}"
+ ];
+ } else {
+ return [];
+ }
+ } else {
+ if (activity > 0 && money > 0) {
+ return [
+ S.of(context).yue,
+ "${userBill.pm == 0 ? '-' : '+'}${(tbalance - money - activity)}"
+ ];
+ } else {
+ return [];
+ }
+ }
+ }
+
//assets/image/recharge,Btn.png
Widget balance() {
return Container(
@@ -291,8 +450,11 @@ class _MineWalletPage extends State {
top: 24,
),
child: Text(
- "总资产(元)",
- style: TextStyle(color: Colors.white, fontSize: 16),
+ S.of(context).zongzichanyuan,
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 16,
+ ),
),
),
Expanded(
@@ -303,7 +465,7 @@ class _MineWalletPage extends State {
width: 24,
),
Text(
- "$mBalance",
+ "$pBalance",
style: TextStyle(
fontWeight: MyFontWeight.semi_bold,
fontSize: 50,
@@ -314,7 +476,7 @@ class _MineWalletPage extends State {
flex: 1,
),
InkWell(
- onTap: (){
+ onTap: () {
toRecharge();
},
child: SizedBox(
@@ -325,24 +487,27 @@ class _MineWalletPage extends State {
Positioned.fill(
child: Image.asset(
"assets/image/rechargeBtn.png",
+ height: 46.h,
+ width: 87.w,
fit: BoxFit.fill,
),
),
Positioned(
- left: 14.w,
- top: 0,
- bottom: 0,
- child: Container(
- alignment: Alignment.centerLeft,
- child: Text(
- "充值",
- style: TextStyle(
- fontSize: 18,
- fontWeight: MyFontWeight.semi_bold,
- color: Color(0xFF32A060),
- ),
+ left: 14.w,
+ top: 0,
+ bottom: 0,
+ child: Container(
+ alignment: Alignment.centerLeft,
+ child: Text(
+ S.of(context).chongzhi,
+ style: TextStyle(
+ fontSize: 18,
+ fontWeight: MyFontWeight.semi_bold,
+ color: Color(0xFF32A060),
),
- )),
+ ),
+ ),
+ ),
],
),
),
@@ -351,40 +516,103 @@ class _MineWalletPage extends State {
),
flex: 1,
),
- if(userInfo != null && userInfo.greenMoney != null && userInfo.greenMoney.isNotEmpty && double.tryParse(userInfo.greenMoney) > 0)
SizedBox(
height: 22,
),
- if(userInfo != null && userInfo.greenMoney != null && userInfo.greenMoney.isNotEmpty && double.tryParse(userInfo.greenMoney) > 0)
- Padding(
- padding: EdgeInsets.only(
- left: 24,
- ),
- child: Text(
- "绿币余额",
- style: TextStyle(
- fontSize: 16,
- fontWeight: MyFontWeight.semi_bold,
- color: Colors.white,
- ),
- ),
- ),
- if(userInfo != null && userInfo.greenMoney != null && userInfo.greenMoney.isNotEmpty && double.tryParse(userInfo.greenMoney) > 0)
- SizedBox(
- height: 8,
- ),
- if(userInfo != null && userInfo.greenMoney != null && userInfo.greenMoney.isNotEmpty && double.tryParse(userInfo.greenMoney) > 0)
Padding(
- padding: EdgeInsets.only(
- left: 24,
+ padding: EdgeInsets.symmetric(
+ horizontal: 24,
),
- child: Text(
- "$mgreenMoney",
- style: TextStyle(
- fontSize: 24,
- fontWeight: MyFontWeight.semi_bold,
- color: Colors.white,
- ),
+ child: Row(
+ children: [
+ Expanded(
+ flex: 1,
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ S.of(context).yue,
+ style: TextStyle(
+ fontSize: 14,
+ fontWeight: MyFontWeight.semi_bold,
+ color: Colors.white,
+ ),
+ ),
+ SizedBox(
+ height: 4,
+ ),
+ Text(
+ "$mBalance",
+ style: TextStyle(
+ fontSize: 18,
+ fontWeight: MyFontWeight.semi_bold,
+ color: Colors.white,
+ ),
+ ),
+ ],
+ ),
+ ),
+ SizedBox(
+ height: 8,
+ ),
+ Expanded(
+ flex: 1,
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ S.of(context).huodongyue,
+ style: TextStyle(
+ fontSize: 14,
+ fontWeight: MyFontWeight.semi_bold,
+ color: Colors.white,
+ ),
+ ),
+ SizedBox(
+ height: 4,
+ ),
+ Text(
+ "$activityMoney",
+ style: TextStyle(
+ fontSize: 18,
+ fontWeight: MyFontWeight.semi_bold,
+ color: Colors.white,
+ ),
+ ),
+ ],
+ ),
+ ),
+ SizedBox(
+ height: 8,
+ ),
+ Expanded(
+ flex: 1,
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ S.of(context).lvbiyue,
+ style: TextStyle(
+ fontSize: 14,
+ fontWeight: MyFontWeight.semi_bold,
+ color: Colors.white,
+ ),
+ ),
+ SizedBox(
+ height: 4,
+ ),
+ Text(
+ "$mgreenMoney",
+ style: TextStyle(
+ fontSize: 18,
+ fontWeight: MyFontWeight.semi_bold,
+ color: Colors.white,
+ ),
+ ),
+ ],
+ ),
+ ),
+ ],
),
),
SizedBox(
@@ -396,109 +624,109 @@ class _MineWalletPage extends State {
);
}
- Widget balance1() {
- return Container(
- width: double.infinity,
- margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 8.h),
- padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h),
- decoration: BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.circular(8),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withAlpha(25),
- offset: Offset(0, 3),
- blurRadius: 14,
- spreadRadius: 0,
- ),
- ],
- ),
- child: Column(
- mainAxisAlignment: MainAxisAlignment.center,
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- Stack(
- alignment: Alignment.center,
- children: [
- Align(
- alignment: Alignment.center,
- child: Text(
- "总资产",
- style: TextStyle(
- fontWeight: MyFontWeight.semi_bold,
- color: Color(0xFF353535),
- fontSize: 16.sp,
- ),
- ),
- ),
- // GestureDetector(
- // onTap: () {
- // queryUserBalance();
- // },
- // child: Row(
- // mainAxisAlignment: MainAxisAlignment.end,
- // children: [
- // Icon(
- // Icons.refresh,
- // size: 20,
- // color: Color(0xFF8A8A8A),
- // ),
- // Text(
- // S.of(context).shuaxin,
- // style: TextStyle(
- // color: Color(0xFF353535),
- // fontSize: 12.sp,
- // ),
- // ),
- // ],
- // ),
- // ),
- ],
- ),
- SizedBox(
- height: 16.h,
- ),
- Text(
- "$mBalance",
- style: TextStyle(
- fontWeight: MyFontWeight.medium,
- color: Color(0xFF353535),
- fontSize: 50.sp,
- ),
- ),
- // SizedBox(
- // height: 4.h,
- // ),
- // Text(
- // S.of(context).keyongyue,
- // style: TextStyle(
- // color: Color(0xFF20662A),
- // fontSize: 16.sp,
- // fontWeight: MyFontWeight.regular
- // ),
- // ),
- SizedBox(
- height: 24.h,
- ),
- InkWell(
- onTap: () {
- toRecharge();
- },
- child: RoundButton(
- width: 104.w,
- text: S.of(context).lijichongzhi,
- textColor: Colors.white,
- fontWeight: MyFontWeight.semi_bold,
- radius: 15,
- backgroup: Color(0xFF32A060),
- fontSize: 14.sp,
- padding: EdgeInsets.symmetric(vertical: 5.h),
- ),
- ),
- ],
- ),
- );
- }
+ // Widget balance1() {
+ // return Container(
+ // width: double.infinity,
+ // margin: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 8.h),
+ // padding: EdgeInsets.fromLTRB(24.w, 24.h, 24.w, 24.h),
+ // decoration: BoxDecoration(
+ // color: Colors.white,
+ // borderRadius: BorderRadius.circular(8),
+ // boxShadow: [
+ // BoxShadow(
+ // color: Colors.black.withAlpha(25),
+ // offset: Offset(0, 3),
+ // blurRadius: 14,
+ // spreadRadius: 0,
+ // ),
+ // ],
+ // ),
+ // child: Column(
+ // mainAxisAlignment: MainAxisAlignment.center,
+ // crossAxisAlignment: CrossAxisAlignment.center,
+ // children: [
+ // Stack(
+ // alignment: Alignment.center,
+ // children: [
+ // Align(
+ // alignment: Alignment.center,
+ // child: Text(
+ // S.of(context).zongzichan,
+ // style: TextStyle(
+ // fontWeight: MyFontWeight.semi_bold,
+ // color: Color(0xFF353535),
+ // fontSize: 16.sp,
+ // ),
+ // ),
+ // ),
+ // // GestureDetector(
+ // // onTap: () {
+ // // queryUserBalance();
+ // // },
+ // // child: Row(
+ // // mainAxisAlignment: MainAxisAlignment.end,
+ // // children: [
+ // // Icon(
+ // // Icons.refresh,
+ // // size: 20,
+ // // color: Color(0xFF8A8A8A),
+ // // ),
+ // // Text(
+ // // S.of(context).shuaxin,
+ // // style: TextStyle(
+ // // color: Color(0xFF353535),
+ // // fontSize: 12.sp,
+ // // ),
+ // // ),
+ // // ],
+ // // ),
+ // // ),
+ // ],
+ // ),
+ // SizedBox(
+ // height: 16.h,
+ // ),
+ // Text(
+ // "$mBalance",
+ // style: TextStyle(
+ // fontWeight: MyFontWeight.medium,
+ // color: Color(0xFF353535),
+ // fontSize: 50.sp,
+ // ),
+ // ),
+ // // SizedBox(
+ // // height: 4.h,
+ // // ),
+ // // Text(
+ // // S.of(context).keyongyue,
+ // // style: TextStyle(
+ // // color: Color(0xFF20662A),
+ // // fontSize: 16.sp,
+ // // fontWeight: MyFontWeight.regular
+ // // ),
+ // // ),
+ // SizedBox(
+ // height: 24.h,
+ // ),
+ // InkWell(
+ // onTap: () {
+ // toRecharge();
+ // },
+ // child: RoundButton(
+ // width: 104.w,
+ // text: S.of(context).lijichongzhi,
+ // textColor: Colors.white,
+ // fontWeight: MyFontWeight.semi_bold,
+ // radius: 15,
+ // backgroup: Color(0xFF32A060),
+ // fontSize: 14.sp,
+ // padding: EdgeInsets.symmetric(vertical: 5.h),
+ // ),
+ // ),
+ // ],
+ // ),
+ // );
+ // }
toRecharge() async {
await Navigator.of(context).pushNamed('/router/recharge_page');
diff --git a/lib/retrofit/data/user_bill.dart b/lib/retrofit/data/user_bill.dart
index 56d5d34a..173de5bb 100644
--- a/lib/retrofit/data/user_bill.dart
+++ b/lib/retrofit/data/user_bill.dart
@@ -1,58 +1,30 @@
-/// id : "1413347011645669376"
-/// createTime : "2021-07-09 11:59:21"
-/// createUser : "1406879717390286848"
-/// updateTime : "2021-07-09 11:59:21"
-/// updateUser : "1406879717390286848"
-/// mid : "1406879717390286848"
-/// linkId : "0"
-/// pm : 1
-/// title : "bill_title_point"
-/// category : "bill_cate_point_get"
-/// type : "bill_type_point_signin"
-/// number : "10.00"
-/// balance : "30.00"
+import 'dart:convert';
+/// id : "1557965116232695808"
+/// createTime : "2022-08-12 13:40:04"
+/// createUser : "1333246101196636160"
+/// updateTime : "2022-08-12 13:40:04"
+/// updateUser : "1333246101196636160"
+/// mid : "1330775037745037312"
+/// linkId : "202208121339050002"
+/// pm : 0
+/// title : "bill_title_balance"
+/// category : "bill_cate_buy"
+/// type : "bill_type_zswpay"
+/// number : "0.01"
+/// realNumber : "0.00"
+/// activityMoney : "0.00"
+/// surplusActivityMoney : "0.00"
+/// greenMoney : "0.00"
+/// surplusGreenMoney : "0.00"
+/// balance : "218.51"
/// mark : ""
/// status : true
/// isDeleted : false
-/// name : "签到"
+/// name : "平台会员余额支付"
+UserBill userBillFromJson(String str) => UserBill.fromJson(json.decode(str));
+String userBillToJson(UserBill data) => json.encode(data.toJson());
class UserBill {
- String _id;
- String _createTime;
- String _createUser;
- String _updateTime;
- String _updateUser;
- String _mid;
- String _linkId;
- int _pm;
- String _title;
- String _category;
- String _type;
- String _number;
- String _balance;
- String _mark;
- bool _status;
- bool _isDeleted;
- String _name;
-
- 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 linkId => _linkId;
- int get pm => _pm;
- String get title => _title;
- String get category => _category;
- String get type => _type;
- String get number => _number;
- String get balance => _balance;
- String get mark => _mark;
- bool get status => _status;
- bool get isDeleted => _isDeleted;
- String get name => _name;
-
UserBill({
String id,
String createTime,
@@ -66,11 +38,16 @@ class UserBill {
String category,
String type,
String number,
+ String realNumber,
+ String activityMoney,
+ String surplusActivityMoney,
+ String greenMoney,
+ String surplusGreenMoney,
String balance,
String mark,
bool status,
bool isDeleted,
- String name}){
+ String name,}){
_id = id;
_createTime = createTime;
_createUser = createUser;
@@ -83,6 +60,11 @@ class UserBill {
_category = category;
_type = type;
_number = number;
+ _realNumber = realNumber;
+ _activityMoney = activityMoney;
+ _surplusActivityMoney = surplusActivityMoney;
+ _greenMoney = greenMoney;
+ _surplusGreenMoney = surplusGreenMoney;
_balance = balance;
_mark = mark;
_status = status;
@@ -91,44 +73,143 @@ class UserBill {
}
UserBill.fromJson(dynamic json) {
- _id = json["id"];
- _createTime = json["createTime"];
- _createUser = json["createUser"];
- _updateTime = json["updateTime"];
- _updateUser = json["updateUser"];
- _mid = json["mid"];
- _linkId = json["linkId"];
- _pm = json["pm"];
- _title = json["title"];
- _category = json["category"];
- _type = json["type"];
- _number = json["number"];
- _balance = json["balance"];
- _mark = json["mark"];
- _status = json["status"];
- _isDeleted = json["isDeleted"];
- _name = json["name"];
+ _id = json['id'];
+ _createTime = json['createTime'];
+ _createUser = json['createUser'];
+ _updateTime = json['updateTime'];
+ _updateUser = json['updateUser'];
+ _mid = json['mid'];
+ _linkId = json['linkId'];
+ _pm = json['pm'];
+ _title = json['title'];
+ _category = json['category'];
+ _type = json['type'];
+ _number = json['number'];
+ _realNumber = json['realNumber'];
+ _activityMoney = json['activityMoney'];
+ _surplusActivityMoney = json['surplusActivityMoney'];
+ _greenMoney = json['greenMoney'];
+ _surplusGreenMoney = json['surplusGreenMoney'];
+ _balance = json['balance'];
+ _mark = json['mark'];
+ _status = json['status'];
+ _isDeleted = json['isDeleted'];
+ _name = json['name'];
}
+ String _id;
+ String _createTime;
+ String _createUser;
+ String _updateTime;
+ String _updateUser;
+ String _mid;
+ String _linkId;
+ int _pm;
+ String _title;
+ String _category;
+ String _type;
+ String _number;
+ String _realNumber;
+ String _activityMoney;
+ String _surplusActivityMoney;
+ String _greenMoney;
+ String _surplusGreenMoney;
+ String _balance;
+ String _mark;
+ bool _status;
+ bool _isDeleted;
+ String _name;
+UserBill copyWith({ String id,
+ String createTime,
+ String createUser,
+ String updateTime,
+ String updateUser,
+ String mid,
+ String linkId,
+ int pm,
+ String title,
+ String category,
+ String type,
+ String number,
+ String realNumber,
+ String activityMoney,
+ String surplusActivityMoney,
+ String greenMoney,
+ String surplusGreenMoney,
+ String balance,
+ String mark,
+ bool status,
+ bool isDeleted,
+ String name,
+}) => UserBill( id: id ?? _id,
+ createTime: createTime ?? _createTime,
+ createUser: createUser ?? _createUser,
+ updateTime: updateTime ?? _updateTime,
+ updateUser: updateUser ?? _updateUser,
+ mid: mid ?? _mid,
+ linkId: linkId ?? _linkId,
+ pm: pm ?? _pm,
+ title: title ?? _title,
+ category: category ?? _category,
+ type: type ?? _type,
+ number: number ?? _number,
+ realNumber: realNumber ?? _realNumber,
+ activityMoney: activityMoney ?? _activityMoney,
+ surplusActivityMoney: surplusActivityMoney ?? _surplusActivityMoney,
+ greenMoney: greenMoney ?? _greenMoney,
+ surplusGreenMoney: surplusGreenMoney ?? _surplusGreenMoney,
+ balance: balance ?? _balance,
+ mark: mark ?? _mark,
+ status: status ?? _status,
+ isDeleted: isDeleted ?? _isDeleted,
+ name: name ?? _name,
+);
+ 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 linkId => _linkId;
+ int get pm => _pm;
+ String get title => _title;
+ String get category => _category;
+ String get type => _type;
+ String get number => _number;
+ String get realNumber => _realNumber;
+ String get activityMoney => _activityMoney;
+ String get surplusActivityMoney => _surplusActivityMoney;
+ String get greenMoney => _greenMoney;
+ String get surplusGreenMoney => _surplusGreenMoney;
+ String get balance => _balance;
+ String get mark => _mark;
+ bool get status => _status;
+ bool get isDeleted => _isDeleted;
+ String get name => _name;
Map toJson() {
- var map = {};
- map["id"] = _id;
- map["createTime"] = _createTime;
- map["createUser"] = _createUser;
- map["updateTime"] = _updateTime;
- map["updateUser"] = _updateUser;
- map["mid"] = _mid;
- map["linkId"] = _linkId;
- map["pm"] = _pm;
- map["title"] = _title;
- map["category"] = _category;
- map["type"] = _type;
- map["number"] = _number;
- map["balance"] = _balance;
- map["mark"] = _mark;
- map["status"] = _status;
- map["isDeleted"] = _isDeleted;
- map["name"] = _name;
+ final map = {};
+ map['id'] = _id;
+ map['createTime'] = _createTime;
+ map['createUser'] = _createUser;
+ map['updateTime'] = _updateTime;
+ map['updateUser'] = _updateUser;
+ map['mid'] = _mid;
+ map['linkId'] = _linkId;
+ map['pm'] = _pm;
+ map['title'] = _title;
+ map['category'] = _category;
+ map['type'] = _type;
+ map['number'] = _number;
+ map['realNumber'] = _realNumber;
+ map['activityMoney'] = _activityMoney;
+ map['surplusActivityMoney'] = _surplusActivityMoney;
+ map['greenMoney'] = _greenMoney;
+ map['surplusGreenMoney'] = _surplusGreenMoney;
+ map['balance'] = _balance;
+ map['mark'] = _mark;
+ map['status'] = _status;
+ map['isDeleted'] = _isDeleted;
+ map['name'] = _name;
return map;
}
diff --git a/lib/retrofit/data/user_info.dart b/lib/retrofit/data/user_info.dart
index 9199e9ab..df218a1f 100644
--- a/lib/retrofit/data/user_info.dart
+++ b/lib/retrofit/data/user_info.dart
@@ -32,6 +32,7 @@ class UserInfo {
String birth;
dynamic balance;
String money;
+ String activityMoney;
String expendAmount;
String points;
String greenMoney;
@@ -63,6 +64,7 @@ class UserInfo {
..birth = json['birth'] as String
..balance = json['balance']
..money = json['money'] as String
+ ..activityMoney = json['activityMoney'] as String
..expendAmount = json['expendAmount'] as String
..points = json['points'] as String
..greenMoney = json['greenMoney'] as String
@@ -93,6 +95,7 @@ class UserInfo {
'birth': this.birth,
'balance': this.balance,
'money': this.money,
+ 'activityMoney': this.activityMoney,
'expendAmount': this.expendAmount,
'points': this.points,
'greenMoney': this.greenMoney,
diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart
index f37552cb..1f2a6374 100644
--- a/lib/retrofit/min_api.dart
+++ b/lib/retrofit/min_api.dart
@@ -26,18 +26,8 @@ import 'data/shopping_home_config.dart';
part 'min_api.g.dart';
-// const base_url = "https://pos.api.lotus-wallet.com/app/"; ///正式
-
-// const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
-
-// const base_url = "http://192.168.10.132:8765/app/";///詹云久
-
-
-// const base_url = "http://192.168.10.236: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.129:8765/app/";///本地
+const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart
index fabaf924..8f74e4cc 100644
--- a/lib/retrofit/retrofit_api.dart
+++ b/lib/retrofit/retrofit_api.dart
@@ -61,17 +61,8 @@ import 'data/wx_pay.dart';
part 'retrofit_api.g.dart';
-// const base_url = "https://pos.platform.lotus-wallet.com/app/"; ///正式
-
-// const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
-
-// const base_url = "http://192.168.10.236:8766/app/"; ///费韬
-
-// const base_url = "http://192.168.10.37: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.129:8765/app/";///本地
+const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
@RestApi(baseUrl: localBaseUrl)
diff --git a/lib/view_widget/keyboard/keyboard_widget.dart b/lib/view_widget/keyboard/keyboard_widget.dart
index 8a3f57e6..6d655456 100644
--- a/lib/view_widget/keyboard/keyboard_widget.dart
+++ b/lib/view_widget/keyboard/keyboard_widget.dart
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:huixiang/view_widget/keyboard/custom_keyboard_button.dart';
-import 'package:huixiang/view_widget/keyboard/pay_password.dart';
+import 'package:huixiang/view_widget/keyboard/pay_password.dart' as key;
/// 自定义密码 键盘
class MyKeyboard extends StatefulWidget {
@@ -22,52 +22,52 @@ class MyKeyboardStat extends State {
var backMethod;
void onCommitChange() {
- widget.callback(KeyEvent("commit"));
+ widget.callback(key.KeyEvent("commit"));
}
void onOneChange(BuildContext cont) {
- widget.callback(KeyEvent("1"));
+ widget.callback(key.KeyEvent("1"));
}
void onTwoChange(BuildContext cont) {
- widget.callback(KeyEvent("2"));
+ widget.callback(key.KeyEvent("2"));
}
void onThreeChange(BuildContext cont) {
- widget.callback(KeyEvent("3"));
+ widget.callback(key.KeyEvent("3"));
}
void onFourChange(BuildContext cont) {
- widget.callback(KeyEvent("4"));
+ widget.callback(key.KeyEvent("4"));
}
void onFiveChange(BuildContext cont) {
- widget.callback(KeyEvent("5"));
+ widget.callback(key.KeyEvent("5"));
}
void onSixChange(BuildContext cont) {
- widget.callback(KeyEvent("6"));
+ widget.callback(key.KeyEvent("6"));
}
void onSevenChange(BuildContext cont) {
- widget.callback(KeyEvent("7"));
+ widget.callback(key.KeyEvent("7"));
}
void onEightChange(BuildContext cont) {
- widget.callback(KeyEvent("8"));
+ widget.callback(key.KeyEvent("8"));
}
void onNineChange(BuildContext cont) {
- widget.callback(KeyEvent("9"));
+ widget.callback(key.KeyEvent("9"));
}
void onZeroChange(BuildContext cont) {
- widget.callback(KeyEvent("0"));
+ widget.callback(key.KeyEvent("0"));
}
/// 点击删除
void onDeleteChange() {
- widget.callback(KeyEvent("del"));
+ widget.callback(key.KeyEvent("del"));
}
@override
diff --git a/pubspec.yaml b/pubspec.yaml
index 12d16944..3a51ea7f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -96,9 +96,6 @@ dependencies:
flutter_slidable: ^1.3.0
-
-
-
dev_dependencies:
flutter_test:
sdk: flutter