Browse Source

部分修改.

null_safety
w-R 4 years ago
parent
commit
ec7f781685
  1. 6
      lib/article/hot_article_item.dart
  2. 2
      lib/generated/intl/messages_en.dart
  3. 2
      lib/generated/intl/messages_zh_CN.dart
  4. 2
      lib/generated/intl/messages_zh_Hans_CN.dart
  5. 2
      lib/generated/intl/messages_zh_Hant_CN.dart
  6. 2
      lib/generated/intl/messages_zh_TW.dart
  7. 20
      lib/generated/l10n.dart
  8. 6
      lib/integral/integral_detailed_page.dart
  9. 4
      lib/l10n/intl_en.arb
  10. 2
      lib/l10n/intl_zh_CN.arb
  11. 2
      lib/l10n/intl_zh_Hans_CN.arb
  12. 2
      lib/l10n/intl_zh_Hant_CN.arb
  13. 2
      lib/l10n/intl_zh_TW.arb
  14. 6
      lib/mine/vip_detail_page.dart
  15. 10
      lib/union/union_details_page.dart
  16. 2
      lib/union/union_page.dart
  17. 7
      pubspec.lock
  18. 3
      pubspec.yaml

6
lib/article/hot_article_item.dart

@ -24,6 +24,12 @@ class HotArticlePage extends StatefulWidget {
class _HotArticlePage extends State<HotArticlePage> {
ApiService apiService;
@override
void dispose() {
super.dispose();
refreshController.dispose();
}
@override
void initState() {
super.initState();

2
lib/generated/intl/messages_en.dart

@ -234,6 +234,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
"jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"),
"jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"),
"jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"),
"jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"),
@ -512,6 +513,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"),
"zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"),
"zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"),
"zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暂无线上进店"),
"zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"),
"zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"),
"zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("账号信息"),

2
lib/generated/intl/messages_zh_CN.dart

@ -233,6 +233,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
"jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"),
"jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"),
"jituanchuangbanren" : MessageLookupByLibrary.simpleMessage(" 集团创办人"),
"jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"),
@ -511,6 +512,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"),
"zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"),
"zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"),
"zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暂无线上进店"),
"zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"),
"zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"),
"zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"),

2
lib/generated/intl/messages_zh_Hans_CN.dart

@ -233,6 +233,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
"jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"),
"jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("进行中的订单"),
"jituanchuangbanren" : MessageLookupByLibrary.simpleMessage(" 集团创办人"),
"jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集团创始人"),
@ -511,6 +512,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再来一单"),
"zaixiankefu" : MessageLookupByLibrary.simpleMessage("在线客服"),
"zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"),
"zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暂无线上进店"),
"zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"),
"zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"),
"zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"),

2
lib/generated/intl/messages_zh_Hant_CN.dart

@ -233,6 +233,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"),
"jinrushangdian" : MessageLookupByLibrary.simpleMessage("進入商店"),
"jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("進行中的訂單"),
"jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"),
"jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集團創始人"),
@ -511,6 +512,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再來一單"),
"zaixiankefu" : MessageLookupByLibrary.simpleMessage("在線客服"),
"zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暫不支持線上點餐"),
"zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暫無綫上進店"),
"zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暫無優惠券可領取"),
"zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("賬號授權"),
"zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("賬號信息"),

2
lib/generated/intl/messages_zh_TW.dart

@ -233,6 +233,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("積分詳情"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("淨弼聯盟會員店"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日會員任務"),
"jinrushangdian" : MessageLookupByLibrary.simpleMessage("進入商店"),
"jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("進行中的訂單"),
"jituanchuangbanren" : MessageLookupByLibrary.simpleMessage("集团创办人"),
"jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("集團創始人"),
@ -511,6 +512,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zailaiyidan" : MessageLookupByLibrary.simpleMessage("再來一單"),
"zaixiankefu" : MessageLookupByLibrary.simpleMessage("在線客服"),
"zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暫不支持線上點餐"),
"zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暫無綫上進店"),
"zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暫無優惠券可領取"),
"zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("賬號授權"),
"zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("賬號信息"),

20
lib/generated/l10n.dart

