From 8b13d814108088220af1bcd12c7fbaf0b87f910a Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Tue, 25 Oct 2022 17:13:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?vip=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../headlines/headlines_column_details.dart | 33 ++-- lib/home/home_view/discount_zone.dart | 4 +- lib/home/home_view/shortcut_operation.dart | 166 +++++++++--------- lib/order/order_detail_page.dart | 6 +- lib/retrofit/data/vip_card_home.dart | 8 + lib/vip/vip_view/vip_goods_discount.dart | 22 +-- 6 files changed, 122 insertions(+), 117 deletions(-) diff --git a/lib/community/headlines/headlines_column_details.dart b/lib/community/headlines/headlines_column_details.dart index cdac9bd5..b043c61d 100644 --- a/lib/community/headlines/headlines_column_details.dart +++ b/lib/community/headlines/headlines_column_details.dart @@ -395,7 +395,7 @@ class _HeadlinesColumnDetails extends State Text( articles?.mainTitle ?? "", overflow: TextOverflow.ellipsis, - maxLines: 1, + maxLines: 2, style: TextStyle( fontSize: 14.sp, height: 1.2.h, @@ -408,7 +408,7 @@ class _HeadlinesColumnDetails extends State child: Text( articles?.viceTitle ?? "", overflow: TextOverflow.ellipsis, - maxLines: 3, + maxLines: 1, style: TextStyle( fontSize: 12.sp, height: 1.2.h, @@ -420,18 +420,18 @@ class _HeadlinesColumnDetails extends State mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Expanded( - child: Text( - articles?.author?.name ?? "", - overflow: TextOverflow.ellipsis, - maxLines: 1, - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.medium, - color: Color(0xFF8E8E8E), - ), - ), - ), + // Expanded( + // child: Text( + // articles?.author?.name ?? "", + // overflow: TextOverflow.ellipsis, + // maxLines: 1, + // style: TextStyle( + // fontSize: 12.sp, + // fontWeight: MyFontWeight.medium, + // color: Color(0xFF8E8E8E), + // ), + // ), + // ), SizedBox(width: 8), Image.asset( "assets/image/browse.webp", @@ -448,14 +448,15 @@ class _HeadlinesColumnDetails extends State color: Color(0xFF8D8D8D), ), )), + Expanded(child: Text( - articles?.createTime ?? "", + articles?.createTime?.split(":")[0] ?? "", style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, color: Color(0xFF8D8D8D), ), - ), + ),) ], ), ], diff --git a/lib/home/home_view/discount_zone.dart b/lib/home/home_view/discount_zone.dart index 1998a9a3..b4bb9dd9 100644 --- a/lib/home/home_view/discount_zone.dart +++ b/lib/home/home_view/discount_zone.dart @@ -62,7 +62,7 @@ class _DiscountZone extends State { ),), if(widget.coupon.length != 0) Container( - height: 120.h, + height: 108.h, margin: EdgeInsets.only(top: 10.h), child: ListView.builder( scrollDirection: Axis.horizontal, @@ -87,7 +87,7 @@ class _DiscountZone extends State { Widget discountItem(Coupon coupon) { return Container( width: 290.w, - height: 120.h, + height: 108.h, decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.fill, diff --git a/lib/home/home_view/shortcut_operation.dart b/lib/home/home_view/shortcut_operation.dart index 4196945c..153dceea 100644 --- a/lib/home/home_view/shortcut_operation.dart +++ b/lib/home/home_view/shortcut_operation.dart @@ -60,38 +60,37 @@ class _ShortcutOperation extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - S.of(context).main_menu2, - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize: 14.sp, - color: Colors.black, + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + S.of(context).main_menu2, + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize: 14.sp, + color: Colors.black, + ), ), - ), - SizedBox(height: 5.h), - Text( - S.of(context).xiadanzhuanjifen, - style: TextStyle( - fontWeight: MyFontWeight.regular, - fontSize: 12.sp, - color: Color(0xff4D4D4D), + SizedBox(height: 5.h), + Text( + S.of(context).xiadanzhuanjifen, + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + color: Color(0xff4D4D4D), + ), ), - ), - ], - ), - SizedBox(width:16.w), - Expanded( - child: Image.asset( - "assets/image/home_lm.webp", - width: 24.w, - height: 31.h, - fit: BoxFit.fill, + ], ), ), + Image.asset( + "assets/image/home_lm.webp", + width: 24.w, + height: 31.h, + fit: BoxFit.fill, + ), ], ), ), @@ -121,38 +120,37 @@ class _ShortcutOperation extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - S.of(context).chongzhi, - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize: 14.sp, - color: Colors.black, + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + S.of(context).chongzhi, + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize: 14.sp, + color: Colors.black, + ), ), - ), - SizedBox(height: 5.h), - Text( - S.of(context).chongzhifuliduo, - style: TextStyle( - fontWeight: MyFontWeight.regular, - fontSize: 12.sp, - color: Color(0xff4D4D4D), + SizedBox(height: 5.h), + Text( + S.of(context).chongzhifuliduo, + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + color: Color(0xff4D4D4D), + ), ), - ), - ], - ), - SizedBox(width:16.w), - Expanded( - child: Image.asset( - "assets/image/home_recharge.webp", - width: 21.w, - height: 33.h, - fit: BoxFit.fill, + ], ), ), + Image.asset( + "assets/image/home_recharge.webp", + width: 21.w, + height: 33.h, + fit: BoxFit.fill, + ) ], ), ), @@ -184,37 +182,35 @@ class _ShortcutOperation extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - S.of(context).fulizhongxin, - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize: 14.sp, - color: Colors.black, + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + S.of(context).fulizhongxin, + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize: 14.sp, + color: Colors.black, + ), ), - ), - SizedBox(height: 5.h), - Text( - S.of(context).tiantiandefuli, - style: TextStyle( - fontWeight: MyFontWeight.regular, - fontSize: 12.sp, - color: Color(0xff4D4D4D), + SizedBox(height: 5.h), + Text( + S.of(context).tiantiandefuli, + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + color: Color(0xff4D4D4D), + ), ), - ), - ], - ), - SizedBox(width: 16.w), - Expanded( - child: Image.asset( - "assets/image/home_welfare.webp", - width: 22.w, - height: 35.h, - fit: BoxFit.fill, - ), + ], + ),), + Image.asset( + "assets/image/home_welfare.webp", + width: 22.w, + height: 35.h, + fit: BoxFit.fill, ), ], ), diff --git a/lib/order/order_detail_page.dart b/lib/order/order_detail_page.dart index e6f60e69..260099c0 100644 --- a/lib/order/order_detail_page.dart +++ b/lib/order/order_detail_page.dart @@ -225,7 +225,7 @@ class _OrderDetailPage extends State { payResult(BaseData baseData) async{ await queryDetails(); - Future.delayed(Duration(milliseconds: 350), () { + Future.delayed(Duration(milliseconds: 400), () { EasyLoading.dismiss(); SmartDialog.showToast(baseData?.msg == "ok" ?"订单支付成功" :baseData?.msg,alignment: Alignment.center); }); @@ -516,9 +516,9 @@ class _OrderDetailPage extends State { .catchError((onError) {}); if (baseData != null && baseData.isSuccess) { SmartDialog.showToast("订单取消成功"); - Future.delayed(Duration(milliseconds: 300), () { + // Future.delayed(Duration(milliseconds:450), () { queryDetails(); - }); + // }); } } diff --git a/lib/retrofit/data/vip_card_home.dart b/lib/retrofit/data/vip_card_home.dart index 949d39a4..96c026fd 100644 --- a/lib/retrofit/data/vip_card_home.dart +++ b/lib/retrofit/data/vip_card_home.dart @@ -150,6 +150,7 @@ class ProductVips { dynamic materialId, String details, String thumbnailImg, + String image, String info, num buyCount, num sellCountLimit, @@ -190,6 +191,7 @@ class ProductVips { _materialId = materialId; _details = details; _thumbnailImg = thumbnailImg; + _image = image; _info = info; _buyCount = buyCount; _sellCountLimit = sellCountLimit; @@ -233,6 +235,7 @@ class ProductVips { _materialId = json['materialId']; _details = json['details']; _thumbnailImg = json['thumbnailImg']; + _image = json['image']; _info = json['info']; _buyCount = json['buyCount']; _sellCountLimit = json['sellCountLimit']; @@ -274,6 +277,7 @@ class ProductVips { dynamic _materialId; String _details; String _thumbnailImg; + String _image; String _info; num _buyCount; num _sellCountLimit; @@ -314,6 +318,7 @@ ProductVips copyWith({ String id, dynamic materialId, String details, String thumbnailImg, + String image, String info, num buyCount, num sellCountLimit, @@ -354,6 +359,7 @@ ProductVips copyWith({ String id, materialId: materialId ?? _materialId, details: details ?? _details, thumbnailImg: thumbnailImg ?? _thumbnailImg, + image:image ?? _image, info: info ?? _info, buyCount: buyCount ?? _buyCount, sellCountLimit: sellCountLimit ?? _sellCountLimit, @@ -395,6 +401,7 @@ ProductVips copyWith({ String id, dynamic get materialId => _materialId; String get details => _details; String get thumbnailImg => _thumbnailImg; + String get image => _image; String get info => _info; num get buyCount => _buyCount; num get sellCountLimit => _sellCountLimit; @@ -438,6 +445,7 @@ ProductVips copyWith({ String id, map['materialId'] = _materialId; map['details'] = _details; map['thumbnailImg'] = _thumbnailImg; + map['image'] = _image; map['info'] = _info; map['buyCount'] = _buyCount; map['sellCountLimit'] = _sellCountLimit; diff --git a/lib/vip/vip_view/vip_goods_discount.dart b/lib/vip/vip_view/vip_goods_discount.dart index 167fe5cc..e0ff74c2 100644 --- a/lib/vip/vip_view/vip_goods_discount.dart +++ b/lib/vip/vip_view/vip_goods_discount.dart @@ -85,9 +85,9 @@ class _VipGoodsDiscount extends State { Widget vipGoodsRecommend(){ return Container( margin: EdgeInsets.only(top: 12.h), - height: 261.h, + height: 253.h, width: double.infinity, - padding: EdgeInsets.only(top: 16.h,left: 13.h), + padding: EdgeInsets.only(top:20.h,left: 13.h), decoration: BoxDecoration( borderRadius: BorderRadius.circular(6.w), color: Colors.white, @@ -124,7 +124,7 @@ class _VipGoodsDiscount extends State { ), ], ), - SizedBox(height:10.h,), + SizedBox(height:15.h,), vipGoodsRecommendList(), ], ), @@ -159,32 +159,32 @@ class _VipGoodsDiscount extends State { Widget vipGoodsRecommendItem(ProductVips productVips){ return Container( - width: 140.w, - margin: EdgeInsets.only(right:13.w,left:6.w), + width: 130.w, + // margin: EdgeInsets.only(right:13.w,left:6.w), child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ MImage( - productVips.thumbnailImg ?? "", - width: 140.w, - height: 145.h, + productVips.image ?? "", + width: 116, + height: 116, fit: BoxFit.cover, radius: BorderRadius.circular(6), errorSrc: "assets/image/default_1.webp", fadeSrc: "assets/image/default_1.webp", ), - Expanded(child: Padding(padding:EdgeInsets.only(top:10.h,bottom:7.h), + Padding(padding:EdgeInsets.only(top:10.h,bottom:7.h), child: Text( productVips.productName ?? "", maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle( color: Color(0xff0D0D0D), - fontSize:14.sp, + fontSize:13.sp, fontWeight: MyFontWeight.regular, ),), - )), + ), Row( children: [ Text( From d6f96af7744aa66074244a1b4974d06cb0a63c08 Mon Sep 17 00:00:00 2001 From: wurong <953969641@qq.com> Date: Fri, 4 Nov 2022 14:36:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E4=BD=93?= =?UTF-8?q?=EF=BC=9B=20=E6=9B=B4=E6=94=B9=E6=95=B0=E5=AD=97=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E4=BB=B7=E6=A0=BC=EF=BC=9B=20=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E7=81=AB=E9=94=85=E4=B8=8B=E5=8D=95=E6=B5=81=E7=A8=8B=EF=BC=9B?= =?UTF-8?q?=20=E6=9B=B4=E6=94=B9VIP=E6=9D=BF=E5=9D=97ui=EF=BC=9B=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0VIP=E4=B8=93=E4=BA=AB=E4=BB=B7=EF=BC=8C?= =?UTF-8?q?=E4=B8=93=E4=BA=AB=E4=BC=98=E6=83=A0=E6=9D=BF=E5=9D=97=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E8=A7=84=E5=88=99=E8=AF=B4=E6=98=8E=EF=BC=9B=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9C=B0=E5=9B=BE=E6=98=BE=E7=A4=BAbug?= =?UTF-8?q?=EF=BC=9B=20=E5=A2=9E=E5=8A=A0=E8=8B=B1=E8=AF=AD=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=EF=BC=9B(=E5=BE=85=E5=AE=8C=E5=96=84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/fonts/JDZhengHT-Bold.ttf | Bin 0 -> 27428 bytes assets/fonts/JDZhengHT-Light.ttf | Bin 0 -> 27368 bytes assets/fonts/JDZhengHT-Regular.ttf | Bin 0 -> 26800 bytes assets/image/2x/vip_tips.webp | Bin 0 -> 906 bytes assets/image/3x/vip_tips.webp | Bin 0 -> 1172 bytes assets/image/vip_tips.webp | Bin 0 -> 700 bytes lib/address/address_map_page.dart | 6 +- .../community_view/community_dynamic.dart | 7 +- lib/generated/intl/messages_en.dart | 19 +- lib/generated/intl/messages_en_US.dart | 781 ++++++++++++++++++ lib/generated/intl/messages_zh_CN.dart | 24 +- lib/generated/intl/messages_zh_Hans_CN.dart | 24 +- lib/generated/l10n.dart | 175 +++- lib/home/guide_page.dart | 6 +- lib/home/home_page.dart | 4 +- lib/home/home_view/discount_zone.dart | 161 ++-- lib/home/home_view/featured_acticvity.dart | 2 +- lib/home/home_view/home_recommend_goods.dart | 95 +-- lib/home/home_view/top_selling_list.dart | 4 +- lib/home/home_view/welfare_core.dart | 10 +- .../points_mall_view/points_goods_title.dart | 2 +- .../points_mall_view/points_goods_view.dart | 1 + lib/home/welfare_exchange.dart | 6 +- lib/home/welfare_page.dart | 9 +- .../integral_store_details_page.dart | 186 +++-- lib/l10n/intl_en.arb | 24 +- lib/l10n/intl_en_US.arb | 706 ++++++++++++++++ lib/l10n/intl_zh_CN.arb | 24 +- lib/l10n/intl_zh_Hans_CN.arb | 24 +- lib/l10n/intl_zh_Hant_CN.arb | 24 +- lib/l10n/intl_zh_TW.arb | 22 + lib/login/new_login_page.dart | 251 +++--- lib/main.dart | 16 +- lib/main_page.dart | 4 +- lib/mine/mine_shop_details.dart | 3 +- lib/mine/mine_shop_page.dart | 1 + lib/mine/mine_view/mine_item.dart | 8 +- lib/mine/mine_view/mine_view.dart | 4 +- lib/mine/mine_wallet_page.dart | 14 +- lib/mine/recharge_page.dart | 7 +- lib/order/exchange_order_page.dart | 6 +- lib/order/order_view/order_commodity.dart | 6 +- lib/order/order_view/order_status.dart | 3 +- lib/retrofit/min_api.dart | 2 +- lib/retrofit/retrofit_api.dart | 2 +- lib/setting/treaty_page.dart | 19 +- lib/setting/user_service_page.dart | 7 + lib/settlement/settlement.dart | 189 ++--- .../activity_coupon_remarks.dart | 4 +- .../settlement_view/pay_method.dart | 9 +- .../settlement_order_commodity.dart | 9 +- lib/store/shop_details_page.dart | 5 +- lib/store/store_order.dart | 662 +++++++-------- lib/store/store_view/shop_car.dart | 3 +- lib/store/store_view/shop_goods.dart | 182 +++- lib/store/store_view/shop_goods_car.dart | 2 + lib/store/store_view/store_order_list.dart | 4 +- lib/union/union_list.dart | 13 +- lib/utils/status_utils.dart | 1 + lib/view_widget/mine_vip_entry.dart | 3 +- lib/view_widget/new_coupon_widget.dart | 16 +- lib/vip/user_vip_service_page.dart | 7 + lib/vip/vip_view/exclusive_coupon.dart | 98 +++ lib/vip/vip_view/vip_goods_discount.dart | 328 +++++--- lib/vip/vip_view/vip_top.dart | 32 +- pubspec.lock | 2 +- pubspec.yaml | 13 +- 67 files changed, 3268 insertions(+), 1013 deletions(-) create mode 100644 assets/fonts/JDZhengHT-Bold.ttf create mode 100644 assets/fonts/JDZhengHT-Light.ttf create mode 100644 assets/fonts/JDZhengHT-Regular.ttf create mode 100644 assets/image/2x/vip_tips.webp create mode 100644 assets/image/3x/vip_tips.webp create mode 100644 assets/image/vip_tips.webp create mode 100644 lib/generated/intl/messages_en_US.dart create mode 100644 lib/l10n/intl_en_US.arb diff --git a/assets/fonts/JDZhengHT-Bold.ttf b/assets/fonts/JDZhengHT-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f9a85a4e1cdfeb287174c2e9e70649c906d08eac GIT binary patch literal 27428 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
    mu?I0-xz4%*S?l`Js^o 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 literal 0 HcmV?d00001 diff --git a/assets/fonts/JDZhengHT-Regular.ttf b/assets/fonts/JDZhengHT-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..6483758edc648384371173e84e02b7d40f75cf34 GIT binary patch literal 26800 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 literal 0 HcmV?d00001 diff --git a/assets/image/vip_tips.webp b/assets/image/vip_tips.webp new file mode 100644 index 0000000000000000000000000000000000000000..b5aaab03e5483e99b6b46db21361c64913009ab8 GIT binary patch literal 700 zcmWIYbaUIn#J~{l>J$(bU=hK^z`$St#JphS>FgXJ0hDE6V3GilEI_H;ypp0IcPE92 z$S4Jn7z`vP7ZJwvVwaZ`lmOM70I5$dC<3wX0NFOVIi(=GKmg=o zp47b1U?3d<#4-%U3_%R;3{F5cRRJPA^A|BNSbSw*V4i>wOPa~Ru)URmLE;udOl1KB z1Ahwx!?yDUiA9NE$FKlNrnEE$hEL0Z5g5t9Abf#=fh!v3P=sDYT;TAl0#J_((4YB0 zn9h*HkjkLI;K`83kj$V5WElYyi6Mg-Fva+k0Tt@=Ixq{EJE$dWWG#7hzeS4WrkU)e zzYo_f$dz7}-~Ql-@l27exksK^2~0V!>m<(bYEG{0eT6@%RU0~UZl4s&*2>c2sbO|u z=P5n5ze7WD(SMdnX51V8np&)vj9#@eRP|a#CyT3HlcxHHKPh_*ZC(0r_6vXaW&i+_ CZhHOz literal 0 HcmV?d00001 diff --git a/lib/address/address_map_page.dart b/lib/address/address_map_page.dart index a359a54c..f885d478 100644 --- a/lib/address/address_map_page.dart +++ b/lib/address/address_map_page.dart @@ -106,6 +106,7 @@ class _AddressMapPage extends State { androidOption.setOpenGps(true); // 设置是否需要使用gps androidOption.setLocationMode(BMFLocationMode.hightAccuracy); // 设置定位模式 androidOption.setScanspan(0); // 设置发起定位请求时间间隔 + androidOption.setCoordType(BMFLocationCoordType.gcj02); Map androidMap = androidOption.getMap(); @@ -121,6 +122,7 @@ class _AddressMapPage extends State { iosOption.setDistanceFilter(1000); // 设置定位最小更新距离 iosOption.setAllowsBackgroundLocationUpdates(true); // 是否允许后台定位 iosOption.setPauseLocUpdateAutomatically(true); // 定位是否会被系统自动暂停 + iosOption.coordType = BMFLocationCoordType.gcj02; Map iosMap = iosOption.getMap(); @@ -352,6 +354,7 @@ class _AddressMapPage extends State { return Scaffold( body: Column( children: [ + searchWidget(), Expanded( child: Stack( children: [ @@ -392,7 +395,6 @@ class _AddressMapPage extends State { // ), // ), // ), - searchWidget(), Positioned( right: 17, bottom: 16, @@ -415,7 +417,7 @@ class _AddressMapPage extends State { ), ), ), - ) + ), ], ), flex: 1, diff --git a/lib/community/community_view/community_dynamic.dart b/lib/community/community_view/community_dynamic.dart index de83143e..22260e31 100644 --- a/lib/community/community_view/community_dynamic.dart +++ b/lib/community/community_view/community_dynamic.dart @@ -274,8 +274,8 @@ class _CommunityDynamic extends State { ? Color(0xFF808080) : Colors.white, text: (widget?.article?.followed ?? false) - ? "已关注" - : "关注", + ? S.of(context).yiguanzhu + : S.of(context).guanzhu, radius: 20, icons: Icon( (widget?.article?.followed ?? false) @@ -379,6 +379,7 @@ class _CommunityDynamic extends State { : "", style: TextStyle( fontSize: 14.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.regular, color: Color(0xFF1A1A1A), ), @@ -405,6 +406,7 @@ class _CommunityDynamic extends State { "${widget.article.comments ?? 0}", style: TextStyle( fontSize: 14.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.regular, color: Color(0xFF1A1A1A), ), @@ -430,6 +432,7 @@ class _CommunityDynamic extends State { "${widget.article.likes ?? 0}", style: TextStyle( fontSize: 14.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.regular, color: Color(0xFF1A1A1A), ), diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index ab481ce3..2b69a59a 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -122,6 +122,7 @@ class MessageLookup extends MessageLookupByLibrary { "beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张"), "beizhu" : MessageLookupByLibrary.simpleMessage("备注"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"), + "benzhouquanbao" : MessageLookupByLibrary.simpleMessage("本周券包"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"), "bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("编辑个人资料"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"), @@ -219,6 +220,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanquan" : MessageLookupByLibrary.simpleMessage("兑换券"), "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"), "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), + "duozhongyouhui" : MessageLookupByLibrary.simpleMessage("多种优惠券等你拿"), "fabu" : MessageLookupByLibrary.simpleMessage("发布"), "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"), "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"), @@ -243,10 +245,12 @@ class MessageLookup extends MessageLookupByLibrary { "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), + "fuliduihuan" : MessageLookupByLibrary.simpleMessage("福利兑换"), "fulizhongxin" : MessageLookupByLibrary.simpleMessage("福利中心"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), + "gengduohaoquan" : MessageLookupByLibrary.simpleMessage("更多好券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"), "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"), "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), @@ -329,7 +333,9 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"), + "jifenhuanquan" : MessageLookupByLibrary.simpleMessage("积分换券"), + "jifenmingxi" : MessageLookupByLibrary.simpleMessage("积分明细"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"), @@ -365,8 +371,10 @@ class MessageLookup extends MessageLookupByLibrary { "kongtiao" : MessageLookupByLibrary.simpleMessage("空调"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快递"), "kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"), + "lianxikefu" : MessageLookupByLibrary.simpleMessage("联系客服"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), + "liaojie" : MessageLookupByLibrary.simpleMessage("了解"), "liaojiejiankang" : MessageLookupByLibrary.simpleMessage("了解健康"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), @@ -394,12 +402,15 @@ class MessageLookup extends MessageLookupByLibrary { "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), + "main_menu5" : MessageLookupByLibrary.simpleMessage("回乡VIP"), "manlijiandaijinquan" : m19, "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), + "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每周三更新"), + "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每周三更新劵包"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"), "mi" : m21, @@ -465,6 +476,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingzhuo" : MessageLookupByLibrary.simpleMessage("清桌"), "qishoupeisongzhongyujisongdashijian" : MessageLookupByLibrary.simpleMessage("骑手配送中,预计送达时间"), "qishouyijiedanquhuozhong" : MessageLookupByLibrary.simpleMessage("骑手已接单、取货中"), + "qita" : MessageLookupByLibrary.simpleMessage("其他"), "quanbao" : MessageLookupByLibrary.simpleMessage("券包"), "quanbu" : MessageLookupByLibrary.simpleMessage("全部"), "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"), @@ -518,6 +530,7 @@ class MessageLookup extends MessageLookupByLibrary { "send_code" : MessageLookupByLibrary.simpleMessage("发送验证码"), "shanchu" : MessageLookupByLibrary.simpleMessage("删除"), "shanchudingdan" : MessageLookupByLibrary.simpleMessage("删除一单"), + "shanghuruzhu" : MessageLookupByLibrary.simpleMessage("商户入驻"), "shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"), "shangjiaqueren" : MessageLookupByLibrary.simpleMessage("商家确认"), "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"), @@ -548,6 +561,7 @@ class MessageLookup extends MessageLookupByLibrary { "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人详细地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("请输入收货人姓名"), "shoujihao" : MessageLookupByLibrary.simpleMessage("手机号"), + "shouqi" : MessageLookupByLibrary.simpleMessage("收起"), "shouye" : MessageLookupByLibrary.simpleMessage("首页"), "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"), "shuaxinchenggong" : MessageLookupByLibrary.simpleMessage("刷新成功"), @@ -562,6 +576,7 @@ class MessageLookup extends MessageLookupByLibrary { "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tiantiandefuli" : MessageLookupByLibrary.simpleMessage("天天得福利"), + "tiantianlingjifen" : MessageLookupByLibrary.simpleMessage("天天领积分"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), @@ -654,6 +669,7 @@ class MessageLookup extends MessageLookupByLibrary { "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"), "yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀请好友"), + "yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀请好友得分"), "yaoqingrenshoujihao_" : m35, "yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), @@ -733,6 +749,7 @@ class MessageLookup extends MessageLookupByLibrary { "zhanghaoyuanquan" : MessageLookupByLibrary.simpleMessage("账号与安全"), "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("账号注销说明"), "zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"), + "zhankai" : MessageLookupByLibrary.simpleMessage("展开"), "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"), "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"), "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"), diff --git a/lib/generated/intl/messages_en_US.dart b/lib/generated/intl/messages_en_US.dart new file mode 100644 index 00000000..277f3b8a --- /dev/null +++ b/lib/generated/intl/messages_en_US.dart @@ -0,0 +1,781 @@ +// DO NOT EDIT. This is code generated via package:intl/generate_localized.dart +// This is a library that provides messages for a en_US locale. All the +// messages from the main program should be duplicated here with the same +// function name. + +// Ignore issues from commonly used lints in this file. +// ignore_for_file:unnecessary_brace_in_string_interps, unnecessary_new +// ignore_for_file:prefer_single_quotes,comment_references, directives_ordering +// ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases +// ignore_for_file:unused_import, file_names + +import 'package:intl/intl.dart'; +import 'package:intl/message_lookup_by_library.dart'; + +final messages = new MessageLookup(); + +typedef String MessageIfAbsent(String messageStr, List args); + +class MessageLookup extends MessageLookupByLibrary { + String get localeName => 'en_US'; + + static m0(version) => "Version:${version}"; + + static m1(yuan) => "The minimum recharge amount is ${yuan}"; + + static m2(time) => "Creation time${time}"; + + static m3(xihuan) => "Like${xihuan}"; + + static m4(shijian) => "Publishing start time ${shijian}"; + + static m5(ge) => "${ge}g/piece"; + + static m6(jian) => "common${jian}piece"; + + static m7(jian) => "common${jian} items in total"; + + static m8(km) => "${km}km"; + + static m9(huifu) => "Reply@${huifu}:"; + + static m10(yuan) => "Event relief${yuan}yuan distribution fee"; + + static m11(yue) => "Activity balance ${yue}"; + + static m12(jifen) => "+ ${jifen} integral"; + + static m13(jianjie) => "Introduction:${jianjie}"; + + static m14(jifen) => "${jifen}integral"; + + static m15(jifen) => "${jifen}Integrate to the next level"; + + static m16(date) => "Opening date:${date}"; + + static m17(shijian) => "Picking time ${shijian}"; + + static m18(yue) => "green coin ${yue}"; + + static m19(man, jian) => "full${man}yuan Lijian${jian}yuan coupons"; + + static m20(yuan) => "full ${yuan}available"; + + static m21(mi) => "${mi}meters"; + + static m22(tian) => "You have signed in for${tian}consecutive days"; + + static m23(pinglun) => "Comment(${pinglun})"; + + static m24(zongyue) => "Balance：${zongyue}"; + + static m25(zhe) => "full${zhe}folding"; + + static m26(num) => "Retrieval No${num}"; + + static m27(ren) => "¥${ren}/person"; + + static m28(second) => "${second}s and then resend"; + + static m29(jifen) => "Product credit ${jifen}credit"; + + static m30(jifen) => "Paid in integral ${jifen}integral"; + + static m31(sui) => "${sui}years old"; + + static m32(num) => "Finish${num}"; + + static m33(time) => "Ordering time:${time}"; + + static m34(xihuan) => "Like(${xihuan})"; + + static m35(shoujihao) => "Inviter\'s mobile number:${shoujihao}"; + + static m36(jian) => "${jian}pieces redeemed"; + + static m37(time) => "Business hours: ${time}"; + + static m38(date) => "Validity:${date}"; + + static m39(date) => "Valid until ${date}"; + + static m40(yuan) => "${yuan}yuan"; + + static m41(yue) => "Balance ${yue}"; + + static m42(yue) => "Balance ${yue}"; + + static m43(zuozhe) => "Author:${zuozhe}"; + + final messages = _notInlinedMessages(_notInlinedMessages); + static _notInlinedMessages(_) => { + "bainianchuanjiao" : MessageLookupByLibrary.simpleMessage("Hundred year Sichuan Pepper"), + "baiyin" : MessageLookupByLibrary.simpleMessage("silver"), + "baiyinhuiyuan" : MessageLookupByLibrary.simpleMessage("Silver Member"), + "banben" : m0, + "bangdingfuka" : MessageLookupByLibrary.simpleMessage("binding sub card"), + "bangong" : MessageLookupByLibrary.simpleMessage("Office"), + "bangzhuyufankui" : MessageLookupByLibrary.simpleMessage("Help and Feedback"), + "baocun" : MessageLookupByLibrary.simpleMessage("Save"), + "baocunchenggong" : MessageLookupByLibrary.simpleMessage("Saving succeeded"), + "baocunsaoma" : MessageLookupByLibrary.simpleMessage("The screenshot saves the QR code below, invites others to scan WeChat for identification, long press follow, completes the small game, receives the coupon, and the invitation is successful！"), + "beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("Each invited user can get a coupon of 10 yuan for Qianjin Maiwei after entering the invitation code"), + "beizhu" : MessageLookupByLibrary.simpleMessage("Remarks"), + "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("Remarks"), + "benzhouquanbao" : MessageLookupByLibrary.simpleMessage("coupon package of this week"), + "bianjidizhi" : MessageLookupByLibrary.simpleMessage("Edit Address"), + "bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("Edit Profile "), + "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("Mark as Read"), + "biaoweiyidu" : MessageLookupByLibrary.simpleMessage("Mark as Read"), + "bodadianhua" : MessageLookupByLibrary.simpleMessage("Make a call"), + "bofangcishu" : MessageLookupByLibrary.simpleMessage("Playback times"), + "bojin" : MessageLookupByLibrary.simpleMessage("platinum"), + "brand_yixinhuixiang" : MessageLookupByLibrary.simpleMessage("going back home with one heart"), + "buzhichikaipiao" : MessageLookupByLibrary.simpleMessage("Invoicing is not supported"), + "chakan" : MessageLookupByLibrary.simpleMessage("View"), + "chakangengduo" : MessageLookupByLibrary.simpleMessage("See more"), + "chakanhexiaoma" : MessageLookupByLibrary.simpleMessage("View Write off Code"), + "chakanquanyi" : MessageLookupByLibrary.simpleMessage("View Equity"), + "chakanshixiaoquan" : MessageLookupByLibrary.simpleMessage("View invalid coupons"), + "chakanwodekabao" : MessageLookupByLibrary.simpleMessage("Check my card bag"), + "chakanwodekaquan" : MessageLookupByLibrary.simpleMessage("Check my card coupon"), + "chakanwuliu" : MessageLookupByLibrary.simpleMessage("View Logistics"), + "chakanxiangqing" : MessageLookupByLibrary.simpleMessage("View Details"), + "changjianwenti" : MessageLookupByLibrary.simpleMessage("Frequently Asked Questions"), + "changqiyouxiao" : MessageLookupByLibrary.simpleMessage("Long term effective"), + "chaojiyouhuiquan" : MessageLookupByLibrary.simpleMessage("Premium coupon"), + "chaungshirengushi" : MessageLookupByLibrary.simpleMessage("Founder\'s story"), + "chenggongdengluzhuce" : MessageLookupByLibrary.simpleMessage("You can become a member by successfully logging in and registering and binding relevant information。"), + "chengjiu" : MessageLookupByLibrary.simpleMessage("achievement"), + "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("Achievement badge"), + "chengshixuanze" : MessageLookupByLibrary.simpleMessage("City Selection"), + "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("Become an exclusive member of the store and enjoy exclusive rights"), + "chijiankang" : MessageLookupByLibrary.simpleMessage("Eat healthy"), + "chongzhi" : MessageLookupByLibrary.simpleMessage("Recharge"), + "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("Recharge succeeded"), + "chongzhifuliduo" : MessageLookupByLibrary.simpleMessage("Recharge Fulido"), + "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("recharge message"), + "chongzhizuixiaojine" : m1, + "chuangjianshijian" : m2, + "chuangshirendegushi" : MessageLookupByLibrary.simpleMessage("The story of the founder -"), + "chuangshirendegushi1" : MessageLookupByLibrary.simpleMessage("The Founder\'s Story"), + "chuzhiyouhui" : MessageLookupByLibrary.simpleMessage("Value saving discount"), + "code_error" : MessageLookupByLibrary.simpleMessage("Wrong input of verification code"), + "cunchu" : MessageLookupByLibrary.simpleMessage("Storage"), + "cunchutishixinxi" : MessageLookupByLibrary.simpleMessage("It is recommended that you open the storage permission during use in order to obtain photo usage, caching and other functions"), + "daifukuan" : MessageLookupByLibrary.simpleMessage("To be paid"), + "daipeisong" : MessageLookupByLibrary.simpleMessage("to be delivered"), + "daiqucan" : MessageLookupByLibrary.simpleMessage("To be picked up"), + "daiqueren" : MessageLookupByLibrary.simpleMessage("to be confirmed"), + "daizhifu" : MessageLookupByLibrary.simpleMessage("to be paid"), + "daizhizuo" : MessageLookupByLibrary.simpleMessage("to be made"), + "dajiadouzaiduihuan" : MessageLookupByLibrary.simpleMessage("Everyone is exchanging"), + "dakaidingwei" : MessageLookupByLibrary.simpleMessage("Open Positioning"), + "dangqianbanben" : MessageLookupByLibrary.simpleMessage("Current Version"), + "dangqiandengji" : MessageLookupByLibrary.simpleMessage("Current Level"), + "dangqianjifen" : MessageLookupByLibrary.simpleMessage("Current integral:"), + "dangqianshangpinduihuanhexiaoma" : MessageLookupByLibrary.simpleMessage("The current commodity exchange write off code has been written off"), + "dangqianzhukadengji" : MessageLookupByLibrary.simpleMessage("Current Master Card Level"), + "daodianziqu" : MessageLookupByLibrary.simpleMessage("Get it at the store"), + "daopinglunliebiaodingbu" : MessageLookupByLibrary.simpleMessage("To the top of the comment list"), + "daoxiayidengji" : MessageLookupByLibrary.simpleMessage("To the next level"), + "dengdaishangjiaqueren" : MessageLookupByLibrary.simpleMessage("Wait for the merchant\'s confirmation"), + "dengdaiyonghuqucan" : MessageLookupByLibrary.simpleMessage("Waiting for the user to pick up the meal"), + "denglu" : MessageLookupByLibrary.simpleMessage("Login"), + "diancan" : MessageLookupByLibrary.simpleMessage("Order a meal"), + "diandan" : MessageLookupByLibrary.simpleMessage("Order"), + "dianhua" : MessageLookupByLibrary.simpleMessage("Telephone"), + "dianjidenglu" : MessageLookupByLibrary.simpleMessage("Click login to enjoy more wonderful information"), + "dianputuijian" : MessageLookupByLibrary.simpleMessage("Store recommendation"), + "dianpuyue" : MessageLookupByLibrary.simpleMessage("Shop balance"), + "dianwolingqu" : MessageLookupByLibrary.simpleMessage("Click me to get it"), + "dianzanxihuan_" : m3, + "dingdan" : MessageLookupByLibrary.simpleMessage("Order"), + "dingdanbianhao" : MessageLookupByLibrary.simpleMessage("Order No"), + "dingdandaifahuo" : MessageLookupByLibrary.simpleMessage("Order to be shipped"), + "dingdandaizhifu" : MessageLookupByLibrary.simpleMessage("Order to be paid"), + "dingdangenzong" : MessageLookupByLibrary.simpleMessage("Order tracking"), + "dingdanhao" : MessageLookupByLibrary.simpleMessage("Order No"), + "dingdanjiesuan" : MessageLookupByLibrary.simpleMessage("Order Settlement"), + "dingdanqueren" : MessageLookupByLibrary.simpleMessage("Order confirmation"), + "dingdantongzhi" : MessageLookupByLibrary.simpleMessage("Order Notice"), + "dingdanxiaoxi" : MessageLookupByLibrary.simpleMessage("Order Message"), + "dingdanyisongda" : MessageLookupByLibrary.simpleMessage("Order delivery"), + "dingdanyituikuan" : MessageLookupByLibrary.simpleMessage("The order has been refunded"), + "dingdanyiwancheng" : MessageLookupByLibrary.simpleMessage("The order has been completed"), + "dingdanyizhifu" : MessageLookupByLibrary.simpleMessage("The order has been paid"), + "dingwei" : MessageLookupByLibrary.simpleMessage("Positioning"), + "dizhi" : MessageLookupByLibrary.simpleMessage("Address"), + "dongtai" : MessageLookupByLibrary.simpleMessage("Dynamic"), + "dongtaitishi" : MessageLookupByLibrary.simpleMessage("The user\'s published content needs to wait for the system review, and will be displayed in the recommended square after the review is passed"), + "dongtaixiangqing" : MessageLookupByLibrary.simpleMessage("Dynamic Details"), + "duihuan" : MessageLookupByLibrary.simpleMessage("exchange"), + "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("Successful exchange"), + "duihuanguize" : MessageLookupByLibrary.simpleMessage("Exchange Rules"), + "duihuanhoufahuo" : MessageLookupByLibrary.simpleMessage("Delivery within five working days after exchange"), + "duihuanhouwugegongzuori" : MessageLookupByLibrary.simpleMessage("You can go to the store five working days after the exchange"), + "duihuanliangdidaogao" : MessageLookupByLibrary.simpleMessage("From low to high exchange volume"), + "duihuanlianggaodaodi" : MessageLookupByLibrary.simpleMessage("From high to low exchange volume"), + "duihuanlishi" : MessageLookupByLibrary.simpleMessage("Exchange History"), + "duihuanquan" : MessageLookupByLibrary.simpleMessage("exchange coupon"), + "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("Details of exchanged goods"), + "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("Exchange information"), + "duozhongyouhui" : MessageLookupByLibrary.simpleMessage("A variety of coupons are waiting for you"), + "fabu" : MessageLookupByLibrary.simpleMessage("Publish"), + "fangshier" : MessageLookupByLibrary.simpleMessage("Mode 2"), + "fangshiyi" : MessageLookupByLibrary.simpleMessage("Mode 1"), + "fanhuiduihuanlishi" : MessageLookupByLibrary.simpleMessage("Return to exchange history"), + "fanhuishequn" : MessageLookupByLibrary.simpleMessage("Return to the community"), + "fanhuishouye" : MessageLookupByLibrary.simpleMessage("Return to the home page"), + "fankui" : MessageLookupByLibrary.simpleMessage("Feedback"), + "fankuilizi" : MessageLookupByLibrary.simpleMessage("You can enter feedback content here, such as product suggestions, functional exceptions, etc"), + "fantizhongwen" : MessageLookupByLibrary.simpleMessage("Traditional Chinese"), + "fapiao" : MessageLookupByLibrary.simpleMessage("Invoice"), + "fapiaozhushou" : MessageLookupByLibrary.simpleMessage("Invoice Assistant"), + "fasong" : MessageLookupByLibrary.simpleMessage("Sending"), + "fasongduanxin" : MessageLookupByLibrary.simpleMessage("Send SMS"), + "faxingshijian" : m4, + "feishiwuduihuanma" : MessageLookupByLibrary.simpleMessage("Non physical exchange code"), + "feishiwushangpin" : MessageLookupByLibrary.simpleMessage("After exchanging non physical goods, you can use the coupon！"), + "fensi" : MessageLookupByLibrary.simpleMessage("fans"), + "fenxiang" : MessageLookupByLibrary.simpleMessage("Sharing"), + "fenxiangdao" : MessageLookupByLibrary.simpleMessage("Share to"), + "fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("Sharing Health"), + "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("You can also directly click on the top right to share with the people you want to invite。"), + "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("Share the invitation code with your friend, and the other person will enter the invitation code on the login page of the app, and the invitation will be successful。"), + "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("Share to WeChat"), + "fukashoujihao" : MessageLookupByLibrary.simpleMessage("Slave card mobile number"), + "fuliduihuan" : MessageLookupByLibrary.simpleMessage("Benefit exchange"), + "fulizhongxin" : MessageLookupByLibrary.simpleMessage("Benefit Center"), + "ge" : m5, + "geiwopingfen" : MessageLookupByLibrary.simpleMessage("Rate me"), + "gengduo" : MessageLookupByLibrary.simpleMessage("more"), + "gengduohaoquan" : MessageLookupByLibrary.simpleMessage("more good coupons"), + "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("more coupons"), + "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("Changing the background"), + "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("Changing the avatar"), + "gengyouhui" : MessageLookupByLibrary.simpleMessage("More preferential"), + "gerenxinxi" : MessageLookupByLibrary.simpleMessage("Personal Information"), + "gexingqianming" : MessageLookupByLibrary.simpleMessage("Personal Signature"), + "gong" : MessageLookupByLibrary.simpleMessage("total"), + "gongchuanghuiyuan" : MessageLookupByLibrary.simpleMessage("Co founder Member"), + "gongjijian" : m6, + "gongjijianshangpin" : m7, + "gongli" : m8, + "gongxinchengwei" : MessageLookupByLibrary.simpleMessage("Congratulations on becoming"), + "gongxinichengweibendianhuiyuan" : MessageLookupByLibrary.simpleMessage("Congratulations, you have become a member of our store. Go and enjoy the super many member rights。"), + "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("Please check the agreement on privacy service and return home service"), + "guanlidizhi" : MessageLookupByLibrary.simpleMessage("Management Address"), + "guanyu" : MessageLookupByLibrary.simpleMessage("About"), + "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("About the Founder"), + "guanyuhuixiang" : MessageLookupByLibrary.simpleMessage("About Going Home"), + "guanzhu" : MessageLookupByLibrary.simpleMessage("Follow"), + "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("Live a healthy and organic life"), + "haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("No message～"), + "haimeiyouyouhuiquankeyilingqu" : MessageLookupByLibrary.simpleMessage("There is no coupon to get~"), + "haixiajiemei" : MessageLookupByLibrary.simpleMessage("Straits Sister"), + "haowu" : MessageLookupByLibrary.simpleMessage("good things"), + "haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("Friend Reward Rules"), + "heji" : MessageLookupByLibrary.simpleMessage("Total:"), + "hejiankang" : MessageLookupByLibrary.simpleMessage("Drink healthy"), + "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("Write off succeeded"), + "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("Write off Code Details"), + "huangjin" : MessageLookupByLibrary.simpleMessage("gold"), + "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("Golden Member"), + "huifu" : MessageLookupByLibrary.simpleMessage("Delete"), + "huifu_" : m9, + "huixiangVIPka" : MessageLookupByLibrary.simpleMessage("Home Returning VIP Card"), + "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("Homecoming Wallet"), + "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("For：Any store dedicated to returning home"), + "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("Homecoming Headlines"), + "huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("Home Return VIP Card Exclusive Rights"), + "huiyuandengji" : MessageLookupByLibrary.simpleMessage("Membership Level"), + "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("Member Level Description"), + "huiyuanguize" : MessageLookupByLibrary.simpleMessage("Member Rules Description"), + "huiyuanhuodejifen" : MessageLookupByLibrary.simpleMessage("How members get points"), + "huiyuanjia" : MessageLookupByLibrary.simpleMessage("member price"), + "huiyuanjibieduizhao" : MessageLookupByLibrary.simpleMessage("Member Level Comparison Table"), + "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("Member Points"), + "huiyuanka" : MessageLookupByLibrary.simpleMessage("Membership Card"), + "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("Membership card details"), + "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("Membership Rights"), + "huiyuanyue" : MessageLookupByLibrary.simpleMessage("Member Balance"), + "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("Member Center"), + "huiyuanzhuanxiangjiage" : MessageLookupByLibrary.simpleMessage("Member Exclusive Price"), + "huode" : MessageLookupByLibrary.simpleMessage("get"), + "huodequanyi" : MessageLookupByLibrary.simpleMessage("acquire interests"), + "huodong" : MessageLookupByLibrary.simpleMessage("activity"), + "huodongjianmianpeisongfei" : m10, + "huodongjinxingzhong" : MessageLookupByLibrary.simpleMessage("Activity in Progress"), + "huodongliebiao" : MessageLookupByLibrary.simpleMessage("Activity List"), + "huodongyue" : MessageLookupByLibrary.simpleMessage("Activity Balance"), + "huodongyue_" : m11, + "huodongzixun" : MessageLookupByLibrary.simpleMessage("Activity information"), + "huopinyisongda" : MessageLookupByLibrary.simpleMessage("The goods have been delivered"), + "input_code" : MessageLookupByLibrary.simpleMessage("Mobile phone verification code"), + "input_code_hide" : MessageLookupByLibrary.simpleMessage("Please enter the verification code"), + "input_invite_code_hide" : MessageLookupByLibrary.simpleMessage("Fill in the invitation code"), + "input_phone" : MessageLookupByLibrary.simpleMessage("Enter the phone number"), + "input_phone_hide" : MessageLookupByLibrary.simpleMessage("Please enter your mobile number"), + "invite_code_error" : MessageLookupByLibrary.simpleMessage("Wrong invitation code"), + "jiajifen" : m12, + "jian" : MessageLookupByLibrary.simpleMessage("piece"), + "jiangli" : MessageLookupByLibrary.simpleMessage("Reward"), + "jiangshi" : MessageLookupByLibrary.simpleMessage("Instructor"), + "jianjie" : m13, + "jiazaishibai" : MessageLookupByLibrary.simpleMessage("Loading failed"), + "jiesuan" : MessageLookupByLibrary.simpleMessage("Settlement"), + "jiesuanjine" : MessageLookupByLibrary.simpleMessage("Settlement Amount"), + "jifen" : MessageLookupByLibrary.simpleMessage("Integral"), + "jifen_" : m14, + "jifenbuzu" : MessageLookupByLibrary.simpleMessage("Your points are insufficient"), + "jifendaoxiayidengji" : m15, + "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("Calculation description of integral"), + "jifendidaogao" : MessageLookupByLibrary.simpleMessage("From low to high"), + "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("Integral from high to low"), + "jifenhuanquan" : MessageLookupByLibrary.simpleMessage("points for coupons"), + "jifenmingxi" : MessageLookupByLibrary.simpleMessage("Integral Details"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("Points Mall"), + "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("Points Details"), + "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("Jingbi League Member Store"), + "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("Selected good articles "), + "jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("Selected Activities"), + "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("Gold Card Member"), + "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("Today\'s Member Task"), + "jinrushangdian" : MessageLookupByLibrary.simpleMessage("Enter the store"), + "jinxingbangdingfuka" : MessageLookupByLibrary.simpleMessage("Bind sub card"), + "jinxingfukabangding" : MessageLookupByLibrary.simpleMessage("Associate card binding"), + "jinxingzhanghaozhuxiao" : MessageLookupByLibrary.simpleMessage("Account cancellation"), + "jinxingzhongdedingdan" : MessageLookupByLibrary.simpleMessage("Orders in Progress"), + "jituanchuangbanren" : MessageLookupByLibrary.simpleMessage(" Founder of the Group"), + "jituanchuangshiren" : MessageLookupByLibrary.simpleMessage("Founder of the Group"), + "jixuduihuan" : MessageLookupByLibrary.simpleMessage("Continue to exchange"), + "jixuzhifu" : MessageLookupByLibrary.simpleMessage("Continue to pay"), + "jubao" : MessageLookupByLibrary.simpleMessage("Report"), + "jubaogaineirong" : MessageLookupByLibrary.simpleMessage("Report this content"), + "jubaotishi" : MessageLookupByLibrary.simpleMessage("Your report is waiting for manual review, and we will process it in 7-15 working days. The processing results can be found in"), + "jubaoyuanyin" : MessageLookupByLibrary.simpleMessage("Please enter the reason for reporting, so that we can locate the problem faster and handle it quickly"), + "jujue" : MessageLookupByLibrary.simpleMessage("Reject"), + "kabao" : MessageLookupByLibrary.simpleMessage("card bag"), + "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("Card bag-available"), + "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("Open Permission"), + "kaitonghuixianghuoququanyi" : MessageLookupByLibrary.simpleMessage("Open a return home VIP card to get more benefits"), + "kaitongriqi" : m16, + "kaquan" : MessageLookupByLibrary.simpleMessage("card coupon"), + "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("Coupons available"), + "keshiyong" : MessageLookupByLibrary.simpleMessage("available"), + "keyongjifen" : MessageLookupByLibrary.simpleMessage("Available Points"), + "keyongquan" : MessageLookupByLibrary.simpleMessage("Available vouchers"), + "keyongyouhuiquan" : MessageLookupByLibrary.simpleMessage("Available Coupons"), + "keyongyue" : MessageLookupByLibrary.simpleMessage("Available Balance"), + "kongtiao" : MessageLookupByLibrary.simpleMessage("Air conditioner"), + "kuaidi" : MessageLookupByLibrary.simpleMessage("express"), + "kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("express logistics"), + "lianxikefu" : MessageLookupByLibrary.simpleMessage("Contact customer service"), + "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("Contact phone number"), + "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("Sign in continuously to receive double points"), + "liaojie" : MessageLookupByLibrary.simpleMessage("Understand"), + "liaojiejiankang" : MessageLookupByLibrary.simpleMessage("Understanding Health"), + "lijicanjia" : MessageLookupByLibrary.simpleMessage("Join now"), + "lijichongzhi" : MessageLookupByLibrary.simpleMessage("Recharge Now"), + "lijikaitong" : MessageLookupByLibrary.simpleMessage("Open now"), + "lijilingqu" : MessageLookupByLibrary.simpleMessage("Get it now"), + "lijiqiandao" : MessageLookupByLibrary.simpleMessage("Sign in immediately"), + "lijitiyan" : MessageLookupByLibrary.simpleMessage("Experience Now"), + "likekaitong" : MessageLookupByLibrary.simpleMessage("Open now"), + "likexufei" : MessageLookupByLibrary.simpleMessage("Renew now"), + "likezhifu" : MessageLookupByLibrary.simpleMessage("Pay Now"), + "lingqu" : MessageLookupByLibrary.simpleMessage("Receive"), + "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("Coupon Collection Center"), + "lingquchenggong" : MessageLookupByLibrary.simpleMessage("Claim succeeded"), + "lingqudaokabao" : MessageLookupByLibrary.simpleMessage("Get the card bag"), + "lingqufangshi" : MessageLookupByLibrary.simpleMessage("Collection Method"), + "lingqushijian" : m17, + "linian" : MessageLookupByLibrary.simpleMessage("concept"), + "lishijilu" : MessageLookupByLibrary.simpleMessage("History"), + "liuxianinjingcaidepinglunba" : MessageLookupByLibrary.simpleMessage("Leave your wonderful comments"), + "login" : MessageLookupByLibrary.simpleMessage("login"), + "login_splash" : MessageLookupByLibrary.simpleMessage("Welcome Back Home"), + "lvbiyue" : MessageLookupByLibrary.simpleMessage("balance of green currency"), + "lvbiyue_" : m18, + "main_menu1" : MessageLookupByLibrary.simpleMessage("Jing Bi"), + "main_menu2" : MessageLookupByLibrary.simpleMessage("Union"), + "main_menu3" : MessageLookupByLibrary.simpleMessage("Organic Life"), + "main_menu4" : MessageLookupByLibrary.simpleMessage("Me"), + "main_menu5" : MessageLookupByLibrary.simpleMessage("Homecoming VIP"), + "manlijiandaijinquan" : m19, + "manyuankeyong" : m20, + "meiriqiandao" : MessageLookupByLibrary.simpleMessage("Sign in every day"), + "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("No more membership cards"), + "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("No more data"), + "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("No more coupons"), + "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("updated every Wednesday"), + "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("Update coupon package every Wednesday"), + "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("Store Selection"), + "menpaihao" : MessageLookupByLibrary.simpleMessage("Please enter the house number"), + "mi" : m21, + "mingxi" : MessageLookupByLibrary.simpleMessage("Details"), + "morenpaixu" : MessageLookupByLibrary.simpleMessage("Default sort"), + "muqianwujilu" : MessageLookupByLibrary.simpleMessage("No record at present"), + "muqianzanwuxingdianhuodong" : MessageLookupByLibrary.simpleMessage("At present, there is no star store activity"), + "nihaimeiyouchongzhihuoxiaofeijilu" : MessageLookupByLibrary.simpleMessage("You have no consumption or recharge records here～"), + "nincunchuquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("You have not opened the storage permission, please click"), + "nindingweigongnengweikaiqi" : MessageLookupByLibrary.simpleMessage("Your positioning function switch is not turned on, please click to turn on positioning"), + "nindingweiquanxianweiyunxu" : MessageLookupByLibrary.simpleMessage("You have not opened the location permission, please click OK to apply for permission"), + "ninweidenglu" : MessageLookupByLibrary.simpleMessage("You are not logged in, please click to log in"), + "ninxiangjiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("You have not opened the camera permission, please click"), + "ninxiaoxiquanxianweikaiqi" : MessageLookupByLibrary.simpleMessage("You have not enabled the message notification permission, please click Enable"), + "ninyichenggonglingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("You have successfully received the coupon, please go to"), + "ninyilianxuqiandaotian" : m22, + "ninyouyigedingdanyaolingqu" : MessageLookupByLibrary.simpleMessage("You need to go to the store to get an order"), + "ninyouyigexindedingdan" : MessageLookupByLibrary.simpleMessage("You have a new order"), + "paizhao" : MessageLookupByLibrary.simpleMessage("Take a picture"), + "peisong" : MessageLookupByLibrary.simpleMessage("Delivery"), + "peisongfangshi" : MessageLookupByLibrary.simpleMessage("Delivery Method"), + "peisongfei" : MessageLookupByLibrary.simpleMessage("Delivery fee"), + "peisongfuwu" : MessageLookupByLibrary.simpleMessage("Ordering time"), + "peisongzhong" : MessageLookupByLibrary.simpleMessage("Shipping"), + "phone_error" : MessageLookupByLibrary.simpleMessage("Wrong phone format"), + "pinglun" : MessageLookupByLibrary.simpleMessage("comment"), + "pinglun_" : m23, + "pingtaiyue" : MessageLookupByLibrary.simpleMessage("Platform Balance"), + "pingtaizhifumima" : MessageLookupByLibrary.simpleMessage("Platform Payment Password"), + "pingtaizongyue" : m24, + "pinpai" : MessageLookupByLibrary.simpleMessage("brand"), + "pinpaijieshao" : MessageLookupByLibrary.simpleMessage("Brand Introduction"), + "privacy_policy1" : MessageLookupByLibrary.simpleMessage("Login Agreed"), + "privacy_policy2" : MessageLookupByLibrary.simpleMessage("《Service Agreement for Returning Home with One Heart》"), + "privacy_policy3" : MessageLookupByLibrary.simpleMessage("《privacy Services》"), + "privacy_policy4" : MessageLookupByLibrary.simpleMessage("Log in with your own number"), + "qiandao" : MessageLookupByLibrary.simpleMessage("Sign in"), + "qiandaodejifen" : MessageLookupByLibrary.simpleMessage("Sign in and get points"), + "qiandaolingjifen" : MessageLookupByLibrary.simpleMessage("Sign in to receive points"), + "qiandaolingqujinfen" : MessageLookupByLibrary.simpleMessage("Sign in to receive points"), + "qiandaowancheng" : MessageLookupByLibrary.simpleMessage("Sign in completion"), + "qianjinmaiwei" : MessageLookupByLibrary.simpleMessage("Qianjin Maiwei"), + "qianshou" : MessageLookupByLibrary.simpleMessage("Signed in"), + "qianwanghuixiangmendianduihuanhexiao" : MessageLookupByLibrary.simpleMessage("Go to any store under Yixin Huixiang and show the commodity exchange code to the staff. After verification, you can get the corresponding commodity"), + "qinglihuancun" : MessageLookupByLibrary.simpleMessage("Clear Cache"), + "qingshurubeizhuyaoqiu" : MessageLookupByLibrary.simpleMessage("Please enter the note requirements"), + "qingshuruchongzhijine" : MessageLookupByLibrary.simpleMessage("Please enter the recharge amount"), + "qingshurushoujihao" : MessageLookupByLibrary.simpleMessage("Please enter your mobile number"), + "qingshuruyanzhengma" : MessageLookupByLibrary.simpleMessage("Please enter the verification code"), + "qingshuruyaoqingma" : MessageLookupByLibrary.simpleMessage("Please enter the invitation code"), + "qingshuruyouxiaoshoujihaoma" : MessageLookupByLibrary.simpleMessage("Please enter your valid mobile number"), + "qingshuruzhifumima" : MessageLookupByLibrary.simpleMessage("Please enter the payment password"), + "qingtianxieshoujihao" : MessageLookupByLibrary.simpleMessage("Please fill in the recipient\'s mobile number"), + "qingtianxiexingming" : MessageLookupByLibrary.simpleMessage("Please fill in the recipient\'s name"), + "qingtong" : MessageLookupByLibrary.simpleMessage("bronze"), + "qingtonghuiyuan" : MessageLookupByLibrary.simpleMessage("Bronze Member"), + "qingxuanzeshiyongmendian" : MessageLookupByLibrary.simpleMessage("Please select a store to use"), + "qingxuanzeshouhuodizhi" : MessageLookupByLibrary.simpleMessage("Please select the shipping address"), + "qingxuanzeyigemendian" : MessageLookupByLibrary.simpleMessage("Please select a store"), + "qingxuanzhemendian" : MessageLookupByLibrary.simpleMessage("Please select a store"), + "qingxuanzheninxiangshezhideyuyan" : MessageLookupByLibrary.simpleMessage("Please select the language you want to set"), + "qingzaiguidingshijianneizhifu" : MessageLookupByLibrary.simpleMessage("Please complete the payment within the specified time"), + "qingzhuo" : MessageLookupByLibrary.simpleMessage("clearing the table"), + "qishoupeisongzhongyujisongdashijian" : MessageLookupByLibrary.simpleMessage("The rider is in delivery, and the estimated delivery time"), + "qishouyijiedanquhuozhong" : MessageLookupByLibrary.simpleMessage("The rider has received the order and is picking up goods"), + "qita" : MessageLookupByLibrary.simpleMessage("Other"), + "quanbao" : MessageLookupByLibrary.simpleMessage("coupon package"), + "quanbu" : MessageLookupByLibrary.simpleMessage("All"), + "quanbudingdan" : MessageLookupByLibrary.simpleMessage("All Orders"), + "quanbuduihuan" : MessageLookupByLibrary.simpleMessage("Exchange All"), + "quanchangtongyong" : MessageLookupByLibrary.simpleMessage("universal"), + "quanchangzhe" : m25, + "quantian" : MessageLookupByLibrary.simpleMessage("all day"), + "quanxian" : MessageLookupByLibrary.simpleMessage("Permissions"), + "quanxianshezhi" : MessageLookupByLibrary.simpleMessage("Permission Settings"), + "quanyijishao" : MessageLookupByLibrary.simpleMessage("Equity Introduction"), + "quanyishuoming" : MessageLookupByLibrary.simpleMessage("Equity Description"), + "quanyixiangqing" : MessageLookupByLibrary.simpleMessage("Equity Details"), + "qucanhao" : MessageLookupByLibrary.simpleMessage("Picking number"), + "qudanhao" : m26, + "qudenglu" : MessageLookupByLibrary.simpleMessage("Log in"), + "queding" : MessageLookupByLibrary.simpleMessage("OK"), + "quedingyaoshanchudongtai" : MessageLookupByLibrary.simpleMessage("Are you sure you want to delete this dynamic？"), + "queren" : MessageLookupByLibrary.simpleMessage("Confirm"), + "querenbangding" : MessageLookupByLibrary.simpleMessage("Confirm Binding"), + "querenchongzhi" : MessageLookupByLibrary.simpleMessage("Confirm Recharging"), + "querenduihuan" : MessageLookupByLibrary.simpleMessage("Confirm exchange"), + "querenshouhuo" : MessageLookupByLibrary.simpleMessage("Confirm receipt"), + "querenyaoshanchudangqianpinglunma" : MessageLookupByLibrary.simpleMessage("Are you sure you want to delete the current comment？"), + "querenzhuxiao" : MessageLookupByLibrary.simpleMessage("Confirm Logout"), + "quhexiao" : MessageLookupByLibrary.simpleMessage("De write off"), + "quhuozhong" : MessageLookupByLibrary.simpleMessage("Picking"), + "qujianma" : MessageLookupByLibrary.simpleMessage("Picking Code"), + "quqiandao" : MessageLookupByLibrary.simpleMessage("Sign in"), + "qushiyong" : MessageLookupByLibrary.simpleMessage("To use"), + "quwancheng" : MessageLookupByLibrary.simpleMessage(" To complete "), + "quxiao" : MessageLookupByLibrary.simpleMessage("Cancel"), + "quxiaodingdan" : MessageLookupByLibrary.simpleMessage("Please complete the payment within the specified time"), + "quxiaozhifu" : MessageLookupByLibrary.simpleMessage("Cancel Payment"), + "quzhifu" : MessageLookupByLibrary.simpleMessage("To pay"), + "remenwenzhangshipin" : MessageLookupByLibrary.simpleMessage("Popular article videos"), + "remenwenzhangshipinliebiao" : MessageLookupByLibrary.simpleMessage("Popular article video list"), + "ren" : m27, + "renwuzhongxin" : MessageLookupByLibrary.simpleMessage("Task Center"), + "resend_in_seconds" : m28, + "ricahngfenxiang" : MessageLookupByLibrary.simpleMessage("Daily sharing"), + "ruhedihuanjifen" : MessageLookupByLibrary.simpleMessage("How to redeem points"), + "ruhedihuanjifen1" : MessageLookupByLibrary.simpleMessage("Click Jingbi to enter the points store, click the goods you want to exchange, enter the details of the goods and click below to exchange~"), + "ruhelingquyouhuiquan" : MessageLookupByLibrary.simpleMessage("How do I get coupons?"), + "ruhelingquyouhuiquan1" : MessageLookupByLibrary.simpleMessage("Click My, enter my page, click the coupon collection center below, and then you can get the coupon~"), + "ruheqiandao" : MessageLookupByLibrary.simpleMessage("How to sign in?"), + "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.Click Jingbi to enter the home page, and click on the top to sign in。\n2.Click on My to enter my page, and click on the point details above to sign in。"), + "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("If you need a refund, please prepare the order number/receipt number in advance and contact the store staff"), + "saoma" : MessageLookupByLibrary.simpleMessage("scanning code"), + "saomadiancan" : MessageLookupByLibrary.simpleMessage("You are about to scan the code to order"), + "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("Scan code to identify and follow official account"), + "send_code" : MessageLookupByLibrary.simpleMessage("Send verification code"), + "shanchu" : MessageLookupByLibrary.simpleMessage("Delete"), + "shanchudingdan" : MessageLookupByLibrary.simpleMessage("Delete a single order"), + "shanghuruzhu" : MessageLookupByLibrary.simpleMessage("Merchant settlement"), + "shangjiaquan" : MessageLookupByLibrary.simpleMessage("merchant coupon"), + "shangjiaqueren" : MessageLookupByLibrary.simpleMessage("Merchant confirmation"), + "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("Merchant has delivered goods"), + "shangjiazhengzaipeican" : MessageLookupByLibrary.simpleMessage("The merchant is preparing meals"), + "shanglajiazai" : MessageLookupByLibrary.simpleMessage("pull-up loading"), + "shangpinjifen" : m29, + "shangpinxiangqing" : MessageLookupByLibrary.simpleMessage("Product Details"), + "shangyidengji" : MessageLookupByLibrary.simpleMessage("Previous Level"), + "shenghuoyule" : MessageLookupByLibrary.simpleMessage("life entertainment"), + "shenmijifendali" : MessageLookupByLibrary.simpleMessage("Mysterious integral gift"), + "shenqingtuikuan" : MessageLookupByLibrary.simpleMessage("Apply for refund"), + "shezhi" : MessageLookupByLibrary.simpleMessage("Settings"), + "shifangjiazaigengduo" : MessageLookupByLibrary.simpleMessage("Release Load More"), + "shifangshuaxin" : MessageLookupByLibrary.simpleMessage("Release Refresh"), + "shifujifen" : m30, + "shimingrenzheng" : MessageLookupByLibrary.simpleMessage("Real name authentication"), + "shixiaoquan" : MessageLookupByLibrary.simpleMessage("Invalid coupon"), + "shixiaoyouhuiquan" : MessageLookupByLibrary.simpleMessage("Invalid coupon"), + "shiyongbangzhu" : MessageLookupByLibrary.simpleMessage("Using Help"), + "shiyongmendian" : MessageLookupByLibrary.simpleMessage("Applicable stores"), + "shiyongriqi" : MessageLookupByLibrary.simpleMessage("Use Date"), + "shiyongshuoming" : MessageLookupByLibrary.simpleMessage("Instructions for Use"), + "shiyongtiaojian" : MessageLookupByLibrary.simpleMessage("Use Conditions"), + "shouhuodi" : MessageLookupByLibrary.simpleMessage("Ship To Address"), + "shouhuodizhi" : MessageLookupByLibrary.simpleMessage("Please enter the detailed receiving address"), + "shouhuodizhi1" : MessageLookupByLibrary.simpleMessage("Delivery address"), + "shouhuorenshoujihao" : MessageLookupByLibrary.simpleMessage("Please enter the receiver\'s mobile phone number"), + "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("Please enter the detailed address of the consignee"), + "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("Please enter the name of the consignee"), + "shoujihao" : MessageLookupByLibrary.simpleMessage("mobile phone number"), + "shouqi" : MessageLookupByLibrary.simpleMessage("Stow"), + "shouye" : MessageLookupByLibrary.simpleMessage("Home"), + "shuaxin" : MessageLookupByLibrary.simpleMessage("Refresh"), + "shuaxinchenggong" : MessageLookupByLibrary.simpleMessage("Refresh succeeded"), + "shuaxinshibai" : MessageLookupByLibrary.simpleMessage("Refresh failed"), + "shuaxinyue" : MessageLookupByLibrary.simpleMessage("Refresh Balance"), + "shuaxinzhong" : MessageLookupByLibrary.simpleMessage("Refreshing...."), + "shurushouhuorendizhi" : MessageLookupByLibrary.simpleMessage("Please enter the consignee address"), + "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("Enter payment password"), + "sui" : m31, + "tebieshengming" : MessageLookupByLibrary.simpleMessage("Special statement"), + "tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("Special offer area"), + "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("Add a new secondary card"), + "tianjifuka" : MessageLookupByLibrary.simpleMessage("Add a new sub card"), + "tiantiandefuli" : MessageLookupByLibrary.simpleMessage("get benefits every day"), + "tiantianlingjifen" : MessageLookupByLibrary.simpleMessage("Earn points every day"), + "tijiao" : MessageLookupByLibrary.simpleMessage("Submit"), + "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("Submitted successfully"), + "tingchewei" : MessageLookupByLibrary.simpleMessage("Parking space"), + "tixian" : MessageLookupByLibrary.simpleMessage("Withdrawal"), + "tongyibingjixu" : MessageLookupByLibrary.simpleMessage("Agree and Continue"), + "tongzhi" : MessageLookupByLibrary.simpleMessage("Notification"), + "tongzhitishixinxi" : MessageLookupByLibrary.simpleMessage("In order that you can receive our activity information in time, it is recommended that you open the receipt of notifications when using HISAPP"), + "toushuxuzhi" : MessageLookupByLibrary.simpleMessage("Instructions for Submission"), + "touxiang" : MessageLookupByLibrary.simpleMessage("avatar"), + "tuichudenglu" : MessageLookupByLibrary.simpleMessage("Log out"), + "tuiguangma" : MessageLookupByLibrary.simpleMessage("Promotion code"), + "tuikuan" : MessageLookupByLibrary.simpleMessage("Refund"), + "waimai" : MessageLookupByLibrary.simpleMessage("take away"), + "waimaipeisong" : MessageLookupByLibrary.simpleMessage("delivery"), + "waisong" : MessageLookupByLibrary.simpleMessage("sending out"), + "wancheng" : MessageLookupByLibrary.simpleMessage("finish"), + "wancheng_" : m32, + "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("Place an order once"), + "wanjiankang" : MessageLookupByLibrary.simpleMessage("Play healthy"), + "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("Automatically generated after improving birthday information"), + "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("Exclusive coupon for improving birthday information"), + "weidenglu" : MessageLookupByLibrary.simpleMessage("not logged in"), + "weidengluxinxi" : MessageLookupByLibrary.simpleMessage("Click login to enjoy more wonderful information"), + "weihexiao" : MessageLookupByLibrary.simpleMessage("Unwritten off"), + "weikaiqi" : MessageLookupByLibrary.simpleMessage("Not open"), + "weilegeiningenghaodefuwu" : MessageLookupByLibrary.simpleMessage("In order to provide you with better services and enjoy more wonderful information, please log in during use"), + "weilejishishoudaohuodongxiaoxi" : MessageLookupByLibrary.simpleMessage("In order that you can receive our activity information in time, please open the message notification permission"), + "weilekaipaizhaoxuanzhetouxiang" : MessageLookupByLibrary.simpleMessage("In order to change your avatar during use, please open the camera permission"), + "weilexiangnintuijianfujindemendianxinxi" : MessageLookupByLibrary.simpleMessage("In order to recommend the nearby store information to you, we recommend that you let us use the location information during the use"), + "weilexuanzhezhaopianhuancun" : MessageLookupByLibrary.simpleMessage("It is recommended that you open the storage permission during use in order to obtain photo usage, caching and other functions"), + "weiwancheng" : MessageLookupByLibrary.simpleMessage(" Incomplete "), + "weixinzhifu" : MessageLookupByLibrary.simpleMessage("WeChat payment"), + "weizhitishixinxi" : MessageLookupByLibrary.simpleMessage("In order to recommend the nearby store information to you, we recommend that you let us use the location information when using HISAPP"), + "wentijian" : MessageLookupByLibrary.simpleMessage("Problem piece"), + "wenzhang" : MessageLookupByLibrary.simpleMessage("Article"), + "wenzhangxiangqing" : MessageLookupByLibrary.simpleMessage("Article Details"), + "wenzhangzhuanlan" : MessageLookupByLibrary.simpleMessage("Article Column"), + "weulingqu" : MessageLookupByLibrary.simpleMessage("Unclaimed"), + "wodechengjiu" : MessageLookupByLibrary.simpleMessage("My achievements"), + "wodedingdan" : MessageLookupByLibrary.simpleMessage("My order"), + "wodedongtai" : MessageLookupByLibrary.simpleMessage("My dynamic"), + "wodegongju" : MessageLookupByLibrary.simpleMessage("My tools"), + "wodehuiyuandengji" : MessageLookupByLibrary.simpleMessage("My membership level"), + "wodejifenzhi" : MessageLookupByLibrary.simpleMessage("My integral value"), + "wodekanjia" : MessageLookupByLibrary.simpleMessage("My bargain"), + "wodekaquan" : MessageLookupByLibrary.simpleMessage("My card coupon"), + "wodenianling" : MessageLookupByLibrary.simpleMessage("my age"), + "wodepintuan" : MessageLookupByLibrary.simpleMessage("My Group"), + "wodeqianbao" : MessageLookupByLibrary.simpleMessage("My wallet"), + "wodeshengri" : MessageLookupByLibrary.simpleMessage("My birthday"), + "wodexiaoxi" : MessageLookupByLibrary.simpleMessage("My Message"), + "wodeyaoqingma" : MessageLookupByLibrary.simpleMessage("My invitation code"), + "woyouyaoqingma" : MessageLookupByLibrary.simpleMessage("I have an invitation code"), + "wuliudanhao" : MessageLookupByLibrary.simpleMessage("Logistics Doc No:"), + "wuliugongsi" : MessageLookupByLibrary.simpleMessage("Logistics company:"), + "wuliuxinxi" : MessageLookupByLibrary.simpleMessage("Logistics Information"), + "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("Logistics status:"), + "xiadanshijian" : MessageLookupByLibrary.simpleMessage("Order placement time"), + "xiadanshijian_" : m33, + "xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("Place an order to earn points"), + "xialashuaxin" : MessageLookupByLibrary.simpleMessage("Pull down Refresh"), + "xiangce" : MessageLookupByLibrary.simpleMessage("album"), + "xiangji" : MessageLookupByLibrary.simpleMessage("camera"), + "xiangjitishixinxi" : MessageLookupByLibrary.simpleMessage("For you to share in the process of using, I hope you can let us use the camera function when using HISAPP"), + "xiangqing" : MessageLookupByLibrary.simpleMessage("universal"), + "xiangxidizhi" : MessageLookupByLibrary.simpleMessage("Detailed Address"), + "xianshangfafang" : MessageLookupByLibrary.simpleMessage("online distribution"), + "xianshangshiyong" : MessageLookupByLibrary.simpleMessage("online use"), + "xianxiashiyong" : MessageLookupByLibrary.simpleMessage("offline use"), + "xiaofei" : MessageLookupByLibrary.simpleMessage("consumption"), + "xiaofeijifen" : MessageLookupByLibrary.simpleMessage("Consumption Points"), + "xiaofeijilu" : MessageLookupByLibrary.simpleMessage("Consumption Record"), + "xiaoxi" : MessageLookupByLibrary.simpleMessage("Messages"), + "xiayidengji" : MessageLookupByLibrary.simpleMessage("Next Level"), + "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("Loading completed"), + "xiedongtai" : MessageLookupByLibrary.simpleMessage("Write dynamic"), + "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("privacy policy for returning home users"), + "xihuan_" : m34, + "xindianhuodong" : MessageLookupByLibrary.simpleMessage("Star Store Activity"), + "xingming" : MessageLookupByLibrary.simpleMessage("name"), + "xitongtongzhi" : MessageLookupByLibrary.simpleMessage("System Notification"), + "xitongxiaoxi" : MessageLookupByLibrary.simpleMessage("System Messages"), + "xiugaichenggong" : MessageLookupByLibrary.simpleMessage("Modification succeeded"), + "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("Modify User Name"), + "xuanguige" : MessageLookupByLibrary.simpleMessage("Select specification"), + "xuanji" : MessageLookupByLibrary.simpleMessage("Selection"), + "xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("Renewal member"), + "xuexijiankang" : MessageLookupByLibrary.simpleMessage("Learning Health"), + "xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("Renewal Home VIP"), + "xuni" : MessageLookupByLibrary.simpleMessage("virtual"), + "yanzhengma" : MessageLookupByLibrary.simpleMessage("verification code"), + "yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("Invite friends"), + "yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("Invite friends to score"), + "yaoqingrenshoujihao_" : m35, + "yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("Invitation completed"), + "yibangfuka" : MessageLookupByLibrary.simpleMessage("bound sub card"), + "yiduihuan" : MessageLookupByLibrary.simpleMessage("redeemed"), + "yiduihuanjian" : m36, + "yifahuo" : MessageLookupByLibrary.simpleMessage("Shipped"), + "yiguanzhu" : MessageLookupByLibrary.simpleMessage("Followed"), + "yihuide" : MessageLookupByLibrary.simpleMessage("acquired"), + "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("Called rider"), + "yikaitongzidongxufei" : MessageLookupByLibrary.simpleMessage("Automatic renewal has been activated"), + "yikexiao" : MessageLookupByLibrary.simpleMessage("Written off"), + "yilingqu" : MessageLookupByLibrary.simpleMessage("claimed"), + "yindao1" : MessageLookupByLibrary.simpleMessage("New multiple functions, real-time push of massive preferential information"), + "yindao2" : MessageLookupByLibrary.simpleMessage("Many new functions have been added, and there are many discounts for using the platform wallet, as well as recharging privileges"), + "yindao3" : MessageLookupByLibrary.simpleMessage("Points will be obtained for new member tasks, and green gold and points store will be exchanged for consumption"), + "yindao4" : MessageLookupByLibrary.simpleMessage("pass on the idea of friendship, purity, health, organic and environmental protection"), + "yindaoye1" : MessageLookupByLibrary.simpleMessage("Members\' latest information is the first to see"), + "yindaoye2" : MessageLookupByLibrary.simpleMessage("New Group Alliance Store Members Order Meals"), + "yindaoye3" : MessageLookupByLibrary.simpleMessage("Member activity zone"), + "yindaoye4" : MessageLookupByLibrary.simpleMessage("Live a healthy and organic life"), + "yingyeshijian" : m37, + "yinkahuiyuan" : MessageLookupByLibrary.simpleMessage("Silver card member"), + "yinshi" : MessageLookupByLibrary.simpleMessage("diet"), + "yinsishengming" : MessageLookupByLibrary.simpleMessage("Privacy Statement"), + "yinsixieyi" : MessageLookupByLibrary.simpleMessage("《Privacy Agreement》"), + "yinsizhengce1" : MessageLookupByLibrary.simpleMessage(" Thank you for using the Home bound APP. We attach great importance to your personal information and privacy protection. In order to better ensure your personal rights and interests, before you use our products, please carefully read"), + "yinsizhengce2" : MessageLookupByLibrary.simpleMessage("     With your consent, we will collect some possible data (geographic location, camera, storage and other information) according to your use needs。"), + "yiqiandao" : MessageLookupByLibrary.simpleMessage("Signed in"), + "yiqianshou" : MessageLookupByLibrary.simpleMessage("Signed in"), + "yiquxiao" : MessageLookupByLibrary.simpleMessage(" Canceled "), + "yishijiao" : MessageLookupByLibrary.simpleMessage("Expired"), + "yishiming" : MessageLookupByLibrary.simpleMessage("already real name"), + "yishixiao" : MessageLookupByLibrary.simpleMessage("Expired"), + "yishiyong" : MessageLookupByLibrary.simpleMessage("used"), + "yishouquan" : MessageLookupByLibrary.simpleMessage("authorized"), + "yisongda" : MessageLookupByLibrary.simpleMessage("Delivered"), + "yituikuan" : MessageLookupByLibrary.simpleMessage("Refunded"), + "yiwancheng" : MessageLookupByLibrary.simpleMessage(" Completed "), + "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("Completed Order"), + "yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("Member benefits enjoyed"), + "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("- All comments displayed-"), + "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("going back home with one heart"), + "yiyoujifen" : MessageLookupByLibrary.simpleMessage("Existing Points"), + "yizhifu" : MessageLookupByLibrary.simpleMessage("Paid"), + "yonghuming" : MessageLookupByLibrary.simpleMessage("User name"), + "yonghuxiaofeijifen" : MessageLookupByLibrary.simpleMessage("The user can get 1 point for every 1 yuan spent。"), + "youhuiquan" : MessageLookupByLibrary.simpleMessage("coupon"), + "youhuiquanlingqu" : MessageLookupByLibrary.simpleMessage("coupon collection"), + "youhuiquanwufajileijifen" : MessageLookupByLibrary.simpleMessage("The preferential amount cannot accumulate points, and the corresponding points cannot be obtained for orders that are not successfully paid due to order cancellation or other reasons。"), + "youkedenglu" : MessageLookupByLibrary.simpleMessage("Visitor login"), + "youxiaoqi" : m38, + "youxiaoqixian" : MessageLookupByLibrary.simpleMessage("Valid Period:"), + "youxiaoqizhi" : m39, + "yuan" : MessageLookupByLibrary.simpleMessage("yuan"), + "yuan_" : m40, + "yuanjia" : MessageLookupByLibrary.simpleMessage("original price"), + "yue" : MessageLookupByLibrary.simpleMessage("Balance"), + "yue_" : m41, + "yue__" : m42, + "yuemingxi" : MessageLookupByLibrary.simpleMessage("Balance Details"), + "yuliudianhua" : MessageLookupByLibrary.simpleMessage("Reserved telephone"), + "yunfei" : MessageLookupByLibrary.simpleMessage("Freight"), + "yuyan" : MessageLookupByLibrary.simpleMessage("Language"), + "zailaiyidan" : MessageLookupByLibrary.simpleMessage("Another order"), + "zaituzhong" : MessageLookupByLibrary.simpleMessage("In transit"), + "zaixiankefu" : MessageLookupByLibrary.simpleMessage("Online Customer Service"), + "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("Online ordering is not supported temporarily"), + "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("Not yet unlocked"), + "zanweikaifang" : MessageLookupByLibrary.simpleMessage("Not yet open"), + "zanweikaitong" : MessageLookupByLibrary.simpleMessage("Not yet open"), + "zanwupinglun" : MessageLookupByLibrary.simpleMessage("No comment, please comment"), + "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("Temporary wireless shopping"), + "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("There are no coupons to receive"), + "zhanghaoanquan" : MessageLookupByLibrary.simpleMessage("Account security"), + "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("Account Authorization"), + "zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("Account Information"), + "zhanghaoyuanquan" : MessageLookupByLibrary.simpleMessage("Account and Security"), + "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("Account cancellation instructions"), + "zhanghuyue" : MessageLookupByLibrary.simpleMessage("Account Balance"), + "zhankai" : MessageLookupByLibrary.simpleMessage("Expand"), + "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("Calling the rider"), + "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("Loading"), + "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("Shipping"), + "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("Loading..."), + "zhidianmendian" : MessageLookupByLibrary.simpleMessage("Call the store"), + "zhifubao" : MessageLookupByLibrary.simpleMessage("Alipay"), + "zhifubaozhifu" : MessageLookupByLibrary.simpleMessage("Alipay payment"), + "zhifufangshi" : MessageLookupByLibrary.simpleMessage("Payment Method"), + "zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("Payment Details"), + "zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("Supreme Member"), + "zhizuowancheng" : MessageLookupByLibrary.simpleMessage("Making completed"), + "zhongchakan" : MessageLookupByLibrary.simpleMessage("View in"), + "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("Simplified Chinese"), + "zhuanlan" : MessageLookupByLibrary.simpleMessage("Column"), + "zhuanxiangyouhuiquan" : MessageLookupByLibrary.simpleMessage("Exclusive coupon"), + "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("Reminder again: After the account is logged off, it cannot be recovered, and relevant data and information will be permanently deleted。"), + "ziqu" : MessageLookupByLibrary.simpleMessage("self fetching"), + "ziti" : MessageLookupByLibrary.simpleMessage("Self mention"), + "zitidizhi" : MessageLookupByLibrary.simpleMessage("Self lifting address"), + "zitiduihuanquan" : MessageLookupByLibrary.simpleMessage("Coupon type：self withdrawal exchange coupon"), + "zitishijian" : MessageLookupByLibrary.simpleMessage("Self mention time"), + "zongzichan" : MessageLookupByLibrary.simpleMessage("Total assets"), + "zongzichanyuan" : MessageLookupByLibrary.simpleMessage("Total assets (元)"), + "zuanshihuiyuan" : MessageLookupByLibrary.simpleMessage("Diamond Member"), + "zuixinwenzhang" : MessageLookupByLibrary.simpleMessage("Latest Articles"), + "zuorenwudejifen" : MessageLookupByLibrary.simpleMessage("Score points for doing tasks"), + "zuozhe" : m43 + }; +} diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart index a2c8c6e8..1e9e3396 100644 --- a/lib/generated/intl/messages_zh_CN.dart +++ b/lib/generated/intl/messages_zh_CN.dart @@ -122,6 +122,7 @@ class MessageLookup extends MessageLookupByLibrary { "beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张"), "beizhu" : MessageLookupByLibrary.simpleMessage("备注"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"), + "benzhouquanbao" : MessageLookupByLibrary.simpleMessage("本周券包"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"), "bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("编辑个人资料"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"), @@ -219,6 +220,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanquan" : MessageLookupByLibrary.simpleMessage("兑换券"), "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"), "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), + "duozhongyouhui" : MessageLookupByLibrary.simpleMessage("多种优惠券等你拿"), "fabu" : MessageLookupByLibrary.simpleMessage("发布"), "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"), "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"), @@ -243,10 +245,12 @@ class MessageLookup extends MessageLookupByLibrary { "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), + "fuliduihuan" : MessageLookupByLibrary.simpleMessage("福利兑换"), "fulizhongxin" : MessageLookupByLibrary.simpleMessage("福利中心"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), + "gengduohaoquan" : MessageLookupByLibrary.simpleMessage("更多好券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"), "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"), "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), @@ -263,6 +267,7 @@ class MessageLookup extends MessageLookupByLibrary { "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanyu" : MessageLookupByLibrary.simpleMessage("关于"), + "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"), "guanyuhuixiang" : MessageLookupByLibrary.simpleMessage("关于回乡"), "guanzhu" : MessageLookupByLibrary.simpleMessage("关注"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), @@ -293,6 +298,7 @@ class MessageLookup extends MessageLookupByLibrary { "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuanka" : MessageLookupByLibrary.simpleMessage("会员卡"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"), + "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("会员权益"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"), "huiyuanzhuanxiangjiage" : MessageLookupByLibrary.simpleMessage("会员专享价格"), @@ -327,7 +333,9 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"), + "jifenhuanquan" : MessageLookupByLibrary.simpleMessage("积分换券"), + "jifenmingxi" : MessageLookupByLibrary.simpleMessage("积分明细"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"), @@ -363,8 +371,10 @@ class MessageLookup extends MessageLookupByLibrary { "kongtiao" : MessageLookupByLibrary.simpleMessage("空调"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快递"), "kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"), + "lianxikefu" : MessageLookupByLibrary.simpleMessage("联系客服"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), + "liaojie" : MessageLookupByLibrary.simpleMessage("了解"), "liaojiejiankang" : MessageLookupByLibrary.simpleMessage("了解健康"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), @@ -392,12 +402,15 @@ class MessageLookup extends MessageLookupByLibrary { "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), + "main_menu5" : MessageLookupByLibrary.simpleMessage("回乡VIP"), "manlijiandaijinquan" : m19, "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), + "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每周三更新"), + "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每周三更新劵包"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"), "mi" : m21, @@ -463,6 +476,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingzhuo" : MessageLookupByLibrary.simpleMessage("清桌"), "qishoupeisongzhongyujisongdashijian" : MessageLookupByLibrary.simpleMessage("骑手配送中,预计送达时间"), "qishouyijiedanquhuozhong" : MessageLookupByLibrary.simpleMessage("骑手已接单、取货中"), + "qita" : MessageLookupByLibrary.simpleMessage("其他"), "quanbao" : MessageLookupByLibrary.simpleMessage("券包"), "quanbu" : MessageLookupByLibrary.simpleMessage("全部"), "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"), @@ -516,6 +530,7 @@ class MessageLookup extends MessageLookupByLibrary { "send_code" : MessageLookupByLibrary.simpleMessage("发送验证码"), "shanchu" : MessageLookupByLibrary.simpleMessage("删除"), "shanchudingdan" : MessageLookupByLibrary.simpleMessage("删除一单"), + "shanghuruzhu" : MessageLookupByLibrary.simpleMessage("商户入驻"), "shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"), "shangjiaqueren" : MessageLookupByLibrary.simpleMessage("商家确认"), "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"), @@ -546,6 +561,7 @@ class MessageLookup extends MessageLookupByLibrary { "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人详细地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("请输入收货人姓名"), "shoujihao" : MessageLookupByLibrary.simpleMessage("手机号"), + "shouqi" : MessageLookupByLibrary.simpleMessage("收起"), "shouye" : MessageLookupByLibrary.simpleMessage("首页"), "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"), "shuaxinchenggong" : MessageLookupByLibrary.simpleMessage("刷新成功"), @@ -560,6 +576,7 @@ class MessageLookup extends MessageLookupByLibrary { "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tiantiandefuli" : MessageLookupByLibrary.simpleMessage("天天得福利"), + "tiantianlingjifen" : MessageLookupByLibrary.simpleMessage("天天领积分"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), @@ -652,7 +669,9 @@ class MessageLookup extends MessageLookupByLibrary { "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"), "yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀请好友"), + "yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀请好友得分"), "yaoqingrenshoujihao_" : m35, + "yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), "yiduihuanjian" : m36, @@ -720,14 +739,17 @@ class MessageLookup extends MessageLookupByLibrary { "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"), "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("暂未解锁"), "zanweikaifang" : MessageLookupByLibrary.simpleMessage("暂未开放"), + "zanweikaitong" : MessageLookupByLibrary.simpleMessage("暂未开通"), "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暂无评论，快来评论吧"), "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暂无线上门店"), "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"), "zhanghaoanquan" : MessageLookupByLibrary.simpleMessage("账号安全"), "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"), + "zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("账号信息"), "zhanghaoyuanquan" : MessageLookupByLibrary.simpleMessage("账号与安全"), "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("账号注销说明"), "zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"), + "zhankai" : MessageLookupByLibrary.simpleMessage("展开"), "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"), "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"), "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"), diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart index 5bb80892..3cd4851f 100644 --- a/lib/generated/intl/messages_zh_Hans_CN.dart +++ b/lib/generated/intl/messages_zh_Hans_CN.dart @@ -122,6 +122,7 @@ class MessageLookup extends MessageLookupByLibrary { "beiyaoqingdejiangli" : MessageLookupByLibrary.simpleMessage("每一位被邀请的用户,在输入邀请码之后可获得前进麦味10元代金券一张"), "beizhu" : MessageLookupByLibrary.simpleMessage("备注"), "beizhuxinxi" : MessageLookupByLibrary.simpleMessage("备注信息"), + "benzhouquanbao" : MessageLookupByLibrary.simpleMessage("本周券包"), "bianjidizhi" : MessageLookupByLibrary.simpleMessage("编辑地址"), "bianjigerenziliao" : MessageLookupByLibrary.simpleMessage("编辑个人资料"), "biaojiweiyidu" : MessageLookupByLibrary.simpleMessage("标为已读"), @@ -219,6 +220,7 @@ class MessageLookup extends MessageLookupByLibrary { "duihuanquan" : MessageLookupByLibrary.simpleMessage("兑换券"), "duihuanshangpinxiangqing" : MessageLookupByLibrary.simpleMessage("兑换商品详情"), "duihuanxinxi" : MessageLookupByLibrary.simpleMessage("兑换信息"), + "duozhongyouhui" : MessageLookupByLibrary.simpleMessage("多种优惠券等你拿"), "fabu" : MessageLookupByLibrary.simpleMessage("发布"), "fangshier" : MessageLookupByLibrary.simpleMessage("方式二"), "fangshiyi" : MessageLookupByLibrary.simpleMessage("方式一"), @@ -243,10 +245,12 @@ class MessageLookup extends MessageLookupByLibrary { "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友，对方在一心回乡App登录页输入邀请码，即可邀请成功。"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), + "fuliduihuan" : MessageLookupByLibrary.simpleMessage("福利兑换"), "fulizhongxin" : MessageLookupByLibrary.simpleMessage("福利中心"), "ge" : m5, "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"), + "gengduohaoquan" : MessageLookupByLibrary.simpleMessage("更多好券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"), "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"), "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), @@ -263,6 +267,7 @@ class MessageLookup extends MessageLookupByLibrary { "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanyu" : MessageLookupByLibrary.simpleMessage("关于"), + "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"), "guanyuhuixiang" : MessageLookupByLibrary.simpleMessage("关于回乡"), "guanzhu" : MessageLookupByLibrary.simpleMessage("关注"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), @@ -293,6 +298,7 @@ class MessageLookup extends MessageLookupByLibrary { "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuanka" : MessageLookupByLibrary.simpleMessage("会员卡"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"), + "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("会员权益"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"), "huiyuanzhuanxiangjiage" : MessageLookupByLibrary.simpleMessage("会员专享价格"), @@ -327,7 +333,9 @@ class MessageLookup extends MessageLookupByLibrary { "jifendejisuanshuoming" : MessageLookupByLibrary.simpleMessage("积分的计算说明"), "jifendidaogao" : MessageLookupByLibrary.simpleMessage("积分从低到高"), "jifengaodaodi" : MessageLookupByLibrary.simpleMessage("积分从高到低"), - "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("净弼积分商城"), + "jifenhuanquan" : MessageLookupByLibrary.simpleMessage("积分换券"), + "jifenmingxi" : MessageLookupByLibrary.simpleMessage("积分明细"), + "jifenshangcheng" : MessageLookupByLibrary.simpleMessage("积分商城"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"), @@ -363,8 +371,10 @@ class MessageLookup extends MessageLookupByLibrary { "kongtiao" : MessageLookupByLibrary.simpleMessage("空调"), "kuaidi" : MessageLookupByLibrary.simpleMessage("快递"), "kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"), + "lianxikefu" : MessageLookupByLibrary.simpleMessage("联系客服"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), + "liaojie" : MessageLookupByLibrary.simpleMessage("了解"), "liaojiejiankang" : MessageLookupByLibrary.simpleMessage("了解健康"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), @@ -392,12 +402,15 @@ class MessageLookup extends MessageLookupByLibrary { "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"), "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"), "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"), + "main_menu5" : MessageLookupByLibrary.simpleMessage("回乡VIP"), "manlijiandaijinquan" : m19, "manyuankeyong" : m20, "meiriqiandao" : MessageLookupByLibrary.simpleMessage("每日签到"), "meiyougengduohuiyuanka" : MessageLookupByLibrary.simpleMessage("没有更多会员卡"), "meiyougengduoshujule" : MessageLookupByLibrary.simpleMessage("没有更多的数据了"), "meiyougengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("没有更多优惠券了"), + "meizhousangengxin" : MessageLookupByLibrary.simpleMessage("每周三更新"), + "meizhousanquanbao" : MessageLookupByLibrary.simpleMessage("每周三更新劵包"), "mendianxuanzhe" : MessageLookupByLibrary.simpleMessage("门店选择"), "menpaihao" : MessageLookupByLibrary.simpleMessage("请输入门牌号"), "mi" : m21, @@ -463,6 +476,7 @@ class MessageLookup extends MessageLookupByLibrary { "qingzhuo" : MessageLookupByLibrary.simpleMessage("清桌"), "qishoupeisongzhongyujisongdashijian" : MessageLookupByLibrary.simpleMessage("骑手配送中,预计送达时间"), "qishouyijiedanquhuozhong" : MessageLookupByLibrary.simpleMessage("骑手已接单、取货中"), + "qita" : MessageLookupByLibrary.simpleMessage("其他"), "quanbao" : MessageLookupByLibrary.simpleMessage("券包"), "quanbu" : MessageLookupByLibrary.simpleMessage("全部"), "quanbudingdan" : MessageLookupByLibrary.simpleMessage("全部订单"), @@ -516,6 +530,7 @@ class MessageLookup extends MessageLookupByLibrary { "send_code" : MessageLookupByLibrary.simpleMessage("发送验证码"), "shanchu" : MessageLookupByLibrary.simpleMessage("删除"), "shanchudingdan" : MessageLookupByLibrary.simpleMessage("删除一单"), + "shanghuruzhu" : MessageLookupByLibrary.simpleMessage("商户入驻"), "shangjiaquan" : MessageLookupByLibrary.simpleMessage("商家券"), "shangjiaqueren" : MessageLookupByLibrary.simpleMessage("商家确认"), "shangjiayifahuo" : MessageLookupByLibrary.simpleMessage("商家已发货"), @@ -546,6 +561,7 @@ class MessageLookup extends MessageLookupByLibrary { "shouhuorenxiangxidizhi" : MessageLookupByLibrary.simpleMessage("请输入收货人详细地址"), "shouhuorenxingming" : MessageLookupByLibrary.simpleMessage("请输入收货人姓名"), "shoujihao" : MessageLookupByLibrary.simpleMessage("手机号"), + "shouqi" : MessageLookupByLibrary.simpleMessage("收起"), "shouye" : MessageLookupByLibrary.simpleMessage("首页"), "shuaxin" : MessageLookupByLibrary.simpleMessage("刷新"), "shuaxinchenggong" : MessageLookupByLibrary.simpleMessage("刷新成功"), @@ -560,6 +576,7 @@ class MessageLookup extends MessageLookupByLibrary { "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tiantiandefuli" : MessageLookupByLibrary.simpleMessage("天天得福利"), + "tiantianlingjifen" : MessageLookupByLibrary.simpleMessage("天天领积分"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), @@ -652,7 +669,9 @@ class MessageLookup extends MessageLookupByLibrary { "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"), "yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀请好友"), + "yaoqinghaoyoudefen" : MessageLookupByLibrary.simpleMessage("邀请好友得分"), "yaoqingrenshoujihao_" : m35, + "yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), "yiduihuanjian" : m36, @@ -720,14 +739,17 @@ class MessageLookup extends MessageLookupByLibrary { "zanbuzhichixianshangdiancan" : MessageLookupByLibrary.simpleMessage("暂不支持线上点餐"), "zanweijiesuo" : MessageLookupByLibrary.simpleMessage("暂未解锁"), "zanweikaifang" : MessageLookupByLibrary.simpleMessage("暂未开放"), + "zanweikaitong" : MessageLookupByLibrary.simpleMessage("暂未开通"), "zanwupinglun" : MessageLookupByLibrary.simpleMessage("暂无评论，快来评论吧"), "zanwuxianshangjindian" : MessageLookupByLibrary.simpleMessage("暂无线上门店"), "zanwuyouhuiquankelingqu" : MessageLookupByLibrary.simpleMessage("暂无优惠券可领取"), "zhanghaoanquan" : MessageLookupByLibrary.simpleMessage("账号安全"), "zhanghaoshouquan" : MessageLookupByLibrary.simpleMessage("账号授权"), + "zhanghaoxinxi" : MessageLookupByLibrary.simpleMessage("账号信息"), "zhanghaoyuanquan" : MessageLookupByLibrary.simpleMessage("账号与安全"), "zhanghaozhuxiaoshuoming" : MessageLookupByLibrary.simpleMessage("账号注销说明"), "zhanghuyue" : MessageLookupByLibrary.simpleMessage("账户余额"), + "zhankai" : MessageLookupByLibrary.simpleMessage("展开"), "zhengzaihujiaoqishou" : MessageLookupByLibrary.simpleMessage("正在呼叫骑手"), "zhengzaijiazai" : MessageLookupByLibrary.simpleMessage("正在加载"), "zhengzaipeisong" : MessageLookupByLibrary.simpleMessage("正在配送"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index fc4560a1..1af72d1c 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -205,6 +205,16 @@ class S { ); } + /// `回乡VIP` + String get main_menu5 { + return Intl.message( + '回乡VIP', + name: 'main_menu5', + desc: '', + args: [], + ); + } + /// `首页` String get shouye { return Intl.message( @@ -225,10 +235,10 @@ class S { ); } - /// `净弼积分商城` + /// `积分商城` String get jifenshangcheng { return Intl.message( - '净弼积分商城', + '积分商城', name: 'jifenshangcheng', desc: '', args: [], @@ -6535,6 +6545,166 @@ class S { ); } + /// `更多好券` + String get gengduohaoquan { + return Intl.message( + '更多好券', + name: 'gengduohaoquan', + desc: '', + args: [], + ); + } + + /// `了解` + String get liaojie { + return Intl.message( + '了解', + name: 'liaojie', + desc: '', + args: [], + ); + } + + /// `本周券包` + String get benzhouquanbao { + return Intl.message( + '本周券包', + name: 'benzhouquanbao', + desc: '', + args: [], + ); + } + + /// `每周三更新劵包` + String get meizhousanquanbao { + return Intl.message( + '每周三更新劵包', + name: 'meizhousanquanbao', + desc: '', + args: [], + ); + } + + /// `邀请好友得分` + String get yaoqinghaoyoudefen { + return Intl.message( + '邀请好友得分', + name: 'yaoqinghaoyoudefen', + desc: '', + args: [], + ); + } + + /// `积分换券` + String get jifenhuanquan { + return Intl.message( + '积分换券', + name: 'jifenhuanquan', + desc: '', + args: [], + ); + } + + /// `多种优惠券等你拿` + String get duozhongyouhui { + return Intl.message( + '多种优惠券等你拿', + name: 'duozhongyouhui', + desc: '', + args: [], + ); + } + + /// `福利兑换` + String get fuliduihuan { + return Intl.message( + '福利兑换', + name: 'fuliduihuan', + desc: '', + args: [], + ); + } + + /// `积分明细` + String get jifenmingxi { + return Intl.message( + '积分明细', + name: 'jifenmingxi', + desc: '', + args: [], + ); + } + + /// `每周三更新` + String get meizhousangengxin { + return Intl.message( + '每周三更新', + name: 'meizhousangengxin', + desc: '', + args: [], + ); + } + + /// `其他` + String get qita { + return Intl.message( + '其他', + name: 'qita', + desc: '', + args: [], + ); + } + + /// `商户入驻` + String get shanghuruzhu { + return Intl.message( + '商户入驻', + name: 'shanghuruzhu', + desc: '', + args: [], + ); + } + + /// `联系客服` + String get lianxikefu { + return Intl.message( + '联系客服', + name: 'lianxikefu', + desc: '', + args: [], + ); + } + + /// `展开` + String get zhankai { + return Intl.message( + '展开', + name: 'zhankai', + desc: '', + args: [], + ); + } + + /// `收起` + String get shouqi { + return Intl.message( + '收起', + name: 'shouqi', + desc: '', + args: [], + ); + } + + /// `天天领积分` + String get tiantianlingjifen { + return Intl.message( + '天天领积分', + name: 'tiantianlingjifen', + desc: '', + args: [], + ); + } + /// `并使用本机号码登录` String get privacy_policy4 { return Intl.message( @@ -6552,6 +6722,7 @@ class AppLocalizationDelegate extends LocalizationsDelegate { List get supportedLocales { return const [ Locale.fromSubtags(languageCode: 'en'), + Locale.fromSubtags(languageCode: 'en', countryCode: 'US'), Locale.fromSubtags(languageCode: 'zh', countryCode: 'CN'), Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hans', countryCode: 'CN'), Locale.fromSubtags(languageCode: 'zh', scriptCode: 'Hant', countryCode: 'CN'), diff --git a/lib/home/guide_page.dart b/lib/home/guide_page.dart index 59d39ead..55c6ea59 100644 --- a/lib/home/guide_page.dart +++ b/lib/home/guide_page.dart @@ -414,7 +414,9 @@ class _GuidePage extends State { showDialog( context: context, builder: (BuildContext context) { - return SimpleDialog( + return WillPopScope( + onWillPop: () async => false, + child:SimpleDialog( titlePadding: EdgeInsets.all(10), backgroundColor: Colors.transparent, elevation: 0, @@ -558,7 +560,7 @@ class _GuidePage extends State { ], ) ], - ); + )); }, ); } diff --git a/lib/home/home_page.dart b/lib/home/home_page.dart index 35baf6ed..60eb1e46 100644 --- a/lib/home/home_page.dart +++ b/lib/home/home_page.dart @@ -566,7 +566,7 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { ), ), SizedBox( - height: 76.h, + height: 80.h, ), ], ); @@ -587,7 +587,7 @@ class HomePageState extends State with AutomaticKeepAliveClientMixin { "assets/image/welfare_spread.webp", width:double.infinity, fit: BoxFit.fill, - height:80.h, + height:double.infinity, ), borderRadius: BorderRadius.circular(6.w), ), diff --git a/lib/home/home_view/discount_zone.dart b/lib/home/home_view/discount_zone.dart index b4bb9dd9..1f5c7c66 100644 --- a/lib/home/home_view/discount_zone.dart +++ b/lib/home/home_view/discount_zone.dart @@ -35,7 +35,8 @@ class _DiscountZone extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ - Padding(padding: EdgeInsets.symmetric(horizontal: 14.w),child: Row( + Padding(padding: EdgeInsets.symmetric(horizontal: 14.w), + child: Row( children: [ Expanded(child: Text( S.of(context).tehuizhuanqu, @@ -50,7 +51,7 @@ class _DiscountZone extends State { Navigator.of(context).pushNamed('/router/welfare_page'); }, child: Text( - "更多好券", + S.of(context).gengduohaoquan, style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, @@ -103,37 +104,25 @@ class _DiscountZone extends State { flex: 2, child: Container( margin: EdgeInsets.only(top: 12.h,bottom: 12.h,left: 20.w,right: 27.w), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - (coupon != null ? coupon.couponName ?? "" : ""), - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 14.sp, - height: 1.5.h, - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF32A060), - ), - ), - ], + child:Text( + (coupon != null ? coupon.couponName ?? "" : ""), + maxLines: 2, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 14.sp, + height: 1.5.h, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF32A060), + ), ), )), Expanded( flex: 1, child:Container( margin: EdgeInsets.only(top: 12.h,bottom: 12.h), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Expanded(child: Container( - padding: EdgeInsets.only(right: 5.w), - child:discountWidget(coupon), - )), - ], + child: Container( + padding: EdgeInsets.only(right: 5.w), + child:discountWidget(coupon), ), )), ], @@ -242,76 +231,64 @@ class _DiscountZone extends State { ], ); } else if (coupon.bizType == 6) { - return Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.baseline, - textBaseline: TextBaseline.alphabetic, - children: [ - Text( - "¥", - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.medium, - color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF32A060), - ), - ), - SizedBox( - height: 4.h, + return Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + Text( + "¥", + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.medium, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF32A060), ), - Text( - coupon != null - ? "${AppUtils.calculateDouble(double.tryParse(coupon.limitAmount) ?? 0)}" - : "", - style: TextStyle( - fontSize: 28.sp, - fontWeight: FontWeight.w900, - color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF32A060), - ), + ), + SizedBox( + height: 4.h, + ), + Text( + coupon != null + ? "${AppUtils.calculateDouble(double.tryParse(coupon.limitAmount) ?? 0)}" + : "", + style: TextStyle( + fontSize: 28.sp, + fontWeight: FontWeight.w900, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF32A060), ), - ], - ), - ], - ); + ), + ], + ); }else{ - return Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.baseline, - textBaseline: TextBaseline.alphabetic, - children: [ - Text( - coupon != null - ? "${(coupon.discountPercent / 10.0 >= 10) ? 10 : coupon.discountPercent / 10.0}" ?? - "0" - : "", - style: TextStyle( - fontSize: 30.sp, - fontWeight: FontWeight.w900, - color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF32A060), - ), - ), - SizedBox( - height: 4.h, + return Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.baseline, + textBaseline: TextBaseline.alphabetic, + children: [ + Text( + coupon != null + ? "${(coupon.discountPercent / 10.0 >= 10) ? 10 : coupon.discountPercent / 10.0}" ?? + "0" + : "", + style: TextStyle( + fontSize: 30.sp, + fontWeight: FontWeight.w900, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF32A060), ), - Text( - "折", - style: TextStyle( - fontSize: 14.sp, - fontWeight: MyFontWeight.semi_bold, - color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF32A060), - ), + ), + SizedBox( + height: 4.h, + ), + Text( + "折", + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.semi_bold, + color: coupon.status == 3 ? Color(0xFFB3B3B3):Color(0xFF32A060), ), - ], - ), - ], - ); + ), + ], + ); } } diff --git a/lib/home/home_view/featured_acticvity.dart b/lib/home/home_view/featured_acticvity.dart index a8eed347..bdc0c314 100644 --- a/lib/home/home_view/featured_acticvity.dart +++ b/lib/home/home_view/featured_acticvity.dart @@ -216,7 +216,7 @@ class _FeaturedActivity extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - "了解", + S.of(context).liaojie, style: TextStyle( fontSize: 10.sp, fontWeight: MyFontWeight.medium, diff --git a/lib/home/home_view/home_recommend_goods.dart b/lib/home/home_view/home_recommend_goods.dart index aa876b8c..b40825e2 100644 --- a/lib/home/home_view/home_recommend_goods.dart +++ b/lib/home/home_view/home_recommend_goods.dart @@ -35,41 +35,32 @@ class _HomeRecommendGoods extends State { @override Widget build(BuildContext context) { return Container( - width: double.infinity, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Container( - height: 240.h, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(6), - color: Colors.white, - ), - margin: EdgeInsets.only( - left: 14.w, right: 14.w, top: 14.h, bottom: 14.h), - child: ListView.builder( - scrollDirection: Axis.horizontal, - physics: BouncingScrollPhysics(), - itemCount: widget.homeRank?.commodityZone?.length ?? 0, - itemBuilder: (context, position) { - return GestureDetector( - onTap: () { - Navigator.of(context).pushNamed( - '/router/store_order', - arguments: { - "id": widget.homeRank.commodityZone[position].storeId, - "tenant": widget.homeRank.commodityZone[position].tenantCode, - "storeName": "" - }, - ); - }, - child: recommendGoodsItem(widget.homeRank?.commodityZone[position]), - ); - }, - ), - ), - ], + height: 240.h, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(6), + color: Colors.white, + ), + margin: EdgeInsets.only( + left: 14.w, right: 14.w, top: 14.h, bottom: 14.h), + child: ListView.builder( + scrollDirection: Axis.horizontal, + physics: BouncingScrollPhysics(), + itemCount: widget.homeRank?.commodityZone?.length ?? 0, + itemBuilder: (context, position) { + return GestureDetector( + onTap: () { + Navigator.of(context).pushNamed( + '/router/store_order', + arguments: { + "id": widget.homeRank.commodityZone[position].storeId, + "tenant": widget.homeRank.commodityZone[position].tenantCode, + "storeName": "" + }, + ); + }, + child: recommendGoodsItem(widget.homeRank?.commodityZone[position]), + ); + }, ), ); } @@ -82,24 +73,20 @@ class _HomeRecommendGoods extends State { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Stack( - children: [ - Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4.r), - ), - child: MImage( - commodityZone?.productImg ?? "", - fit: BoxFit.contain, - radius: BorderRadius.circular(4.r), - width: 158.w, - height: 158.h, - errorSrc: "assets/image/default_2_1.webp", - fadeSrc: "assets/image/default_2_1.webp", - ), - ), - ], + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4.r), + ), + child: MImage( + commodityZone?.productImg ?? "", + fit: BoxFit.contain, + radius: BorderRadius.circular(4.r), + width: 158.w, + height: 158.h, + errorSrc: "assets/image/default_2_1.webp", + fadeSrc: "assets/image/default_2_1.webp", ), + ), SizedBox( height: 8.h, ), @@ -124,7 +111,8 @@ class _HomeRecommendGoods extends State { "¥${AppUtils.calculateDouble(double.tryParse(commodityZone?.price) ?? 0)}", style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.medium, + fontFamily: 'JDZhengHT', color: Color(0xFFF85400), ), ), @@ -135,6 +123,7 @@ class _HomeRecommendGoods extends State { fontSize: 10.sp, decoration: TextDecoration.lineThrough, fontWeight: MyFontWeight.regular, + fontFamily: 'JDZhengHT', color: Color(0xFFB3B3B3), ), ), diff --git a/lib/home/home_view/top_selling_list.dart b/lib/home/home_view/top_selling_list.dart index 3219cf2c..fa4b1ac9 100644 --- a/lib/home/home_view/top_selling_list.dart +++ b/lib/home/home_view/top_selling_list.dart @@ -185,7 +185,8 @@ class _TopSellingList extends State { "¥${AppUtils.calculateDouble(double.tryParse(goodList?.price) ?? 0)}", style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.medium, + fontFamily: 'JDZhengHT', color: Color(0xFF0D0D0D), ), ), @@ -195,6 +196,7 @@ class _TopSellingList extends State { style: TextStyle( fontSize: 10.sp, decoration: TextDecoration.lineThrough, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.regular, color: Color(0xFF4D4D4D), ), diff --git a/lib/home/home_view/welfare_core.dart b/lib/home/home_view/welfare_core.dart index 4059a318..8952a5b3 100644 --- a/lib/home/home_view/welfare_core.dart +++ b/lib/home/home_view/welfare_core.dart @@ -82,7 +82,7 @@ class _WelfareCore extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - "本周劵包", + S.of(context).benzhouquanbao, style: TextStyle( fontSize: 14.sp, fontWeight: MyFontWeight.regular, @@ -91,7 +91,7 @@ class _WelfareCore extends State { ), SizedBox(height:5.h), Text( - "每周三更新劵包", + S.of(context).meizhousanquanbao, style: TextStyle( fontSize: 11.sp, fontWeight: MyFontWeight.regular, @@ -130,7 +130,7 @@ class _WelfareCore extends State { ), SizedBox(height:5.h), Text( - "邀请好友得分", + S.of(context).yaoqinghaoyoudefen, style: TextStyle( fontSize: 11.sp, fontWeight: MyFontWeight.regular, @@ -160,7 +160,7 @@ class _WelfareCore extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Text( - "积分换券", + S.of(context).jifenhuanquan, style: TextStyle( fontSize: 14.sp, fontWeight: MyFontWeight.regular, @@ -169,7 +169,7 @@ class _WelfareCore extends State { ), SizedBox(height:5.h), Text( - "多种优惠券等你拿", + S.of(context).duozhongyouhui, style: TextStyle( fontSize: 11.sp, fontWeight: MyFontWeight.regular, diff --git a/lib/home/points_mall_view/points_goods_title.dart b/lib/home/points_mall_view/points_goods_title.dart index f8a46de0..bd1513ee 100644 --- a/lib/home/points_mall_view/points_goods_title.dart +++ b/lib/home/points_mall_view/points_goods_title.dart @@ -48,7 +48,7 @@ class _PointsGoodsTitle extends State // imgPath: "assets/image/icon_points_mall.webp", // ), ItemTitle( - text: "积分商城", + text: S.of(context).jifenshangcheng, // imgPath: "assets/image/icon_points_mall.webp", moreText: _itemText, moreType: 1, diff --git a/lib/home/points_mall_view/points_goods_view.dart b/lib/home/points_mall_view/points_goods_view.dart index c7d83001..18ae03d2 100644 --- a/lib/home/points_mall_view/points_goods_view.dart +++ b/lib/home/points_mall_view/points_goods_view.dart @@ -158,6 +158,7 @@ class _PointGoods extends State { style: TextStyle( color: Color(0xFFE5600D), fontSize: 15.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.semi_bold, ), ), diff --git a/lib/home/welfare_exchange.dart b/lib/home/welfare_exchange.dart index 5623627d..6a7743e9 100644 --- a/lib/home/welfare_exchange.dart +++ b/lib/home/welfare_exchange.dart @@ -174,7 +174,7 @@ class _WelfareExchange extends State with SingleTickerProvider backgroundColor: Colors.white, elevation: 0, title: Text( - "福利兑换", + S.of(context).fuliduihuan, style: TextStyle(fontWeight: FontWeight.w500, color: Colors.white), ), @@ -381,7 +381,7 @@ class _WelfareExchange extends State with SingleTickerProvider child: Row( children: [ Text( - "积分明细", + S.of(context).jifenmingxi, style: TextStyle( fontSize: 14.sp, fontWeight: MyFontWeight.medium, @@ -415,6 +415,7 @@ class _WelfareExchange extends State with SingleTickerProvider style: TextStyle( fontSize: 16.sp, color: Color(0xFF32A060), + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.medium, ), ), @@ -546,6 +547,7 @@ class _WelfareExchange extends State with SingleTickerProvider maxLines: 2, style: TextStyle( color: Color(0xFFE5600D), + fontFamily: 'JDZhengHT', fontSize: 16.sp, fontWeight: MyFontWeight.semi_bold, ), diff --git a/lib/home/welfare_page.dart b/lib/home/welfare_page.dart index 38c345ca..94633c35 100644 --- a/lib/home/welfare_page.dart +++ b/lib/home/welfare_page.dart @@ -253,7 +253,7 @@ class _WelfarePage extends State { ), ), Text( - "每周三上新 ", + S.of(context).meizhousangengxin, style: TextStyle( color: Color(0xFF4D4D4D), fontSize: 12.sp, @@ -384,9 +384,7 @@ class _WelfarePage extends State { // mainAxisAlignment: MainAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.end, children: [ - Expanded(child: Container( - child:weekWidget(cop), - )), + Expanded(child: weekWidget(cop)), Container( margin: EdgeInsets.only(bottom: 12), child: weekBtn(cop), @@ -733,7 +731,7 @@ class _WelfarePage extends State { children: [ Expanded(child: Text( - "福利兑换", + S.of(context).fuliduihuan, style: TextStyle( fontSize: 15.sp, fontWeight: MyFontWeight.bold, @@ -867,6 +865,7 @@ class _WelfarePage extends State { style: TextStyle( color: Color(0xFFE5600D), fontSize: 16.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.semi_bold, ), ), diff --git a/lib/integral_store/integral_store_details_page.dart b/lib/integral_store/integral_store_details_page.dart index f81d31af..8ad55829 100644 --- a/lib/integral_store/integral_store_details_page.dart +++ b/lib/integral_store/integral_store_details_page.dart @@ -94,112 +94,110 @@ class _IntegralStoreDetailsPage extends State { @override Widget build(BuildContext context) { return Scaffold( - body: Container( - child: Column( - children: [ - Expanded( - child: SmartRefresher( - controller: refreshController, - enablePullDown: true, - enablePullUp: false, - header: MyHeader(), - footer: CustomFooter( - builder: (context, mode) { - return MyFooter(mode); - }, - ), - onRefresh:(){ - setState(() { - queryGoodsById(); - }); + body: Column( + children: [ + Expanded( + child: SmartRefresher( + controller: refreshController, + enablePullDown: true, + enablePullUp: false, + header: MyHeader(), + footer: CustomFooter( + builder: (context, mode) { + return MyFooter(mode); }, - physics: BouncingScrollPhysics(), - scrollController: scrollController, - child: Container( - child: SingleChildScrollView( - physics: BouncingScrollPhysics(), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - buildProduct(), - Column( - children: [ + ), + onRefresh:(){ + setState(() { + queryGoodsById(); + }); + }, + physics: BouncingScrollPhysics(), + scrollController: scrollController, + child: Container( + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + buildProduct(), + Column( + children: [ + Container( + padding: EdgeInsets.fromLTRB(16.w, 32.h, 16.w, 16.h), + margin: EdgeInsets.only(top: 16.h), + color: Colors.white, + width: double.infinity, + child: Text( + S.of(context).duihuanguize, + style: TextStyle( + fontWeight: MyFontWeight.semi_bold, + fontSize: 15.sp, + color: Color(0xFF000000), + ), + ), + ), + if (goods?.detail != null && + goods.detail != "") Container( - padding: EdgeInsets.fromLTRB(16.w, 32.h, 16.w, 16.h), - margin: EdgeInsets.only(top: 16.h), color: Colors.white, - width: double.infinity, - child: Text( - S.of(context).duihuanguize, - style: TextStyle( - fontWeight: MyFontWeight.semi_bold, - fontSize: 15.sp, - color: Color(0xFF000000), - ), + padding: EdgeInsets.only(bottom: 40.h), + child: Html( + data: goods?.detail??"", + customImageRenders: { + networkSourceMatcher(): networkImageRender( + loadingWidget: () { + return Container(); + }, + ), + }, ), ), - if (goods?.detail != null && - goods.detail != "") - Container( - color: Colors.white, - padding: EdgeInsets.only(bottom: 40.h), - child: Html( - data: goods?.detail??"", - customImageRenders: { - networkSourceMatcher(): networkImageRender( - loadingWidget: () { - return Container(); - }, - ), - }, - ), - ), - ], - ) - ], - ), + ], + ) + ], ), ), ), - flex: 1, ), - GestureDetector( - onTap: () { - if(payType > 0){ - toExchangeOrder(); - }else{ - SmartDialog.showToast("您的积分不足!", alignment: Alignment.center); - return; - } - }, - child: Container( - padding: EdgeInsets.only(top: 16.h, bottom: 16.h), - margin: EdgeInsets.only(bottom:25.h,left:20,right: 20), - decoration: BoxDecoration( - color: (payType > 0) - ? Color(0xFF32A060) - : Color(0xFFD8D8D8), - borderRadius: BorderRadius.circular( - 45 - ), + flex: 1, + ), + GestureDetector( + onTap: () { + if(payType > 0){ + toExchangeOrder(); + }else{ + SmartDialog.showToast("您的积分不足!", alignment: Alignment.center); + return; + } + }, + child: Container( + padding: EdgeInsets.only(top: 16.h, bottom: 16.h), + margin: EdgeInsets.only(bottom:25.h,left:20,right: 20), + decoration: BoxDecoration( + color: (payType > 0) + ? Color(0xFF32A060) + : Color(0xFFD8D8D8), + borderRadius: BorderRadius.circular( + 45 ), - alignment: Alignment.center, - child: Text( - (payType > 0) - ? "立即兑换" - : S.of(context).jifenbuzu, - // "兑换功能暂未开放", - style: TextStyle( - fontSize: 16.sp, - color: Color(0xFFFFFFFF), - fontWeight: MyFontWeight.semi_bold, - ), + ), + alignment: Alignment.center, + child: Text( + (payType > 0) + ? "立即兑换" + : S.of(context).jifenbuzu, + // "兑换功能暂未开放", + style: TextStyle( + fontSize: 16.sp, + color: Color(0xFFFFFFFF), + fontWeight: MyFontWeight.semi_bold, ), ), - ) - ], - ), + ), + ) + ], ), ); } diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 5404d653..b670c2f2 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -16,6 +16,7 @@ "main_menu2": "联盟", "main_menu3": "有机生活", "main_menu4": "我的", + "main_menu5":"回乡VIP", "shouye": "首页", "huodongliebiao": "活动列表", "jifenshangcheng": "净弼积分商城", @@ -586,9 +587,6 @@ "xuanji": "选集", "wodekanjia": "我的砍价", "wodepintuan": "我的拼团", - - - "bofangcishu": "播放次数", "jiangshi" : "讲师", "quedingyaoshanchudongtai": "确定要删除这条动态？", @@ -681,9 +679,23 @@ "likezhifu":"立刻支付", "zhifubaozhifu":"支付宝支付", "gengyouhui":"更优惠", - - - + "gengduohaoquan":"更多好券", + "liaojie":"了解", + "benzhouquanbao":"本周券包", + "meizhousanquanbao":"每周三更新劵包", + "yaoqinghaoyoudefen":"邀请好友得分", + "jifenhuanquan":"积分换券", + "duozhongyouhui":"多种优惠券等你拿", + "jifenshangcheng":"积分商城", + "fuliduihuan":"福利兑换", + "jifenmingxi":"积分明细", + "meizhousangengxin":"每周三更新", + "qita":"其他", + "shanghuruzhu":"商户入驻", + "lianxikefu":"联系客服", + "zhankai":"展开", + "shouqi":"收起", + "tiantianlingjifen":"天天领积分", diff --git a/lib/l10n/intl_en_US.arb b/lib/l10n/intl_en_US.arb new file mode 100644 index 00000000..191e3243 --- /dev/null +++ b/lib/l10n/intl_en_US.arb @@ -0,0 +1,706 @@ +{ + "login_splash": "Welcome Back Home", + "input_phone": "Enter the phone number", + "input_code": "Mobile phone verification code", + "input_phone_hide": "Please enter your mobile number", + "input_code_hide": "Please enter the verification code", + "login": "login", + "send_code": "Send verification code", + "resend_in_seconds": "{second}s and then resend", + "phone_error": "Wrong phone format", + "code_error": "Wrong input of verification code", + "privacy_policy1": "Login Agreed", + "privacy_policy2": "《Service Agreement for Returning Home with One Heart》", + "privacy_policy3": "《privacy Services》", + "main_menu1": "Jing Bi", + "main_menu2": "Union", + "main_menu3": "Organic Life", + "main_menu4": "Me", + "main_menu5":"Homecoming VIP", + "shouye": "Home", + "huodongliebiao": "Activity List", + "jifenshangcheng": "Jingbi Point Mall", + "jinrihuiyuanrenwu": "Today's Member Task", + "renwuzhongxin": "Task Center", + "qiandaolingqujinfen": "Sign in to receive points", + "quqiandao": "Sign in", + "youhuiquanlingqu": "coupon collection", + "gengduoyouhuiquan": "more coupons", + "lingqu": "Receive", + "pinpaijieshao": "Brand Introduction", + "jingbilianmenghuiyuandian": "Jingbi League Member Store", + "gongli": "{km}km", + "manlijiandaijinquan": "full{man}yuan Lijian{jian}yuan coupons", + "ren": "¥{ren}/person", + "youxiaoqizhi": "Valid until {date}", + "huodongjinxingzhong": "Activity in Progress", + "yiyoujifen": "Existing Points", + "morenpaixu": "Default sort", + "duihuanlianggaodaodi": "From high to low exchange volume", + "duihuanliangdidaogao": "From low to high exchange volume", + "jifengaodaodi": "Integral from high to low", + "jifendidaogao": "From low to high", + "yiduihuanjian": "{jian}pieces redeemed", + "yuan_": "{yuan}yuan", + "jifen_": "{jifen}integral", + "jifenxiangqing": "Points Details", + "dangqiandengji": "Current Level", + "jifendaoxiayidengji": "{jifen}Integrate to the next level", + "kaitongriqi": "Opening date:{date}", + "kabao": "card bag", + "dingdan": "Order", + "ninyouyigedingdanyaolingqu": "You need to go to the store to get an order", + "wodeqianbao": "My wallet", + "fapiaozhushou": "Invoice Assistant", + "zaixiankefu": "Online Customer Service", + "shezhi": "Settings", + "youhuiquan": "coupon", + "bangzhuyufankui": "Help and Feedback", + "shiyongriqi": "Use Date", + "keyongyouhuiquan": "Available Coupons", + "yishixiao": "Expired", + "quanbudingdan": "All Orders", + "weiwancheng": " Incomplete ", + "yingyeshijian": "Business hours: {time}", + "yiwancheng": " Completed ", + "yiquxiao": " Canceled ", + "jiesuanjine": "Settlement Amount", + "quzhifu": "To pay", + "xiadanshijian": "Order placement time", + "jinxingzhongdedingdan": "Orders in Progress", + "ziqu": "self fetching", + "waisong": "sending out", + "qingzaiguidingshijianneizhifu": "Please complete the payment within the specified time", + "quxiaodingdan": "Please complete the payment within the specified time", + "jixuzhifu": "Continue to pay", + "ge": "{ge}g/piece", + "peisongfei": "Delivery fee", + "huodongjianmianpeisongfei": "Event relief{yuan}yuan distribution fee", + "shoujihao": "mobile phone number", + "beizhu": "Remarks", + "fapiao": "Invoice", + "yue": "Balance", + "buzhichikaipiao": "Invoicing is not supported", + "qingshurubeizhuyaoqiu": "Please enter the note requirements", + "qingshuruzhifumima": "Please enter the payment password", + "shuruzhifumima": "Enter payment password", + "zhanghuyue": "Account Balance", + "keyongyue": "Available Balance", + "shuaxinyue": "Refresh Balance", + "chongzhi": "Recharge", + "tixian": "Withdrawal", + "yishijiao": "Expired", + "lishijilu": "History", + "yue_": "Balance {yue}", + "duihuanlishi": "Exchange History", + "quanbuduihuan": "Exchange All", + "weulingqu": "Unclaimed", + "keshiyong": "available", + "qushiyong": "To use", + "yikexiao": "Written off", + "chuangjianshijian": "Creation time{time}", + "yiduihuan": "redeemed", + "zitidizhi": "Self lifting address", + "zitishijian": "Self mention time", + "feishiwuduihuanma": "Non physical exchange code", + "shangpinjifen": "Product credit {jifen}credit", + "shifujifen": "Paid in integral {jifen}integral", + "shanchudingdan": "Delete Order", + "dingwei": "Positioning", + "weikaiqi": "Not open", + "tongzhi": "Notification", + "xiangji": "camera", + "quanxianshezhi": "Permission Settings", + "weizhitishixinxi": "In order to recommend the nearby store information to you, we recommend that you let us use the location information when using HISAPP", + "tongzhitishixinxi": "In order that you can receive our activity information in time, it is recommended that you open the receipt of notifications when using HISAPP", + "xiangjitishixinxi": "For you to share in the process of using, I hope you can let us use the camera function when using HISAPP", + "cunchutishixinxi": "It is recommended that you open the storage permission during use in order to obtain photo usage, caching and other functions", + "cunchu": "Storage", + "wodejifenzhi": "My integral value", + "mingxi": "Details", + "qiandaolingjifen": "Sign in to receive points", + "lianxuqiandaolingqushuangbeijifen": "Sign in continuously to receive double points", + "shenmijifendali": "Mysterious integral gift", + "lijiqiandao": "Sign in immediately", + "zuorenwudejifen": "Score points for doing tasks", + "meiriqiandao": "Sign in every day", + "wanchengyicixiadan": "Place an order once", + "ricahngfenxiang": "Daily sharing", + "wancheng_": "Finish{num}", + "quwancheng": " To complete ", + "huode": "get", + "xiaofei": "consumption", + "qiandao": "Sign in", + "huiyuandengjishuoming": "Member Level Description", + "wodehuiyuandengji": "My membership level", + "chenggongdengluzhuce": "You can become a member by successfully logging in and registering and binding relevant information。", + "huiyuandengji": "Membership Level", + "jifen": "Integral", + "qingtonghuiyuan": "Bronze Member", + "baiyinhuiyuan": "Silver Member", + "huangjinhuiyuan": "Golden Member", + "zuanshihuiyuan": "Diamond Member", + "zhizunhuiyuan": "Supreme Member", + "jifendejisuanshuoming": "Calculation description of integral", + "yonghuxiaofeijifen": "The user can get 1 point for every 1 yuan spent。", + "youhuiquanwufajileijifen": "The preferential amount cannot accumulate points, and the corresponding points cannot be obtained for orders that are not successfully paid due to order cancellation or other reasons。", + "zhanghaoxinxi": "Account Information", + "gerenxinxi": "Personal Information", + "touxiang": "avatar", + "yonghuming": "User name", + "shimingrenzheng": "Real name authentication", + "zhanghaoshouquan": "Account Authorization", + "yuyan": "Language", + "zhongwenjianti": "Simplified Chinese", + "quanxian": "Permissions", + "tuichudenglu": "Log out", + "xiaoxi": "Messages", + "huodongzixun": "Activity information", + "wodexiaoxi": "My Message", + "xitongxiaoxi": "System Messages", + "ninyouyigexindedingdan": "You have a new order", + "chakangengduo": "See more", + "qujianma": "Picking Code", + "dingdanhao": "Order No", + "xiadanshijian_": "Ordering time:{time}", + "peisongfuwu": "Ordering time", + "diancan": "Order a meal", + "xindianhuodong": "Star Store Activity", + "tingchewei": "Parking space", + "kongtiao": "Air conditioner", + "lijicanjia": "Join now", + "hexiaomaxiangqing": "Write off Code Details", + "hexiaochenggong": "Write off succeeded", + "dangqianshangpinduihuanhexiaoma": "The current commodity exchange write off code has been written off", + "fanhuiduihuanlishi": "Return to exchange history", + "weihexiao": "Unwritten off", + "shiyongtiaojian": "Use Conditions", + "shiyongshuoming": "Instructions for Use", + "qianwanghuixiangmendianduihuanhexiao": "Go to any store under Yixin Huixiang and show the commodity exchange code to the staff. After verification, you can get the corresponding commodity", + "zitiduihuanquan": "Coupon type：self withdrawal exchange coupon", + "huixiangrenyimendian": "For：Any store dedicated to returning home", + "mendianxuanzhe": "Store Selection", + "queren": "Confirm", + "zhifuxiangqing": "Payment Details", + "duihuanchenggong": "Successful exchange", + "xiaofeijifen": "Consumption Points", + "keyongjifen": "Available Points", + "jixuduihuan": "Continue to exchange", + "lingqudaokabao": "Get the card bag", + "dingdanqueren": "Order confirmation", + "duihuanxinxi": "Exchange information", + "lingqufangshi": "Collection Method", + "ziti": "Self mention", + "qingxuanzhemendian": "Please select a store", + "duihuanhouwugegongzuori": "You can go to the store five working days after the exchange", + "duihuanshangpinxiangqing": "Details of exchanged goods", + "querenduihuan": "Confirm exchange", + "yiwanchengdingdan": "Completed Order", + "shixiaoquan": "Invalid coupon", + "wenzhangxiangqing": "Article Details", + "shouhuodizhi1": "Delivery address", + "yishiming": "already real name", + "chakanshixiaoquan": "View invalid coupons", + "meiyougengduoyouhuiquan": "No more coupons", + "shixiaoyouhuiquan": "Invalid coupon", + "xitongtongzhi": "System Notification", + "wancheng": "finish", + "duihuanguize": "Exchange Rules", + "duihuan": "exchange", + "fantizhongwen": "Traditional Chinese", + "qingxuanzheninxiangshezhideyuyan": "Please select the language you want to set", + "quxiao": "Cancel", + "brand_yixinhuixiang": "going back home with one heart", + "bainianchuanjiao": "Hundred year Sichuan Pepper", + "haixiajiemei": "Straits Sister", + "qianjinmaiwei": "Qianjin Maiwei", + "pinpai": "brand", + "qingshurushoujihao": "Please enter your mobile number", + "qingshuruyanzhengma": "Please enter the verification code", + "gouxuanxieyi": "Please check the agreement on privacy service and return home service", + "qingshuruchongzhijine": "Enter recharge amount (yuan)", + "chongzhizuixiaojine": "The minimum recharge amount is {yuan}", + "remenwenzhangshipin": "Popular article videos", + "remenwenzhangshipinliebiao": "Popular article video list", + "chuangshirendegushi": "The story of the founder -", + "chuangshirendegushi1": "The Founder's Story", + "wodeshengri": "My birthday", + "wodenianling": "my age", + "sui": "{sui}years old", + "wanshanshengrixinxi_yhq": "Exclusive coupon for improving birthday information", + "wanshanshengrixinxi_nl": "Automatically generated after improving birthday information", + "zhifufangshi": "Payment Method", + "zhifubao": "Alipay", + "weixinzhifu": "WeChat payment", + "querenchongzhi": "Confirm Recharging", + "peisong": "Delivery", + "keyongquan": "Available vouchers", + "xuni": "virtual", + "qingxuanzeshouhuodizhi": "Please select the shipping address", + "feishiwushangpin": "After exchanging non physical goods, you can use the coupon！", + "duihuanhoufahuo": "Delivery within five working days after exchange", + "xianshangfafang": "online distribution", + "lingqushijian": "Picking time {shijian}", + "faxingshijian": "Publishing start time {shijian}", + "chakanwodekabao": "Check my card bag", + "mi": "{mi}meters", + "xialashuaxin": "Pull down Refresh", + "shifangshuaxin": "Release Refresh", + "shuaxinzhong": "Refreshing....", + "shuaxinchenggong": "Refresh succeeded", + "shuaxinshibai": "Refresh failed", + "zuozhe": "Author:{zuozhe}", + "quanchangzhe": "full{zhe}folding", + "shanglajiazai": "pull-up loading", + "jiazaishibai": "Loading failed", + "shifangjiazaigengduo": "Release Load More", + "meiyougengduoshujule": "No more data", + "shangpinxiangqing": "Product Details", + "kaiqiquanxian": "Open Permission", + "meiyougengduohuiyuanka": "No more membership cards", + "huiyuankaxiangqing": "Membership card details", + "yuemingxi": "Balance Details", + "kelingqudeyouhuiquan": "Coupons available", + "shangjiaquan": "merchant coupon", + "manyuankeyong": "full {man}yuan available", + "jifen": "Integral", + "chakanwodekaquan": "Check my card coupon", + "guanyu": "About", + "linian": "concept", + "jingbilianmenghuiyuandian": "Jingbi League Member Store", + "kaquan": "card coupon", + "wodekaquan": "My card coupon", + "guanlidizhi": "Management Address", + "lingquanzhongxin": "Coupon Collection Center", + "lianxishoujihao": "Contact phone number", + "shangjiaquan": "merchant coupon", + "manyuankeyong": "full {yuan}available", + "tijiao": "Submit", + "changjianwenti": "Frequently Asked Questions", + "fankui": "Feedback", + "quxiaozhifu": "Cancel Payment", + "daifukuan": "To be paid", + "quanbu": "All", + "wuliuxinxi": "Logistics Information", + "huiyuankaxiangqing": "Membership card details", + "meiyougengduohuiyuanka": "No more membership cards", + "yuemingxi": "Balance Details", + "chakanwodekaquan": "Check my card coupon", + "kelingqudeyouhuiquan": "Coupons available", + "dangqiandengji": "Current Level", + "xiayidengji": "Next Level", + "daoxiayidengji": "To the next level", + "kaitongriqi": "Opening date:{date}", + "yiqiandao": "Signed in", + "quanchangtongyong": "universal", + "xiangqing": "universal", + "yishiyong": "used", + "zanbuzhichixianshangdiancan": "Online ordering is not supported temporarily", + "dakaidingwei": "Open Positioning", + "dianjikaiqiquanxian": "You have not opened the location permission, please click Open", + "queding": "OK", + "qingxuanzeshiyongmendian": "Please select a store to use", + "daizhifu": "to be paid", + "yizhifu": "Paid", + "daiqueren": "to be confirmed", + "shangjiaqueren": "Merchant confirmation", + "qingzhuo": "clearing the table", + "tuikuan": "Refund", + "daizhizuo": "to be made", + "zhizuowancheng": "Making completed", + "daipeisong": "to be delivered", + "yihujiaoqishou": "Called rider", + "quhuozhong": "Picking", + "yisongda": "Delivered", + "yifahuo": "Shipped", + "peisongzhong": "Shipping", + "yixinhuixiang": "going back home with one heart", + "guojiankangyoujishenghuo": "Live a healthy and organic life", + "banben": "Version:{version}", + "waimai": "take away", + "kuaidi": "express", + "shenqingtuikuan": "Apply for refund", + "zailaiyidan": "Another order", + "gongjijianshangpin": "common{jian} items in total", + "dingdanyiwancheng": "The order has been completed ", + "peisongfangshi": "Delivery Method", + "dingdandaizhifu": "Order to be paid", + "dingdanyizhifu": "The order has been paid", + "shangjiazhengzaipeican": "The merchant is preparing meals", + "dengdaiyonghuqucan": "Waiting for the user to pick up the meal", + "qucanhao": "Picking number", + "dingdanyiwancheng": "The order has been completed", + "dingdanyituikuan": "The order has been refunded", + "zhengzaihujiaoqishou": "Calling the rider", + "qishouyijiedanquhuozhong": "The rider has received the order and is picking up goods", + "qishoupeisongzhongyujisongdashijian": "The rider is in delivery, and the estimated delivery time", + "dingdanyisongda": "Order delivery", + "dingdanyiwancheng": "The order has been completed", + "dingdandaizhifu": "Order to be paid", + "dingdanyizhifu": "The order has been paid", + "shangjiayifahuo": "Merchant has delivered goods", + "huopinyisongda": "The goods have been delivered", + "zhengzaipeisong": "Shipping", + "daiqucan": "To be picked up", + "yituikuan": "Refunded", + "querenshouhuo": "Confirm receipt", + "chakanwuliu": "View Logistics", + "zailaiyidan": "Another order", + "shanchudingdan": "Delete a single order", + "qudanhao": "Retrieval No{num}", + "lingquchenggong": "Claim succeeded", + "dianwolingqu": "Click me to get it", + "chengweidianpuzhuanshuhuiyuan": "Become an exclusive member of the store and enjoy exclusive rights", + "yinsishengming": "Privacy Statement", + "dangqianbanben": "Current Version", + "tebieshengming": "Special statement", + "shiyongbangzhu": "Using Help", + "geiwopingfen": "Rate me", + "yilingqu": "claimed", + "yinsizhengce": "Privacy Policy", + "heji": "Total:", + "yuan": "yuan", + "gong": "total", + "jian": "piece", + "nindingweigongnengweikaiqi": "Your positioning function switch is not turned on, please click to turn on positioning", + "nindingweiquanxianweiyunxu": "You have not opened the location permission, please click OK to apply for permission", + "weilexiangnintuijianfujindemendianxinxi": "In order to recommend the nearby store information to you, we recommend that you let us use the location information during the use", + "ninxiaoxiquanxianweikaiqi": "You have not enabled the message notification permission, please click Enable", + "ninxiangjiquanxianweikaiqi": "You have not opened the camera permission, please click", + "nincunchuquanxianweikaiqi": "You have not opened the storage permission, please click", + "weilejishishoudaohuodongxiaoxi": "In order that you can receive our activity information in time, please open the message notification permission", + "weilekaipaizhaoxuanzhetouxiang": "In order to change your avatar during use, please open the camera permission", + "weilexuanzhezhaopianhuancun": "It is recommended that you open the storage permission during use in order to obtain photo usage, caching and other functions", + "dengdaishangjiaqueren": "Wait for the merchant's confirmation", + "dingdandaifahuo": "Order to be shipped", + "gengduo": "more", + "jituanchuangbanren": " Founder of the Group", + "zhengzaijiazai": "Loading", + "quantian": "all day", + "yunfei": "Freight", + "jiesuan": "Settlement", + "qinglihuancun": "Clear Cache", + "guanyuchuangshiren": "About the Founder", + "chaungshirengushi": "Founder's story", + "jituanchuangshiren": "Founder of the Group", + "jianjie": "Introduction:{jianjie}", + "zhengzaixiazaizhong": "Loading...", + "qingxuanzeyigemendian": "Please select a store", + "muqianzanwuxingdianhuodong": "At present, there is no star store activity", + "zanwuyouhuiquankelingqu": "There are no coupons to receive", + "huiyuanjifen": "Member Points", + "huiyuanyue": "Member Balance", + "gongxinichengweibendianhuiyuan": "Congratulations, you have become a member of our store. Go and enjoy the super many member rights。", + "ninweidenglu": "You are not logged in, please click to log in", + "weilegeiningenghaodefuwu": "In order to provide you with better services and enjoy more wonderful information, please log in during use", + "qudenglu": "Log in", + "denglu": "Login", + "dianjidenglu": "Click login to enjoy more wonderful information", + "weidenglu": "not logged in", + "youkedenglu": "Visitor login", + "yishouquan": "authorized", + "qingshuruchongzhijine": "Please enter the recharge amount", + "yinshi": "diet", + "shenghuoyule": "life entertainment", + "bangong": "Office", + "fenxiangdao": "Share to", + "jifenbuzu": "Your points are insufficient", + "haowu": "good things", + "huixiangtoutiao": "Homecoming Headlines", + "shangyidengji": "Previous Level", + "bodadianhua": "Make a call", + "genghuantouxiang": "Changing the avatar", + "paizhao": "Take a picture", + "xiangce": "album", + "xianxiashiyong": "offline use", + "xianshangshiyong": "online use", + "duihuanquan": "exchange coupon", + "quhexiao": "De write off", + "biaojiweiyidu": "Mark as Read", + "xitongtongzhi": "System Notification", + "dingdanxiaoxi": "Order Message", + "chongzhixiaoxi": "recharge message", + "shuaxin": "Refresh", + "lijichongzhi": "Recharge Now", + "nihaimeiyouchongzhihuoxiaofeijilu": "You have no consumption or recharge records here～", + "haimeiyouxiaoxi": "No message～", + "chakanxiangqing": "View Details", + "xieyitanchuang": "privacy policy for returning home users", + "yinsixieyi": "《Privacy Agreement》", + "shiyongmendian": "Applicable stores", + "tongyibingjixu": "Agree and Continue", + "jujue": "Reject", + "yinsizhengce1": " Thank you for using the Home bound APP. We attach great importance to your personal information and privacy protection. In order to better ensure your personal rights and interests, before you use our products, please carefully read", + "yinsizhengce2": "     With your consent, we will collect some possible data (geographic location, camera, storage and other information) according to your use needs。", + "chengshixuanze": "City Selection", + "bianjidizhi": "Edit Address", + "xingming": "name", + "qingtianxiexingming": "Please fill in the recipient's name", + "dianhua": "Telephone", + "qingtianxieshoujihao": "Please fill in the recipient's mobile number", + "dizhi": "Address", + "shouhuodizhi": "Please enter the detailed receiving address", + "xiangxidizhi": "Detailed Address", + "menpaihao": "Please enter the house number", + "baocun": "Save", + "shouhuorenxingming": "Please enter the name of the consignee", + "shouhuorenshoujihao": "Please enter the receiver's mobile phone number", + "shurushouhuorendizhi": "Please enter the consignee address", + "shouhuorenxiangxidizhi": "Please enter the detailed address of the consignee", + "baocunchenggong": "Saving succeeded", + "xiugaichenggong": "Modification succeeded", + "yindaoye1": "Members' latest information is the first to see", + "yindao1": "New multiple functions, real-time push of massive preferential information", + "yindaoye2": "New Group Alliance Store Members Order Meals", + "yindao2": "Many new functions have been added, and there are many discounts for using the platform wallet, as well as recharging privileges", + "yindaoye3": "Member activity zone", + "yindao3": "Points will be obtained for new member tasks, and green gold and points store will be exchanged for consumption", + "yindaoye4": "Live a healthy and organic life", + "yindao4": "pass on the idea of friendship, purity, health, organic and environmental protection", + "lijitiyan": "Experience Now", + "denglu": "Login", + "weidengluxinxi": "Click login to enjoy more wonderful information", + "huiyuanka": "Membership Card", + "quanbao": "coupon package", + "youxiaoqi": "Validity:{date}", + "qiandaowancheng": "Sign in completion", + "ninyilianxuqiandaotian": "You have signed in for{tian}consecutive days", + "jiajifen": "+ {jifen} integral", + "dangqianjifen": "Current integral:", + "youxiaoqixian": "Valid Period", + "dingdangenzong": "Order tracking", + "gongjijian": "common{jian}piece", + "wuliuzhuangtai": "Logistics status:", + "wuliugongsi": "Logistics company:", + "wuliudanhao": "Logistics Doc No:", + "yiqianshou": "Signed in", + "jinrushangdian": "Enter the store", + "zanwuxianshangjindian": "Temporary wireless shopping", + "fankuilizi": "You can enter feedback content here, such as product suggestions, functional exceptions, etc", + "qingshuruyouxiaoshoujihaoma": "Please enter your valid mobile number", + "ruhelingquyouhuiquan": "How do I get coupons?", + "ruhelingquyouhuiquan1": "Click My, enter my page, click the coupon collection center below, and then you can get the coupon~", + "ruhedihuanjifen":"How to redeem points", + "ruhedihuanjifen1": "Click Jingbi to enter the points store, click the goods you want to exchange, enter the details of the goods and click below to exchange~", + "ruheqiandao": "How to sign in?", + "ruheqiandao1": "1.Click Jingbi to enter the home page, and click on the top to sign in。\n2.Click on My to enter my page, and click on the point details above to sign in。", + "youxiaoqixian": "Valid Period:", + "changqiyouxiao": "Long term effective", + "fasong": "Sending", + "yixiansquanbupinglun": "- All comments displayed-", + "huifu_": "Reply@{huifu}:", + "xihuan_": "Like({xihuan})", + "pinglun_": "Comment({pinglun})", + "liuxianinjingcaidepinglunba": "Leave your wonderful comments", + "shanchu": "Delete", + "huifu": "Delete", + "querenyaoshanchudangqianpinglunma": "Are you sure you want to delete the current comment？", + "ruxutuikuanqingyumendianlianxi": "If you need a refund, please prepare the order number/receipt number in advance and contact the store staff", + "zhidianmendian": "Call the store", + "chakan": "View", + "zaituzhong": "In transit", + "qianshou": "Signed in", + "wentijian": "Problem piece", + "zanwupinglun": "No comment, please comment", + "xiazaiwancheng": "Loading completed", + "zhengzaixiazaizhong": "Loading...", + "daopinglunliebiaodingbu": "To the top of the comment list", + "dianzanxihuan_": "Like{xihuan}", + "wenzhang": "Article", + "huodong": "activity", + "pinglun": "comment", + "fangshiyi": "Mode 1", + "fangshier": "Mode 2", + "baocunsaoma": "The screenshot saves the QR code below, invites others to scan WeChat for identification, long press follow, completes the small game, receives the coupon, and the invitation is successful！", + "fenxiangyaoqing": "You can also directly click on the top right to share with the people you want to invite。", + "yaoqingrenshoujihao_": "Inviter's mobile number:{shoujihao}", + "saomashibieguanzhugongzonghao": "Scan code to identify and follow official account", + "fenxiangzhiweixin": "Share to WeChat", + "haimeiyouyouhuiquankeyilingqu": "There is no coupon to get~", + "ninyichenggonglingquyouhuiquan": "You have successfully received the coupon, please go to", + "kabaokeshiyong": "Card bag-available", + "zhongchakan": "View in", + "diandan": "Order", + "pingtaiyue": "Platform Balance", + "dianpuyue": "Shop balance", + "dingdanjiesuan": "Order Settlement", + "daodianziqu": "Get it at the store", + "waimaipeisong": "delivery", + "kuaidiwuliu": "express logistics", + "yuliudianhua": "Reserved telephone", + "tuiguangma": "Promotion code", + "wodegongju": "My tools", + "beizhuxinxi": "Remarks", + "huiyuanjia": "member price", + "yuanjia": "original price", + "xuanguige": "Select specification", + "chaojiyouhuiquan": "Premium coupon", + "fensi": "fans", + "guanzhu": "Follow", + "wodedongtai": "My dynamic", + "yinkahuiyuan": "Silver card member", + "jinkahuiyuan": "Gold Card Member", + "gongchuanghuiyuan": "Co founder Member", + "qingtong": "bronze", + "huangjin": "gold", + "baiyin": "silver", + "bojin": "platinum", + "wodechengjiu": "My achievements", + "chengjiuhuizhang": "Achievement badge", + "chengjiu": "achievement", + "jiangli": "Reward", + "yihuide": "acquired", + "huiyuanzhongxin": "Member Center", + "huiyuanguize": "Member Rules Description", + "huiyuanjibieduizhao": "Member Level Comparison Table", + "huiyuanhuodejifen": "How members get points", + "lijikaitong": "Open now", + "gongxinchengwei": "Congratulations on becoming", + "huodequanyi": "acquire interests", + "chakanquanyi": "View Equity", + "chuzhiyouhui": "Value saving discount", + "quanyixiangqing": "Equity Details", + "quanyijishao": "Equity Introduction", + "quanyishuoming": "Equity Description", + "yibangfuka": "bound sub card", + "tianjifuka": "Add a new sub card", + "bangdingfuka": "binding sub card", + "jinxingbangdingfuka": "Bind sub card", + "fukashoujihao": "Slave card mobile number", + "querenbangding": "Confirm Binding", + "zanweikaitong": "Not yet open", + "huiyuanquanyi": "Membership Rights", + "dingdanbianhao": "Order No", + "shouhuodi": "Ship To Address", + "chakanhexiaoma": "View Write off Code", + "chakanwuliu": "View Logistics", + "dangqianzhukadengji": "Current Master Card Level", + "wodeyaoqingma": "My invitation code", + "haoyoujiangliguize": "Friend Reward Rules", + "beiyaoqingdejiangli": "Each invited user can get a coupon of 10 yuan for Qianjin Maiwei after entering the invitation code", + "fenxiangyaoqingma": "Share the invitation code with your friend, and the other person will enter the invitation code on the login page of the app, and the invitation will be successful。", + "woyouyaoqingma": "I have an invitation code", + "input_invite_code_hide": "Fill in the invitation code", + "qingshuruyaoqingma": "Please enter the invitation code", + "invite_code_error": "Wrong invitation code", + "yaoqingwancheng": "Invitation completed", + "yaoqingwancheng": "Invitation completed", + "xuanji": "Selection", + "wodekanjia": "My bargain", + "wodepintuan": "My Group", + "bofangcishu": "Playback times", + "jiangshi" : "Instructor", + "quedingyaoshanchudongtai": "Are you sure you want to delete this dynamic？", + "fenxiang": "Sharing", + "jubaogaineirong": "Report this content", + "jingxuanhaowen": "Selected good articles ", + "zuixinwenzhang": "Latest Articles", + "wenzhangzhuanlan": "Article Column", + "zhuanlan": "Column", + "toushuxuzhi": "Instructions for Submission", + "jubao": "Report", + "jubaoyuanyin": "Please enter the reason for reporting, so that we can locate the problem faster and handle it quickly", + "tijiaochenggong": "Submitted successfully", + "jubaotishi": "Your report is waiting for manual review, and we will process it in 7-15 working days. The processing results can be found in", + "xitongxiaoxi": "System Messages", + "fanhuishequn": "Return to the community", + "fabu": "Publish", + "dingdantongzhi": "Order Notice", + "chongzhichenggong" : "Recharge succeeded", + "biaoweiyidu": "Mark as Read", + "wodedingdan": "My order", + "qiandaodejifen": "Sign in and get points", + "chengjiuhuizhang": "Achievement badge", + "zanweikaifang": "Not yet open", + "zanweijiesuo": "Not yet unlocked", + "tianjiaxinfuka": "Add a new secondary card", + "jinxingfukabangding": "Associate card binding", + "xiugaiyonghuming": "Modify User Name", + "gexingqianming": "Personal Signature", + "chengjiu": "achievement", + "genghuanbeijing": "Changing the background", + "dongtai": "Dynamic", + "bianjigerenziliao": "Edit Profile ", + "saoma": "scanning code", + "jinxingzhanghaozhuxiao" : "Account cancellation", + "zhuxiaotixing": "Reminder again: After the account is logged off, it cannot be recovered, and relevant data and information will be permanently deleted。", + "querenzhuxiao": "Confirm Logout", + "yanzhengma": "verification code", + "zhanghaozhuxiaoshuoming": "Account cancellation instructions", + "lijilingqu": "Get it now", + "fanhuishouye": "Return to the home page", + "zhanghaoyuanquan": "Account and Security", + "zhanghaoanquan": "Account security", + "pingtaizhifumima": "Platform Payment Password", + "fasongduanxin": "Send SMS", + "yue__": "Balance {yue}", + "lvbiyue_": "green coin {yue}", + "huodongyue_": "Activity balance {yue}", + "lvbiyue": "balance of green currency", + "huixiangqianbao": "Homecoming Wallet", + "zongzichan": "Total assets", + "zongzichanyuan": "Total assets (元)", + "huodongyue": "Activity Balance", + "xiaofeijilu": "Consumption Record", + "muqianwujilu": "No record at present", + "pingtaizongyue": "Balance：{zongyue}", + "dongtaixiangqing":"Dynamic Details", + "yiguanzhu":"Followed", + "guanzhu":"Follow", + "guanyuhuixiang":"About Going Home", + "liaojiejiankang":"Understanding Health", + "xuexijiankang":"Learning Health", + "fenxiangjiankang":"Sharing Health", + "xiedongtai":"Write dynamic", + "dongtaitishi":"The user's published content needs to wait for the system review, and will be displayed in the recommended square after the review is passed", + "tehuizhuanqu":"Special offer area", + "jingxuanhuodong":"Selected Activities", + "dajiadouzaiduihuan":"Everyone is exchanging", + "dianputuijian":"Store recommendation", + "saomadiancan":"You are about to scan the code to order", + "xiadanzhuanjifen":"Place an order to earn points", + "chongzhifuliduo":"Recharge Fulido", + "fulizhongxin":"Benefit Center", + "tiantiandefuli":"get benefits every day", + "chijiankang":"Eat healthy", + "wanjiankang":"Play healthy", + "hejiankang":"Drink healthy", + "yaoqinghaoyou":"Invite friends", + "zhuanxiangyouhuiquan":"Exclusive coupon", + "huixiangvipkazhuanxiang":"Home Return VIP Card Exclusive Rights", + "kaitonghuixianghuoququanyi":"Open a return home VIP card to get more benefits", + "huiyuanzhuanxiangjiage":"Member Exclusive Price", + "yixianghuiyuanquanyi":"Member benefits enjoyed", + "yikaitongzidongxufei":"Automatic renewal has been activated", + "xufeihuixiangVIP":"Renewal Home VIP", + "huixiangVIPka":"Home Returning VIP Card", + "xuefeihuiyuan":"Renewal member", + "likexufei":"Renew now", + "likekaitong":"Open now", + "likezhifu":"Pay Now", + "zhifubaozhifu":"Alipay payment", + "gengyouhui":"More preferential", + "gengduohaoquan":"more good coupons", + "liaojie":"Understand", + "benzhouquanbao":"coupon package of this week", + "meizhousanquanbao":"Update coupon package every Wednesday", + "yaoqinghaoyoudefen":"Invite friends to score", + "jifenhuanquan":"points for coupons", + "duozhongyouhui":"A variety of coupons are waiting for you", + "jifenshangcheng":"Points Mall", + "fuliduihuan":"Benefit exchange", + "jifenmingxi":"Integral Details", + "meizhousangengxin":"updated every Wednesday", + "qita":"Other", + "shanghuruzhu":"Merchant settlement", + "lianxikefu":"Contact customer service", + "zhankai":"Expand", + "shouqi":"Stow", + "tiantianlingjifen":"Earn points every day", + + + + + + "privacy_policy4": "Log in with your own number" +} \ No newline at end of file diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb index bf011ebe..e81cbe8d 100644 --- a/lib/l10n/intl_zh_CN.arb +++ b/lib/l10n/intl_zh_CN.arb @@ -16,6 +16,7 @@ "main_menu2": "联盟", "main_menu3": "有机生活", "main_menu4": "我的", + "main_menu5":"回乡VIP", "shouye": "首页", "huodongliebiao": "活动列表", "jifenshangcheng": "净弼积分商城", @@ -143,7 +144,7 @@ "jifendejisuanshuoming": "积分的计算说明", "yonghuxiaofeijifen": "用户每消费1元可获得1个积分。", "youhuiquanwufajileijifen": "优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。", - "": "账号信息", + "zhanghaoxinxi": "账号信息", "gerenxinxi": "个人信息", "touxiang": "头像", "yonghuming": "用户名", @@ -379,6 +380,7 @@ "yunfei": "运费", "jiesuan": "结算", "qinglihuancun": "清理缓存", + "guanyuchuangshiren": "关于创始人", "chaungshirengushi": "创始人故事", "jituanchuangshiren": "集团创始人", "jianjie": "简介:{jianjie}", @@ -567,6 +569,8 @@ "jinxingbangdingfuka": "进行绑定副卡", "fukashoujihao": "副卡手机号", "querenbangding": "确认绑定", + "zanweikaitong": "暂未开通", + "huiyuanquanyi": "会员权益", "dingdanbianhao": "订单编号", "shouhuodi": "收货地址", "chakanhexiaoma": "查看核销码", @@ -580,6 +584,7 @@ "input_invite_code_hide": "填写邀请码", "qingshuruyaoqingma": "请输入邀请码", "invite_code_error": "邀请码输入错误", + "yaoqingwancheng": "邀请完成", "xuanji": "选集", "wodekanjia": "我的砍价", "wodepintuan": "我的拼团", @@ -675,6 +680,23 @@ "likezhifu":"立刻支付", "zhifubaozhifu":"支付宝支付", "gengyouhui":"更优惠", + "gengduohaoquan":"更多好券", + "liaojie":"了解", + "benzhouquanbao":"本周券包", + "meizhousanquanbao":"每周三更新劵包", + "yaoqinghaoyoudefen":"邀请好友得分", + "jifenhuanquan":"积分换券", + "duozhongyouhui":"多种优惠券等你拿", + "jifenshangcheng":"积分商城", + "fuliduihuan":"福利兑换", + "jifenmingxi":"积分明细", + "meizhousangengxin":"每周三更新", + "qita":"其他", + "shanghuruzhu":"商户入驻", + "lianxikefu":"联系客服", + "zhankai":"展开", + "shouqi":"收起", + "tiantianlingjifen":"天天领积分", diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb index 2563e918..e4890bb6 100644 --- a/lib/l10n/intl_zh_Hans_CN.arb +++ b/lib/l10n/intl_zh_Hans_CN.arb @@ -16,6 +16,7 @@ "main_menu2": "联盟", "main_menu3": "有机生活", "main_menu4": "我的", + "main_menu5":"回乡VIP", "shouye": "首页", "huodongliebiao": "活动列表", "jifenshangcheng": "净弼积分商城", @@ -143,7 +144,7 @@ "jifendejisuanshuoming": "积分的计算说明", "yonghuxiaofeijifen": "用户每消费1元可获得1个积分。", "youhuiquanwufajileijifen": "优惠金额无法累积积分，订单撤销或其他原因造成的未成功支付的订单，无法获得对应的积分。", - "": "账号信息", + "zhanghaoxinxi": "账号信息", "gerenxinxi": "个人信息", "touxiang": "头像", "yonghuming": "用户名", @@ -379,6 +380,7 @@ "yunfei": "运费", "jiesuan": "结算", "qinglihuancun": "清理缓存", + "guanyuchuangshiren": "关于创始人", "chaungshirengushi": "创始人故事", "jituanchuangshiren": "集团创始人", "jianjie": "简介:{jianjie}", @@ -567,6 +569,8 @@ "jinxingbangdingfuka": "进行绑定副卡", "fukashoujihao": "副卡手机号", "querenbangding": "确认绑定", + "zanweikaitong": "暂未开通", + "huiyuanquanyi": "会员权益", "dingdanbianhao": "订单编号", "shouhuodi": "收货地址", "chakanhexiaoma": "查看核销码", @@ -580,6 +584,7 @@ "input_invite_code_hide": "填写邀请码", "qingshuruyaoqingma": "请输入邀请码", "invite_code_error": "邀请码输入错误", + "yaoqingwancheng": "邀请完成", "xuanji": "选集", "wodekanjia": "我的砍价", "wodepintuan": "我的拼团", @@ -675,6 +680,23 @@ "likezhifu":"立刻支付", "zhifubaozhifu":"支付宝支付", "gengyouhui":"更优惠", + "gengduohaoquan":"更多好券", + "liaojie":"了解", + "benzhouquanbao":"本周券包", + "meizhousanquanbao":"每周三更新劵包", + "yaoqinghaoyoudefen":"邀请好友得分", + "jifenhuanquan":"积分换券", + "duozhongyouhui":"多种优惠券等你拿", + "jifenshangcheng":"积分商城", + "fuliduihuan":"福利兑换", + "jifenmingxi":"积分明细", + "meizhousangengxin":"每周三更新", + "qita":"其他", + "shanghuruzhu":"商户入驻", + "lianxikefu":"联系客服", + "zhankai":"展开", + "shouqi":"收起", + "tiantianlingjifen":"天天领积分", diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb index 85f0001d..91b9c8e8 100644 --- a/lib/l10n/intl_zh_Hant_CN.arb +++ b/lib/l10n/intl_zh_Hant_CN.arb @@ -16,6 +16,7 @@ "main_menu2": "聯盟", "main_menu3": "有機生活", "main_menu4": "我的", + "main_menu5": "回鄉VIP", "shouye": "首頁", "huodongliebiao": "活動列表", "jifenshangcheng": "淨弼積分商城", @@ -371,6 +372,7 @@ "yunfei": "運費", "jiesuan": "結算", "qinglihuancun": "清理緩存", + "guanyuchuangshiren": "關於創始人", "chaungshirengushi": "創始人故事", "jituanchuangshiren": "集團創始人", "jianjie": "簡介:{jianjie}", @@ -562,6 +564,8 @@ "jinxingbangdingfuka": "進行綁定副卡", "fukashoujihao": "副卡手機號", "querenbangding": "確認綁定", + "zanweikaitong": "暫未開通", + "huiyuanquanyi": "會員權益", "dingdanbianhao": "訂單編號", "chakanhexiaoma": "查看核銷碼", "chakanwuliu": "查看物流", @@ -574,6 +578,7 @@ "input_invite_code_hide": "填寫邀請碼", "qingshuruyaoqingma": "請輸入邀請碼", "invite_code_error": "邀請碼輸入錯誤", + "yaoqingwancheng": "邀請完成", "xuanji": "選集", "wodekanjia": "我的砍價", "wodepintuan": "我的拼團", @@ -658,7 +663,7 @@ "zhuanxiangyouhuiquan":"專享優惠券", "huixiangvipkazhuanxiang":"回鄉VIP卡專享權益", "kaitonghuixianghuoququanyi":"開通回鄉VIP卡獲取更多權益", - "huiyuanzhuanxiangjiage":"會員專享價格", + "huiyuanzhuanxiangjiage": "會員專享價格", "yixianghuiyuanquanyi":"已享會員權益", "yikaitongzidongxufei":"已開通自動續費", "xufeihuixiangVIP":"續費回鄉VIP", @@ -669,6 +674,23 @@ "likezhifu":"立刻支付", "zhifubaozhifu":"支付寶支付", "gengyouhui":"更優惠", + "gengduohaoquan":"更多好券", + "liaojie":"瞭解", + "benzhouquanbao":"本周券包", + "meizhousanquanbao":"每週三更新劵包", + "yaoqinghaoyoudefen":"邀請好友得分", + "jifenhuanquan":"積分換券", + "duozhongyouhui":"多種優惠券等你拿", + "jifenshangcheng":"積分商城", + "fuliduihuan":"福利兌換", + "jifenmingxi":"積分明細", + "meizhousangengxin":"每週三更新", + "qita":"其他", + "shanghuruzhu":"商戶入駐", + "lianxikefu":"聯系客服", + "zhankai":"展開", + "shouqi":"收起", + "tiantianlingjifen":"天天領積分", diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb index 90828217..30950b9f 100644 --- a/lib/l10n/intl_zh_TW.arb +++ b/lib/l10n/intl_zh_TW.arb @@ -16,6 +16,7 @@ "main_menu2": "聯盟", "main_menu3": "有機生活", "main_menu4": "我的", + "main_menu5": "回鄉VIP", "shouye": "首頁", "huodongliebiao": "活動列表", "jifenshangcheng": "淨弼積分商城", @@ -371,6 +372,7 @@ "yunfei": "運費", "jiesuan": "結算", "qinglihuancun": "清理緩存", + "guanyuchuangshiren": "關於創始人", "chaungshirengushi": "創始人故事", "jituanchuangshiren": "集團創始人", "jianjie": "簡介:{jianjie}", @@ -561,6 +563,8 @@ "jinxingbangdingfuka": "進行綁定副卡", "fukashoujihao": "副卡手機號", "querenbangding": "確認綁定", + "zanweikaitong": "暫未開通", + "huiyuanquanyi": "會員權益", "dingdanbianhao": "訂單編號", "shouhuodi": "收貨地址", "chakanhexiaoma": "查看核銷碼", @@ -574,6 +578,7 @@ "input_invite_code_hide": "填寫邀請碼", "qingshuruyaoqingma": "請輸入邀請碼", "invite_code_error": "邀請碼輸入錯誤", + "yaoqingwancheng": "邀請完成", "xuanji": "選集", "wodekanjia": "我的砍價", "wodepintuan": "我的拼團", @@ -671,6 +676,23 @@ "likezhifu":"立刻支付", "zhifubaozhifu":"支付寶支付", "gengyouhui":"更優惠", + "gengduohaoquan":"更多好券", + "liaojie":"瞭解", + "benzhouquanbao":"本周券包", + "meizhousanquanbao":"每週三更新劵包", + "yaoqinghaoyoudefen":"邀請好友得分", + "jifenhuanquan":"積分換券", + "duozhongyouhui":"多種優惠券等你拿", + "jifenshangcheng":"積分商城", + "fuliduihuan":"福利兌換", + "jifenmingxi":"積分明細", + "meizhousangengxin":"每週三更新", + "qita":"其他", + "shanghuruzhu":"商戶入駐", + "lianxikefu":"聯系客服", + "zhankai":"展開", + "shouqi":"收起", + "tiantianlingjifen":"天天領積分", diff --git a/lib/login/new_login_page.dart b/lib/login/new_login_page.dart index d5d043a7..50c904ac 100644 --- a/lib/login/new_login_page.dart +++ b/lib/login/new_login_page.dart @@ -732,150 +732,153 @@ class _NewLoginPage extends State { showDialog( context: context, builder: (BuildContext context) { - return SimpleDialog( - titlePadding: EdgeInsets.all(10), - backgroundColor: Colors.transparent, - elevation: 0, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(6), - ), - children: [ - Stack( - alignment: Alignment.bottomCenter, - children: [ - Container( - alignment: Alignment.center, - width: double.infinity, - height: 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, + return WillPopScope( + onWillPop: () async => false, + child: SimpleDialog( + titlePadding: EdgeInsets.all(10), + backgroundColor: Colors.transparent, + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(6), + ), + children: [ + Stack( + alignment: Alignment.bottomCenter, + children: [ + Container( + alignment: Alignment.center, + width: double.infinity, + height: 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( - fontWeight: MyFontWeight.medium, - fontSize: 14.sp, - height: 1.3.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.3.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: 10.h, + ), + Text( + S.of(context).yinsizhengce2, + style: TextStyle( + color: Color(0xff727272), + fontSize: 14.sp, + height: 1.3.h, + fontWeight: MyFontWeight.medium, + ), + ), + SizedBox( + height: 16.h, + ), + ], + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + GestureDetector( + onTap: () { + Navigator.of(context).pop(); + // exit(0); + }, + child: Container( + height: 40.h, + alignment: Alignment.bottomCenter, + margin: EdgeInsets.only(bottom: 20.h), + child: BorderText( + padding: EdgeInsets.only( + top: 10.h, + bottom: 10.h, + left: 36.w, + right: 36.w, + ), + text: S.of(context).jujue, + fontSize: 12.sp, + textColor: Color(0xFF32A060), + borderColor: Color(0xFF32A060), + borderWidth: 1.w, + radius: 23, ), - ]), - ), - SizedBox( - height: 10.h, - ), - Text( - S.of(context).yinsizhengce2, - style: TextStyle( - color: Color(0xff727272), - fontSize: 14.sp, - height: 1.3.h, - fontWeight: MyFontWeight.medium, ), ), SizedBox( - height: 16.h, + width: 21.w, ), - ], - ), - ), - Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - GestureDetector( - onTap: () { - Navigator.of(context).pop(); - exit(0); - }, - child: Container( + Container( height: 40.h, - alignment: Alignment.bottomCenter, margin: EdgeInsets.only(bottom: 20.h), - child: BorderText( + alignment: Alignment.bottomCenter, + child: RoundButton( + text: S.of(context).tongyibingjixu, + textColor: Colors.white, + fontSize: 12.sp, + callback: () { + SharedPreferences.getInstance().then((value) { + value.setBool("isShowPrivacyPolicy", true); + }); + SharesdkPlugin.uploadPrivacyPermissionStatus( + 1, + (success) => { + Navigator.of(context).pop(), + }, + ); + }, padding: EdgeInsets.only( top: 10.h, bottom: 10.h, - left: 36.w, - right: 36.w, + left: 21.5.w, + right: 21.5.w, ), - text: S.of(context).jujue, - fontSize: 12.sp, - textColor: Color(0xFF32A060), - borderColor: Color(0xFF32A060), - borderWidth: 1.w, + backgroup: Color(0xff32A060), radius: 23, ), ), - ), - SizedBox( - width: 21.w, - ), - Container( - height: 40.h, - margin: EdgeInsets.only(bottom: 20.h), - alignment: Alignment.bottomCenter, - child: RoundButton( - text: S.of(context).tongyibingjixu, - textColor: Colors.white, - fontSize: 12.sp, - callback: () { - SharedPreferences.getInstance().then((value) { - value.setBool("isShowPrivacyPolicy", true); - }); - SharesdkPlugin.uploadPrivacyPermissionStatus( - 1, - (success) => { - Navigator.of(context).pop(), - }, - ); - }, - padding: EdgeInsets.only( - top: 10.h, - bottom: 10.h, - left: 21.5.w, - right: 21.5.w, - ), - backgroup: Color(0xff32A060), - radius: 23, + SizedBox( + height: 20.h, ), - ), - SizedBox( - height: 20.h, - ), - ], - ), - ], - ) - ], + ], + ), + ], + ) + ], + ), ); }, ); diff --git a/lib/main.dart b/lib/main.dart index 7fc26679..ec654dcb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -129,7 +129,8 @@ void main() async { if (sharedPreferences.containsKey("language") && sharedPreferences.getString("language") == "tw") { locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'TW'); - } else { + } else if(sharedPreferences.containsKey("language") && + sharedPreferences.getString("language") == "ch"){ locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH'); } ImgCachePath(); @@ -168,6 +169,7 @@ class MyApp extends StatelessWidget { title: Platform.isAndroid ? (ExamineInstance.instance.isExamine?"一心回乡":""):"", theme: ThemeData( primarySwatch: Colors.blue, + // fontFamily: 'JDZhengHT', textTheme: TextTheme( button: TextStyle(fontSize: 24.sp), bodyText1: TextStyle(fontSize: 12.sp), @@ -180,15 +182,23 @@ class MyApp extends StatelessWidget { return appLocale ?? locale; }, localizationsDelegates: [ + S.delegate, GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate, GlobalWidgetsLocalizations.delegate, - S.delegate ], localeListResolutionCallback: (List locales, Iterable supportedLocales) { print("locale: ${locales[0]}"); - return appLocale ?? locales[0]; + Locale locale; + if (locales[0].countryCode == "TW") { + locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'TW'); + } else if (locales[0].countryCode == "CN"){ + locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH'); + } else{ + locale = Locale.fromSubtags(languageCode: 'en', countryCode: 'US'); + } + return appLocale ?? locale; }, supportedLocales: S.delegate.supportedLocales, home: (isFirst ?? true) ? GuidePage() : NewLoginPage(), diff --git a/lib/main_page.dart b/lib/main_page.dart index 406aa7b8..69255113 100644 --- a/lib/main_page.dart +++ b/lib/main_page.dart @@ -207,7 +207,7 @@ class _MainPage extends State with WidgetsBindingObserver { BMF_COORD_TYPE.COMMON, ); } else if (Platform.isAndroid) { - BMFMapSDK.setCoordType(BMF_COORD_TYPE.COMMON); + BMFMapSDK.setCoordType(BMF_COORD_TYPE.BD09LL); } if (Platform.isAndroid) { @@ -436,7 +436,7 @@ class _MainPage extends State with WidgetsBindingObserver { bottomNavigationItem(S.of(context).main_menu1, 0), bottomNavigationItem(S.of(context).main_menu2, 1), // bottomNavigationItem(S.of(context).main_menu3 , 2), - bottomNavigationItem("回乡VIP", 2), + bottomNavigationItem(S.of(context).main_menu5, 2), bottomNavigationItem(Platform.isAndroid ? (ExamineInstance.instance.isExamine?"订单":S.of(context).main_menu3) :S.of(context).main_menu3, 3), bottomNavigationItem(S.of(context).main_menu4, 4), ], diff --git a/lib/mine/mine_shop_details.dart b/lib/mine/mine_shop_details.dart index 3d02e9f9..244ca00c 100644 --- a/lib/mine/mine_shop_details.dart +++ b/lib/mine/mine_shop_details.dart @@ -383,10 +383,11 @@ class _MineShopDetails extends State { height: 4.h, ), Text( - "￥${vipCard != null ? vipCard.balance : ""}", + "￥ ${vipCard != null ? vipCard.balance : ""}", style: TextStyle( color: Color(0xFF262626), fontSize: 24.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.bold, ), ), diff --git a/lib/mine/mine_shop_page.dart b/lib/mine/mine_shop_page.dart index a1be7f1a..2c0e5953 100644 --- a/lib/mine/mine_shop_page.dart +++ b/lib/mine/mine_shop_page.dart @@ -198,6 +198,7 @@ class _MineShopPage extends State { style: TextStyle( color: Color(0xFF262626), fontSize: 12.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.regular, ), ), diff --git a/lib/mine/mine_view/mine_item.dart b/lib/mine/mine_view/mine_item.dart index 3bce18a5..2e897f8c 100644 --- a/lib/mine/mine_view/mine_item.dart +++ b/lib/mine/mine_view/mine_item.dart @@ -40,7 +40,7 @@ class _MineItem extends State { Container( padding: EdgeInsets.only(left: 16,top:16,bottom:13,right: 16), child:Text( - "其他", + S.of(context).qita, style: TextStyle( color: Color(0xFF353535), fontWeight: MyFontWeight.semi_bold, @@ -258,7 +258,7 @@ class _MineItem extends State { alignment: Alignment.center); }, child: mineItem( - "商户入驻", + S.of(context).shanghuruzhu, "assets/image/settled.webp", ), ),), @@ -278,7 +278,7 @@ class _MineItem extends State { showCallMobile(); }, child: mineItem( - "联系客服", + S.of(context).lianxikefu, "assets/image/icon_mine_online_service.webp", ), ),), @@ -359,7 +359,7 @@ class _MineItem extends State { mainAxisSize: MainAxisSize.max, children: [ Text( - (isShowMore != null && !isShowMore)?"展开": "收起", + (isShowMore != null && !isShowMore)?S.of(context).zhankai: S.of(context).shouqi, style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, diff --git a/lib/mine/mine_view/mine_view.dart b/lib/mine/mine_view/mine_view.dart index a94f68f1..d5bd0531 100644 --- a/lib/mine/mine_view/mine_view.dart +++ b/lib/mine/mine_view/mine_view.dart @@ -332,6 +332,7 @@ class _MineView extends State { style: TextStyle( fontSize: 12.sp, fontWeight: MyFontWeight.regular, + fontFamily: 'JDZhengHT', color: Color(0xFFFFFFFF), ), ), @@ -345,6 +346,7 @@ class _MineView extends State { "${S.of(context).fensi} ${widget?.infoNumber?.fans ?? "0"}", style: TextStyle( fontSize: 12.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.regular, color: Color(0xFFFFFFFF), ), @@ -388,7 +390,7 @@ class _MineView extends State { height: 16, ), Text( - "天天领积分", + S.of(context).tiantianlingjifen, style: TextStyle( color: Color(0xFF32A060), fontSize: 12.sp, diff --git a/lib/mine/mine_wallet_page.dart b/lib/mine/mine_wallet_page.dart index 925defd5..e42ad44b 100644 --- a/lib/mine/mine_wallet_page.dart +++ b/lib/mine/mine_wallet_page.dart @@ -240,7 +240,8 @@ class _MineWalletPage extends State { e, style: TextStyle( color: Color(0xFF20662A), - fontWeight: FontWeight.bold, + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.bold, fontSize: 12.sp, ), ), @@ -249,7 +250,8 @@ class _MineWalletPage extends State { e, style: TextStyle( color: Color(0xFF20662A), - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.bold, + fontFamily: 'JDZhengHT', fontSize: 12.sp, ), ), @@ -319,6 +321,8 @@ class _MineWalletPage extends State { S.of(context).pingtaizongyue(userBill.balance), style: TextStyle( color: Color(0xFF727272), + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.regular, fontSize: 10.sp, ), ), @@ -470,8 +474,9 @@ class _MineWalletPage extends State { Text( "${NP.plus(mBalance,mgreenMoney)}", style: TextStyle( - fontWeight: MyFontWeight.semi_bold, + fontWeight: MyFontWeight.medium, fontSize: 50.sp, + fontFamily: 'JDZhengHT', color: Colors.white, ), ), @@ -548,6 +553,7 @@ class _MineWalletPage extends State { "${NP.strip(mBalance)}", style: TextStyle( fontSize: 18.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.semi_bold, color: Colors.white, ), @@ -578,6 +584,7 @@ class _MineWalletPage extends State { "${NP.strip(activityMoney)}", style: TextStyle( fontSize: 18.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.semi_bold, color: Colors.white, ), @@ -608,6 +615,7 @@ class _MineWalletPage extends State { "${NP.strip(mgreenMoney)}", style: TextStyle( fontSize: 18.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.semi_bold, color: Colors.white, ), diff --git a/lib/mine/recharge_page.dart b/lib/mine/recharge_page.dart index 8b2fbde1..1889cb9e 100644 --- a/lib/mine/recharge_page.dart +++ b/lib/mine/recharge_page.dart @@ -214,8 +214,8 @@ class _RechargePage extends State { style: TextStyle( fontSize: 15.sp, color: Color(0xFF181818), - fontWeight: - MyFontWeight.semi_bold), + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.semi_bold), )), Text.rich( TextSpan(children: [ @@ -223,6 +223,7 @@ class _RechargePage extends State { text: "$mBalance", style: TextStyle( fontSize: 26.sp, + fontFamily: 'JDZhengHT', color: Color(0xFF181818), fontWeight: MyFontWeight.semi_bold), @@ -554,6 +555,7 @@ class _RechargePage extends State { "${AppUtils.calculateDouble(double.tryParse(rechargeA.rechargeMoney) ?? 0)}元", style: TextStyle( fontSize: 18.sp, + fontFamily: 'JDZhengHT', color: selectIndex == index ? Color(0xFF353535) : Color(0xFF868686), fontWeight: MyFontWeight.semi_bold), ), @@ -586,6 +588,7 @@ class _RechargePage extends State { "${AppUtils.calculateDouble((double.tryParse(rechargeA.rechargeMoney) ?? 0) + (double.tryParse(rechargeA.giftdMoney) ?? 0) + ((double.tryParse(rechargeA.rechargeMoney) ?? 0) - ((double.tryParse(rechargeA.rechargeMoney) ?? 0) * (discount / 100))))}元", style: TextStyle( fontSize: 18.sp, + fontFamily: 'JDZhengHT', color: selectIndex == index ? Color(0xFF353535) : Color(0xFF868686), fontWeight: MyFontWeight.semi_bold), ), diff --git a/lib/order/exchange_order_page.dart b/lib/order/exchange_order_page.dart index 5f17894a..d65341fa 100644 --- a/lib/order/exchange_order_page.dart +++ b/lib/order/exchange_order_page.dart @@ -660,6 +660,7 @@ class _ExchangeOrderPage extends State { decoration: (widget.arguments["payType"] == 3) ? TextDecoration.lineThrough : TextDecoration.none, + fontFamily: 'JDZhengHT', color: Color(0xFF32A060), ), ), @@ -687,6 +688,7 @@ class _ExchangeOrderPage extends State { "${double.parse(widget.arguments["oneMoney"]) * buyNum}元", style: TextStyle( fontSize: 12, + fontFamily: 'JDZhengHT', color: Colors.black, ), ), @@ -712,6 +714,7 @@ class _ExchangeOrderPage extends State { Text( handleNeedPay(), style: TextStyle( + fontFamily: 'JDZhengHT', fontSize: 12.sp, color: Color(0xFF32A060)), ), ], @@ -867,7 +870,8 @@ class _ExchangeOrderPage extends State { style: TextStyle( fontSize: 14.sp, color: Color(0xff353535), - fontWeight: MyFontWeight.semi_bold, + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.medium, ), ), SizedBox( diff --git a/lib/order/order_view/order_commodity.dart b/lib/order/order_view/order_commodity.dart index c45e132c..3177360b 100644 --- a/lib/order/order_view/order_commodity.dart +++ b/lib/order/order_view/order_commodity.dart @@ -232,8 +232,9 @@ class _OrderCommodity extends State { Text( S.of(context).yuan_(productList.sellPrice), style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.medium, fontSize: 12.sp, + fontFamily: 'JDZhengHT', color: Color(0xFF4C4C4C), ), ) @@ -288,6 +289,7 @@ class _OrderCommodity extends State { S.of(context).yuan_("$amount"), style: TextStyle( fontSize: 12.sp, + fontFamily: 'JDZhengHT', color: color, ), ), @@ -327,6 +329,7 @@ class _OrderCommodity extends State { S.of(context).yuan_("$amount"), style: TextStyle( fontSize: 12.sp, + fontFamily: 'JDZhengHT', color: color, ), ), @@ -466,6 +469,7 @@ class _OrderCommodity extends State { style: TextStyle( fontSize: 14.sp, color: Color(0xFF32A060), + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.semi_bold), ) ], diff --git a/lib/order/order_view/order_status.dart b/lib/order/order_view/order_status.dart index c1f09bb6..3d320c1f 100644 --- a/lib/order/order_view/order_status.dart +++ b/lib/order/order_view/order_status.dart @@ -111,9 +111,10 @@ class _OrderStatus extends State { borderRadius: BorderRadius.circular(15), ), child: Text( - S.of(context).qudanhao(":" + widget.orderInfo.dayFlowCode), + S.of(context).qudanhao(": " + widget.orderInfo.dayFlowCode), style: TextStyle( color:Colors.white, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.regular, fontSize: 14.sp, ), diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 1308a39d..f7e60731 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///本地 +const localBaseUrl = "http://192.168.10.78: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 d4d2e1d1..db673ef1 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -63,7 +63,7 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地 +const localBaseUrl = "http://192.168.10.78:8766/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 diff --git a/lib/setting/treaty_page.dart b/lib/setting/treaty_page.dart index 20ccf1c2..a3c2ec26 100644 --- a/lib/setting/treaty_page.dart +++ b/lib/setting/treaty_page.dart @@ -2,6 +2,7 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; @@ -22,6 +23,7 @@ class _TreatyPage extends State { @override void initState() { super.initState(); + EasyLoading.show(status: S.current.zhengzaijiazai); // if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView(); // if (Platform.isIOS) WebView.platform = CupertinoWebView(); } @@ -44,21 +46,10 @@ class _TreatyPage extends State { WebView( initialUrl: "http://huixiang.lotus-wallet.com/Privacy.html", javascriptMode: JavascriptMode.unrestricted, + onPageFinished: (initialUrl){ + EasyLoading.dismiss(); + }, )), ); } - - Widget _textRich(var text) { - return Padding( - padding: EdgeInsets.only(bottom: 25), - child: Text( - text, - style: TextStyle( - fontSize: 16.sp, - fontWeight: MyFontWeight.regular, - height: 1.7, - color: Colors.black), - ), - ); - } } diff --git a/lib/setting/user_service_page.dart b/lib/setting/user_service_page.dart index 1dc6fc05..83e6e9d7 100644 --- a/lib/setting/user_service_page.dart +++ b/lib/setting/user_service_page.dart @@ -2,12 +2,15 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/src/webview_cupertino.dart'; +import '../generated/l10n.dart'; + class UserServicePage extends StatefulWidget { @override State createState() { @@ -22,6 +25,7 @@ class _UserServicePage extends State with WidgetsBindingObserve void initState() { super.initState(); WidgetsBinding.instance.addObserver(this); + EasyLoading.show(status: S.current.zhengzaijiazai); if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView(); if (Platform.isIOS) WebView.platform = CupertinoWebView(); } @@ -43,6 +47,9 @@ class _UserServicePage extends State with WidgetsBindingObserve WebView( initialUrl: "http://huixiang.lotus-wallet.com/user.html", javascriptMode: JavascriptMode.unrestricted, + onPageFinished: (initialUrl){ + EasyLoading.dismiss(); + }, )), ); } diff --git a/lib/settlement/settlement.dart b/lib/settlement/settlement.dart index 3530da62..ad359578 100644 --- a/lib/settlement/settlement.dart +++ b/lib/settlement/settlement.dart @@ -117,7 +117,7 @@ class _Settlement extends State { token: minToken, tenant: tenant, storeId: storeId, - showLoading: true + showLoading: false ); if (promotions != null && promotions != "" && tableId <= 0) { queryOrderInfo( @@ -183,6 +183,8 @@ class _Settlement extends State { buyNum, payChannel, tableId) async { + try { + EasyLoading.show(status: S.current.zhengzaijiazai); BaseData baseData = await minService.getOrderInfo({ "addressId": addressId, "isTake": isTake, @@ -202,34 +204,36 @@ class _Settlement extends State { this.couponListBean = null; coupons = ""; if (baseData != null && baseData.isSuccess) { - setState(() { - settleOrderInfo = baseData.data; - if ((settleOrderInfo?.promotionId ?? "") != "") { - settleOrderInfo.promotionInfoList.forEach((element) { - if (element.id == settleOrderInfo.promotionId) { - this.promotion = element; - promotions = promotion?.name ?? ""; - } - }); - } - if ((settleOrderInfo?.memberCouponId ?? "") != "") { - settleOrderInfo.couponList.forEach((element) { - if (element.id == settleOrderInfo.memberCouponId) { - this.couponListBean = element; - coupons = couponListBean?.promotionName ?? ""; - } - }); - } - if (settleOrderInfo.orderProductList == null || - settleOrderInfo.orderProductList.length == 0) { - placeOrder = true; - queryOrderDetails( - pageType != null ? widget.arguments["orderId"] : parentId); - } - }); + settleOrderInfo = baseData.data; + if ((settleOrderInfo?.promotionId ?? "") != "") { + settleOrderInfo.promotionInfoList.forEach((element) { + if (element.id == settleOrderInfo.promotionId) { + this.promotion = element; + promotions = promotion?.name ?? ""; + } + }); + } + if ((settleOrderInfo?.memberCouponId ?? "") != "") { + settleOrderInfo.couponList.forEach((element) { + if (element.id == settleOrderInfo.memberCouponId) { + this.couponListBean = element; + coupons = couponListBean?.promotionName ?? ""; + } + }); + } + if (settleOrderInfo.orderProductList == null || + settleOrderInfo.orderProductList.length == 0) { + placeOrder = true; + queryOrderDetails( + pageType != null ? widget.arguments["orderId"] : parentId); + } } else { SmartDialog.showToast(baseData?.msg ?? "", alignment: Alignment.center); } + }finally{ + setState(() {}); + EasyLoading.dismiss(); + } } ///查看订单详情 @@ -274,80 +278,76 @@ class _Settlement extends State { } queryAddress(int selectedBtn) async { - setState(() { - this.selectedBtn = selectedBtn; - }); - if (address != null) { - queryOrderInfo( - address.id, - selectedBtn, - null, - 0, - productId ?? null, - productSkuId ?? "", - actProductId ?? "", - actProductSkuId ?? "", - useVipPriceSelect, - count1, - payChannel, - tableId); - return; - } - BaseData> baseDate = - await minService.queryAddress().catchError((error) {}); - - BMFCoordinate bmfCoordinate = BMFCoordinate( - double.tryParse(storeInfo.latitude), - double.tryParse(storeInfo.longitude), - ); - if (baseDate != null && baseDate.isSuccess) { setState(() { - address = baseDate.data[0]; + this.selectedBtn = selectedBtn; }); + if (address != null) { + queryOrderInfo( + address.id, + selectedBtn, + null, + 0, + productId ?? null, + productSkuId ?? "", + actProductId ?? "", + actProductSkuId ?? "", + useVipPriceSelect, + count1, + payChannel, + tableId); + return; + } + BaseData> baseDate = + await minService.queryAddress().catchError((error) {}); - for (int i = 1; i < baseDate.data.length; i++) { - Address address1 = baseDate.data[i]; + BMFCoordinate bmfCoordinate = BMFCoordinate( + double.tryParse(storeInfo.latitude), + double.tryParse(storeInfo.longitude), + ); + if (baseDate != null && baseDate.isSuccess) { + setState(() { + address = baseDate.data[0]; + }); + for (int i = 1; i < baseDate.data.length; i++) { + Address address1 = baseDate.data[i]; - BMFCoordinate coordinate = await BMFCalculateUtils.coordConvert( - coordinate: BMFCoordinate( - double.tryParse(address.longitude), - double.tryParse(address.latitude), - ), - fromType: BMF_COORD_TYPE.COMMON, - toType: BMF_COORD_TYPE.BD09LL); - BMFCoordinate coordinate1 = await BMFCalculateUtils.coordConvert( - coordinate: BMFCoordinate( - double.tryParse(address1.longitude), - double.tryParse(address1.latitude), - ), - fromType: BMF_COORD_TYPE.COMMON, - toType: BMF_COORD_TYPE.BD09LL); - - double mi = await BMFCalculateUtils.getLocationDistance( - bmfCoordinate, coordinate); - double mi1 = await BMFCalculateUtils.getLocationDistance( - bmfCoordinate, coordinate1); - if (mi1 < mi) { - setState(() { + BMFCoordinate coordinate = await BMFCalculateUtils.coordConvert( + coordinate: BMFCoordinate( + double.tryParse(address.longitude), + double.tryParse(address.latitude), + ), + fromType: BMF_COORD_TYPE.COMMON, + toType: BMF_COORD_TYPE.BD09LL); + BMFCoordinate coordinate1 = await BMFCalculateUtils.coordConvert( + coordinate: BMFCoordinate( + double.tryParse(address1.longitude), + double.tryParse(address1.latitude), + ), + fromType: BMF_COORD_TYPE.COMMON, + toType: BMF_COORD_TYPE.BD09LL); + + double mi = await BMFCalculateUtils.getLocationDistance( + bmfCoordinate, coordinate); + double mi1 = await BMFCalculateUtils.getLocationDistance( + bmfCoordinate, coordinate1); + if (mi1 < mi) { address = address1; - }); + } } + await queryOrderInfo( + address.id, + selectedBtn, + null, + 0, + productId ?? null, + productSkuId ?? "", + actProductId ?? "", + actProductSkuId ?? "", + useVipPriceSelect, + count1, + payChannel, + tableId); } - - queryOrderInfo( - address.id, - selectedBtn, - null, - 0, - productId ?? null, - productSkuId ?? "", - actProductId ?? "", - actProductSkuId ?? "", - useVipPriceSelect, - count1, - payChannel, - tableId); - } } ///选择收货地址 @@ -827,7 +827,8 @@ class _Settlement extends State { : "￥${settleOrderInfo == null ? "0" : settleOrderInfo.price}"), style: TextStyle( fontSize: 20.sp, - fontWeight: MyFontWeight.semi_bold, + fontWeight: MyFontWeight.medium, + fontFamily: 'JDZhengHT', color: Color(0xFF32A060), ), ), diff --git a/lib/settlement/settlement_view/activity_coupon_remarks.dart b/lib/settlement/settlement_view/activity_coupon_remarks.dart index 22e4904f..0357caf6 100644 --- a/lib/settlement/settlement_view/activity_coupon_remarks.dart +++ b/lib/settlement/settlement_view/activity_coupon_remarks.dart @@ -96,9 +96,9 @@ class _ActivityCouponRemarks extends State { ), ), ), - CupertinoSwitch( + Switch.adaptive( value: (widget.coupons != null && widget.coupons != ""||widget.promotions != null && widget.promotions != "") ? false:vipSelect, - // materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, activeColor: Color(0xff32A060), onChanged: (bool value) { setState(() { diff --git a/lib/settlement/settlement_view/pay_method.dart b/lib/settlement/settlement_view/pay_method.dart index 08902664..25035b2c 100644 --- a/lib/settlement/settlement_view/pay_method.dart +++ b/lib/settlement/settlement_view/pay_method.dart @@ -103,8 +103,9 @@ class _PayMethod extends State { "¥$money", style: TextStyle( fontSize: 14.sp, + fontFamily: 'JDZhengHT', color: Color(0xff353535), - fontWeight: MyFontWeight.semi_bold, + fontWeight: MyFontWeight.medium, ), ), SizedBox( @@ -144,8 +145,9 @@ class _PayMethod extends State { "¥$balance", style: TextStyle( fontSize: 14.sp, + fontFamily: 'JDZhengHT', color: Color(0xff353535), - fontWeight: MyFontWeight.semi_bold, + fontWeight: MyFontWeight.medium, ), ), SizedBox( @@ -195,8 +197,9 @@ class _PayMethod extends State { "¥$mGreenMoney", style: TextStyle( fontSize: 14.sp, + fontFamily: 'JDZhengHT', color: Color(0xff353535), - fontWeight: MyFontWeight.semi_bold, + fontWeight: MyFontWeight.medium, ), ), SizedBox( diff --git a/lib/settlement/settlement_view/settlement_order_commodity.dart b/lib/settlement/settlement_view/settlement_order_commodity.dart index fb776ca0..552dbd9e 100644 --- a/lib/settlement/settlement_view/settlement_order_commodity.dart +++ b/lib/settlement/settlement_view/settlement_order_commodity.dart @@ -220,7 +220,7 @@ class _SettlementOrderCommodity extends State { Text( S.of(context).yuan_(AppUtils.calculateDouble(double.tryParse(productList.sellPrice ?? "0") - double.tryParse(productList.discountAmount ?? "0"))), style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.medium, fontSize: 14.sp, color: Color(0xFF4C4C4C), ), @@ -231,6 +231,7 @@ class _SettlementOrderCommodity extends State { style: TextStyle( fontWeight: MyFontWeight.regular, fontSize: 12.sp, + fontFamily: 'JDZhengHT', decoration: TextDecoration.lineThrough, color: Color(0xFFA29E9E), ), @@ -283,6 +284,7 @@ class _SettlementOrderCommodity extends State { style: TextStyle( fontSize: 12.sp, color: color, + fontFamily: 'JDZhengHT', ), ), ], @@ -321,6 +323,7 @@ class _SettlementOrderCommodity extends State { S.of(context).yuan_("-￥$vipDiscount"), style: TextStyle( fontSize: 12.sp, + fontFamily: 'JDZhengHT', color: color, ), ), @@ -438,6 +441,7 @@ class _SettlementOrderCommodity extends State { "已优惠:￥${discountPrice()}", style: TextStyle( fontSize: 12.sp, + fontFamily: 'JDZhengHT', color: Color(0xFF7B7B7B), fontWeight: MyFontWeight.medium, ), @@ -466,7 +470,8 @@ class _SettlementOrderCommodity extends State { style: TextStyle( fontSize: 14.sp, color: Color(0xFF32A060), - fontWeight: MyFontWeight.semi_bold, + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.medium, ), ), ], diff --git a/lib/store/shop_details_page.dart b/lib/store/shop_details_page.dart index 3c790402..2584d5fd 100644 --- a/lib/store/shop_details_page.dart +++ b/lib/store/shop_details_page.dart @@ -645,7 +645,8 @@ class _ShopDetailsPage extends State { style: TextStyle( fontSize: 20.sp, color: Color(0xFFFFFFFF), - fontWeight: MyFontWeight.semi_bold), + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.medium), ), ]), ), @@ -742,6 +743,7 @@ class _ShopDetailsPage extends State { miNiDetail?.price ?? "", style: TextStyle( fontSize: 24.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.semi_bold, color: Color(0xFFF85400), ), @@ -754,6 +756,7 @@ class _ShopDetailsPage extends State { miNiDetail?.applyPrice ?? "", style: TextStyle( fontSize: 16.sp, + fontFamily: 'JDZhengHT', decoration: TextDecoration.lineThrough, fontWeight: MyFontWeight.regular, color: Color(0xFFA29E9E), diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index f2bea6e1..7e67ca65 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -30,9 +30,13 @@ import 'package:huixiang/view_widget/my_tab.dart'; import 'package:huixiang/view_widget/receive_success.dart'; import 'package:huixiang/view_widget/round_button.dart'; import 'package:intl/intl.dart'; +import 'package:permission_handler/permission_handler.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import '../view_widget/border_text.dart'; +import '../view_widget/request_permission.dart'; + class StoreOrderPage extends StatefulWidget { final Map arguments; @@ -106,11 +110,11 @@ class _StoreOrderPage extends State SmartDialog.showToast(AppUtils.dioErrorTypeToString(onError.type), alignment: Alignment.center); debugPrint(onError); - }).then((baseData) { + }).then((baseData) async { if (baseData != null && baseData.isSuccess) { Map minStoreInfo = baseData.data; minToken = minStoreInfo["token"]; - queryStoreInfo(); + await queryStoreInfo(); SharedPreferences.getInstance().then( (value) => { value.setString('minToken', minToken), @@ -211,236 +215,249 @@ class _StoreOrderPage extends State @override Widget build(BuildContext context) { - return Container( - color: Colors.white, - child: Stack( - children: [ - Positioned( - left: 0, - right: 0, - top: 0, - bottom: 54.h, - child: NestedScrollView( - controller: controller, - dragStartBehavior: DragStartBehavior.start, - physics: BouncingScrollPhysics(), - headerSliverBuilder: - (BuildContext context, bool innerScrolled) { - return [ - SliverOverlapAbsorber( - handle: NestedScrollView - .sliverOverlapAbsorberHandleFor(context), - sliver: SliverAppBar( - expandedHeight: (storeInfo != null && - storeInfo.couponVOList != null) - ? 400.h - : 395.h, - floating: false, - snap: false, - pinned: true, - stretch: false, - brightness: Brightness.light, - leading: GestureDetector( - behavior: HitTestBehavior.opaque, - onTap: () { - Navigator.of(context).pop(); - }, - child: Container( - width: double.infinity, - height: double.infinity, - color: Colors.transparent, - alignment: Alignment.centerRight, - margin: EdgeInsets.only(left: 10.w), - padding: EdgeInsets.all(10.h), - child: Icon( - Icons.arrow_back_ios, - color: Colors.black, - size: 24, - ), - ), - ), - flexibleSpace: FlexibleSpaceBar( - title: Title( - controller, - storeInfo != null - ? storeInfo.storeName - : '',(alpha){ - setState(() { - if(alpha == 1) - scrollPhysics = BouncingScrollPhysics(); - else scrollPhysics = NeverScrollableScrollPhysics(); - }); - }), - collapseMode: CollapseMode.pin, - stretchModes: [ - StretchMode.zoomBackground, - StretchMode.fadeTitle, - StretchMode.blurBackground, - ], - background: Container( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8.w), + return WillPopScope( + onWillPop: () async { + if (dialogShowing) { + debugPrint("ssssasdadsasdadasd"); + SmartDialog.dismiss(); + return false; + } else { + return true; + } + }, + child: Container( + color: Colors.white, + child: Stack( + children: [ + Positioned( + left: 0, + right: 0, + top: 0, + bottom: 54.h, + child: NestedScrollView( + controller: controller, + dragStartBehavior: DragStartBehavior.start, + physics: BouncingScrollPhysics(), + headerSliverBuilder: + (BuildContext context, bool innerScrolled) { + return [ + SliverOverlapAbsorber( + handle: + NestedScrollView.sliverOverlapAbsorberHandleFor( + context), + sliver: SliverAppBar( + expandedHeight: (storeInfo != null && + storeInfo.couponVOList != null) + ? 400.h + : 395.h, + floating: false, + snap: false, + pinned: true, + stretch: false, + brightness: Brightness.light, + leading: GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () { + Navigator.of(context).pop(); + }, + child: Container( + width: double.infinity, + height: double.infinity, + color: Colors.transparent, + alignment: Alignment.centerRight, + margin: EdgeInsets.only(left: 10.w), + padding: EdgeInsets.all(10.h), + child: Icon( + Icons.arrow_back_ios, + color: Colors.black, + size: 24, + ), + ), ), - child: Stack( - children: [ - Positioned( - child: Column( - children: [ - buildSwiper(), - Expanded( - child: Container( - color: Colors.transparent, + flexibleSpace: FlexibleSpaceBar( + title: Title(controller, + storeInfo != null ? storeInfo.storeName : '', + (alpha) { + setState(() { + if (alpha == 1) + scrollPhysics = BouncingScrollPhysics(); + else + scrollPhysics = + NeverScrollableScrollPhysics(); + }); + }), + collapseMode: CollapseMode.pin, + stretchModes: [ + StretchMode.zoomBackground, + StretchMode.fadeTitle, + StretchMode.blurBackground, + ], + background: Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8.w), + ), + child: Stack( + children: [ + Positioned( + child: Column( + children: [ + buildSwiper(), + Expanded( + child: Container( + color: Colors.transparent, + ), + flex: 1, + ), + ], + ), + top: 0, + bottom: 0, + left: 0, + right: 0, + ), + Positioned( + child: Container( + decoration: BoxDecoration( + color: Colors.white, + borderRadius: + BorderRadius.circular(8.w), + ), + child: Column( + mainAxisAlignment: + MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + ///门店信息 + StoreInfoView(storeInfo), + // Padding(padding:EdgeInsets.only(left: 14.w), + // child: Text( + // S.of(context).diandan, + // style: TextStyle( + // fontWeight: MyFontWeight.bold, + // fontSize: 15.sp, + // color: Color(0xFF000000), + // ), + // ),), + // Container( + // width:22.w, + // height: 3.h, + // color: Color(0xFF32A060), + // margin: EdgeInsets.only(top: 5.h,left: 14.w), + // ), + // ///门店对应优惠券 + // if (storeInfo != null && + // storeInfo.couponVOList != null) + // UnionCoupon( + // storeInfo, + // _receiveCoupon, + // coupon: true, + // ), + // + // if (storeInfo == null || + // storeInfo.couponVOList == null) + // SizedBox( + // height: 8, + // ), + // + // ///门店对应VIP信息 + // Vip(storeInfo, () {}, false), + ], ), - flex: 1, ), - ], - ), - top: 0, - bottom: 0, - left: 0, - right: 0, + top: 233.h, + bottom: 0, + left: 0, + right: 0, + ), + ], ), - Positioned( - child: Container( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: - BorderRadius.circular(8.w), + ), + ), + backgroundColor: Color(0x33FAFAFA), + centerTitle: false, + elevation: 0, + bottom: PreferredSize( + preferredSize: Size( + MediaQuery.of(context).size.width, + 38.h, + ), + child: Container( + padding: EdgeInsets.symmetric(horizontal: 10.w), + width: MediaQuery.of(context).size.width, + child: Theme( + data: ThemeData( + splashColor: Colors.transparent, + // 点击时的水波纹颜色设置为透明 + highlightColor: + Colors.transparent, // 点击时的背景高亮颜色设置为透明 ), - child: Column( - mainAxisAlignment: - MainAxisAlignment.start, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - ///门店信息 - StoreInfoView(storeInfo), - // Padding(padding:EdgeInsets.only(left: 14.w), - // child: Text( - // S.of(context).diandan, - // style: TextStyle( - // fontWeight: MyFontWeight.bold, - // fontSize: 15.sp, - // color: Color(0xFF000000), - // ), - // ),), - // Container( - // width:22.w, - // height: 3.h, - // color: Color(0xFF32A060), - // margin: EdgeInsets.only(top: 5.h,left: 14.w), - // ), - // ///门店对应优惠券 - // if (storeInfo != null && - // storeInfo.couponVOList != null) - // UnionCoupon( - // storeInfo, - // _receiveCoupon, - // coupon: true, - // ), - // - // if (storeInfo == null || - // storeInfo.couponVOList == null) - // SizedBox( - // height: 8, - // ), - // - // ///门店对应VIP信息 - // Vip(storeInfo, () {}, false), + child: TabBar( + controller: tabcontroller, + automaticIndicatorColorAdjustment: true, + isScrollable: true, + indicatorWeight: 3, + indicatorColor: Color(0xFF32A060), + labelPadding: EdgeInsets.only( + left: 8.w, + right: 8.w, + ), + indicatorSize: TabBarIndicatorSize.label, + unselectedLabelStyle: TextStyle( + fontSize: 15.sp, + fontWeight: FontWeight.w400, + ), + labelStyle: TextStyle( + color: Colors.black, + fontSize: 18.sp, + fontWeight: FontWeight.bold, + ), + labelColor: Colors.black, + tabs: [ + MyTab(text: S.of(context).diandan), + // MyTab(text: ""), ], - ), - ), - top: 233.h, - bottom: 0, - left: 0, - right: 0, - ), - ], + )), + ), ), ), ), - backgroundColor: Color(0x33FAFAFA), - centerTitle: false, - elevation: 0, - bottom: PreferredSize( - preferredSize: Size( - MediaQuery.of(context).size.width, - 38.h, - ), - child: Container( - padding: - EdgeInsets.symmetric(horizontal: 10.w), - width: MediaQuery.of(context).size.width, - child: Theme( - data: ThemeData( - splashColor: Colors.transparent, // 点击时的水波纹颜色设置为透明 - highlightColor: Colors.transparent, // 点击时的背景高亮颜色设置为透明 - ), - child: TabBar( - controller: tabcontroller, - automaticIndicatorColorAdjustment: true, - isScrollable: true, - indicatorWeight: 3, - indicatorColor: Color(0xFF32A060), - labelPadding: EdgeInsets.only( - left: 8.w, - right: 8.w, - ), - indicatorSize: TabBarIndicatorSize.label, - unselectedLabelStyle: TextStyle( - fontSize: 15.sp, - fontWeight: FontWeight.w400, - ), - labelStyle: TextStyle( - color: Colors.black, - fontSize: 18.sp, - fontWeight: FontWeight.bold, - ), - labelColor: Colors.black, - tabs: [ - MyTab(text: S.of(context).diandan), - // MyTab(text: ""), - ], - )), - ), - ), - ), - ), - ]; - }, - body: - ///点餐 - TabBarView( - physics: NeverScrollableScrollPhysics(), - children: [ - ///点餐 - StoreOrderListPage( - widget.arguments, - activitys, - storeInfo, - shopCarGoods, - controller, - minToken, - tenant, - tableId, - _queryMiNiDetail, () { - queryShopCar().then((value) { - this.shopCarGoods = value; - setState(() {}); - }); - },scrollPhysics), + ]; + }, + body: - ///星店活动, - // StoreActivity( - // widget.arguments, - // activitys, - // ), - ], - controller: tabcontroller, - ), - ), - /*SmartRefresher( + ///点餐 + TabBarView( + physics: NeverScrollableScrollPhysics(), + children: [ + ///点餐 + StoreOrderListPage( + widget.arguments, + activitys, + storeInfo, + shopCarGoods, + controller, + minToken, + tenant, + tableId, + _queryMiNiDetail, () { + queryShopCar().then((value) { + this.shopCarGoods = value; + setState(() {}); + }); + }, scrollPhysics), + + ///星店活动, + // StoreActivity( + // widget.arguments, + // activitys, + // ), + ], + controller: tabcontroller, + ), + ), + /*SmartRefresher( controller: refreshController = RefreshController(initialRefresh: false), enablePullDown: true, @@ -452,110 +469,110 @@ class _StoreOrderPage extends State }, child: ),*/ - ), - Positioned( - bottom: 30, - left: 0, - right: 0, - child: Stack( - alignment: Alignment.bottomLeft, - children: [ - Container( - margin: EdgeInsets.symmetric(horizontal: 14), - height: 45.h, - // color: Color(0xFFFAFAFA), - decoration: BoxDecoration( - color: Color(0xFF383A38), - borderRadius: BorderRadius.circular(100), - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 45.w, + ), + Positioned( + bottom: 30, + left: 0, + right: 0, + child: Stack( + alignment: Alignment.bottomLeft, + children: [ + Container( + margin: EdgeInsets.symmetric(horizontal: 14), + height: 45.h, + // color: Color(0xFFFAFAFA), + decoration: BoxDecoration( + color: Color(0xFF383A38), + borderRadius: BorderRadius.circular(100), ), - Text.rich( - TextSpan(children: [ - TextSpan( - text: "￥ ", - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFFFFFFFF), - fontWeight: MyFontWeight.bold), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + width: 45.w, ), - TextSpan( - text: shopCarGoods != null - ? shopCarGoods.cartSum - : "0.0", - style: TextStyle( - fontSize: 20.sp, - color: Color(0xFFFFFFFF), - fontWeight: MyFontWeight.semi_bold), + Text.rich( + TextSpan(children: [ + TextSpan( + text: "￥ ", + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFFFFFFFF), + fontWeight: MyFontWeight.bold), + ), + TextSpan( + text: shopCarGoods != null + ? shopCarGoods.cartSum + : "0.0", + style: TextStyle( + fontSize: 20.sp, + fontFamily: 'JDZhengHT', + color: Color(0xFFFFFFFF), + fontWeight: MyFontWeight.medium), + ), + ]), ), - ]), - ), - Spacer(), - GestureDetector( - onTap: () { - // if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now())) - // &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){ - toDownOrder(); - // } - // else - // SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center); - }, - child: RoundButton( - width: 103.w, - height: 54.h, - text: S.current.jiesuan, - textColor: Colors.white, - fontWeight: MyFontWeight.bold, - backgroup: Color(0xFF32A060), - radius: 100, - fontSize: 16.sp, - padding: - EdgeInsets.symmetric(vertical: 5.h), - ), - ), - ], - ), - ), - Stack( - children: [ - InkWell( - onTap: () { - if (count() != 0) showShoppingCart(); - }, - child: Image.asset( - "assets/image/shopping_bag.webp", - width: 66, - height: 66, - fit: BoxFit.fitWidth, + Spacer(), + GestureDetector( + onTap: () { + // if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now())) + // &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){ + toDownOrder(); + // } + // else + // SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center); + }, + child: RoundButton( + width: 103.w, + height: 54.h, + text: S.current.jiesuan, + textColor: Colors.white, + fontWeight: MyFontWeight.bold, + backgroup: Color(0xFF32A060), + radius: 100, + fontSize: 16.sp, + padding: EdgeInsets.symmetric(vertical: 5.h), + ), + ), + ], ), ), - if (count() != 0) - Positioned( - right: 5, - // top: 14, - child: RoundButton( - width: 17.w, - height: 17.h, - text: "${count()}", - textColor: Colors.white, - fontWeight: MyFontWeight.regular, - backgroup: Color(0xFFF65720), - fontSize: 12.sp, - radius: 100, + Stack( + children: [ + InkWell( + onTap: () { + if (count() != 0) showShoppingCart(); + }, + child: Image.asset( + "assets/image/shopping_bag.webp", + width: 66, + height: 66, + fit: BoxFit.fitWidth, + ), ), - ), + if (count() != 0) + Positioned( + right: 5, + // top: 14, + child: RoundButton( + width: 17.w, + height: 17.h, + text: "${count()}", + textColor: Colors.white, + fontWeight: MyFontWeight.regular, + backgroup: Color(0xFFF65720), + fontSize: 12.sp, + radius: 100, + ), + ), + ], + ), ], ), - ], - ), - ), - ], - )); + ), + ], + ))); } ///领取优惠券 @@ -737,9 +754,7 @@ class _StoreOrderPage extends State ///选规格弹窗 showStoreSelector(MiNiDetail miNiDetail, String id, int count) async { - if (miNiDetail.attrList != null && - miNiDetail.attrList.length == 1 && - miNiDetail.attrList[0].attrValueList.length == 1) { + if (miNiDetail.attrList != null && miNiDetail.attrStyle == 0) { _addShopCar(miNiDetail, [], count); } else { EasyLoading.dismiss(); @@ -826,6 +841,9 @@ class _StoreOrderPage extends State pid = ""; //活动 cName = ""; //优惠券 cid = ""; //优惠券 + if (storeInfo?.posType?.code == "NORMALSTORE" && tableId == 0) { + return null; + } BaseData> baseDate = await minService.getShoppingCart(tableId); if (baseDate != null && @@ -991,7 +1009,7 @@ class Title extends StatefulWidget { final String title; final Function scrollChange; - Title(this.controller, this.title,this.scrollChange); + Title(this.controller, this.title, this.scrollChange); @override State createState() { diff --git a/lib/store/store_view/shop_car.dart b/lib/store/store_view/shop_car.dart index bc5ffacd..57d1ba48 100644 --- a/lib/store/store_view/shop_car.dart +++ b/lib/store/store_view/shop_car.dart @@ -164,8 +164,9 @@ class _ShopCar extends State { : widget.shopingCar.cartSum, style: TextStyle( fontSize: 20.sp, + fontFamily: 'JDZhengHT', color: Color(0xFFFFFFFF), - fontWeight: MyFontWeight.semi_bold), + fontWeight: MyFontWeight.medium), ), ]), ), diff --git a/lib/store/store_view/shop_goods.dart b/lib/store/store_view/shop_goods.dart index 4154a568..7755e4b6 100644 --- a/lib/store/store_view/shop_goods.dart +++ b/lib/store/store_view/shop_goods.dart @@ -1,4 +1,5 @@ import 'package:dio/dio.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/findMiNiGroupList.dart'; @@ -8,11 +9,15 @@ import 'package:huixiang/utils/font_weight.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/round_button.dart'; +import 'package:permission_handler/permission_handler.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../../retrofit/data/base_data.dart'; import '../../retrofit/data/miNiDetail.dart'; +import '../../retrofit/data/store_info.dart'; import '../../retrofit/min_api.dart'; +import '../../view_widget/border_text.dart'; +import '../../view_widget/request_permission.dart'; class ShopGoods extends StatefulWidget { final Function(String id, int count) queryMiNiDetail; @@ -25,6 +30,7 @@ class ShopGoods extends StatefulWidget { final int count; final int tableId; final bool isShopCart; + final StoreInfo storeInfo; ShopGoods( this.add, @@ -36,6 +42,7 @@ class ShopGoods extends StatefulWidget { this.queryShoppingCart, this.queryMiNiDetail, this.shoppingCartSkuItemListBean, + this.storeInfo }); @override @@ -186,6 +193,7 @@ class _ShopGoods extends State { style: TextStyle( color: Color(0xFFFF7A1A), fontSize: 16.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.medium, ), ), @@ -228,12 +236,16 @@ class _ShopGoods extends State { fontSize: 11.sp, padding: EdgeInsets.symmetric(vertical: 5.h), callback: () { - widget.queryMiNiDetail( - widget.productListBean != null - ? widget.productListBean.id - : widget.shoppingCartSkuItemListBean - .productId, - 0); + if(widget.storeInfo.posType.code == "NORMALSTORE"&& widget.tableId == 0){ + showDeleteDialog(); + }else{ + widget.queryMiNiDetail( + widget.productListBean != null + ? widget.productListBean.id + : widget.shoppingCartSkuItemListBean + .productId, + 0); + } }, ), ), @@ -259,7 +271,10 @@ class _ShopGoods extends State { (widget.productListBean?.attrStyle ?? 0) == 0) InkWell( onTap: () { - widget.reduce(widget.shoppingCartSkuItemListBean); + if(widget.storeInfo.posType.code == "NORMALSTORE" && widget.tableId == 0){ + showDeleteDialog(); + }else{ + widget.reduce(widget.shoppingCartSkuItemListBean);} }, child: Image.asset( "assets/image/reduce.webp", @@ -285,18 +300,22 @@ class _ShopGoods extends State { (widget.productListBean?.attrStyle ?? 0) == 0) GestureDetector( onTap: () async{ - if(_jumpType == -1) - queryMiNiDetail(widget.productListBean.id); - else if(_jumpType == 0) - widget.add(widget.shoppingCartSkuItemListBean); - else if(_jumpType == 1) - await Navigator.of(context) - .pushNamed('/router/product_meals_sku', arguments: { - "id":widget.productListBean.id, - "storeId":widget.productListBean.storeId, - "tableId":widget.tableId - }); - widget.queryShoppingCart(); + if(widget.storeInfo.posType.code == "NORMALSTORE" && widget.tableId == 0){ + showDeleteDialog(); + }else{ + if(_jumpType == -1) + queryMiNiDetail(widget.productListBean.id); + else if(_jumpType == 0) + widget.add(widget.shoppingCartSkuItemListBean); + else if(_jumpType == 1) + await Navigator.of(context) + .pushNamed('/router/product_meals_sku', arguments: { + "id":widget.productListBean.id, + "storeId":widget.productListBean.storeId, + "tableId":widget.tableId + }); + widget.queryShoppingCart(); + } }, child: Image.asset( "assets/image/add.webp", @@ -323,7 +342,7 @@ class _ShopGoods extends State { "VIP", style: TextStyle( fontSize: 12.sp, - fontWeight: MyFontWeight.regular, + fontWeight: MyFontWeight.medium, color: Color(0xFFFFFFFF), ), ), @@ -333,6 +352,7 @@ class _ShopGoods extends State { style: TextStyle( fontSize: 16.sp, fontWeight: MyFontWeight.medium, + fontFamily: 'JDZhengHT', color: Color(0xff32A060), ), ), @@ -355,4 +375,126 @@ class _ShopGoods extends State { ); } + ///扫码提示弹窗 + showDeleteDialog() { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + content: Container( + width: MediaQuery.of(context).size.width - 84.w, + height: 130.h, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + "您即将进行扫码点餐", + style: TextStyle( + fontSize: 17.sp, + fontWeight: FontWeight.bold, + color: Colors.black, + ), + ), + SizedBox( + height: 30.h, + ), + Row( + children: [ + Expanded( + child: InkWell( + child: BorderText( + text: "取消", + textColor: Color(0xFF32A060), + fontSize: 16.sp, + fontWeight: FontWeight.bold, + borderColor: Color(0xFF32A060), + radius: 4, + padding: EdgeInsets.all(12), + borderWidth: 1, + ), + onTap: () { + Navigator.of(context).pop(); + }, + ), + flex: 1, + ), + SizedBox( + width: 16.w, + ), + Expanded( + child: InkWell( + child: RoundButton( + text: "确定", + textColor: Colors.white, + radius: 4, + padding: EdgeInsets.all(12), + backgroup: Color(0xFF32A060), + fontSize: 16.sp, + fontWeight: FontWeight.bold, + ), + onTap: () { + toScan(); + Navigator.of(context).pop(); + }, + ), + flex: 1, + ), + ], + ) + ], + ), + ), + ); + }, + ); + } + + ///扫码 + toScan() async { + if (await Permission.camera.isPermanentlyDenied) { + showCupertinoDialog( + context: context, + builder: (context) { + return RequestPermission( + "assets/image/icon_camera_permission_tips.webp", + S.of(context).ninxiangjiquanxianweikaiqi, + S.of(context).weilekaipaizhaoxuanzhetouxiang, + S.of(context).kaiqiquanxian, + (result) async { + if (result) { + await openAppSettings(); + } + }, + heightRatioWithWidth: 0.82, + ); + }); + } else if (await Permission.camera.isGranted) { + var result = await Navigator.of(context).pushNamed('/router/qr_scan'); + // String result = "http://pos.app.gznl.top/placeorder/?tableId=1315906639160672256&tenantCode=1166&shopId=1300372027722432512"; + Uri uri = Uri.parse(result); + String tableId = uri.queryParameters["tableId"]; + String tenantCode = uri.queryParameters["tenantCode"]; + String shopId = uri.queryParameters["shopId"]; + if (tableId != null && + tableId != "" && + tenantCode != null && + tenantCode != "" && + shopId != null && + shopId != "") { + Navigator.of(context).pushReplacementNamed( + '/router/store_order', + arguments: { + "id": shopId, + "tenant": tenantCode, + "storeName": "", + "tableId": int.tryParse(tableId), + }, + ); + } + } else { + await Permission.camera.request(); + } + } + } diff --git a/lib/store/store_view/shop_goods_car.dart b/lib/store/store_view/shop_goods_car.dart index 5195f3f5..d727ecf2 100644 --- a/lib/store/store_view/shop_goods_car.dart +++ b/lib/store/store_view/shop_goods_car.dart @@ -139,6 +139,7 @@ class _ShopGoodsCar extends State { style: TextStyle( color: Color(0xFFFF7A1A), fontSize: 16.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.medium, ), ), @@ -256,6 +257,7 @@ class _ShopGoodsCar extends State { style: TextStyle( color: Color(0xFFA29E9E), fontSize: 12.sp, + fontFamily: 'JDZhengHT', decoration: TextDecoration.lineThrough, fontWeight: MyFontWeight.regular, ), diff --git a/lib/store/store_view/store_order_list.dart b/lib/store/store_view/store_order_list.dart index 39b341c4..80878f7e 100644 --- a/lib/store/store_view/store_order_list.dart +++ b/lib/store/store_view/store_order_list.dart @@ -293,8 +293,7 @@ class _StoreOrderListPage extends State { return GestureDetector( onTap: (){ if (widget.storeInfo.posType.code == - "NORMALSTORE" && - widget.storeInfo.storeName == "百年川椒（光谷店）"||widget.storeInfo.storeName == "百年川椒（汉街店）"||widget.storeInfo.storeName == "回乡农场火锅") + "NORMALSTORE") return; else goShopDetailsPage(e); @@ -351,6 +350,7 @@ class _StoreOrderListPage extends State { queryShoppingCart:widget.queryShoppingCart, queryMiNiDetail: widget.queryMiNiDetail, shoppingCartSkuItemListBean: shoppingCartSkuItemListBean, + storeInfo:widget.storeInfo ); } } diff --git a/lib/union/union_list.dart b/lib/union/union_list.dart index 73d69d9e..0260d7de 100644 --- a/lib/union/union_list.dart +++ b/lib/union/union_list.dart @@ -65,12 +65,11 @@ class _UnionList extends State { itemBuilder: (context, position) { return InkWell( onTap: () { - if (widget.storeList[position].posType.code == "NORMALSTORE") { - showDeleteDialog(); - } - // else if (widget.storeList[position].posType.code == - // "DIRECT" && - // widget.storeList[position].storeName == "一心回乡商城") { + // if (widget.storeList[position].posType.code == "NORMALSTORE") { + // showDeleteDialog(); + // } + // else + // if ( widget.storeList[position].storeName == "一心回乡商城") { // Navigator.of(context).pushNamed( // '/router/shopping_mall_home', // arguments: { @@ -81,7 +80,7 @@ class _UnionList extends State { // }, // ); // } - else + // else { Navigator.of(context).pushNamed( '/router/store_order', diff --git a/lib/utils/status_utils.dart b/lib/utils/status_utils.dart index 56c0f8a3..13b8c46f 100644 --- a/lib/utils/status_utils.dart +++ b/lib/utils/status_utils.dart @@ -180,6 +180,7 @@ class StatusUtils { S.of(context).qudanhao(dayFlowCode), style: TextStyle( fontSize: 16.sp, + fontFamily: 'JDZhengHT', fontWeight: FontWeight.bold, color: Colors.black, ), diff --git a/lib/view_widget/mine_vip_entry.dart b/lib/view_widget/mine_vip_entry.dart index e48975be..88f3edd3 100644 --- a/lib/view_widget/mine_vip_entry.dart +++ b/lib/view_widget/mine_vip_entry.dart @@ -150,7 +150,8 @@ class MineVipEntry extends StatelessWidget { : "消费金额￥${rank.toStringAsFixed(2).toString()} 距${S.of(context).xiayidengji}还需￥${(rankMax - (rank ?? 0)).toStringAsFixed(2)}", style: TextStyle( color: Color(0xFFFFEAD2), - fontWeight: MyFontWeight.regular, + fontWeight: MyFontWeight.light, + fontFamily: 'JDZhengHT', fontSize: 14.sp, ), ) diff --git a/lib/view_widget/new_coupon_widget.dart b/lib/view_widget/new_coupon_widget.dart index 83ba1521..e00a17fc 100644 --- a/lib/view_widget/new_coupon_widget.dart +++ b/lib/view_widget/new_coupon_widget.dart @@ -563,14 +563,14 @@ class NewCouponWidget extends StatelessWidget { ), ], ), - Text( - S.of(context).quanchangtongyong, - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.semi_bold, - color: (coupon.status ==2 || coupon.status == 3) ? Color(0xFFB3B3B3):Color(0xff32A060), - ), - ), + // Text( + // S.of(context).quanchangtongyong, + // style: TextStyle( + // fontSize: 12.sp, + // fontWeight: MyFontWeight.semi_bold, + // color: (coupon.status ==2 || coupon.status == 3) ? Color(0xFFB3B3B3):Color(0xff32A060), + // ), + // ), ], ); } diff --git a/lib/vip/user_vip_service_page.dart b/lib/vip/user_vip_service_page.dart index b698febd..416e70de 100644 --- a/lib/vip/user_vip_service_page.dart +++ b/lib/vip/user_vip_service_page.dart @@ -2,12 +2,15 @@ import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/src/webview_cupertino.dart'; +import '../generated/l10n.dart'; + class UserVipServicePage extends StatefulWidget { @override State createState() { @@ -22,6 +25,7 @@ class _UserVipServicePage extends State with WidgetsBindingO void initState() { super.initState(); WidgetsBinding.instance.addObserver(this); + EasyLoading.show(status: S.current.zhengzaijiazai); if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView(); if (Platform.isIOS) WebView.platform = CupertinoWebView(); } @@ -43,6 +47,9 @@ class _UserVipServicePage extends State with WidgetsBindingO WebView( initialUrl: "http://huixiang.lotus-wallet.com/vip.html", javascriptMode: JavascriptMode.unrestricted, + onPageFinished: (initialUrl){ + EasyLoading.dismiss(); + }, )), ); } diff --git a/lib/vip/vip_view/exclusive_coupon.dart b/lib/vip/vip_view/exclusive_coupon.dart index 2515132d..c870b042 100644 --- a/lib/vip/vip_view/exclusive_coupon.dart +++ b/lib/vip/vip_view/exclusive_coupon.dart @@ -53,6 +53,21 @@ class _ExclusiveCoupon extends State { fontWeight: MyFontWeight.semi_bold, ), ), + GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: (){ + showAlertDialog(); + }, + child:Container( + padding: EdgeInsets.only(left: 8.w,right:30.w,top: 3.h,bottom: 3.h), + child: Image.asset( + "assets/image/vip_tips.webp", + fit: BoxFit.fill, //填充剩余空间 + height:14, + width: 14, + ), + ), + ), ], ), SizedBox( @@ -97,6 +112,7 @@ class _ExclusiveCoupon extends State { style: TextStyle( fontWeight: MyFontWeight.semi_bold, fontSize: 36.sp, + fontFamily: 'JDZhengHT', color: Color(0xffFF7E12), ), ), @@ -165,6 +181,7 @@ class _ExclusiveCoupon extends State { style: TextStyle( fontWeight: MyFontWeight.semi_bold, fontSize: 36.sp, + fontFamily: 'JDZhengHT', color: Color(0xffFF7E12), ), ), @@ -233,6 +250,7 @@ class _ExclusiveCoupon extends State { style: TextStyle( fontWeight: MyFontWeight.semi_bold, fontSize: 36.sp, + fontFamily: 'JDZhengHT', color: Color(0xffFF7E12), ), ), @@ -266,4 +284,84 @@ class _ExclusiveCoupon extends State { ), ); } + + ///会员优惠规则弹窗 + showAlertDialog() { + //显示对话框 + showDialog( + context: context, + builder: (BuildContext context) { + return SimpleDialog( + backgroundColor: Colors.transparent, + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(6), + ), + children: [ + Container( + width: double.infinity, + height:470.h, + padding: EdgeInsets.symmetric(horizontal:14.w,vertical: 16.h), + decoration: new BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + child:Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Spacer(), + GestureDetector( + onTap: () { + Navigator.of(context).pop(); + }, + child: Icon( + Icons.clear, + color: Colors.black, + ), + ) + ], + ), + SizedBox(height: 10.h,), + Text( + "VIP会员专享优惠券：" + "\n ①海峡姐妹饮品券" + "\n *用户开通回乡VIP卡，可享以面价6折优惠购买部分现制饮品的会员权益。" + "\n *适用饮品：门店现制奶茶类饮品及现制咖啡类饮品。" + "\n *适用门店：海峡姐妹茶汉街店" + "\n ②前进麦味烘焙券" + "\n *用户开通回乡VIP卡，可享以面价7折优惠购买部分现制面包的会员权益。" + "\n *适用产品：门店现制面包类产品及甜品类产品。" + "\n *适用门店：前进麦味凯德1818店、前进麦味哈乐城店" + "\n ③回乡农场火锅券" + "\n *用户开通回乡VIP卡，可享以面价8折优惠购买部分火锅菜品的会员权益。" + "\n *适用产品：门店现制菜品" + "\n *适用门店：回乡农场火锅汉街店" + "\n ④百年川椒火锅券" + "\n *用户开通回乡VIP卡，可享以面价8折优惠购买部分火锅菜品的会员权益。" + "\n *适用产品：门店现制菜品" + "\n *适用门店：百年川椒重庆老火锅光谷店", + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 14.sp, + height: 1.7.h, + color: Colors.black, + ), + ), + SizedBox(height: 15.h,) + ], + ), + ), + ), + ), + ], + ); + }, + ); + } } diff --git a/lib/vip/vip_view/vip_goods_discount.dart b/lib/vip/vip_view/vip_goods_discount.dart index 330f57a5..07aa9f02 100644 --- a/lib/vip/vip_view/vip_goods_discount.dart +++ b/lib/vip/vip_view/vip_goods_discount.dart @@ -5,13 +5,14 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import '../../generated/l10n.dart'; import '../../retrofit/data/vip_card_home.dart'; +import '../../utils/flutter_utils.dart'; import '../../view_widget/custom_image.dart'; - class VipGoodsDiscount extends StatefulWidget { final VipCardHome vipCardHome; VipGoodsDiscount(this.vipCardHome); + @override State createState() { return _VipGoodsDiscount(); @@ -22,72 +23,79 @@ class _VipGoodsDiscount extends State { @override Widget build(BuildContext context) { return Container( - margin: EdgeInsets.symmetric(vertical: 25.h,horizontal: 14.w), - child:Column( + margin: EdgeInsets.symmetric(vertical: 25.h, horizontal: 14.w), + child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - (widget?.vipCardHome?.member?.isVip ?? false)? - Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - "assets/image/vip_discount_left.webp", - width: 21.w, - height: 39.h, - fit: BoxFit.fill, - ), - SizedBox(width: 11.w,), - Text( - S.of(context).huixiangvipkazhuanxiang, - style: TextStyle( - color: Color(0xff32A060), - fontSize:15.sp, - fontWeight: MyFontWeight.semi_bold, - ), - ), - SizedBox(width: 11.w,), - Image.asset( - "assets/image/vip_discount_right.webp", - width: 21.w, - height: 39.h, - fit: BoxFit.fill, - ), - ],): - Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - "assets/image/vip_lock.webp", - width: 20, - height: 20, - fit: BoxFit.cover, - ), - SizedBox(width: 2.w,), - Text( - S.of(context).kaitonghuixianghuoququanyi, - style: TextStyle( - color: Colors.black, - fontSize:15.sp, - fontWeight: MyFontWeight.semi_bold, + (widget?.vipCardHome?.member?.isVip ?? false) + ? Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/image/vip_discount_left.webp", + width: 21.w, + height: 39.h, + fit: BoxFit.fill, + ), + SizedBox( + width: 11.w, + ), + Text( + S.of(context).huixiangvipkazhuanxiang, + style: TextStyle( + color: Color(0xff32A060), + fontSize: 15.sp, + fontWeight: MyFontWeight.semi_bold, + ), + ), + SizedBox( + width: 11.w, + ), + Image.asset( + "assets/image/vip_discount_right.webp", + width: 21.w, + height: 39.h, + fit: BoxFit.fill, + ), + ], + ) + : Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + "assets/image/vip_lock.webp", + width: 20, + height: 20, + fit: BoxFit.cover, + ), + SizedBox( + width: 2.w, + ), + Text( + S.of(context).kaitonghuixianghuoququanyi, + style: TextStyle( + color: Colors.black, + fontSize: 15.sp, + fontWeight: MyFontWeight.semi_bold, + ), + ), + ], ), - ), - ], - ), vipGoodsRecommend(), ], ), ); } - Widget vipGoodsRecommend(){ + Widget vipGoodsRecommend() { return Container( margin: EdgeInsets.only(top: 12.h), - height: 253.h, + height: 260.h, width: double.infinity, - padding: EdgeInsets.only(top:20.h,left: 13.h), + padding: EdgeInsets.only(top: 20.h, left: 13.h), decoration: BoxDecoration( borderRadius: BorderRadius.circular(6.w), color: Colors.white, @@ -100,38 +108,60 @@ class _VipGoodsDiscount extends State { ) ], ), - child:Column( + child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( children: [ - SizedBox(width: 7.w,), + SizedBox( + width: 7.w, + ), Image.asset( "assets/image/vip_title.webp", fit: BoxFit.fill, //填充剩余空间 - height:13.h, + height: 13.h, width: 27.w, ), - SizedBox(width: 4.w,), + SizedBox( + width: 4.w, + ), Text( S.of(context).huiyuanzhuanxiangjiage, style: TextStyle( color: Colors.black, - fontSize:15.sp, + fontSize: 15.sp, fontWeight: MyFontWeight.semi_bold, ), ), + GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () { + showAlertDialog(); + }, + child: Container( + padding: EdgeInsets.only( + left: 8.w, right: 30.w, top: 3.h, bottom: 3.h), + child: Image.asset( + "assets/image/vip_tips.webp", + fit: BoxFit.fill, //填充剩余空间 + height: 14, + width: 14, + ), + ), + ), ], ), - SizedBox(height:15.h,), + SizedBox( + height: 15.h, + ), vipGoodsRecommendList(), ], ), ); } - Widget vipGoodsRecommendList(){ + Widget vipGoodsRecommendList() { return Container( height: 200.h, child: ListView.builder( @@ -144,20 +174,23 @@ class _VipGoodsDiscount extends State { Navigator.of(context).pushNamed( '/router/store_order', arguments: { - "id":widget?.vipCardHome?.productVips[position].storeId, - "tenant": widget?.vipCardHome?.productVips[position].tenantCode, - "storeName": widget?.vipCardHome?.productVips[position].supplierName + "id": widget?.vipCardHome?.productVips[position].storeId, + "tenant": + widget?.vipCardHome?.productVips[position].tenantCode, + "storeName": + widget?.vipCardHome?.productVips[position].supplierName }, ); }, - child: vipGoodsRecommendItem(widget.vipCardHome.productVips[position]), + child: + vipGoodsRecommendItem(widget.vipCardHome.productVips[position]), ); }, ), ); } - Widget vipGoodsRecommendItem(ProductVips productVips){ + Widget vipGoodsRecommendItem(ProductVips productVips) { return Container( width: 130.w, // margin: EdgeInsets.only(right:13.w,left:6.w), @@ -165,55 +198,82 @@ class _VipGoodsDiscount extends State { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ - MImage( - productVips.image ?? "", - width: 116, - height: 116, - fit: BoxFit.cover, - radius: BorderRadius.circular(6), - errorSrc: "assets/image/default_1.webp", - fadeSrc: "assets/image/default_1.webp", + Stack( + alignment: Alignment.topRight, + children: [ + MImage( + productVips.image ?? "", + width: 116, + height: 116, + fit: BoxFit.cover, + radius: BorderRadius.circular(6), + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", + ), + if (productVips.vipDiscount != "0.00") + Container( + // width:53.w, + // alignment: Alignment.center, + padding: + EdgeInsets.symmetric(vertical: 2.h, horizontal:8.w), + margin: EdgeInsets.only(left: 5.w), + decoration: BoxDecoration( + color: Color(0xffF96519), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(0), + topRight: Radius.circular(6), + bottomLeft: Radius.circular(12), + bottomRight: Radius.circular(0), + ), + ), + child: Text( + "省${AppUtils.calculateDouble(double.tryParse(productVips.vipDiscount ?? "0"))}元", + style: TextStyle( + color: Colors.white, + fontSize: 13.sp, + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.regular, + ), + ), + ), + ], ), - Padding(padding:EdgeInsets.only(top:10.h,bottom:7.h), + Padding( + padding: EdgeInsets.only(top: 10.h, bottom: 7.h), child: Text( productVips.productName ?? "", maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle( color: Color(0xff0D0D0D), - fontSize:13.sp, + fontSize: 13.sp, fontWeight: MyFontWeight.regular, - ),), - )), + ), + ), + ), Row( children: [ Text( - "￥${productVips.vipPrice ?? "0.00"}", + "￥${AppUtils.calculateDouble(double.tryParse(productVips.vipPrice ?? "0.00"))}", + textAlign: TextAlign.end, style: TextStyle( color: Color(0xff32A060), - fontSize:14.sp, + fontSize: 16.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.medium, - ),), - if(productVips.vipDiscount != "0.00") - Container( - padding: EdgeInsets.symmetric(vertical: 2.h,horizontal:3.w), - margin: EdgeInsets.only(left: 5.w), - decoration: BoxDecoration( - color: Color(0xffF96519), - borderRadius: BorderRadius.only( - topLeft: Radius.circular(10), - topRight: Radius.circular(10), - bottomLeft: Radius.circular(0), - bottomRight: Radius.circular(10), - ), ), - child: Text( - "省${productVips.vipDiscount ?? "0"}元", - style: TextStyle( - color: Colors.white, - fontSize:13.sp, - fontWeight: MyFontWeight.regular, - ),), + ), + SizedBox(width: 4.w,), + Text( + "￥${AppUtils.calculateDouble(double.tryParse(productVips.applyPrice ?? "0.00"))}", + textAlign: TextAlign.end, + style: TextStyle( + color: Color(0xffB2B2B2), + fontSize: 10.sp, + fontFamily: 'JDZhengHT', + decoration: TextDecoration.lineThrough, + fontWeight: MyFontWeight.regular, + ), ), ], ) @@ -221,4 +281,72 @@ class _VipGoodsDiscount extends State { ), ); } + + ///会员专享价格规则弹窗 + showAlertDialog() { + //显示对话框 + showDialog( + context: context, + builder: (BuildContext context) { + return SimpleDialog( + backgroundColor: Colors.transparent, + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(6), + ), + children: [ + Container( + width: double.infinity, + height: 470.h, + padding: EdgeInsets.symmetric(horizontal: 14.w, vertical: 16.h), + decoration: new BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + ), + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Container( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Spacer(), + GestureDetector( + onTap: () { + Navigator.of(context).pop(); + }, + child: Icon( + Icons.clear, + color: Colors.black, + ), + ) + ], + ), + SizedBox( + height: 10.h, + ), + Text( + "VIP会员专享价格" + "\n*用户开通回乡VIP卡，可享以专享优惠价格购买一心回乡APP入驻商户部分门店商品的会员权益。" + "\n*权益适用产品及专享价格，以会员权益页面公示为准。" + "\n为满足不同用户的需求，一心回乡将可能适时调整权益适用产品及专享价格，具体权益内容以会员权益页面公示为准。", + style: TextStyle( + fontWeight: MyFontWeight.medium, + fontSize: 14.sp, + height: 1.7.h, + color: Colors.black, + ), + ), + ], + ), + ), + ), + ), + ], + ); + }, + ); + } } diff --git a/lib/vip/vip_view/vip_top.dart b/lib/vip/vip_view/vip_top.dart index 080810e3..bdd7317e 100644 --- a/lib/vip/vip_view/vip_top.dart +++ b/lib/vip/vip_view/vip_top.dart @@ -258,7 +258,7 @@ class _VipTop extends State { Widget vipCard() { return Container( margin: EdgeInsets.fromLTRB( - 14.w,( MediaQuery.of(context).padding.top + 30.h), 14.w, 8.h), + 14.w,( MediaQuery.of(context).padding.top + 50.h), 14.w, 8.h), width: double.infinity, height: 207.h, decoration: BoxDecoration( @@ -382,6 +382,7 @@ class _VipTop extends State { style: TextStyle( color: Colors.black, fontSize: 15.sp, + fontFamily: 'JDZhengHT', fontWeight: MyFontWeight.medium, ), ), @@ -404,14 +405,25 @@ class _VipTop extends State { SizedBox( height: 10.h, ), - Text( - "￥${AppUtils.calculateDouble(double.tryParse(cards?.price ?? ""))}", - textAlign: TextAlign.center, - style: TextStyle( - color: Color(0xff32A060), - fontSize: 36.sp, - fontWeight: MyFontWeight.medium, - ), + Text.rich( + TextSpan(children: [ + TextSpan( + text: "￥", + style: TextStyle( + fontSize: 20.sp, + color: Color(0xff32A060), + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.medium,), + ), + TextSpan( + text: "${AppUtils.calculateDouble(double.tryParse(cards?.price ?? ""))}", + style: TextStyle( + fontSize: 36.sp, + color: Color(0xff32A060), + fontFamily: 'JDZhengHT', + fontWeight: MyFontWeight.medium,), + ), + ]), ), ], ), @@ -850,6 +862,7 @@ class _VipTop extends State { style: TextStyle( fontWeight: MyFontWeight.regular, fontSize: 12.sp, + fontFamily: 'JDZhengHT', color: Colors.white, ), ), @@ -861,6 +874,7 @@ class _VipTop extends State { style: TextStyle( fontWeight: MyFontWeight.regular, fontSize: 20.sp, + fontFamily: 'JDZhengHT', color: Colors.white, ), ), diff --git a/pubspec.lock b/pubspec.lock index 4d460852..2c9578aa 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -300,7 +300,7 @@ packages: name: fluwx url: "https://pub.flutter-io.cn" source: hosted - version: "3.10.0" + version: "3.9.0+2" font_awesome_flutter: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index db2dc6e4..f099b387 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: 一心回乡. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 3.1.5+33 +version: 3.1.7+35 environment: sdk: ">=2.7.0 <3.0.0" @@ -119,10 +119,13 @@ flutter: - assets/svg/ # - assets/fonts/ - # fonts: - # - family: iconfont - # fonts: - # - asset: assets/fonts/iconfont.ttf + fonts: + - family: JDZhengHT + fonts: + - asset: assets/fonts/JDZhengHT-Bold.ttf + - asset: assets/fonts/JDZhengHT-Light.ttf + - asset: assets/fonts/JDZhengHT-Regular.ttf + uses-material-design: true