@ -4455,6 +4455,26 @@ class S {
);
}
/// ``
String get jinrushangdian {
return Intl.message(
'进入商店',
name: 'jinrushangdian',
desc: '',
args: [],
);
}
/// `线`
String get zanwuxianshangjindian {
return Intl.message(
'暂无线上进店',
name: 'zanwuxianshangjindian',
desc: '',
args: [],
);
}
/// `使`
String get privacy_policy4 {
return Intl.message(

6
lib/integral/integral_detailed_page.dart

@ -52,6 +52,12 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
ApiService apiService;
UserInfo userInfo;
@override
void dispose() {
super.dispose();
refreshController.dispose();
}
@override
void initState() {
super.initState();

4
lib/l10n/intl_en.arb

@ -462,6 +462,10 @@
"wuliugongsi": "物流公司:",
"wuliudanhao": "物流单号:",
"yiqianshou": "已签收",
"jinrushangdian": "进入商店",
"zanwuxianshangjindian": "暂无线上进店",

2
lib/l10n/intl_zh_CN.arb

@ -463,6 +463,8 @@
"wuliugongsi": "物流公司:",
"wuliudanhao": "物流单号:",
"yiqianshou": "已签收",
"jinrushangdian": "进入商店",
"zanwuxianshangjindian": "暂无线上进店",

2
lib/l10n/intl_zh_Hans_CN.arb

@ -463,6 +463,8 @@
"wuliugongsi": "物流公司:",
"wuliudanhao": "物流单号:",
"yiqianshou": "已签收",
"jinrushangdian": "进入商店",
"zanwuxianshangjindian": "暂无线上进店",

2
lib/l10n/intl_zh_Hant_CN.arb

@ -457,6 +457,8 @@
"wuliugongsi": "物流公司:",
"wuliudanhao": "物流單號:",
"yiqianshou": "已簽收",
"jinrushangdian": "進入商店",
"zanwuxianshangjindian": "暫無綫上進店",

2
lib/l10n/intl_zh_TW.arb

@ -455,6 +455,8 @@
"wuliugongsi": "物流公司:",
"wuliudanhao": "物流單號:",
"yiqianshou": "已簽收",
"jinrushangdian": "進入商店",
"zanwuxianshangjindian": "暫無綫上進店",

6
lib/mine/vip_detail_page.dart

@ -29,6 +29,12 @@ class VipDetailPage extends StatefulWidget {
class _VipDetailPage extends State<VipDetailPage> {
ApiService apiService;
@override
void dispose() {
super.dispose();
refreshController.dispose();
}
@override
void initState() {
super.initState();

10
lib/union/union_details_page.dart

@ -42,6 +42,12 @@ class UnionDetailsPage extends StatefulWidget {
class _UnionDetailsPage extends State<UnionDetailsPage> {
ApiService apiService;
@override
void dispose() {
super.dispose();
refreshController.dispose();
}
@override
void initState() {
super.initState();
@ -316,8 +322,8 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
alignment: Alignment.center,
child: Text(
isEnable()
? S.of(context).diancan
: S.of(context).zanbuzhichixianshangdiancan,
? S.of(context).jinrushangdian
: S.of(context).zanwuxianshangjindian,
style: TextStyle(
fontSize: 16.sp,
color: isEnable() ? Colors.white : Color(0xFFA0A0A0),

2
lib/union/union_page.dart

@ -732,4 +732,4 @@ class _UnionPage extends State<UnionPage>
@override
bool get wantKeepAlive => true;
}
}

7
pubspec.lock

@ -307,6 +307,13 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.0.1"
flutter_bmflocation:
dependency: "direct main"
description:
name: flutter_bmflocation
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.0.4"
flutter_cache_manager:
dependency: transitive
description:

3
pubspec.yaml

@ -45,7 +45,8 @@ dependencies:
permission_handler: ^5.0.1+1
# flutter_bmflocation: ^1.0.4
flutter_bmflocation: ^1.0.4
flutter_baidu_mapapi_base: ^2.0.1
flutter_baidu_mapapi_map: ^2.0.1
flutter_baidu_mapapi_search: ^2.0.1

Loading…
Cancel
Save