Browse Source

Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app

# Conflicts:
#	lib/store/store_view/product_meals_sku.dart
dart3_last
fmk 2 years ago
parent
commit
b2be6b56b1
  1. 429
      lib/article/hot_article_details_page.dart
  2. 163
      lib/article/hot_article_item.dart
  3. 428
      lib/article/video_playback_page.dart
  4. 2
      lib/community/community_details.dart
  5. 4
      lib/community/community_list.dart
  6. 15
      lib/community/community_page.dart
  7. 2
      lib/community/community_view/community_dynamic.dart
  8. 6
      lib/community/new_community_details.dart
  9. 4
      lib/community/release_dynamic.dart
  10. 35
      lib/generated/intl/messages_en.dart
  11. 35
      lib/generated/intl/messages_zh_CN.dart
  12. 35
      lib/generated/intl/messages_zh_Hans_CN.dart
  13. 350
      lib/generated/l10n.dart
  14. 3
      lib/home/home_view/coupon.dart
  15. 7
      lib/home/home_view/discount_zone.dart
  16. 2
      lib/home/home_view/featured_acticvity.dart
  17. 2
      lib/home/home_view/home_integral_store.dart
  18. 8
      lib/home/home_view/quick_order.dart
  19. 13
      lib/home/home_view/shortcut_operation.dart
  20. 8
      lib/home/home_view/union_entry.dart
  21. 6
      lib/home/home_view/welfare_core.dart
  22. 38
      lib/l10n/intl_en.arb
  23. 36
      lib/l10n/intl_zh_CN.arb
  24. 36
      lib/l10n/intl_zh_Hans_CN.arb
  25. 36
      lib/l10n/intl_zh_Hant_CN.arb
  26. 37
      lib/l10n/intl_zh_TW.arb
  27. 9
      lib/main.dart
  28. 12
      lib/main_page.dart
  29. 1
      lib/mine/recharge_page.dart
  30. 15
      lib/order/order_view/order_commodity.dart
  31. 5
      lib/retrofit/data/order_info.dart
  32. 5
      lib/retrofit/data/placeOrderFirst.dart
  33. 434
      lib/retrofit/data/settleOrderInfo.dart
  34. 2
      lib/retrofit/min_api.dart
  35. 2
      lib/retrofit/retrofit_api.dart
  36. 42
      lib/settlement/settlement.dart
  37. 92
      lib/settlement/settlement_view/activity_coupon_remarks.dart
  38. 46
      lib/settlement/settlement_view/settlement_order_commodity.dart
  39. 74
      lib/store/store_view/shop_goods.dart
  40. 49
      lib/vip/user_vip_service_page.dart
  41. 59
      lib/vip/vip_page.dart
  42. 9
      lib/vip/vip_view/exclusive_coupon.dart
  43. 29
      lib/vip/vip_view/vip_goods_discount.dart
  44. 238
      lib/vip/vip_view/vip_top.dart
  45. 2
      pubspec.yaml

429
lib/article/hot_article_details_page.dart

@ -1,429 +0,0 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
class HotArticleDetailsPage extends StatefulWidget {
@override
State<StatefulWidget> createState() {
return _HotArticleDetailsPage();
}
}
class _HotArticleDetailsPage extends State<HotArticleDetailsPage> {
var controller = new ScrollController();
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: MyAppBar(
background: Color(0xFFFFFFFF),
leadingColor: Colors.black,
title: S.of(context).wenzhangxiangqing,
titleColor: Colors.black,
titleSize: 16.sp,
action: Padding(
padding: EdgeInsets.only(right: 16.w),
child: Image.asset(
"assets/image/icon_share.webp",
width: 24.w,
height: 24.h,
),
),
),
body: Container(
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Column(
children: [
Container(
margin: EdgeInsets.only(bottom: 20.h),
padding: EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 2),
blurRadius: 14,
spreadRadius: 0,
)
],
),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
"牡丹花的养护知识",
style: TextStyle(
fontSize: 24.sp,
fontWeight: FontWeight.bold,
color: Color(0xff1A1A1A),
),
),
SizedBox(
height: 20.h,
),
Row(
children: [
ClipOval(
child: Image.network(
"https://t7.baidu.com/it/u=2841334870,333581502&fm=193&f=GIF",
fit: BoxFit.cover,
width: 44.w,
height: 44.h,
),
clipBehavior: Clip.hardEdge,
),
SizedBox(
width: 8.w,
),
Expanded(
child: Container(
height: 60.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text.rich(
TextSpan(children: [
TextSpan(
text: "百花谷",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14.sp,
color: Colors.black),
),
]),
textDirection: TextDirection.ltr,
),
Text(
"2021.04.12 12:12",
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xff808080),
),
),
],
),
),
flex: 1,
)
],
),
SizedBox(
height: 20.h,
),
RichText(
text: TextSpan(
text:
"文本,是指书面语言的表现形式,从文学角度说,通常是具有完整、系统含义(Message)的一个句子或多个句子的组合。"
"一个文本可以是一个句子(Sentence)、一个段落(Paragraph)或者一个篇章(Discourse)。广义“文本”:"
"任何由书写所固定下来的任何话语。(利科尔) 狭义“文本”:由语言文字组成的文学实体,代指“作品”,相对于作者、世界构成一个独立、自足的系统。",
style:
TextStyle(color: Color(0xFF1A1A1A), fontSize: 16.sp),
)),
SizedBox(
height: 16.h,
),
Image.network(
"https://t7.baidu.com/it/u=2487758541,1861252964&fm=193&f=GIF",
fit: BoxFit.cover,
width: double.infinity,
height: 170.h,
),
SizedBox(
height: 16.h,
),
RichText(
text: TextSpan(
text:
"文本,是指书面语言的表现形式,从文学角度说,通常是具有完整、系统含义(Message)的一个句子或多个句子的组合。一个文本可以",
style:
TextStyle(color: Color(0xFF1A1A1A), fontSize: 16.sp),
)),
],
),
),
Container(
// margin: EdgeInsets.only(bottom: 20),
// padding: EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 2),
blurRadius: 14,
spreadRadius: 0)
],
),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.all(16),
child: Text("评论 (58) 喜欢 (58)",
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
color: Color(0xff1A1A1A))),
),
SizedBox(
height: 600.h,
child: ListView.builder(
itemCount: 6,
scrollDirection: Axis.vertical,
physics: BouncingScrollPhysics(),
itemBuilder: (context, position) {
return _commentItem(position);
},
),
),
],
),
),
SizedBox(
height: 12.h,
),
Container(
padding: EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 2),
blurRadius: 14,
spreadRadius: 0)
],
borderRadius: new BorderRadius.only(
topLeft: Radius.circular(8.0),
topRight: Radius.circular(8.0),
),
),
child: Row(
children: [
Expanded(
flex: 1,
child: Container(
decoration: new BoxDecoration(
color: Color(0xffF2F2F2),
borderRadius: BorderRadius.circular(2.0)),
child: Column(
children: [
Container(
margin: const EdgeInsets.fromLTRB(4, 0, 4, 0),
alignment: Alignment.topLeft,
child: TextField(
maxLines: 8,
minLines: 1,
decoration: InputDecoration(
border: InputBorder.none,
hintText: "留下您精彩的评论吧~",
hintStyle: TextStyle(
fontSize: 14.sp,
color: Color(0xffCDCCCC),
),
),
),
),
],
),
),
),
Padding(
padding: EdgeInsets.only(left: 20.w, right: 20.w),
child: Text(
"发送",
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
color: Color(0XFF1A1A1A)),
),
),
Image.asset("assets/image/icon_like_h.webp")
],
),
),
],
),
),
),
);
}
// var _status = 0;
// var _bgStatus = false;
// Widget rightAction() {
// if (_status == 0) {
// return Container(
// margin: EdgeInsets.only(right: 17),
// child: GestureDetector(
// onTap: () {
// setState(() {
// _status = (_status + 1) % 2;
// });
// },
// child: Image.asset(
// "assets/image/icon_share.webp",
// width: 24,
// height: 24,
// ),
// ),
// );
// } else {
// return GestureDetector(
// onTap: () {
// setState(() {
// _status = (_status + 1) % 2;
// });
// },
// child: Container(
// margin: EdgeInsets.only(right: 17),
// padding: EdgeInsets.only(top: 15, bottom: 15),
// alignment: Alignment.center,
// child: RoundButton(
// text: S.of(context).wancheng,
// textColor: _bgStatus ? Colors.white : Color(0xFFA0A0A0),
// backgroup: _bgStatus ? Color(0xFF32A060) : Color(0xFFD8D8D8),
// fontSize: 14,
// fontWeight: FontWeight.bold,
// padding: EdgeInsets.only(left: 12, right: 12, top: 2, bottom: 2),
// radius: 12,
// ),
// ),
// );
// }
// }
Widget _commentItem(var position) {
return Container(
child: Column(
children: [
Padding(
padding: EdgeInsets.all(16),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
ClipOval(
child: Image.network(
"https://t7.baidu.com/it/u=2841334870,333581502&fm=193&f=GIF",
fit: BoxFit.cover,
width: 40.w,
height: 40.h,
),
clipBehavior: Clip.hardEdge,
),
SizedBox(
width: 12.w,
),
Expanded(
child: Container(
height: 60.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text.rich(
TextSpan(children: [
TextSpan(
text: "张三",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14.sp,
color: Colors.black),
),
]),
textDirection: TextDirection.ltr,
),
Text(
"2021.04.12 12:12",
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xff808080),
),
),
],
),
),
flex: 1,
),
Container(
alignment: Alignment.topRight,
child: Row(
children: [
Image.asset(
"assets/image/icon_like.webp",
width: 16.w,
height: 16.h,
),
Text(
"58",
style: TextStyle(
fontSize: 12.sp, color: Color(0xff1A1A1A)),
),
],
),
),
],
),
),
Padding(
padding: EdgeInsets.only(left: 68, right: 16),
child: Text(
"文本,是指书面语言的表现形式,从文学角度说,通常是具有完整、系统含义(Mess…",
style: TextStyle(fontSize: 14.sp, color: Color(0xff1A1A1A)),
),
),
SizedBox(
height: 12.h,
),
Container(
width: double.infinity,
margin: EdgeInsets.only(left: 68.w, right: 16.w),
decoration: new BoxDecoration(
color: Color(0xffF2F2F2),
borderRadius: BorderRadius.circular(2.0),
),
child: Padding(
padding: EdgeInsets.only(left: 4.w, top: 4.h, bottom: 4.h),
child: Text(
"文本,是指书面语言的表现形式文本,是指、",
style: TextStyle(fontSize: 12.sp, color: Color(0xff808080)),
),
),
),
if (position == 5)
Container(
height: 63.h,
decoration: BoxDecoration(
color: Color(0xffF2F2F2),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 2),
blurRadius: 14,
spreadRadius: 0)
],
),
margin: EdgeInsets.only(top: 30.h),
alignment: Alignment.center,
child: Text(
"-已显示全部评论-",
style: TextStyle(fontSize: 14.sp, color: Color(0xff353535)),
),
),
],
),
);
}
}

163
lib/article/hot_article_item.dart

@ -1,163 +0,0 @@
import 'package:dio/dio.dart';
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/retrofit/data/article.dart';
import 'package:huixiang/retrofit/data/banner.dart';
import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/hot_item.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/my_footer.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class TouTiao extends StatefulWidget {
@override
State<StatefulWidget> createState() {
return _TouTiao();
}
}
class _TouTiao extends State<TouTiao> {
ApiService apiService;
List<BannerData> bannerData = [];
@override
void dispose() {
super.dispose();
refreshController.dispose();
}
@override
void initState() {
super.initState();
SharedPreferences.getInstance().then((value) => {
apiService = ApiService(Dio(), context: context, token: value.getString("token")),
queryArticle(),
});
}
int pageNum = 1;
RefreshController refreshController = RefreshController();
_onRefresh() {
pageNum = 1;
queryArticle();
}
List<Article> articles = [];
queryArticle() async {
BaseData<PageInfo<Article>> baseData = await apiService.queryArticle({
"pageNum": pageNum,
"pageSize": 10,
"searchKey": "",
"state": 1,
"type": 2
}).catchError((onError){
refreshController.refreshFailed();
refreshController.loadFailed();
});
if (baseData != null && baseData.isSuccess) {
refreshController.refreshCompleted();
refreshController.loadComplete();
if(pageNum == 1) {
articles.clear();
}
articles.addAll(baseData.data.list);
if (baseData.data.pageNum == baseData.data.pages) {
refreshController.loadNoData();
} else {
pageNum += 1;
}
setState(() {});
} else {
refreshController.refreshFailed();
refreshController.loadFailed();
}
}
///banner
queryCourseBanner() async {
if (apiService == null) {
SharedPreferences value = await SharedPreferences.getInstance();
apiService = ApiService(
Dio(),
context: context,
token: value.getString("token"),
showLoading: true
);
}
BaseData<PageInfo<BannerData>> baseData =
await apiService.queryBanner({
"model": {"type": "COURSE_BANNER"},
}).catchError((onError) {
refreshController.refreshFailed();
});
if (baseData != null && baseData.isSuccess) {
bannerData.clear();
bannerData.addAll(baseData.data.records);
refreshController.refreshCompleted();
} else {
refreshController.refreshFailed();
// SmartDialog.showToast(baseData.msg, alignment: Alignment.center);
}
EasyLoading.dismiss();
}
@override
Widget build(BuildContext context) {
return Scaffold(
// appBar: MyAppBar(
// background: Color(0xFFF7F7F7),
// leadingColor: Colors.black,
// title: S.of(context).huixiangtoutiao,
// titleColor: Colors.black,
// titleSize: 18.sp,
// ),
body: Container(
child: Column(
children: [
SmartRefresher(
controller: refreshController,
enablePullDown: true,
enablePullUp: true,
physics: BouncingScrollPhysics(),
header: MyHeader(),
footer: CustomFooter(
builder: (context, mode) {
return MyFooter(mode);
},
),
onRefresh: _onRefresh,
onLoading: queryArticle,
child: ListView.builder(
itemCount: articles.length,
physics: NeverScrollableScrollPhysics(),
scrollDirection: Axis.vertical,
itemBuilder: (context, position) {
return AspectRatio(
aspectRatio: position == 0 ? 1.38 : 2.56,
child: Container(
height: position == 0 ? 247.h : 96.h,
margin: EdgeInsets.symmetric(vertical:6.h, horizontal: 16.w),
child:
HotArticleItem(article: articles[position], isHot: position == 0),
),
);
},
),
),
],
),
),
);
}
}

428
lib/article/video_playback_page.dart

@ -1,428 +0,0 @@
import 'package:chewie/chewie.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:video_player/video_player.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class VideoPlaybackPage extends StatefulWidget {
@override
State<StatefulWidget> createState() {
return _VideoPlaybackPage();
}
}
class _VideoPlaybackPage extends State<VideoPlaybackPage> {
var controller = new ScrollController();
VideoPlayerController videoPlayerController;
ChewieController chewieController;
@override
void initState() {
super.initState();
// player.setDataSource(
// "https://www.xxx/test.mp4",
// autoPlay: false);
//
videoPlayerController = VideoPlayerController.network(
'https://www.runoob.com/try/demo_source/movie.mp4');
chewieController = ChewieController(
videoPlayerController: videoPlayerController,
aspectRatio: 3 / 2,
//
autoPlay: !true,
//
looping: true,
//
//
materialProgressColors: ChewieProgressColors(
playedColor: Colors.white,
handleColor: Colors.white,
backgroundColor: Colors.grey,
bufferedColor: Colors.transparent,
),
);
}
@override
void dispose() {
/**
*
*/
videoPlayerController.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: Container(
child: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Column(
children: [
Stack(
children: [
Container(
height: 274.h,
child: Chewie(
controller: chewieController,
),
),
Container(
margin: EdgeInsets.only(top: 40.h, left: 16.w, right: 16.w),
decoration: BoxDecoration(
color: Colors.transparent,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
GestureDetector(
child: Icon(
Icons.arrow_back_ios,
color: Colors.white,
size: 24,
),
onTap: () {
Navigator.of(context).pop();
},
),
Image.asset(
"assets/image/icon_share_w.webp",
width: 24.w,
height: 24.h,
),
],
),
),
],
),
Container(
margin: EdgeInsets.only(bottom: 20.h),
padding: EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 2),
blurRadius: 14,
spreadRadius: 0,
)
],
),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
ClipOval(
child: Image.network(
"https://t7.baidu.com/it/u=2841334870,333581502&fm=193&f=GIF",
fit: BoxFit.cover,
width: 44.w,
height: 44.h,
),
clipBehavior: Clip.hardEdge,
),
SizedBox(
width: 8.w,
),
Expanded(
child: Container(
height: 60.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text.rich(
TextSpan(children: [
TextSpan(
text: "百花谷",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14.sp,
color: Colors.black),
),
]),
textDirection: TextDirection.ltr,
),
Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"2021.04.12 12:12",
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xff808080),
),
),
Text(
"播放次数 56",
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xff808080),
),
),
],
),
],
),
),
flex: 1,
)
],
),
SizedBox(
height: 20.h,
),
Text("牡丹花的养护知识",
style: TextStyle(
fontSize: 24.sp,
fontWeight: FontWeight.bold,
color: Color(0xff1A1A1A))),
],
),
),
Container(
// margin: EdgeInsets.only(bottom: 20),
// padding: EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 2),
blurRadius: 14,
spreadRadius: 0)
],
),
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: EdgeInsets.all(16),
child: Text("评论 (58) 喜欢 (58)",
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
color: Color(0xff1A1A1A))),
),
SizedBox(
height: 500.h,
child: ListView.builder(
itemCount: 6,
scrollDirection: Axis.vertical,
physics: BouncingScrollPhysics(),
itemBuilder: (context, position) {
return _commentItem(position);
},
),
),
// _commentItem()
],
),
),
SizedBox(
height: 12.h,
),
Container(
padding: EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 2),
blurRadius: 14,
spreadRadius: 0)
],
borderRadius: new BorderRadius.only(
topLeft: Radius.circular(8.0),
topRight: Radius.circular(8.0),
),
),
child: Row(
children: [
Expanded(
flex: 1,
child: Container(
decoration: new BoxDecoration(
color: Color(0xffF2F2F2),
borderRadius: BorderRadius.circular(2.0)),
child: Column(
children: [
Container(
margin: const EdgeInsets.fromLTRB(4, 0, 4, 0),
alignment: Alignment.topLeft,
child: TextField(
maxLines: 8,
minLines: 1,
decoration: InputDecoration(
border: InputBorder.none,
hintText: "留下您精彩的评论吧~",
hintStyle: TextStyle(
fontSize: 14.sp,
color: Color(0xffCDCCCC),
),
),
),
),
],
),
),
),
Padding(
padding: EdgeInsets.only(left: 20.w, right: 20.w),
child: Text(
"发送",
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.bold,
color: Color(0XFF1A1A1A)),
),
),
Image.asset("assets/image/icon_like_h.webp")
],
),
),
],
),
),
),
);
}
Widget _commentItem(var position) {
return Container(
child: Column(
children: [
Padding(
padding: EdgeInsets.all(16),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
ClipOval(
child: Image.network(
"https://t7.baidu.com/it/u=2841334870,333581502&fm=193&f=GIF",
fit: BoxFit.cover,
width: 40.w,
height: 40.h,
),
clipBehavior: Clip.hardEdge,
),
SizedBox(
width: 12.w,
),
Expanded(
child: Container(
height: 60,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text.rich(
TextSpan(children: [
TextSpan(
text: "张三",
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 14.sp,
color: Colors.black),
),
]),
textDirection: TextDirection.ltr,
),
Text(
"2021.04.12 12:12",
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: 12.sp,
color: Color(0xff808080),
),
),
],
),
),
flex: 1,
),
Container(
alignment: Alignment.topRight,
child: Row(
children: [
Image.asset(
"assets/image/icon_like.webp",
width: 16.w,
height: 16.h,
),
Text(
"58",
style:
TextStyle(fontSize: 12.sp, color: Color(0xff1A1A1A)),
),
],
),
),
],
),
),
Padding(
padding: EdgeInsets.only(left: 68.w, right: 16.w),
child: Text(
"文本,是指书面语言的表现形式,从文学角度说,通常是具有完整、系统含义(Mess…",
style: TextStyle(fontSize: 14.sp, color: Color(0xff1A1A1A)),
),
),
SizedBox(
height: 12.h,
),
Container(
width: double.infinity,
margin: EdgeInsets.only(left: 68.w, right: 16.w),
decoration: new BoxDecoration(
color: Color(0xffF2F2F2),
borderRadius: BorderRadius.circular(2.0),
),
child: Padding(
padding: EdgeInsets.only(left: 4.w, top: 4.h, bottom: 4.h),
child: Text(
"文本,是指书面语言的表现形式文本,是指、",
style: TextStyle(fontSize: 12.sp, color: Color(0xff808080)),
),
),
),
if (position == 5)
Container(
height: 63.h,
decoration: BoxDecoration(
color: Color(0xffF2F2F2),
boxShadow: [
BoxShadow(
color: Colors.black.withAlpha(12),
offset: Offset(0, 2),
blurRadius: 14,
spreadRadius: 0)
],
),
margin: EdgeInsets.only(top: 30.h),
alignment: Alignment.center,
child: Text(
"-已显示全部评论-",
style: TextStyle(fontSize: 14.sp, color: Color(0xff353535)),
),
),
],
),
);
}
}

2
lib/community/community_details.dart

@ -105,7 +105,7 @@ class _CommunityDetails extends State<CommunityDetails> with WidgetsBindingObser
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: MyAppBar( appBar: MyAppBar(
title: "动态详情", title: S.of(context).dongtaixiangqing,
titleColor: Colors.black, titleColor: Colors.black,
titleSize: 18.sp, titleSize: 18.sp,
background: Colors.white, background: Colors.white,

4
lib/community/community_list.dart

@ -341,8 +341,8 @@ class _CommunityList extends State<CommunityList> {
? Color(0xFF808080) ? Color(0xFF808080)
: Colors.white, : Colors.white,
text: (comments?.selfFollow ?? false) text: (comments?.selfFollow ?? false)
? "已关注" ? S.of(context).yiguanzhu
: "关注", : S.of(context).guanzhu,
radius: 20, radius: 20,
icons: Icon( icons: Icon(
(comments?.selfFollow ?? false) (comments?.selfFollow ?? false)

15
lib/community/community_page.dart

@ -6,6 +6,7 @@ import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/my_tab.dart'; import 'package:huixiang/view_widget/my_tab.dart';
import '../generated/l10n.dart';
import 'community_course.dart'; import 'community_course.dart';
import 'headlines/article_page.dart'; import 'headlines/article_page.dart';
@ -129,21 +130,21 @@ class _CommunityPage extends State<CommunityPage>
child: TabBarView( child: TabBarView(
physics: b, physics: b,
children: lables.map((e) { children: lables.map((e) {
if (e == "关于回乡") { if (e == S.of(context).guanyuhuixiang) {
return BrandPage(); return BrandPage();
}else if(e == "了解健康"){ }else if(e == S.of(context).liaojiejiankang){
return ArticlePage(onChildScroll); return ArticlePage(onChildScroll);
}else if(e == "学习健康"){ }else if(e == S.of(context).xuexijiankang){
return CommunityCourse(); return CommunityCourse();
} }
else if(e == "分享健康"){ else if(e == S.of(context).fenxiangjiankang){
if (tuijian == null){ if (tuijian == null){
tuijian = CommunityChildPage(tuijianKey,"分享健康",onChildScroll,_toRelease); tuijian = CommunityChildPage(tuijianKey, S.of(context).fenxiangjiankang,onChildScroll,_toRelease);
} }
return tuijian; return tuijian;
}else if(e == "关注"){ }else if(e == S.of(context).guanzhu){
if (guanzhu == null){ if (guanzhu == null){
guanzhu = CommunityChildPage(guanzhuKey,"关注",onChildScroll,_toRelease); guanzhu = CommunityChildPage(guanzhuKey,S.of(context).guanzhu,onChildScroll,_toRelease);
} }
return guanzhu; return guanzhu;
} }

2
lib/community/community_view/community_dynamic.dart

@ -118,7 +118,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
token: value.getString("token"), token: value.getString("token"),
); );
} }
BaseData baseData = await apiService.follow(followId); BaseData baseData = await apiService.follow(followId ?? "");
if (baseData != null && baseData.isSuccess) { if (baseData != null && baseData.isSuccess) {
widget.exitFull(); widget.exitFull();
SmartDialog.showToast(isFollow ? "关注成功" : "取关成功", SmartDialog.showToast(isFollow ? "关注成功" : "取关成功",

6
lib/community/new_community_details.dart

@ -130,7 +130,7 @@ class _NewCommunityDetails extends State<NewCommunityDetails> with WidgetsBindin
value: SystemUiOverlayStyle.light, value: SystemUiOverlayStyle.light,
child: Material(child: Scaffold( child: Material(child: Scaffold(
appBar: MyAppBar( appBar: MyAppBar(
title: "动态详情", title: S.of(context).dongtaixiangqing,
titleColor: Colors.black, titleColor: Colors.black,
titleSize: 18.sp, titleSize: 18.sp,
background: Colors.white, background: Colors.white,
@ -240,8 +240,8 @@ class _NewCommunityDetails extends State<NewCommunityDetails> with WidgetsBindin
? Color(0xFF808080) ? Color(0xFF808080)
: Colors.white, : Colors.white,
text: (article?.liked ?? false) text: (article?.liked ?? false)
? "已关注" ? S.of(context).yiguanzhu
: "关注", : S.of(context).guanzhu,
radius: 20, radius: 20,
icons: Icon( icons: Icon(
(article?.liked ?? false) (article?.liked ?? false)

4
lib/community/release_dynamic.dart

@ -55,7 +55,7 @@ class _ReleaseDynamic extends State<ReleaseDynamic> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: MyAppBar( appBar: MyAppBar(
title: "写动态", title: S.of(context).xiedongtai,
titleColor: Colors.black, titleColor: Colors.black,
leadingColor: Colors.black, leadingColor: Colors.black,
background: Colors.white, background: Colors.white,
@ -118,7 +118,7 @@ class _ReleaseDynamic extends State<ReleaseDynamic> {
), ),
Expanded( Expanded(
child: Text( child: Text(
"用户发布内容需要等待系统审核,审核通过后才会在推荐广场展示", S.of(context).dongtaitishi,
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(

35
lib/generated/intl/messages_en.dart

@ -149,8 +149,10 @@ class MessageLookup extends MessageLookupByLibrary {
"chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"),
"chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
"chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员,享专属权益"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员,享专属权益"),
"chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"),
"chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
"chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"), "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
"chongzhifuliduo" : MessageLookupByLibrary.simpleMessage("充值福利多"),
"chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"), "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
"chongzhizuixiaojine" : m1, "chongzhizuixiaojine" : m1,
"chuangjianshijian" : m2, "chuangjianshijian" : m2,
@ -166,6 +168,7 @@ class MessageLookup extends MessageLookupByLibrary {
"daiqueren" : MessageLookupByLibrary.simpleMessage("待确认"), "daiqueren" : MessageLookupByLibrary.simpleMessage("待确认"),
"daizhifu" : MessageLookupByLibrary.simpleMessage("待支付"), "daizhifu" : MessageLookupByLibrary.simpleMessage("待支付"),
"daizhizuo" : MessageLookupByLibrary.simpleMessage("待制作"), "daizhizuo" : MessageLookupByLibrary.simpleMessage("待制作"),
"dajiadouzaiduihuan" : MessageLookupByLibrary.simpleMessage("大家都在兑换"),
"dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"), "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"),
"dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"), "dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"),
"dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
@ -182,6 +185,7 @@ class MessageLookup extends MessageLookupByLibrary {
"diandan" : MessageLookupByLibrary.simpleMessage("点单"), "diandan" : MessageLookupByLibrary.simpleMessage("点单"),
"dianhua" : MessageLookupByLibrary.simpleMessage("电话"), "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
"dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录,享受更多精彩信息"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录,享受更多精彩信息"),
"dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"),
"dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"),
"dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
"dianzanxihuan_" : m3, "dianzanxihuan_" : m3,
@ -202,6 +206,8 @@ class MessageLookup extends MessageLookupByLibrary {
"dingwei" : MessageLookupByLibrary.simpleMessage("定位"), "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
"dizhi" : MessageLookupByLibrary.simpleMessage("地址"), "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
"dongtai" : MessageLookupByLibrary.simpleMessage("动态"), "dongtai" : MessageLookupByLibrary.simpleMessage("动态"),
"dongtaitishi" : MessageLookupByLibrary.simpleMessage("用户发布内容需要等待系统审核,审核通过后才会在推荐广场展示"),
"dongtaixiangqing" : MessageLookupByLibrary.simpleMessage("动态详情"),
"duihuan" : MessageLookupByLibrary.simpleMessage("兑换"), "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
"duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"), "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
"duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"), "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@ -232,16 +238,19 @@ class MessageLookup extends MessageLookupByLibrary {
"fensi" : MessageLookupByLibrary.simpleMessage("粉丝"), "fensi" : MessageLookupByLibrary.simpleMessage("粉丝"),
"fenxiang" : MessageLookupByLibrary.simpleMessage("分享"), "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"),
"fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
"fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("分享健康"),
"fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
"fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。"), "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。"),
"fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
"fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"),
"fulizhongxin" : MessageLookupByLibrary.simpleMessage("福利中心"),
"ge" : m5, "ge" : m5,
"geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
"gengduo" : MessageLookupByLibrary.simpleMessage("更多"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
"gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
"genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"), "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"),
"genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
"gengyouhui" : MessageLookupByLibrary.simpleMessage("更优惠"),
"gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
"gexingqianming" : MessageLookupByLibrary.simpleMessage("个性签名"), "gexingqianming" : MessageLookupByLibrary.simpleMessage("个性签名"),
"gong" : MessageLookupByLibrary.simpleMessage(""), "gong" : MessageLookupByLibrary.simpleMessage(""),
@ -255,6 +264,7 @@ class MessageLookup extends MessageLookupByLibrary {
"guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
"guanyu" : MessageLookupByLibrary.simpleMessage("关于"), "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
"guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"), "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"),
"guanyuhuixiang" : MessageLookupByLibrary.simpleMessage("关于回乡"),
"guanzhu" : MessageLookupByLibrary.simpleMessage("关注"), "guanzhu" : MessageLookupByLibrary.simpleMessage("关注"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("还没有消息~"), "haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("还没有消息~"),
@ -263,15 +273,18 @@ class MessageLookup extends MessageLookupByLibrary {
"haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"), "haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"), "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
"huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"),
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
"huifu" : MessageLookupByLibrary.simpleMessage("回复"), "huifu" : MessageLookupByLibrary.simpleMessage("回复"),
"huifu_" : m9, "huifu_" : m9,
"huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回乡VIP卡"),
"huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"), "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"), "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
"huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回乡VIP卡专享权益"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
"huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"),
"huiyuanguize" : MessageLookupByLibrary.simpleMessage("会员规则说明"), "huiyuanguize" : MessageLookupByLibrary.simpleMessage("会员规则说明"),
@ -284,6 +297,7 @@ class MessageLookup extends MessageLookupByLibrary {
"huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("会员权益"), "huiyuanquanyi" : MessageLookupByLibrary.simpleMessage("会员权益"),
"huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"),
"huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"), "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"),
"huiyuanzhuanxiangjiage" : MessageLookupByLibrary.simpleMessage("会员专享价格"),
"huode" : MessageLookupByLibrary.simpleMessage("获得"), "huode" : MessageLookupByLibrary.simpleMessage("获得"),
"huodequanyi" : MessageLookupByLibrary.simpleMessage("获得权益"), "huodequanyi" : MessageLookupByLibrary.simpleMessage("获得权益"),
"huodong" : MessageLookupByLibrary.simpleMessage("活动"), "huodong" : MessageLookupByLibrary.simpleMessage("活动"),
@ -319,6 +333,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
"jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"), "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"),
"jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精选活动"),
"jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
"jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"),
@ -338,6 +353,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
"kaitonghuixianghuoququanyi" : MessageLookupByLibrary.simpleMessage("开通回乡VIP卡获取更多权益"),
"kaitongriqi" : m16, "kaitongriqi" : m16,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
"kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"),
@ -351,12 +367,16 @@ class MessageLookup extends MessageLookupByLibrary {
"kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"), "kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"),
"lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"),
"lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"),
"liaojiejiankang" : MessageLookupByLibrary.simpleMessage("了解健康"),
"lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
"lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
"lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"), "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"),
"lijilingqu" : MessageLookupByLibrary.simpleMessage("立即领取"), "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即领取"),
"lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"),
"lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"),
"likekaitong" : MessageLookupByLibrary.simpleMessage("立刻开通"),
"likexufei" : MessageLookupByLibrary.simpleMessage("立刻续费"),
"likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"),
"lingqu" : MessageLookupByLibrary.simpleMessage("领取"), "lingqu" : MessageLookupByLibrary.simpleMessage("领取"),
"lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("领券中心"), "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("领券中心"),
"lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"), "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
@ -493,6 +513,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。"), "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。"),
"ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款,请您提前准备好订单号/取单号,并与门店人员进行联系"), "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款,请您提前准备好订单号/取单号,并与门店人员进行联系"),
"saoma" : MessageLookupByLibrary.simpleMessage("扫码"), "saoma" : MessageLookupByLibrary.simpleMessage("扫码"),
"saomadiancan" : MessageLookupByLibrary.simpleMessage("您即将进行扫码点餐"),
"saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("扫码识别,关注公众号"), "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("扫码识别,关注公众号"),
"send_code" : MessageLookupByLibrary.simpleMessage("发送验证码"), "send_code" : MessageLookupByLibrary.simpleMessage("发送验证码"),
"shanchu" : MessageLookupByLibrary.simpleMessage("删除"), "shanchu" : MessageLookupByLibrary.simpleMessage("删除"),
@ -537,8 +558,10 @@ class MessageLookup extends MessageLookupByLibrary {
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
"sui" : m31, "sui" : m31,
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
"tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠专区"),
"tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tiantiandefuli" : MessageLookupByLibrary.simpleMessage("天天得福利"),
"tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
"tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"), "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"),
"tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"),
@ -557,6 +580,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32, "wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
"wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"),
"wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
"wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
"weidenglu" : MessageLookupByLibrary.simpleMessage("未登录"), "weidenglu" : MessageLookupByLibrary.simpleMessage("未登录"),
@ -597,6 +621,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"), "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
"xiadanshijian_" : m33, "xiadanshijian_" : m33,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下单赚积分"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相册"), "xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
"xiangji" : MessageLookupByLibrary.simpleMessage("相机"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
@ -612,6 +637,7 @@ class MessageLookup extends MessageLookupByLibrary {
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
"xiedongtai" : MessageLookupByLibrary.simpleMessage("写动态"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
"xihuan_" : m34, "xihuan_" : m34,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"), "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
@ -622,16 +648,22 @@ class MessageLookup extends MessageLookupByLibrary {
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"), "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
"xuanji" : MessageLookupByLibrary.simpleMessage("选集"), "xuanji" : MessageLookupByLibrary.simpleMessage("选集"),
"xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("续费会员"),
"xuexijiankang" : MessageLookupByLibrary.simpleMessage("学习健康"),
"xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("续费回乡VIP"),
"xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
"yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
"yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀请好友"),
"yaoqingrenshoujihao_" : m35, "yaoqingrenshoujihao_" : m35,
"yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"), "yaoqingwancheng" : MessageLookupByLibrary.simpleMessage("邀请完成"),
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
"yiduihuanjian" : m36, "yiduihuanjian" : m36,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
"yiguanzhu" : MessageLookupByLibrary.simpleMessage("已关注"),
"yihuide" : MessageLookupByLibrary.simpleMessage("已获得"), "yihuide" : MessageLookupByLibrary.simpleMessage("已获得"),
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
"yikaitongzidongxufei" : MessageLookupByLibrary.simpleMessage("已开通自动续费"),
"yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
"yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
"yindao1" : MessageLookupByLibrary.simpleMessage("新增多项功能,海量优惠资讯实时推送"), "yindao1" : MessageLookupByLibrary.simpleMessage("新增多项功能,海量优惠资讯实时推送"),
@ -661,6 +693,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yituikuan" : MessageLookupByLibrary.simpleMessage("已退款"), "yituikuan" : MessageLookupByLibrary.simpleMessage("已退款"),
"yiwancheng" : MessageLookupByLibrary.simpleMessage(" 已完成 "), "yiwancheng" : MessageLookupByLibrary.simpleMessage(" 已完成 "),
"yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"), "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"),
"yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("已享会员权益"),
"yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已显示全部评论-"), "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已显示全部评论-"),
"yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"), "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
"yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有积分"), "yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有积分"),
@ -706,6 +739,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加载中..."), "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加载中..."),
"zhidianmendian" : MessageLookupByLibrary.simpleMessage("致电门店"), "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致电门店"),
"zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"), "zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"),
"zhifubaozhifu" : MessageLookupByLibrary.simpleMessage("支付宝支付"),
"zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"), "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"),
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"), "zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"), "zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"),
@ -713,6 +747,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"), "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"), "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
"zhuanlan" : MessageLookupByLibrary.simpleMessage("专栏"), "zhuanlan" : MessageLookupByLibrary.simpleMessage("专栏"),
"zhuanxiangyouhuiquan" : MessageLookupByLibrary.simpleMessage("专享优惠券"),
"zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复,相关数据和信息会永久删除。"), "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复,相关数据和信息会永久删除。"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"), "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"), "ziti" : MessageLookupByLibrary.simpleMessage("自提"),

35
lib/generated/intl/messages_zh_CN.dart

@ -149,8 +149,10 @@ class MessageLookup extends MessageLookupByLibrary {
"chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"),
"chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
"chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员,享专属权益"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员,享专属权益"),
"chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"),
"chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
"chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"), "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
"chongzhifuliduo" : MessageLookupByLibrary.simpleMessage("充值福利多"),
"chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"), "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
"chongzhizuixiaojine" : m1, "chongzhizuixiaojine" : m1,
"chuangjianshijian" : m2, "chuangjianshijian" : m2,
@ -166,6 +168,7 @@ class MessageLookup extends MessageLookupByLibrary {
"daiqueren" : MessageLookupByLibrary.simpleMessage("待确认"), "daiqueren" : MessageLookupByLibrary.simpleMessage("待确认"),
"daizhifu" : MessageLookupByLibrary.simpleMessage("待支付"), "daizhifu" : MessageLookupByLibrary.simpleMessage("待支付"),
"daizhizuo" : MessageLookupByLibrary.simpleMessage("待制作"), "daizhizuo" : MessageLookupByLibrary.simpleMessage("待制作"),
"dajiadouzaiduihuan" : MessageLookupByLibrary.simpleMessage("大家都在兑换"),
"dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"), "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"),
"dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"), "dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"),
"dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
@ -182,6 +185,7 @@ class MessageLookup extends MessageLookupByLibrary {
"diandan" : MessageLookupByLibrary.simpleMessage("点单"), "diandan" : MessageLookupByLibrary.simpleMessage("点单"),
"dianhua" : MessageLookupByLibrary.simpleMessage("电话"), "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
"dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录,享受更多精彩信息"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录,享受更多精彩信息"),
"dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"),
"dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"),
"dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
"dianzanxihuan_" : m3, "dianzanxihuan_" : m3,
@ -202,6 +206,8 @@ class MessageLookup extends MessageLookupByLibrary {
"dingwei" : MessageLookupByLibrary.simpleMessage("定位"), "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
"dizhi" : MessageLookupByLibrary.simpleMessage("地址"), "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
"dongtai" : MessageLookupByLibrary.simpleMessage("动态"), "dongtai" : MessageLookupByLibrary.simpleMessage("动态"),
"dongtaitishi" : MessageLookupByLibrary.simpleMessage("用户发布内容需要等待系统审核,审核通过后才会在推荐广场展示"),
"dongtaixiangqing" : MessageLookupByLibrary.simpleMessage("动态详情"),
"duihuan" : MessageLookupByLibrary.simpleMessage("兑换"), "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
"duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"), "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
"duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"), "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@ -232,16 +238,19 @@ class MessageLookup extends MessageLookupByLibrary {
"fensi" : MessageLookupByLibrary.simpleMessage("粉丝"), "fensi" : MessageLookupByLibrary.simpleMessage("粉丝"),
"fenxiang" : MessageLookupByLibrary.simpleMessage("分享"), "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"),
"fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
"fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("分享健康"),
"fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
"fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。"), "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。"),
"fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
"fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"),
"fulizhongxin" : MessageLookupByLibrary.simpleMessage("福利中心"),
"ge" : m5, "ge" : m5,
"geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
"gengduo" : MessageLookupByLibrary.simpleMessage("更多"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
"gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
"genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"), "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"),
"genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
"gengyouhui" : MessageLookupByLibrary.simpleMessage("更优惠"),
"gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
"gexingqianming" : MessageLookupByLibrary.simpleMessage("个性签名"), "gexingqianming" : MessageLookupByLibrary.simpleMessage("个性签名"),
"gong" : MessageLookupByLibrary.simpleMessage(""), "gong" : MessageLookupByLibrary.simpleMessage(""),
@ -254,6 +263,7 @@ class MessageLookup extends MessageLookupByLibrary {
"gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"),
"guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
"guanyu" : MessageLookupByLibrary.simpleMessage("关于"), "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
"guanyuhuixiang" : MessageLookupByLibrary.simpleMessage("关于回乡"),
"guanzhu" : MessageLookupByLibrary.simpleMessage("关注"), "guanzhu" : MessageLookupByLibrary.simpleMessage("关注"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("还没有消息~"), "haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("还没有消息~"),
@ -262,15 +272,18 @@ class MessageLookup extends MessageLookupByLibrary {
"haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"), "haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"), "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
"huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"),
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
"huifu" : MessageLookupByLibrary.simpleMessage("回复"), "huifu" : MessageLookupByLibrary.simpleMessage("回复"),
"huifu_" : m9, "huifu_" : m9,
"huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回乡VIP卡"),
"huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"), "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"), "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
"huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回乡VIP卡专享权益"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
"huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"),
"huiyuanguize" : MessageLookupByLibrary.simpleMessage("会员规则说明"), "huiyuanguize" : MessageLookupByLibrary.simpleMessage("会员规则说明"),
@ -282,6 +295,7 @@ class MessageLookup extends MessageLookupByLibrary {
"huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"),
"huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"),
"huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"), "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"),
"huiyuanzhuanxiangjiage" : MessageLookupByLibrary.simpleMessage("会员专享价格"),
"huode" : MessageLookupByLibrary.simpleMessage("获得"), "huode" : MessageLookupByLibrary.simpleMessage("获得"),
"huodequanyi" : MessageLookupByLibrary.simpleMessage("获得权益"), "huodequanyi" : MessageLookupByLibrary.simpleMessage("获得权益"),
"huodong" : MessageLookupByLibrary.simpleMessage("活动"), "huodong" : MessageLookupByLibrary.simpleMessage("活动"),
@ -317,6 +331,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
"jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"), "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"),
"jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精选活动"),
"jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
"jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"),
@ -336,6 +351,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
"kaitonghuixianghuoququanyi" : MessageLookupByLibrary.simpleMessage("开通回乡VIP卡获取更多权益"),
"kaitongriqi" : m16, "kaitongriqi" : m16,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
"kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"),
@ -349,12 +365,16 @@ class MessageLookup extends MessageLookupByLibrary {
"kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"), "kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"),
"lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"),
"lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"),
"liaojiejiankang" : MessageLookupByLibrary.simpleMessage("了解健康"),
"lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
"lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
"lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"), "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"),
"lijilingqu" : MessageLookupByLibrary.simpleMessage("立即领取"), "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即领取"),
"lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"),
"lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"),
"likekaitong" : MessageLookupByLibrary.simpleMessage("立刻开通"),
"likexufei" : MessageLookupByLibrary.simpleMessage("立刻续费"),
"likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"),
"lingqu" : MessageLookupByLibrary.simpleMessage("领取"), "lingqu" : MessageLookupByLibrary.simpleMessage("领取"),
"lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("领券中心"), "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("领券中心"),
"lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"), "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
@ -491,6 +511,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。"), "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。"),
"ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款,请您提前准备好订单号/取单号,并与门店人员进行联系"), "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款,请您提前准备好订单号/取单号,并与门店人员进行联系"),
"saoma" : MessageLookupByLibrary.simpleMessage("扫码"), "saoma" : MessageLookupByLibrary.simpleMessage("扫码"),
"saomadiancan" : MessageLookupByLibrary.simpleMessage("您即将进行扫码点餐"),
"saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("扫码识别,关注公众号"), "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("扫码识别,关注公众号"),
"send_code" : MessageLookupByLibrary.simpleMessage("发送验证码"), "send_code" : MessageLookupByLibrary.simpleMessage("发送验证码"),
"shanchu" : MessageLookupByLibrary.simpleMessage("删除"), "shanchu" : MessageLookupByLibrary.simpleMessage("删除"),
@ -535,8 +556,10 @@ class MessageLookup extends MessageLookupByLibrary {
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
"sui" : m31, "sui" : m31,
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
"tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠专区"),
"tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tiantiandefuli" : MessageLookupByLibrary.simpleMessage("天天得福利"),
"tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
"tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"), "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"),
"tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"),
@ -555,6 +578,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32, "wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
"wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"),
"wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
"wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
"weidenglu" : MessageLookupByLibrary.simpleMessage("未登录"), "weidenglu" : MessageLookupByLibrary.simpleMessage("未登录"),
@ -595,6 +619,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"), "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
"xiadanshijian_" : m33, "xiadanshijian_" : m33,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下单赚积分"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相册"), "xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
"xiangji" : MessageLookupByLibrary.simpleMessage("相机"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
@ -610,6 +635,7 @@ class MessageLookup extends MessageLookupByLibrary {
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
"xiedongtai" : MessageLookupByLibrary.simpleMessage("写动态"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
"xihuan_" : m34, "xihuan_" : m34,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"), "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
@ -620,15 +646,21 @@ class MessageLookup extends MessageLookupByLibrary {
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"), "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
"xuanji" : MessageLookupByLibrary.simpleMessage("选集"), "xuanji" : MessageLookupByLibrary.simpleMessage("选集"),
"xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("续费会员"),
"xuexijiankang" : MessageLookupByLibrary.simpleMessage("学习健康"),
"xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("续费回乡VIP"),
"xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
"yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
"yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀请好友"),
"yaoqingrenshoujihao_" : m35, "yaoqingrenshoujihao_" : m35,
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
"yiduihuanjian" : m36, "yiduihuanjian" : m36,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
"yiguanzhu" : MessageLookupByLibrary.simpleMessage("已关注"),
"yihuide" : MessageLookupByLibrary.simpleMessage("已获得"), "yihuide" : MessageLookupByLibrary.simpleMessage("已获得"),
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
"yikaitongzidongxufei" : MessageLookupByLibrary.simpleMessage("已开通自动续费"),
"yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
"yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
"yindao1" : MessageLookupByLibrary.simpleMessage("新增多项功能,海量优惠资讯实时推送"), "yindao1" : MessageLookupByLibrary.simpleMessage("新增多项功能,海量优惠资讯实时推送"),
@ -658,6 +690,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yituikuan" : MessageLookupByLibrary.simpleMessage("已退款"), "yituikuan" : MessageLookupByLibrary.simpleMessage("已退款"),
"yiwancheng" : MessageLookupByLibrary.simpleMessage(" 已完成 "), "yiwancheng" : MessageLookupByLibrary.simpleMessage(" 已完成 "),
"yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"), "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"),
"yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("已享会员权益"),
"yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已显示全部评论-"), "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已显示全部评论-"),
"yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"), "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
"yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有积分"), "yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有积分"),
@ -701,6 +734,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加载中..."), "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加载中..."),
"zhidianmendian" : MessageLookupByLibrary.simpleMessage("致电门店"), "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致电门店"),
"zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"), "zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"),
"zhifubaozhifu" : MessageLookupByLibrary.simpleMessage("支付宝支付"),
"zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"), "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"),
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"), "zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"), "zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"),
@ -708,6 +742,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"), "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"), "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
"zhuanlan" : MessageLookupByLibrary.simpleMessage("专栏"), "zhuanlan" : MessageLookupByLibrary.simpleMessage("专栏"),
"zhuanxiangyouhuiquan" : MessageLookupByLibrary.simpleMessage("专享优惠券"),
"zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复,相关数据和信息会永久删除。"), "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复,相关数据和信息会永久删除。"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"), "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"), "ziti" : MessageLookupByLibrary.simpleMessage("自提"),

35
lib/generated/intl/messages_zh_Hans_CN.dart

@ -149,8 +149,10 @@ class MessageLookup extends MessageLookupByLibrary {
"chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"), "chengjiuhuizhang" : MessageLookupByLibrary.simpleMessage("成就徽章"),
"chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"), "chengshixuanze" : MessageLookupByLibrary.simpleMessage("城市选择"),
"chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员,享专属权益"), "chengweidianpuzhuanshuhuiyuan" : MessageLookupByLibrary.simpleMessage("成为店铺专属会员,享专属权益"),
"chijiankang" : MessageLookupByLibrary.simpleMessage("吃健康"),
"chongzhi" : MessageLookupByLibrary.simpleMessage("充值"), "chongzhi" : MessageLookupByLibrary.simpleMessage("充值"),
"chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"), "chongzhichenggong" : MessageLookupByLibrary.simpleMessage("充值成功"),
"chongzhifuliduo" : MessageLookupByLibrary.simpleMessage("充值福利多"),
"chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"), "chongzhixiaoxi" : MessageLookupByLibrary.simpleMessage("充值消息"),
"chongzhizuixiaojine" : m1, "chongzhizuixiaojine" : m1,
"chuangjianshijian" : m2, "chuangjianshijian" : m2,
@ -166,6 +168,7 @@ class MessageLookup extends MessageLookupByLibrary {
"daiqueren" : MessageLookupByLibrary.simpleMessage("待确认"), "daiqueren" : MessageLookupByLibrary.simpleMessage("待确认"),
"daizhifu" : MessageLookupByLibrary.simpleMessage("待支付"), "daizhifu" : MessageLookupByLibrary.simpleMessage("待支付"),
"daizhizuo" : MessageLookupByLibrary.simpleMessage("待制作"), "daizhizuo" : MessageLookupByLibrary.simpleMessage("待制作"),
"dajiadouzaiduihuan" : MessageLookupByLibrary.simpleMessage("大家都在兑换"),
"dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"), "dakaidingwei" : MessageLookupByLibrary.simpleMessage("打开定位"),
"dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"), "dangqianbanben" : MessageLookupByLibrary.simpleMessage("当前版本"),
"dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"), "dangqiandengji" : MessageLookupByLibrary.simpleMessage("当前等级"),
@ -182,6 +185,7 @@ class MessageLookup extends MessageLookupByLibrary {
"diandan" : MessageLookupByLibrary.simpleMessage("点单"), "diandan" : MessageLookupByLibrary.simpleMessage("点单"),
"dianhua" : MessageLookupByLibrary.simpleMessage("电话"), "dianhua" : MessageLookupByLibrary.simpleMessage("电话"),
"dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录,享受更多精彩信息"), "dianjidenglu" : MessageLookupByLibrary.simpleMessage("点击登录,享受更多精彩信息"),
"dianputuijian" : MessageLookupByLibrary.simpleMessage("店铺推荐"),
"dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"), "dianpuyue" : MessageLookupByLibrary.simpleMessage("店铺余额"),
"dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"), "dianwolingqu" : MessageLookupByLibrary.simpleMessage("点我领取"),
"dianzanxihuan_" : m3, "dianzanxihuan_" : m3,
@ -202,6 +206,8 @@ class MessageLookup extends MessageLookupByLibrary {
"dingwei" : MessageLookupByLibrary.simpleMessage("定位"), "dingwei" : MessageLookupByLibrary.simpleMessage("定位"),
"dizhi" : MessageLookupByLibrary.simpleMessage("地址"), "dizhi" : MessageLookupByLibrary.simpleMessage("地址"),
"dongtai" : MessageLookupByLibrary.simpleMessage("动态"), "dongtai" : MessageLookupByLibrary.simpleMessage("动态"),
"dongtaitishi" : MessageLookupByLibrary.simpleMessage("用户发布内容需要等待系统审核,审核通过后才会在推荐广场展示"),
"dongtaixiangqing" : MessageLookupByLibrary.simpleMessage("动态详情"),
"duihuan" : MessageLookupByLibrary.simpleMessage("兑换"), "duihuan" : MessageLookupByLibrary.simpleMessage("兑换"),
"duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"), "duihuanchenggong" : MessageLookupByLibrary.simpleMessage("兑换成功"),
"duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"), "duihuanguize" : MessageLookupByLibrary.simpleMessage("兑换规则"),
@ -232,16 +238,19 @@ class MessageLookup extends MessageLookupByLibrary {
"fensi" : MessageLookupByLibrary.simpleMessage("粉丝"), "fensi" : MessageLookupByLibrary.simpleMessage("粉丝"),
"fenxiang" : MessageLookupByLibrary.simpleMessage("分享"), "fenxiang" : MessageLookupByLibrary.simpleMessage("分享"),
"fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"), "fenxiangdao" : MessageLookupByLibrary.simpleMessage("分享到"),
"fenxiangjiankang" : MessageLookupByLibrary.simpleMessage("分享健康"),
"fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"), "fenxiangyaoqing" : MessageLookupByLibrary.simpleMessage("也可以直接点击右上方的分享给到你想要邀请的人。"),
"fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。"), "fenxiangyaoqingma" : MessageLookupByLibrary.simpleMessage("将邀请码分享给好友,对方在一心回乡App登录页输入邀请码,即可邀请成功。"),
"fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"), "fenxiangzhiweixin" : MessageLookupByLibrary.simpleMessage("分享至微信"),
"fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"), "fukashoujihao" : MessageLookupByLibrary.simpleMessage("副卡手机号"),
"fulizhongxin" : MessageLookupByLibrary.simpleMessage("福利中心"),
"ge" : m5, "ge" : m5,
"geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"), "geiwopingfen" : MessageLookupByLibrary.simpleMessage("给我评分"),
"gengduo" : MessageLookupByLibrary.simpleMessage("更多"), "gengduo" : MessageLookupByLibrary.simpleMessage("更多"),
"gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"), "gengduoyouhuiquan" : MessageLookupByLibrary.simpleMessage("更多优惠券"),
"genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"), "genghuanbeijing" : MessageLookupByLibrary.simpleMessage("更换背景"),
"genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"), "genghuantouxiang" : MessageLookupByLibrary.simpleMessage("更换头像"),
"gengyouhui" : MessageLookupByLibrary.simpleMessage("更优惠"),
"gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"), "gerenxinxi" : MessageLookupByLibrary.simpleMessage("个人信息"),
"gexingqianming" : MessageLookupByLibrary.simpleMessage("个性签名"), "gexingqianming" : MessageLookupByLibrary.simpleMessage("个性签名"),
"gong" : MessageLookupByLibrary.simpleMessage(""), "gong" : MessageLookupByLibrary.simpleMessage(""),
@ -254,6 +263,7 @@ class MessageLookup extends MessageLookupByLibrary {
"gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"), "gouxuanxieyi" : MessageLookupByLibrary.simpleMessage("请勾选同意隐私服务和一心回乡服务协议"),
"guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"), "guanlidizhi" : MessageLookupByLibrary.simpleMessage("管理地址"),
"guanyu" : MessageLookupByLibrary.simpleMessage("关于"), "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
"guanyuhuixiang" : MessageLookupByLibrary.simpleMessage("关于回乡"),
"guanzhu" : MessageLookupByLibrary.simpleMessage("关注"), "guanzhu" : MessageLookupByLibrary.simpleMessage("关注"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("还没有消息~"), "haimeiyouxiaoxi" : MessageLookupByLibrary.simpleMessage("还没有消息~"),
@ -262,15 +272,18 @@ class MessageLookup extends MessageLookupByLibrary {
"haowu" : MessageLookupByLibrary.simpleMessage("好物"), "haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"), "haoyoujiangliguize" : MessageLookupByLibrary.simpleMessage("好友奖励规则"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"), "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hejiankang" : MessageLookupByLibrary.simpleMessage("喝健康"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
"huangjin" : MessageLookupByLibrary.simpleMessage("黄金"), "huangjin" : MessageLookupByLibrary.simpleMessage("黄金"),
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
"huifu" : MessageLookupByLibrary.simpleMessage("回复"), "huifu" : MessageLookupByLibrary.simpleMessage("回复"),
"huifu_" : m9, "huifu_" : m9,
"huixiangVIPka" : MessageLookupByLibrary.simpleMessage("回乡VIP卡"),
"huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"), "huixiangqianbao" : MessageLookupByLibrary.simpleMessage("回乡钱包"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"), "huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
"huixiangvipkazhuanxiang" : MessageLookupByLibrary.simpleMessage("回乡VIP卡专享权益"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
"huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"),
"huiyuanguize" : MessageLookupByLibrary.simpleMessage("会员规则说明"), "huiyuanguize" : MessageLookupByLibrary.simpleMessage("会员规则说明"),
@ -282,6 +295,7 @@ class MessageLookup extends MessageLookupByLibrary {
"huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"), "huiyuankaxiangqing" : MessageLookupByLibrary.simpleMessage("会员卡详情"),
"huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"), "huiyuanyue" : MessageLookupByLibrary.simpleMessage("会员余额"),
"huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"), "huiyuanzhongxin" : MessageLookupByLibrary.simpleMessage("会员中心"),
"huiyuanzhuanxiangjiage" : MessageLookupByLibrary.simpleMessage("会员专享价格"),
"huode" : MessageLookupByLibrary.simpleMessage("获得"), "huode" : MessageLookupByLibrary.simpleMessage("获得"),
"huodequanyi" : MessageLookupByLibrary.simpleMessage("获得权益"), "huodequanyi" : MessageLookupByLibrary.simpleMessage("获得权益"),
"huodong" : MessageLookupByLibrary.simpleMessage("活动"), "huodong" : MessageLookupByLibrary.simpleMessage("活动"),
@ -317,6 +331,7 @@ class MessageLookup extends MessageLookupByLibrary {
"jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"), "jifenxiangqing" : MessageLookupByLibrary.simpleMessage("积分详情"),
"jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"), "jingbilianmenghuiyuandian" : MessageLookupByLibrary.simpleMessage("净弼联盟会员店"),
"jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"), "jingxuanhaowen" : MessageLookupByLibrary.simpleMessage("精选好文"),
"jingxuanhuodong" : MessageLookupByLibrary.simpleMessage("精选活动"),
"jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"), "jinkahuiyuan" : MessageLookupByLibrary.simpleMessage("金卡会员"),
"jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"), "jinrihuiyuanrenwu" : MessageLookupByLibrary.simpleMessage("今日会员任务"),
"jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"), "jinrushangdian" : MessageLookupByLibrary.simpleMessage("进入商店"),
@ -336,6 +351,7 @@ class MessageLookup extends MessageLookupByLibrary {
"kabao" : MessageLookupByLibrary.simpleMessage("卡包"), "kabao" : MessageLookupByLibrary.simpleMessage("卡包"),
"kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"), "kabaokeshiyong" : MessageLookupByLibrary.simpleMessage("卡包-可使用"),
"kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"), "kaiqiquanxian" : MessageLookupByLibrary.simpleMessage("开启权限"),
"kaitonghuixianghuoququanyi" : MessageLookupByLibrary.simpleMessage("开通回乡VIP卡获取更多权益"),
"kaitongriqi" : m16, "kaitongriqi" : m16,
"kaquan" : MessageLookupByLibrary.simpleMessage("卡券"), "kaquan" : MessageLookupByLibrary.simpleMessage("卡券"),
"kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"), "kelingqudeyouhuiquan" : MessageLookupByLibrary.simpleMessage("可领取的优惠券"),
@ -349,12 +365,16 @@ class MessageLookup extends MessageLookupByLibrary {
"kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"), "kuaidiwuliu" : MessageLookupByLibrary.simpleMessage("快递物流"),
"lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"), "lianxishoujihao" : MessageLookupByLibrary.simpleMessage("联系手机号"),
"lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"), "lianxuqiandaolingqushuangbeijifen" : MessageLookupByLibrary.simpleMessage("连续签到领取双倍积分"),
"liaojiejiankang" : MessageLookupByLibrary.simpleMessage("了解健康"),
"lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"), "lijicanjia" : MessageLookupByLibrary.simpleMessage("立即参加"),
"lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"), "lijichongzhi" : MessageLookupByLibrary.simpleMessage("立即充值"),
"lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"), "lijikaitong" : MessageLookupByLibrary.simpleMessage("立即开通"),
"lijilingqu" : MessageLookupByLibrary.simpleMessage("立即领取"), "lijilingqu" : MessageLookupByLibrary.simpleMessage("立即领取"),
"lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"), "lijiqiandao" : MessageLookupByLibrary.simpleMessage("立即签到"),
"lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"), "lijitiyan" : MessageLookupByLibrary.simpleMessage("立即体验"),
"likekaitong" : MessageLookupByLibrary.simpleMessage("立刻开通"),
"likexufei" : MessageLookupByLibrary.simpleMessage("立刻续费"),
"likezhifu" : MessageLookupByLibrary.simpleMessage("立刻支付"),
"lingqu" : MessageLookupByLibrary.simpleMessage("领取"), "lingqu" : MessageLookupByLibrary.simpleMessage("领取"),
"lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("领券中心"), "lingquanzhongxin" : MessageLookupByLibrary.simpleMessage("领券中心"),
"lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"), "lingquchenggong" : MessageLookupByLibrary.simpleMessage("领取成功"),
@ -491,6 +511,7 @@ class MessageLookup extends MessageLookupByLibrary {
"ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。"), "ruheqiandao1" : MessageLookupByLibrary.simpleMessage("1.点击净弼,进入首页,点击上方的去签到。\n2.点击我的,进入我的页面,点击上方的积分详情,进入后即可签到。"),
"ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款,请您提前准备好订单号/取单号,并与门店人员进行联系"), "ruxutuikuanqingyumendianlianxi" : MessageLookupByLibrary.simpleMessage("如需退款,请您提前准备好订单号/取单号,并与门店人员进行联系"),
"saoma" : MessageLookupByLibrary.simpleMessage("扫码"), "saoma" : MessageLookupByLibrary.simpleMessage("扫码"),
"saomadiancan" : MessageLookupByLibrary.simpleMessage("您即将进行扫码点餐"),
"saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("扫码识别,关注公众号"), "saomashibieguanzhugongzonghao" : MessageLookupByLibrary.simpleMessage("扫码识别,关注公众号"),
"send_code" : MessageLookupByLibrary.simpleMessage("发送验证码"), "send_code" : MessageLookupByLibrary.simpleMessage("发送验证码"),
"shanchu" : MessageLookupByLibrary.simpleMessage("删除"), "shanchu" : MessageLookupByLibrary.simpleMessage("删除"),
@ -535,8 +556,10 @@ class MessageLookup extends MessageLookupByLibrary {
"shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"), "shuruzhifumima" : MessageLookupByLibrary.simpleMessage("输入支付密码"),
"sui" : m31, "sui" : m31,
"tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"), "tebieshengming" : MessageLookupByLibrary.simpleMessage("特别声明"),
"tehuizhuanqu" : MessageLookupByLibrary.simpleMessage("特惠专区"),
"tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjiaxinfuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"), "tianjifuka" : MessageLookupByLibrary.simpleMessage("添加新副卡"),
"tiantiandefuli" : MessageLookupByLibrary.simpleMessage("天天得福利"),
"tijiao" : MessageLookupByLibrary.simpleMessage("提交"), "tijiao" : MessageLookupByLibrary.simpleMessage("提交"),
"tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"), "tijiaochenggong" : MessageLookupByLibrary.simpleMessage("提交成功"),
"tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"), "tingchewei" : MessageLookupByLibrary.simpleMessage("停车位"),
@ -555,6 +578,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wancheng" : MessageLookupByLibrary.simpleMessage("完成"), "wancheng" : MessageLookupByLibrary.simpleMessage("完成"),
"wancheng_" : m32, "wancheng_" : m32,
"wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"), "wanchengyicixiadan" : MessageLookupByLibrary.simpleMessage("完成一次下单"),
"wanjiankang" : MessageLookupByLibrary.simpleMessage("玩健康"),
"wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"), "wanshanshengrixinxi_nl" : MessageLookupByLibrary.simpleMessage("完善生日信息后自动生成"),
"wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"), "wanshanshengrixinxi_yhq" : MessageLookupByLibrary.simpleMessage("完善生日信息得专属优惠劵"),
"weidenglu" : MessageLookupByLibrary.simpleMessage("未登录"), "weidenglu" : MessageLookupByLibrary.simpleMessage("未登录"),
@ -595,6 +619,7 @@ class MessageLookup extends MessageLookupByLibrary {
"wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"), "wuliuzhuangtai" : MessageLookupByLibrary.simpleMessage("物流状态:"),
"xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"), "xiadanshijian" : MessageLookupByLibrary.simpleMessage("下单时间"),
"xiadanshijian_" : m33, "xiadanshijian_" : m33,
"xiadanzhuanjifen" : MessageLookupByLibrary.simpleMessage("下单赚积分"),
"xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"), "xialashuaxin" : MessageLookupByLibrary.simpleMessage("下拉刷新"),
"xiangce" : MessageLookupByLibrary.simpleMessage("相册"), "xiangce" : MessageLookupByLibrary.simpleMessage("相册"),
"xiangji" : MessageLookupByLibrary.simpleMessage("相机"), "xiangji" : MessageLookupByLibrary.simpleMessage("相机"),
@ -610,6 +635,7 @@ class MessageLookup extends MessageLookupByLibrary {
"xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"), "xiaoxi" : MessageLookupByLibrary.simpleMessage("消息"),
"xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"), "xiayidengji" : MessageLookupByLibrary.simpleMessage("下一等级"),
"xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"), "xiazaiwancheng" : MessageLookupByLibrary.simpleMessage("加载完成"),
"xiedongtai" : MessageLookupByLibrary.simpleMessage("写动态"),
"xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"), "xieyitanchuang" : MessageLookupByLibrary.simpleMessage("一心回乡用户隐私政策"),
"xihuan_" : m34, "xihuan_" : m34,
"xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"), "xindianhuodong" : MessageLookupByLibrary.simpleMessage("星店活动"),
@ -620,15 +646,21 @@ class MessageLookup extends MessageLookupByLibrary {
"xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"), "xiugaiyonghuming" : MessageLookupByLibrary.simpleMessage("修改用户名"),
"xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"), "xuanguige" : MessageLookupByLibrary.simpleMessage("选规格"),
"xuanji" : MessageLookupByLibrary.simpleMessage("选集"), "xuanji" : MessageLookupByLibrary.simpleMessage("选集"),
"xuefeihuiyuan" : MessageLookupByLibrary.simpleMessage("续费会员"),
"xuexijiankang" : MessageLookupByLibrary.simpleMessage("学习健康"),
"xufeihuixiangVIP" : MessageLookupByLibrary.simpleMessage("续费回乡VIP"),
"xuni" : MessageLookupByLibrary.simpleMessage("虚拟"), "xuni" : MessageLookupByLibrary.simpleMessage("虚拟"),
"yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"), "yanzhengma" : MessageLookupByLibrary.simpleMessage("验证码"),
"yaoqinghaoyou" : MessageLookupByLibrary.simpleMessage("邀请好友"),
"yaoqingrenshoujihao_" : m35, "yaoqingrenshoujihao_" : m35,
"yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"), "yibangfuka" : MessageLookupByLibrary.simpleMessage("已绑副卡"),
"yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"), "yiduihuan" : MessageLookupByLibrary.simpleMessage("已兑换"),
"yiduihuanjian" : m36, "yiduihuanjian" : m36,
"yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"), "yifahuo" : MessageLookupByLibrary.simpleMessage("已发货"),
"yiguanzhu" : MessageLookupByLibrary.simpleMessage("已关注"),
"yihuide" : MessageLookupByLibrary.simpleMessage("已获得"), "yihuide" : MessageLookupByLibrary.simpleMessage("已获得"),
"yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"), "yihujiaoqishou" : MessageLookupByLibrary.simpleMessage("已呼叫骑手"),
"yikaitongzidongxufei" : MessageLookupByLibrary.simpleMessage("已开通自动续费"),
"yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"), "yikexiao" : MessageLookupByLibrary.simpleMessage("已核销"),
"yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"), "yilingqu" : MessageLookupByLibrary.simpleMessage("已领取"),
"yindao1" : MessageLookupByLibrary.simpleMessage("新增多项功能,海量优惠资讯实时推送"), "yindao1" : MessageLookupByLibrary.simpleMessage("新增多项功能,海量优惠资讯实时推送"),
@ -658,6 +690,7 @@ class MessageLookup extends MessageLookupByLibrary {
"yituikuan" : MessageLookupByLibrary.simpleMessage("已退款"), "yituikuan" : MessageLookupByLibrary.simpleMessage("已退款"),
"yiwancheng" : MessageLookupByLibrary.simpleMessage(" 已完成 "), "yiwancheng" : MessageLookupByLibrary.simpleMessage(" 已完成 "),
"yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"), "yiwanchengdingdan" : MessageLookupByLibrary.simpleMessage("已完成订单"),
"yixianghuiyuanquanyi" : MessageLookupByLibrary.simpleMessage("已享会员权益"),
"yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已显示全部评论-"), "yixiansquanbupinglun" : MessageLookupByLibrary.simpleMessage("-已显示全部评论-"),
"yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"), "yixinhuixiang" : MessageLookupByLibrary.simpleMessage("一心回乡"),
"yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有积分"), "yiyoujifen" : MessageLookupByLibrary.simpleMessage("已有积分"),
@ -701,6 +734,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加载中..."), "zhengzaixiazaizhong" : MessageLookupByLibrary.simpleMessage("正在加载中..."),
"zhidianmendian" : MessageLookupByLibrary.simpleMessage("致电门店"), "zhidianmendian" : MessageLookupByLibrary.simpleMessage("致电门店"),
"zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"), "zhifubao" : MessageLookupByLibrary.simpleMessage("支付宝"),
"zhifubaozhifu" : MessageLookupByLibrary.simpleMessage("支付宝支付"),
"zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"), "zhifufangshi" : MessageLookupByLibrary.simpleMessage("支付方式"),
"zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"), "zhifuxiangqing" : MessageLookupByLibrary.simpleMessage("支付详情"),
"zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"), "zhizunhuiyuan" : MessageLookupByLibrary.simpleMessage("至尊会员"),
@ -708,6 +742,7 @@ class MessageLookup extends MessageLookupByLibrary {
"zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"), "zhongchakan" : MessageLookupByLibrary.simpleMessage("中查看"),
"zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"), "zhongwenjianti" : MessageLookupByLibrary.simpleMessage("简体中文"),
"zhuanlan" : MessageLookupByLibrary.simpleMessage("专栏"), "zhuanlan" : MessageLookupByLibrary.simpleMessage("专栏"),
"zhuanxiangyouhuiquan" : MessageLookupByLibrary.simpleMessage("专享优惠券"),
"zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复,相关数据和信息会永久删除。"), "zhuxiaotixing" : MessageLookupByLibrary.simpleMessage("再次提醒:注销帐号后不可恢复,相关数据和信息会永久删除。"),
"ziqu" : MessageLookupByLibrary.simpleMessage("自取"), "ziqu" : MessageLookupByLibrary.simpleMessage("自取"),
"ziti" : MessageLookupByLibrary.simpleMessage("自提"), "ziti" : MessageLookupByLibrary.simpleMessage("自提"),

350
lib/generated/l10n.dart

@ -6185,6 +6185,356 @@ class S {
); );
} }
/// ``
String get dongtaixiangqing {
return Intl.message(
'动态详情',
name: 'dongtaixiangqing',
desc: '',
args: [],
);
}
/// ``
String get yiguanzhu {
return Intl.message(
'已关注',
name: 'yiguanzhu',
desc: '',
args: [],
);
}
/// ``
String get guanyuhuixiang {
return Intl.message(
'关于回乡',
name: 'guanyuhuixiang',
desc: '',
args: [],
);
}
/// ``
String get liaojiejiankang {
return Intl.message(
'了解健康',
name: 'liaojiejiankang',
desc: '',
args: [],
);
}
/// ``
String get xuexijiankang {
return Intl.message(
'学习健康',
name: 'xuexijiankang',
desc: '',
args: [],
);
}
/// ``
String get fenxiangjiankang {
return Intl.message(
'分享健康',
name: 'fenxiangjiankang',
desc: '',
args: [],
);
}
/// ``
String get xiedongtai {
return Intl.message(
'写动态',
name: 'xiedongtai',
desc: '',
args: [],
);
}
/// `广`
String get dongtaitishi {
return Intl.message(
'用户发布内容需要等待系统审核,审核通过后才会在推荐广场展示',
name: 'dongtaitishi',
desc: '',
args: [],
);
}
/// ``
String get tehuizhuanqu {
return Intl.message(
'特惠专区',
name: 'tehuizhuanqu',
desc: '',
args: [],
);
}
/// ``
String get jingxuanhuodong {
return Intl.message(
'精选活动',
name: 'jingxuanhuodong',
desc: '',
args: [],
);
}
/// ``
String get dajiadouzaiduihuan {
return Intl.message(
'大家都在兑换',
name: 'dajiadouzaiduihuan',
desc: '',
args: [],
);
}
/// ``
String get dianputuijian {
return Intl.message(
'店铺推荐',
name: 'dianputuijian',
desc: '',
args: [],
);
}
/// ``
String get saomadiancan {
return Intl.message(
'您即将进行扫码点餐',
name: 'saomadiancan',
desc: '',
args: [],
);
}
/// ``
String get xiadanzhuanjifen {
return Intl.message(
'下单赚积分',
name: 'xiadanzhuanjifen',
desc: '',
args: [],
);
}
/// ``
String get chongzhifuliduo {
return Intl.message(
'充值福利多',
name: 'chongzhifuliduo',
desc: '',
args: [],
);
}
/// ``
String get fulizhongxin {
return Intl.message(
'福利中心',
name: 'fulizhongxin',
desc: '',
args: [],
);
}
/// ``
String get tiantiandefuli {
return Intl.message(
'天天得福利',
name: 'tiantiandefuli',
desc: '',
args: [],
);
}
/// ``
String get chijiankang {
return Intl.message(
'吃健康',
name: 'chijiankang',
desc: '',
args: [],
);
}
/// ``
String get wanjiankang {
return Intl.message(
'玩健康',
name: 'wanjiankang',
desc: '',
args: [],
);
}
/// ``
String get hejiankang {
return Intl.message(
'喝健康',
name: 'hejiankang',
desc: '',
args: [],
);
}
/// ``
String get yaoqinghaoyou {
return Intl.message(
'邀请好友',
name: 'yaoqinghaoyou',
desc: '',
args: [],
);
}
/// ``
String get zhuanxiangyouhuiquan {
return Intl.message(
'专享优惠券',
name: 'zhuanxiangyouhuiquan',
desc: '',
args: [],
);
}
/// `VIP卡专享权益`
String get huixiangvipkazhuanxiang {
return Intl.message(
'回乡VIP卡专享权益',
name: 'huixiangvipkazhuanxiang',
desc: '',
args: [],
);
}
/// `VIP卡获取更多权益`
String get kaitonghuixianghuoququanyi {
return Intl.message(
'开通回乡VIP卡获取更多权益',
name: 'kaitonghuixianghuoququanyi',
desc: '',
args: [],
);
}
/// ``
String get huiyuanzhuanxiangjiage {
return Intl.message(
'会员专享价格',
name: 'huiyuanzhuanxiangjiage',
desc: '',
args: [],
);
}
/// ``
String get yixianghuiyuanquanyi {
return Intl.message(
'已享会员权益',
name: 'yixianghuiyuanquanyi',
desc: '',
args: [],
);
}
/// ``
String get yikaitongzidongxufei {
return Intl.message(
'已开通自动续费',
name: 'yikaitongzidongxufei',
desc: '',
args: [],
);
}
/// `VIP`
String get xufeihuixiangVIP {
return Intl.message(
'续费回乡VIP',
name: 'xufeihuixiangVIP',
desc: '',
args: [],
);
}
/// `VIP卡`
String get huixiangVIPka {
return Intl.message(
'回乡VIP卡',
name: 'huixiangVIPka',
desc: '',
args: [],
);
}
/// ``
String get xuefeihuiyuan {
return Intl.message(
'续费会员',
name: 'xuefeihuiyuan',
desc: '',
args: [],
);
}
/// ``
String get likexufei {
return Intl.message(
'立刻续费',
name: 'likexufei',
desc: '',
args: [],
);
}
/// ``
String get likekaitong {
return Intl.message(
'立刻开通',
name: 'likekaitong',
desc: '',
args: [],
);
}
/// ``
String get likezhifu {
return Intl.message(
'立刻支付',
name: 'likezhifu',
desc: '',
args: [],
);
}
/// ``
String get zhifubaozhifu {
return Intl.message(
'支付宝支付',
name: 'zhifubaozhifu',
desc: '',
args: [],
);
}
/// ``
String get gengyouhui {
return Intl.message(
'更优惠',
name: 'gengyouhui',
desc: '',
args: [],
);
}
/// `使` /// `使`
String get privacy_policy4 { String get privacy_policy4 {
return Intl.message( return Intl.message(

3
lib/home/home_view/coupon.dart

@ -11,7 +11,6 @@ import 'package:huixiang/view_widget/item_title.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/receive_success.dart'; import 'package:huixiang/view_widget/receive_success.dart';
import 'package:huixiang/view_widget/round_button.dart'; import 'package:huixiang/view_widget/round_button.dart';
import 'package:huixiang/view_widget/selector_store_dialog.dart';
import 'package:huixiang/view_widget/separator.dart'; import 'package:huixiang/view_widget/separator.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
@ -251,7 +250,7 @@ class _CouponView extends State<CouponView> {
receiveCoupon(coupon?.id??""); receiveCoupon(coupon?.id??"");
}, },
child: RoundButton( child: RoundButton(
text: ((coupon?.status??0) == 0) ? "领取" : "已领取", text: ((coupon?.status??0) == 0) ? S.of(context).lingqu : S.of(context).yilingqu,
textColor: Colors.white, textColor: Colors.white,
backgroup: ((coupon?.status??0) == 0)?Color(0xFF32A060):Colors.grey, backgroup: ((coupon?.status??0) == 0)?Color(0xFF32A060):Colors.grey,
radius: 100, radius: 100,

7
lib/home/home_view/discount_zone.dart

@ -1,4 +1,3 @@
import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
@ -7,10 +6,6 @@ import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/flutter_utils.dart'; import 'package:huixiang/utils/flutter_utils.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/item_title.dart';
import 'package:huixiang/view_widget/my_footer.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
class DiscountZone extends StatefulWidget { class DiscountZone extends StatefulWidget {
final List<Coupon> coupon; final List<Coupon> coupon;
@ -42,7 +37,7 @@ class _DiscountZone extends State<DiscountZone> {
children: [ children: [
Padding(padding:EdgeInsets.symmetric(horizontal: 14.w), Padding(padding:EdgeInsets.symmetric(horizontal: 14.w),
child: Text( child: Text(
"特惠专区", S.of(context).tehuizhuanqu,
style: TextStyle( style: TextStyle(
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),
fontSize: 15.sp, fontSize: 15.sp,

2
lib/home/home_view/featured_acticvity.dart

@ -54,7 +54,7 @@ class _FeaturedActivity extends State<FeaturedActivity> {
return Column( return Column(
children: [ children: [
ItemTitle( ItemTitle(
text: "精选活动", text: S.of(context).jingxuanhuodong,
imgPath: "assets/image/home_activity.webp", imgPath: "assets/image/home_activity.webp",
moreText: S.of(context).chakangengduo, moreText: S.of(context).chakangengduo,
onTap: () { onTap: () {

2
lib/home/home_view/home_integral_store.dart

@ -47,7 +47,7 @@ class _HomeIntegralStore extends State<HomeIntegralStore> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding(padding: EdgeInsets.only(left: 16,bottom: 10),child: Text( Padding(padding: EdgeInsets.only(left: 16,bottom: 10),child: Text(
"大家都在兑换", S.of(context).dajiadouzaiduihuan,
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,

8
lib/home/home_view/quick_order.dart

@ -159,7 +159,7 @@ class _QuickOrder extends State<QuickOrder> {
return Column( return Column(
children: [ children: [
ItemTitle( ItemTitle(
text: "店铺推荐", text: S.of(context).dianputuijian,
imgPath: "assets/image/icon_shop.webp", imgPath: "assets/image/icon_shop.webp",
), ),
Container( Container(
@ -310,7 +310,7 @@ class _QuickOrder extends State<QuickOrder> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text( Text(
"您即将进行扫码点餐", S.of(context).saomadiancan,
style: TextStyle( style: TextStyle(
fontSize: 17.sp, fontSize: 17.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -325,7 +325,7 @@ class _QuickOrder extends State<QuickOrder> {
Expanded( Expanded(
child: InkWell( child: InkWell(
child: BorderText( child: BorderText(
text: "取消", text: S.of(context).quxiao,
textColor: Color(0xFF32A060), textColor: Color(0xFF32A060),
fontSize: 16.sp, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
@ -346,7 +346,7 @@ class _QuickOrder extends State<QuickOrder> {
Expanded( Expanded(
child: InkWell( child: InkWell(
child: RoundButton( child: RoundButton(
text: "确定", text: S.of(context).queren,
textColor: Colors.white, textColor: Colors.white,
radius: 4, radius: 4,
padding: EdgeInsets.all(12), padding: EdgeInsets.all(12),

13
lib/home/home_view/shortcut_operation.dart

@ -1,6 +1,7 @@
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -70,7 +71,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"联盟", S.of(context).main_menu2,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp, fontSize: 14.sp,
@ -79,7 +80,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
), ),
SizedBox(height: 5.h), SizedBox(height: 5.h),
Text( Text(
"下单赚积分", S.of(context).xiadanzhuanjifen,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
fontSize: 12.sp, fontSize: 12.sp,
@ -136,7 +137,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"充值", S.of(context).chongzhi,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp, fontSize: 14.sp,
@ -145,7 +146,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
), ),
SizedBox(height: 5.h), SizedBox(height: 5.h),
Text( Text(
"充值福利多", S.of(context).chongzhifuliduo,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
fontSize: 12.sp, fontSize: 12.sp,
@ -204,7 +205,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"福利中心", S.of(context).fulizhongxin,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp, fontSize: 14.sp,
@ -213,7 +214,7 @@ class _ShortcutOperation extends State<ShortcutOperation> {
), ),
SizedBox(height: 5.h), SizedBox(height: 5.h),
Text( Text(
"天天得福利", S.of(context).tiantiandefuli,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
fontSize: 12.sp, fontSize: 12.sp,

8
lib/home/home_view/union_entry.dart

@ -5,6 +5,8 @@ import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import '../../generated/l10n.dart';
class UnionEntry extends StatefulWidget { class UnionEntry extends StatefulWidget {
final Function goToOrder; final Function goToOrder;
@ -63,7 +65,7 @@ class _UnionEntry extends State<UnionEntry> {
), ),
SizedBox(height:4.h), SizedBox(height:4.h),
Text( Text(
"吃健康", S.of(context).chijiankang,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
fontSize: 15.sp, fontSize: 15.sp,
@ -89,7 +91,7 @@ class _UnionEntry extends State<UnionEntry> {
), ),
SizedBox(height:4.h), SizedBox(height:4.h),
Text( Text(
"喝健康", S.of(context).hejiankang,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
fontSize: 15.sp, fontSize: 15.sp,
@ -115,7 +117,7 @@ class _UnionEntry extends State<UnionEntry> {
), ),
SizedBox(height:4.h), SizedBox(height:4.h),
Text( Text(
"玩健康", S.of(context).wanjiankang,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
fontSize: 15.sp, fontSize: 15.sp,

6
lib/home/home_view/welfare_core.dart

@ -36,7 +36,7 @@ class _WelfareCore extends State<WelfareCore> {
children: [ children: [
Expanded(child: Expanded(child:
Text( Text(
"福利中心", S.of(context).fulizhongxin,
style: TextStyle( style: TextStyle(
color: Color(0xFF0D0D0D), color: Color(0xFF0D0D0D),
fontSize: 15.sp, fontSize: 15.sp,
@ -48,7 +48,7 @@ class _WelfareCore extends State<WelfareCore> {
Navigator.of(context).pushNamed('/router/welfare_page'); Navigator.of(context).pushNamed('/router/welfare_page');
}, },
child: Text( child: Text(
"查看更多", S.of(context).chakangengduo,
style: TextStyle( style: TextStyle(
color: Color(0xFF4D4D4D), color: Color(0xFF4D4D4D),
fontSize: 12.sp, fontSize: 12.sp,
@ -123,7 +123,7 @@ class _WelfareCore extends State<WelfareCore> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"邀请好友", S.of(context).yaoqinghaoyou,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,

38
lib/l10n/intl_en.arb

@ -645,6 +645,44 @@
"xiaofeijilu": "消费记录", "xiaofeijilu": "消费记录",
"muqianwujilu": "目前暂未记录哦", "muqianwujilu": "目前暂未记录哦",
"pingtaizongyue": "余额:{zongyue}", "pingtaizongyue": "余额:{zongyue}",
"dongtaixiangqing":"动态详情",
"yiguanzhu":"已关注",
"guanzhu":"关注",
"guanyuhuixiang":"关于回乡",
"liaojiejiankang":"了解健康",
"xuexijiankang":"学习健康",
"fenxiangjiankang":"分享健康",
"xiedongtai":"写动态",
"dongtaitishi":"用户发布内容需要等待系统审核,审核通过后才会在推荐广场展示",
"tehuizhuanqu":"特惠专区",
"jingxuanhuodong":"精选活动",
"dajiadouzaiduihuan":"大家都在兑换",
"dianputuijian":"店铺推荐",
"saomadiancan":"您即将进行扫码点餐",
"xiadanzhuanjifen":"下单赚积分",
"chongzhifuliduo":"充值福利多",
"fulizhongxin":"福利中心",
"tiantiandefuli":"天天得福利",
"chijiankang":"吃健康",
"wanjiankang":"玩健康",
"hejiankang":"喝健康",
"yaoqinghaoyou":"邀请好友",
"zhuanxiangyouhuiquan":"专享优惠券",
"huixiangvipkazhuanxiang":"回乡VIP卡专享权益",
"kaitonghuixianghuoququanyi":"开通回乡VIP卡获取更多权益",
"huiyuanzhuanxiangjiage":"会员专享价格",
"yixianghuiyuanquanyi":"已享会员权益",
"yikaitongzidongxufei":"已开通自动续费",
"xufeihuixiangVIP":"续费回乡VIP",
"huixiangVIPka":"回乡VIP卡",
"xuefeihuiyuan":"续费会员",
"likexufei":"立刻续费",
"likekaitong":"立刻开通",
"likezhifu":"立刻支付",
"zhifubaozhifu":"支付宝支付",
"gengyouhui":"更优惠",

36
lib/l10n/intl_zh_CN.arb

@ -639,6 +639,42 @@
"xiaofeijilu": "消费记录", "xiaofeijilu": "消费记录",
"muqianwujilu": "目前暂未记录哦", "muqianwujilu": "目前暂未记录哦",
"pingtaizongyue": "余额:{zongyue}", "pingtaizongyue": "余额:{zongyue}",
"dongtaixiangqing":"动态详情",
"yiguanzhu":"已关注",
"guanzhu":"关注",
"guanyuhuixiang":"关于回乡",
"liaojiejiankang":"了解健康",
"xuexijiankang":"学习健康",
"fenxiangjiankang":"分享健康",
"xiedongtai":"写动态",
"dongtaitishi":"用户发布内容需要等待系统审核,审核通过后才会在推荐广场展示",
"tehuizhuanqu":"特惠专区",
"jingxuanhuodong":"精选活动",
"dajiadouzaiduihuan":"大家都在兑换",
"dianputuijian":"店铺推荐",
"saomadiancan":"您即将进行扫码点餐",
"xiadanzhuanjifen":"下单赚积分",
"chongzhifuliduo":"充值福利多",
"fulizhongxin":"福利中心",
"tiantiandefuli":"天天得福利",
"chijiankang":"吃健康",
"wanjiankang":"玩健康",
"hejiankang":"喝健康",
"yaoqinghaoyou":"邀请好友",
"zhuanxiangyouhuiquan":"专享优惠券",
"huixiangvipkazhuanxiang":"回乡VIP卡专享权益",
"kaitonghuixianghuoququanyi":"开通回乡VIP卡获取更多权益",
"huiyuanzhuanxiangjiage":"会员专享价格",
"yixianghuiyuanquanyi":"已享会员权益",
"yikaitongzidongxufei":"已开通自动续费",
"xufeihuixiangVIP":"续费回乡VIP",
"huixiangVIPka":"回乡VIP卡",
"xuefeihuiyuan":"续费会员",
"likexufei":"立刻续费",
"likekaitong":"立刻开通",
"likezhifu":"立刻支付",
"zhifubaozhifu":"支付宝支付",
"gengyouhui":"更优惠",

36
lib/l10n/intl_zh_Hans_CN.arb

@ -639,6 +639,42 @@
"xiaofeijilu": "消费记录", "xiaofeijilu": "消费记录",
"muqianwujilu": "目前暂未记录哦", "muqianwujilu": "目前暂未记录哦",
"pingtaizongyue": "余额:{zongyue}", "pingtaizongyue": "余额:{zongyue}",
"dongtaixiangqing":"动态详情",
"yiguanzhu":"已关注",
"guanzhu":"关注",
"guanyuhuixiang":"关于回乡",
"liaojiejiankang":"了解健康",
"xuexijiankang":"学习健康",
"fenxiangjiankang":"分享健康",
"xiedongtai":"写动态",
"dongtaitishi":"用户发布内容需要等待系统审核,审核通过后才会在推荐广场展示",
"tehuizhuanqu":"特惠专区",
"jingxuanhuodong":"精选活动",
"dajiadouzaiduihuan":"大家都在兑换",
"dianputuijian":"店铺推荐",
"saomadiancan":"您即将进行扫码点餐",
"xiadanzhuanjifen":"下单赚积分",
"chongzhifuliduo":"充值福利多",
"fulizhongxin":"福利中心",
"tiantiandefuli":"天天得福利",
"chijiankang":"吃健康",
"wanjiankang":"玩健康",
"hejiankang":"喝健康",
"yaoqinghaoyou":"邀请好友",
"zhuanxiangyouhuiquan":"专享优惠券",
"huixiangvipkazhuanxiang":"回乡VIP卡专享权益",
"kaitonghuixianghuoququanyi":"开通回乡VIP卡获取更多权益",
"huiyuanzhuanxiangjiage":"会员专享价格",
"yixianghuiyuanquanyi":"已享会员权益",
"yikaitongzidongxufei":"已开通自动续费",
"xufeihuixiangVIP":"续费回乡VIP",
"huixiangVIPka":"回乡VIP卡",
"xuefeihuiyuan":"续费会员",
"likexufei":"立刻续费",
"likekaitong":"立刻开通",
"likezhifu":"立刻支付",
"zhifubaozhifu":"支付宝支付",
"gengyouhui":"更优惠",

36
lib/l10n/intl_zh_Hant_CN.arb

@ -633,6 +633,42 @@
"lvbiyue": "綠幣餘額 {yue}", "lvbiyue": "綠幣餘額 {yue}",
"huodongyue": "活動餘額 {yue}", "huodongyue": "活動餘額 {yue}",
"pingtaizongyue": "餘額:{zongyue}", "pingtaizongyue": "餘額:{zongyue}",
"dongtaixiangqing":"動態詳情",
"yiguanzhu":"已關注",
"guanzhu":"關注",
"guanyuhuixiang":"關於回鄉",
"liaojiejiankang":"瞭解健康",
"xuexijiankang":"學習健康",
"fenxiangjiankang":"分享健康",
"xiedongtai":"寫動態",
"dongtaitishi":"用戶發佈內容需要等待系統稽核,稽核通過後才會在推薦廣場展示",
"tehuizhuanqu":"特惠專區",
"jingxuanhuodong":"精選活動",
"dajiadouzaiduihuan":"大家都在兌換",
"dianputuijian":"店鋪推薦",
"saomadiancan":"您即將進行掃碼點餐",
"xiadanzhuanjifen":"下單賺積分",
"chongzhifuliduo":"充值福利多",
"fulizhongxin":"福利中心",
"tiantiandefuli":"天天得福利",
"chijiankang":"吃健康",
"wanjiankang":"玩健康",
"hejiankang":"喝健康",
"yaoqinghaoyou":"邀請好友",
"zhuanxiangyouhuiquan":"專享優惠券",
"huixiangvipkazhuanxiang":"回鄉VIP卡專享權益",
"kaitonghuixianghuoququanyi":"開通回鄉VIP卡獲取更多權益",
"huiyuanzhuanxiangjiage":"會員專享價格",
"yixianghuiyuanquanyi":"已享會員權益",
"yikaitongzidongxufei":"已開通自動續費",
"xufeihuixiangVIP":"續費回鄉VIP",
"huixiangVIPka":"回鄉VIP卡",
"xuefeihuiyuan":"續費會員",
"likexufei":"立刻續費",
"likekaitong":"立刻開通",
"likezhifu":"立刻支付",
"zhifubaozhifu":"支付寶支付",
"gengyouhui":"更優惠",

37
lib/l10n/intl_zh_TW.arb

@ -635,6 +635,43 @@
"lvbiyue": "綠幣餘額 {yue}", "lvbiyue": "綠幣餘額 {yue}",
"huodongyue": "活動餘額 {yue}", "huodongyue": "活動餘額 {yue}",
"pingtaizongyue": "餘額:{zongyue}", "pingtaizongyue": "餘額:{zongyue}",
"dongtaixiangqing":"動態詳情",
"yiguanzhu":"已關注",
"guanzhu":"關注",
"guanyuhuixiang":"關於回鄉",
"liaojiejiankang":"瞭解健康",
"xuexijiankang":"學習健康",
"fenxiangjiankang":"分享健康",
"xiedongtai":"寫動態",
"dongtaitishi":"用戶發佈內容需要等待系統稽核,稽核通過後才會在推薦廣場展示",
"tehuizhuanqu":"特惠專區",
"jingxuanhuodong":"精選活動",
"dajiadouzaiduihuan":"大家都在兌換",
"dianputuijian":"店鋪推薦",
"saomadiancan":"您即將進行掃碼點餐",
"xiadanzhuanjifen":"下單賺積分",
"chongzhifuliduo":"充值福利多",
"fulizhongxin":"福利中心",
"tiantiandefuli":"天天得福利",
"chijiankang":"吃健康",
"wanjiankang":"玩健康",
"hejiankang":"喝健康",
"yaoqinghaoyou":"邀請好友",
"zhuanxiangyouhuiquan":"專享優惠券",
"huixiangvipkazhuanxiang":"回鄉VIP卡專享權益",
"kaitonghuixianghuoququanyi":"開通回鄉VIP卡獲取更多權益",
"huiyuanzhuanxiangjiage":"會員專享價格",
"yixianghuiyuanquanyi":"已享會員權益",
"yikaitongzidongxufei":"已開通自動續費",
"xufeihuixiangVIP":"續費回鄉VIP",
"huixiangVIPka":"回鄉VIP卡",
"xuefeihuiyuan":"續費會員",
"likexufei":"立刻續費",
"likekaitong":"立刻開通",
"likezhifu":"立刻支付",
"zhifubaozhifu":"支付寶支付",
"gengyouhui":"更優惠",

9
lib/main.dart

@ -10,8 +10,6 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
import 'package:huixiang/address/address_map_page.dart'; import 'package:huixiang/address/address_map_page.dart';
import 'package:huixiang/address/edit_address_page.dart'; import 'package:huixiang/address/edit_address_page.dart';
import 'package:huixiang/article/hot_article_details_page.dart';
import 'package:huixiang/article/video_playback_page.dart';
import 'package:huixiang/community/community_details.dart'; import 'package:huixiang/community/community_details.dart';
import 'package:huixiang/community/release_dynamic.dart'; import 'package:huixiang/community/release_dynamic.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
@ -74,7 +72,7 @@ import 'package:huixiang/store/store_view/product_meals_sku.dart';
import 'package:huixiang/test_page.dart'; import 'package:huixiang/test_page.dart';
import 'package:huixiang/union/location_map_page.dart'; import 'package:huixiang/union/location_map_page.dart';
import 'package:huixiang/utils/ImgCachePath.dart'; import 'package:huixiang/utils/ImgCachePath.dart';
import 'package:huixiang/vip/vip_page.dart'; import 'package:huixiang/vip/user_vip_service_page.dart';
import 'package:huixiang/web/web_page.dart'; import 'package:huixiang/web/web_page.dart';
import 'package:huixiang/union/union_details_page.dart'; import 'package:huixiang/union/union_details_page.dart';
@ -275,8 +273,6 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
// '/router/hot_article_details_page': (context, {arguments}) => HotArticleDetailsPage(), // '/router/hot_article_details_page': (context, {arguments}) => HotArticleDetailsPage(),
'/router/write_off_page': (context, {arguments}) => '/router/write_off_page': (context, {arguments}) =>
WriteOffPage(arguments: arguments), WriteOffPage(arguments: arguments),
'/router/hot_article_details_page': (context, {arguments}) =>
HotArticleDetailsPage(),
'/router/store_order': (context, {arguments}) => '/router/store_order': (context, {arguments}) =>
StoreOrderPage(arguments: arguments), StoreOrderPage(arguments: arguments),
'/router/shopping_mall_home': (context, {arguments}) => '/router/shopping_mall_home': (context, {arguments}) =>
@ -311,7 +307,6 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
'/router/edit_signature': (context, {arguments}) => EditSignature(arguments: arguments), '/router/edit_signature': (context, {arguments}) => EditSignature(arguments: arguments),
'/router/mine_card_invalid': (context, {arguments}) => MineCardInvalidPage(), '/router/mine_card_invalid': (context, {arguments}) => MineCardInvalidPage(),
'/router/store_selector_page': (context, {arguments}) => StoreSelectorPage(), '/router/store_selector_page': (context, {arguments}) => StoreSelectorPage(),
'/router/video_playback_page': (context, {arguments}) => VideoPlaybackPage(),
'/router/web_page': (context, {arguments}) => WebPage(arguments: arguments), '/router/web_page': (context, {arguments}) => WebPage(arguments: arguments),
'/router/web_turntable_activity': (context, {arguments}) => WebTurntableActivity(), '/router/web_turntable_activity': (context, {arguments}) => WebTurntableActivity(),
'/router/help_feedback_page': (context, {arguments}) => HelpFeedbackPage(), '/router/help_feedback_page': (context, {arguments}) => HelpFeedbackPage(),
@ -407,4 +402,6 @@ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
PhoneAddressPage(), PhoneAddressPage(),
'/router/product_meals_sku': (context, {arguments}) => '/router/product_meals_sku': (context, {arguments}) =>
ProductMealsSku(arguments:arguments), ProductMealsSku(arguments:arguments),
'/router/user_vip_service_page': (context, {arguments}) =>
UserVipServicePage(),
}; };

12
lib/main_page.dart

@ -54,7 +54,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
final GlobalKey homePageKey = GlobalKey(); final GlobalKey homePageKey = GlobalKey();
final GlobalKey minePageKey = GlobalKey(); final GlobalKey minePageKey = GlobalKey();
final GlobalKey unionPageKey = GlobalKey(); final GlobalKey unionPageKey = GlobalKey();
// final GlobalKey vipPageKey = GlobalKey(); final GlobalKey vipPageKey = GlobalKey();
// List<String> iconn; // List<String> iconn;
ApiService apiService; ApiService apiService;
@ -130,7 +130,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
},invite:invite,interviewCouponList:interviewCouponList,firstLoginCouponList:firstLoginCouponList,), },invite:invite,interviewCouponList:interviewCouponList,firstLoginCouponList:firstLoginCouponList,),
// MainHomePage(), // MainHomePage(),
UnionPage(unionPageKey,0), UnionPage(unionPageKey,0),
// VipPage(vipPageKey), VipPage(vipPageKey),
Platform.isAndroid ? (ExamineInstance.instance.isExamine?OrderPage():CommunityPage()) :CommunityPage(), Platform.isAndroid ? (ExamineInstance.instance.isExamine?OrderPage():CommunityPage()) :CommunityPage(),
// CommunityPage(), // CommunityPage(),
MinePage(minePageKey), MinePage(minePageKey),
@ -139,7 +139,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
icons = [ icons = [
"assets/svg/jingbi.svg", "assets/svg/jingbi.svg",
"assets/svg/lianmeng.svg", "assets/svg/lianmeng.svg",
// "assets/svg/huixiang_vip.svg", "assets/svg/huixiang_vip.svg",
"assets/svg/shequn.svg", "assets/svg/shequn.svg",
"assets/svg/wode.svg", "assets/svg/wode.svg",
]; ];
@ -429,9 +429,9 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
bottomNavigationItem(S.of(context).main_menu1, 0), bottomNavigationItem(S.of(context).main_menu1, 0),
bottomNavigationItem(S.of(context).main_menu2, 1), bottomNavigationItem(S.of(context).main_menu2, 1),
// bottomNavigationItem(S.of(context).main_menu3 , 2), // bottomNavigationItem(S.of(context).main_menu3 , 2),
// bottomNavigationItem("回乡VIP", 2), bottomNavigationItem("回乡VIP", 2),
bottomNavigationItem(Platform.isAndroid ? (ExamineInstance.instance.isExamine?"订单":S.of(context).main_menu3) :S.of(context).main_menu3, 2), bottomNavigationItem(Platform.isAndroid ? (ExamineInstance.instance.isExamine?"订单":S.of(context).main_menu3) :S.of(context).main_menu3, 3),
bottomNavigationItem(S.of(context).main_menu4, 3), bottomNavigationItem(S.of(context).main_menu4, 4),
], ],
), ),
), ),

1
lib/mine/recharge_page.dart

@ -65,6 +65,7 @@ class _RechargePage extends State<RechargePage> {
print("payCallback: ${event.errCode}"); print("payCallback: ${event.errCode}");
if (event.errCode == 0) { if (event.errCode == 0) {
queryUserBalance(); queryUserBalance();
Navigator.of(context).pop();
SmartDialog.showToast("充值成功", alignment: Alignment.center); SmartDialog.showToast("充值成功", alignment: Alignment.center);
} }
else{ else{

15
lib/order/order_view/order_commodity.dart

@ -126,6 +126,21 @@ class _OrderCommodity extends State<OrderCommodity> {
); );
} }
if (widget.orderInfo.orderDetail != null &&
widget.orderInfo.vipDiscountPrice != null &&
double.tryParse(widget.orderInfo.vipDiscountPrice ?? "0") > 0) {
// vip价格
widgets.add(
discountItem(
Color(0xFFFF7A1A),
"VIP优惠",
"",
"- ${widget.orderInfo.vipDiscountPrice??""}",
),
);
}
if (widget.orderInfo.storeVO != null && if (widget.orderInfo.storeVO != null &&
widget.orderInfo.storeVO.couponVO != null) { widget.orderInfo.storeVO.couponVO != null) {
// widgets.add(discountItem(Color(0xFF32A060), // widgets.add(discountItem(Color(0xFF32A060),

5
lib/retrofit/data/order_info.dart

@ -120,6 +120,7 @@ class OrderInfo {
String finalPayPrice; String finalPayPrice;
String activityNoPrice; String activityNoPrice;
String activityDiscountPrice; String activityDiscountPrice;
String vipDiscountPrice;
String totalDiscountPrice; String totalDiscountPrice;
int orderSource; int orderSource;
StoreVO storeVO; StoreVO storeVO;
@ -183,6 +184,7 @@ class OrderInfo {
String finalPayPrice, String finalPayPrice,
String activityNoPrice, String activityNoPrice,
String activityDiscountPrice, String activityDiscountPrice,
String vipDiscountPrice,
String totalDiscountPrice, String totalDiscountPrice,
int orderSource, int orderSource,
StoreVO storeVO, StoreVO storeVO,
@ -244,6 +246,7 @@ class OrderInfo {
this.finalPayPrice = finalPayPrice; this.finalPayPrice = finalPayPrice;
this.activityNoPrice = activityNoPrice; this.activityNoPrice = activityNoPrice;
this.activityDiscountPrice = activityDiscountPrice; this.activityDiscountPrice = activityDiscountPrice;
this.vipDiscountPrice = vipDiscountPrice;
this.totalDiscountPrice = totalDiscountPrice; this.totalDiscountPrice = totalDiscountPrice;
this.orderSource = orderSource; this.orderSource = orderSource;
this.storeVO = storeVO; this.storeVO = storeVO;
@ -310,6 +313,7 @@ class OrderInfo {
this.finalPayPrice = json["finalPayPrice"]; this.finalPayPrice = json["finalPayPrice"];
this.activityNoPrice = json["activityNoPrice"]; this.activityNoPrice = json["activityNoPrice"];
this.activityDiscountPrice = json["activityDiscountPrice"]; this.activityDiscountPrice = json["activityDiscountPrice"];
this.vipDiscountPrice = json["vipDiscountPrice"];
this.totalDiscountPrice = json["totalDiscountPrice"]; this.totalDiscountPrice = json["totalDiscountPrice"];
this.orderSource = json["orderSource"]; this.orderSource = json["orderSource"];
this.storeVO = this.storeVO =
@ -385,6 +389,7 @@ class OrderInfo {
map["finalPayPrice"] = this.finalPayPrice; map["finalPayPrice"] = this.finalPayPrice;
map["activityNoPrice"] = this.activityNoPrice; map["activityNoPrice"] = this.activityNoPrice;
map["activityDiscountPrice"] = this.activityDiscountPrice; map["activityDiscountPrice"] = this.activityDiscountPrice;
map["vipDiscountPrice"] = this.vipDiscountPrice;
map["totalDiscountPrice"] = this.totalDiscountPrice; map["totalDiscountPrice"] = this.totalDiscountPrice;
map["orderSource"] = this.orderSource; map["orderSource"] = this.orderSource;
if (this.storeVO != null) { if (this.storeVO != null) {

5
lib/retrofit/data/placeOrderFirst.dart

@ -118,19 +118,22 @@ class PlaceOrderFirst {
class PromotionInfoDTOBean { class PromotionInfoDTOBean {
String couponId; String couponId;
String promotionId; String promotionId;
bool useVipPrice;
PromotionInfoDTOBean({this.couponId, this.promotionId}); PromotionInfoDTOBean({this.couponId, this.promotionId,this.useVipPrice});
static PromotionInfoDTOBean fromJson(Map<String, dynamic> json) { static PromotionInfoDTOBean fromJson(Map<String, dynamic> json) {
if (json == null) return null; if (json == null) return null;
PromotionInfoDTOBean promotionInfoDTOBean = PromotionInfoDTOBean(); PromotionInfoDTOBean promotionInfoDTOBean = PromotionInfoDTOBean();
promotionInfoDTOBean.couponId = json['couponId']; promotionInfoDTOBean.couponId = json['couponId'];
promotionInfoDTOBean.promotionId = json['promotionId']; promotionInfoDTOBean.promotionId = json['promotionId'];
promotionInfoDTOBean.useVipPrice = json['useVipPrice'];
return promotionInfoDTOBean; return promotionInfoDTOBean;
} }
Map<String, dynamic> toJson() => { Map<String, dynamic> toJson() => {
"couponId": couponId, "couponId": couponId,
"promotionId": promotionId, "promotionId": promotionId,
"useVipPrice":useVipPrice
}; };
} }

434
lib/retrofit/data/settleOrderInfo.dart

@ -5,7 +5,7 @@ class SettleOrderInfo {
int orderNum; int orderNum;
int productNum; int productNum;
int mins; int mins;
dynamic memberVO; MemberVo memberVO;
String postAge; String postAge;
String price; String price;
String benefitDiscountAmount; String benefitDiscountAmount;
@ -18,6 +18,9 @@ class SettleOrderInfo {
List<OrderProductVOList> orderProductList; List<OrderProductVOList> orderProductList;
String promotionId; String promotionId;
String memberCouponId; String memberCouponId;
bool usePlateMoney;
int selectDiscount;
bool useVipPriceSelect = false;
static SettleOrderInfo fromJson(Map<String, dynamic> map) { static SettleOrderInfo fromJson(Map<String, dynamic> map) {
if (map == null) return null; if (map == null) return null;
@ -25,7 +28,7 @@ class SettleOrderInfo {
settleOrderInfoBean.orderNum = map['orderNum']; settleOrderInfoBean.orderNum = map['orderNum'];
settleOrderInfoBean.productNum = map['productNum']; settleOrderInfoBean.productNum = map['productNum'];
settleOrderInfoBean.mins = map['mins']; settleOrderInfoBean.mins = map['mins'];
settleOrderInfoBean.memberVO = map['memberVO']; settleOrderInfoBean.memberVO = MemberVo.fromJson(map['memberVO']);
settleOrderInfoBean.postAge = map['postAge']; settleOrderInfoBean.postAge = map['postAge'];
settleOrderInfoBean.price = map['price']; settleOrderInfoBean.price = map['price'];
settleOrderInfoBean.benefitDiscountAmount = map['benefitDiscountAmount']; settleOrderInfoBean.benefitDiscountAmount = map['benefitDiscountAmount'];
@ -44,6 +47,8 @@ class SettleOrderInfo {
); );
settleOrderInfoBean.promotionId = map['promotionId']; settleOrderInfoBean.promotionId = map['promotionId'];
settleOrderInfoBean.memberCouponId = map['memberCouponId']; settleOrderInfoBean.memberCouponId = map['memberCouponId'];
settleOrderInfoBean.usePlateMoney = map['usePlateMoney'];
settleOrderInfoBean.selectDiscount = map['selectDiscount'];
return settleOrderInfoBean; return settleOrderInfoBean;
} }
@ -64,7 +69,11 @@ class SettleOrderInfo {
"orderProductList": orderProductList, "orderProductList": orderProductList,
"promotionId": promotionId, "promotionId": promotionId,
"memberCouponId": memberCouponId, "memberCouponId": memberCouponId,
"usePlateMoney":usePlateMoney,
"selectDiscount":selectDiscount
}; };
} }
/// id : null /// id : null
@ -475,4 +484,425 @@ class PromotionDetailBean {
"collageNumber": collageNumber, "collageNumber": collageNumber,
"fullNumber": fullNumber, "fullNumber": fullNumber,
}; };
}
/// masterId : null
/// masterCardRankName : null
/// vipNo : "1379254113602109440"
/// nickname : "soon"
/// headimg : "https://thirdwx.qlogo.cn/mmopen/vi_32/TVpH76S7l3fOMZdErn7XeyWvib7bodcfBfQiaZqSDiaia9KVkC1cKmO8EL1kdLDPREacyoND9ZbJib7ZyCxzz1fQmVA/132"
/// userType : true
/// sex : "2"
/// level : 1
/// addressId : null
/// remark : null
/// phone : "13052919193"
/// createTime : "2021-08-20 15:19:48"
/// birth : "1998-09-17"
/// balance : "10.50"
/// money : "31.12"
/// activityMoney : "0.00"
/// greenMoney : "4872.00"
/// expendAmount : "202.01"
/// organic : null
/// points : "745"
/// isBind : true
/// memberRankVo : {"id":"1462684050274648064","rankName":"白银会员","rankOrigin":69,"rankContent":"","rankImg":"https://pos.upload.lotus-wallet.com/MDAwMA==/2021/11/7453eb74-661e-42b7-b575-8accc00fcbf5.png","status":true,"nextId":"1462684471177248768","nextName":"黄金会员","nextOrigin":20000}
/// age : 24
/// inviteCode : null
/// inviteNumber : null
/// todayInviteNumber : null
/// signature : null
/// background : null
/// certification : false
/// hasPayPassword : null
/// isVip : null
/// vipExpire : null
/// isVipSubscribe : null
/// vipDuration : null
class MemberVo {
MemberVo({
dynamic masterId,
dynamic masterCardRankName,
String vipNo,
String nickname,
String headimg,
bool userType,
String sex,
num level,
dynamic addressId,
dynamic remark,
String phone,
String createTime,
String birth,
String balance,
String money,
String activityMoney,
String greenMoney,
String expendAmount,
dynamic organic,
String points,
bool isBind,
MemberRankVo memberRankVo,
num age,
dynamic inviteCode,
dynamic inviteNumber,
dynamic todayInviteNumber,
dynamic signature,
dynamic background,
bool certification,
dynamic hasPayPassword,
dynamic isVip,
dynamic vipExpire,
dynamic isVipSubscribe,
dynamic vipDuration,}){
_masterId = masterId;
_masterCardRankName = masterCardRankName;
_vipNo = vipNo;
_nickname = nickname;
_headimg = headimg;
_userType = userType;
_sex = sex;
_level = level;
_addressId = addressId;
_remark = remark;
_phone = phone;
_createTime = createTime;
_birth = birth;
_balance = balance;
_money = money;
_activityMoney = activityMoney;
_greenMoney = greenMoney;
_expendAmount = expendAmount;
_organic = organic;
_points = points;
_isBind = isBind;
_memberRankVo = memberRankVo;
_age = age;
_inviteCode = inviteCode;
_inviteNumber = inviteNumber;
_todayInviteNumber = todayInviteNumber;
_signature = signature;
_background = background;
_certification = certification;
_hasPayPassword = hasPayPassword;
_isVip = isVip;
_vipExpire = vipExpire;
_isVipSubscribe = isVipSubscribe;
_vipDuration = vipDuration;
}
MemberVo.fromJson(dynamic json) {
_masterId = json['masterId'];
_masterCardRankName = json['masterCardRankName'];
_vipNo = json['vipNo'];
_nickname = json['nickname'];
_headimg = json['headimg'];
_userType = json['userType'];
_sex = json['sex'];
_level = json['level'];
_addressId = json['addressId'];
_remark = json['remark'];
_phone = json['phone'];
_createTime = json['createTime'];
_birth = json['birth'];
_balance = json['balance'];
_money = json['money'];
_activityMoney = json['activityMoney'];
_greenMoney = json['greenMoney'];
_expendAmount = json['expendAmount'];
_organic = json['organic'];
_points = json['points'];
_isBind = json['isBind'];
_memberRankVo = json['memberRankVo'] != null ? MemberRankVo.fromJson(json['memberRankVo']) : null;
_age = json['age'];
_inviteCode = json['inviteCode'];
_inviteNumber = json['inviteNumber'];
_todayInviteNumber = json['todayInviteNumber'];
_signature = json['signature'];
_background = json['background'];
_certification = json['certification'];
_hasPayPassword = json['hasPayPassword'];
_isVip = json['isVip'];
_vipExpire = json['vipExpire'];
_isVipSubscribe = json['isVipSubscribe'];
_vipDuration = json['vipDuration'];
}
dynamic _masterId;
dynamic _masterCardRankName;
String _vipNo;
String _nickname;
String _headimg;
bool _userType;
String _sex;
num _level;
dynamic _addressId;
dynamic _remark;
String _phone;
String _createTime;
String _birth;
String _balance;
String _money;
String _activityMoney;
String _greenMoney;
String _expendAmount;
dynamic _organic;
String _points;
bool _isBind;
MemberRankVo _memberRankVo;
num _age;
dynamic _inviteCode;
dynamic _inviteNumber;
dynamic _todayInviteNumber;
dynamic _signature;
dynamic _background;
bool _certification;
dynamic _hasPayPassword;
dynamic _isVip;
dynamic _vipExpire;
dynamic _isVipSubscribe;
dynamic _vipDuration;
MemberVo copyWith({ dynamic masterId,
dynamic masterCardRankName,
String vipNo,
String nickname,
String headimg,
bool userType,
String sex,
num level,
dynamic addressId,
dynamic remark,
String phone,
String createTime,
String birth,
String balance,
String money,
String activityMoney,
String greenMoney,
String expendAmount,
dynamic organic,
String points,
bool isBind,
MemberRankVo memberRankVo,
num age,
dynamic inviteCode,
dynamic inviteNumber,
dynamic todayInviteNumber,
dynamic signature,
dynamic background,
bool certification,
dynamic hasPayPassword,
dynamic isVip,
dynamic vipExpire,
dynamic isVipSubscribe,
dynamic vipDuration,
}) => MemberVo( masterId: masterId ?? _masterId,
masterCardRankName: masterCardRankName ?? _masterCardRankName,
vipNo: vipNo ?? _vipNo,
nickname: nickname ?? _nickname,
headimg: headimg ?? _headimg,
userType: userType ?? _userType,
sex: sex ?? _sex,
level: level ?? _level,
addressId: addressId ?? _addressId,
remark: remark ?? _remark,
phone: phone ?? _phone,
createTime: createTime ?? _createTime,
birth: birth ?? _birth,
balance: balance ?? _balance,
money: money ?? _money,
activityMoney: activityMoney ?? _activityMoney,
greenMoney: greenMoney ?? _greenMoney,
expendAmount: expendAmount ?? _expendAmount,
organic: organic ?? _organic,
points: points ?? _points,
isBind: isBind ?? _isBind,
memberRankVo: memberRankVo ?? _memberRankVo,
age: age ?? _age,
inviteCode: inviteCode ?? _inviteCode,
inviteNumber: inviteNumber ?? _inviteNumber,
todayInviteNumber: todayInviteNumber ?? _todayInviteNumber,
signature: signature ?? _signature,
background: background ?? _background,
certification: certification ?? _certification,
hasPayPassword: hasPayPassword ?? _hasPayPassword,
isVip: isVip ?? _isVip,
vipExpire: vipExpire ?? _vipExpire,
isVipSubscribe: isVipSubscribe ?? _isVipSubscribe,
vipDuration: vipDuration ?? _vipDuration,
);
dynamic get masterId => _masterId;
dynamic get masterCardRankName => _masterCardRankName;
String get vipNo => _vipNo;
String get nickname => _nickname;
String get headimg => _headimg;
bool get userType => _userType;
String get sex => _sex;
num get level => _level;
dynamic get addressId => _addressId;
dynamic get remark => _remark;
String get phone => _phone;
String get createTime => _createTime;
String get birth => _birth;
String get balance => _balance;
String get money => _money;
String get activityMoney => _activityMoney;
String get greenMoney => _greenMoney;
String get expendAmount => _expendAmount;
dynamic get organic => _organic;
String get points => _points;
bool get isBind => _isBind;
MemberRankVo get memberRankVo => _memberRankVo;
num get age => _age;
dynamic get inviteCode => _inviteCode;
dynamic get inviteNumber => _inviteNumber;
dynamic get todayInviteNumber => _todayInviteNumber;
dynamic get signature => _signature;
dynamic get background => _background;
bool get certification => _certification;
dynamic get hasPayPassword => _hasPayPassword;
dynamic get isVip => _isVip;
dynamic get vipExpire => _vipExpire;
dynamic get isVipSubscribe => _isVipSubscribe;
dynamic get vipDuration => _vipDuration;
Map<String, dynamic> toJson() {
final map = <String, dynamic>{};
map['masterId'] = _masterId;
map['masterCardRankName'] = _masterCardRankName;
map['vipNo'] = _vipNo;
map['nickname'] = _nickname;
map['headimg'] = _headimg;
map['userType'] = _userType;
map['sex'] = _sex;
map['level'] = _level;
map['addressId'] = _addressId;
map['remark'] = _remark;
map['phone'] = _phone;
map['createTime'] = _createTime;
map['birth'] = _birth;
map['balance'] = _balance;
map['money'] = _money;
map['activityMoney'] = _activityMoney;
map['greenMoney'] = _greenMoney;
map['expendAmount'] = _expendAmount;
map['organic'] = _organic;
map['points'] = _points;
map['isBind'] = _isBind;
if (_memberRankVo != null) {
map['memberRankVo'] = _memberRankVo.toJson();
}
map['age'] = _age;
map['inviteCode'] = _inviteCode;
map['inviteNumber'] = _inviteNumber;
map['todayInviteNumber'] = _todayInviteNumber;
map['signature'] = _signature;
map['background'] = _background;
map['certification'] = _certification;
map['hasPayPassword'] = _hasPayPassword;
map['isVip'] = _isVip;
map['vipExpire'] = _vipExpire;
map['isVipSubscribe'] = _isVipSubscribe;
map['vipDuration'] = _vipDuration;
return map;
}
}
/// id : "1462684050274648064"
/// rankName : "白银会员"
/// rankOrigin : 69
/// rankContent : ""
/// rankImg : "https://pos.upload.lotus-wallet.com/MDAwMA==/2021/11/7453eb74-661e-42b7-b575-8accc00fcbf5.png"
/// status : true
/// nextId : "1462684471177248768"
/// nextName : "黄金会员"
/// nextOrigin : 20000
class MemberRankVo {
MemberRankVo({
String id,
String rankName,
num rankOrigin,
String rankContent,
String rankImg,
bool status,
String nextId,
String nextName,
num nextOrigin,}){
_id = id;
_rankName = rankName;
_rankOrigin = rankOrigin;
_rankContent = rankContent;
_rankImg = rankImg;
_status = status;
_nextId = nextId;
_nextName = nextName;
_nextOrigin = nextOrigin;
}
MemberRankVo.fromJson(dynamic json) {
_id = json['id'];
_rankName = json['rankName'];
_rankOrigin = json['rankOrigin'];
_rankContent = json['rankContent'];
_rankImg = json['rankImg'];
_status = json['status'];
_nextId = json['nextId'];
_nextName = json['nextName'];
_nextOrigin = json['nextOrigin'];
}
String _id;
String _rankName;
num _rankOrigin;
String _rankContent;
String _rankImg;
bool _status;
String _nextId;
String _nextName;
num _nextOrigin;
MemberRankVo copyWith({ String id,
String rankName,
num rankOrigin,
String rankContent,
String rankImg,
bool status,
String nextId,
String nextName,
num nextOrigin,
}) => MemberRankVo( id: id ?? _id,
rankName: rankName ?? _rankName,
rankOrigin: rankOrigin ?? _rankOrigin,
rankContent: rankContent ?? _rankContent,
rankImg: rankImg ?? _rankImg,
status: status ?? _status,
nextId: nextId ?? _nextId,
nextName: nextName ?? _nextName,
nextOrigin: nextOrigin ?? _nextOrigin,
);
String get id => _id;
String get rankName => _rankName;
num get rankOrigin => _rankOrigin;
String get rankContent => _rankContent;
String get rankImg => _rankImg;
bool get status => _status;
String get nextId => _nextId;
String get nextName => _nextName;
num get nextOrigin => _nextOrigin;
Map<String, dynamic> toJson() {
final map = <String, dynamic>{};
map['id'] = _id;
map['rankName'] = _rankName;
map['rankOrigin'] = _rankOrigin;
map['rankContent'] = _rankContent;
map['rankImg'] = _rankImg;
map['status'] = _status;
map['nextId'] = _nextId;
map['nextName'] = _nextName;
map['nextOrigin'] = _nextOrigin;
return map;
}
} }

2
lib/retrofit/min_api.dart

@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart';
part 'min_api.g.dart'; part 'min_api.g.dart';
const localBaseUrl = "http://192.168.10.129:8765/app/";/// const localBaseUrl = "http://192.168.10.78:8765/app/";///
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";/// // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线

2
lib/retrofit/retrofit_api.dart

@ -62,7 +62,7 @@ import 'data/wx_pay.dart';
part 'retrofit_api.g.dart'; part 'retrofit_api.g.dart';
const localBaseUrl = "http://192.168.10.129:8766/app/";/// const localBaseUrl = "http://192.168.10.78:8766/app/";///
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";/// // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线

42
lib/settlement/settlement.dart

@ -80,6 +80,7 @@ class _Settlement extends State<Settlement> {
int count1 = 0; int count1 = 0;
String productId; String productId;
bool orderButton = false; bool orderButton = false;
bool useVipPriceSelect = false;
@override @override
void initState() { void initState() {
@ -126,6 +127,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -139,6 +141,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -152,6 +155,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -173,6 +177,7 @@ class _Settlement extends State<Settlement> {
productSkuId, productSkuId,
actProductId, actProductId,
actProductSkuId, actProductSkuId,
useVipPriceSelect,
buyNum, buyNum,
payChannel, payChannel,
tableId) async { tableId) async {
@ -185,6 +190,7 @@ class _Settlement extends State<Settlement> {
"productSkuId": productSkuId, "productSkuId": productSkuId,
"actProductId": actProductId, "actProductId": actProductId,
"actProductSkuId": actProductSkuId, "actProductSkuId": actProductSkuId,
"useVipPrice":useVipPriceSelect,
"buyNum": buyNum, "buyNum": buyNum,
"payChannel": payChannel, "payChannel": payChannel,
"tableId": tableId "tableId": tableId
@ -279,6 +285,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -334,6 +341,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -361,6 +369,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -461,6 +470,7 @@ class _Settlement extends State<Settlement> {
placeOrderFirst.promotionInfoDTO.couponId = placeOrderFirst.promotionInfoDTO.couponId =
(couponListBean != null && tableId <= 0) ? couponListBean.id : ""; (couponListBean != null && tableId <= 0) ? couponListBean.id : "";
// : widget.arguments["cid"] ?? ""; // : widget.arguments["cid"] ?? "";
placeOrderFirst.promotionInfoDTO.useVipPrice = useVipPriceSelect;
placeOrderFirst.recMobile = placeOrderFirst.recMobile =
(mobile == null || mobile == "") ? mobile : storeInfo.headMobile; (mobile == null || mobile == "") ? mobile : storeInfo.headMobile;
placeOrderFirst.shoppingCartSkuItemList = settleOrderInfo.orderProductList; placeOrderFirst.shoppingCartSkuItemList = settleOrderInfo.orderProductList;
@ -716,6 +726,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId ?? 0); tableId ?? 0);
@ -740,6 +751,7 @@ class _Settlement extends State<Settlement> {
minOrderInfo, minOrderInfo,
tableId, tableId,
pageType, pageType,
(coupons != "" || promotions!="") ? (useVipPriceSelect == false) :(useVipPriceSelect == true)
), ),
///// /////
@ -761,13 +773,12 @@ class _Settlement extends State<Settlement> {
setState(() { setState(() {
if (value != null) remakers = value; if (value != null) remakers = value;
}) })
}); });},
},
tableId, tableId,
vipPriceSelect,
), ),
if (placeOrder && joinA != JoinActivity.BargainBug) if (placeOrder && joinA != JoinActivity.BargainBug)
/// ///
PayMethod(payChannelCheck), PayMethod(payChannelCheck),
], ],
@ -874,11 +885,32 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
useVipPriceSelect,
count1, count1,
payChannel, payChannel,
tableId);} tableId);}
} }
vipPriceSelect(bool useVipPriceSelect) {
this.useVipPriceSelect = useVipPriceSelect;
if (tableId > 0) {
queryOrderDetails(parentId);
} else {
queryOrderInfo(
address?.id,
selectedBtn,
null,
0,
productId ?? null,
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
useVipPriceSelect,
count1,
payChannel,
tableId);}
}
mobileChange(String mobile) { mobileChange(String mobile) {
this.mobile = mobile; this.mobile = mobile;
} }
@ -930,6 +962,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
false,
count1, count1,
payChannel, payChannel,
tableId); tableId);
@ -958,10 +991,11 @@ class _Settlement extends State<Settlement> {
selectedBtn, selectedBtn,
null, null,
0, 0,
pro.id??productId, (pro.id??"")??productId,
productSkuId ?? "", productSkuId ?? "",
actProductId ?? "", actProductId ?? "",
actProductSkuId ?? "", actProductSkuId ?? "",
false,
count1, count1,
payChannel, payChannel,
tableId); tableId);

92
lib/settlement/settlement_view/activity_coupon_remarks.dart

@ -1,8 +1,8 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/min_order_info.dart'; import 'package:huixiang/retrofit/data/min_order_info.dart';
import 'package:huixiang/retrofit/data/settleOrderInfo.dart'; import 'package:huixiang/retrofit/data/settleOrderInfo.dart';
import 'package:huixiang/retrofit/data/store_info.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -19,6 +19,7 @@ class ActivityCouponRemarks extends StatefulWidget {
final bool placeOrder; final bool placeOrder;
final String remark; final String remark;
final int tableId; final int tableId;
final Function(bool useVipPriceSelect) vipPriceSelect;
ActivityCouponRemarks( ActivityCouponRemarks(
this.couponCart, this.couponCart,
@ -31,7 +32,8 @@ class ActivityCouponRemarks extends StatefulWidget {
this.placeOrder, this.placeOrder,
this.remark, this.remark,
this.editRemark, this.editRemark,
this.tableId this.tableId,
this.vipPriceSelect,
); );
@override @override
@ -41,6 +43,8 @@ class ActivityCouponRemarks extends StatefulWidget {
} }
class _ActivityCouponRemarks extends State<ActivityCouponRemarks> { class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
bool vipSelect = false;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
@ -73,45 +77,35 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
// if () if(widget?.settleOrderInfo?.memberVO?.isVip ?? false)
// InkWell( Row(
// onTap: () { mainAxisAlignment: MainAxisAlignment.center,
// // widget.activityCart(); crossAxisAlignment: CrossAxisAlignment.center,
// }, children: [
// child: Row( Expanded(
// mainAxisAlignment: MainAxisAlignment.center, flex: 1,
// crossAxisAlignment: CrossAxisAlignment.center, child: Text(
// children: [ "VIP价格",
// Expanded( style: TextStyle(
// flex: 1, fontWeight: MyFontWeight.regular,
// child: Text( fontSize: 14.sp,
// "VIP价格", color: Color(0xFF353535),
// style: TextStyle( ),
// fontWeight: MyFontWeight.regular, ),
// fontSize: 14.sp, ),
// color: Color(0xFF353535), Switch.adaptive(
// ), value: (widget.coupons != null && widget.coupons != ""||widget.promotions != null && widget.promotions != "") ? false:vipSelect,
// ), materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
// ), activeColor: Color(0xff32A060),
// Text( onChanged: (bool value) {
// "使用", setState(() {
// textAlign: TextAlign.end, vipSelect = !vipSelect;
// style: TextStyle( widget.vipPriceSelect(vipSelect);
// fontSize: 14.sp, });
// color: Color(0xFF32A060), },
// fontWeight: MyFontWeight.semi_bold, ),
// ), ],
// ), ),
// Icon(
// Icons.keyboard_arrow_right,
// size: 16,
// ),
// ],
// ),
// ),
// SizedBox(
// height: 13,
// ),
if (widget.placeOrder && widget?.settleOrderInfo?.benefitDiscountAmount != null && widget?.settleOrderInfo?.benefitDiscountAmount != "0") if (widget.placeOrder && widget?.settleOrderInfo?.benefitDiscountAmount != null && widget?.settleOrderInfo?.benefitDiscountAmount != "0")
Container( Container(
margin:EdgeInsets.only(bottom: 13), margin:EdgeInsets.only(bottom: 13),
@ -264,22 +258,6 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
); );
} }
String vipText() {
String vip = "";
if (widget.promotions == null || widget.promotions == "") {
vip = "使用";
if (widget.settleOrderInfo == null ||
widget.settleOrderInfo.promotionInfoList == null) {
vip = "使用";
} else if (widget.coupons != null && widget.coupons != "") {
vip = "不使用";
}
} else {
vip = widget.promotions;
}
return vip;
}
String activityText() { String activityText() {
String promotion = ""; String promotion = "";
if (widget.promotions == null || widget.promotions == "") { if (widget.promotions == null || widget.promotions == "") {

46
lib/settlement/settlement_view/settlement_order_commodity.dart

@ -17,9 +17,10 @@ class SettlementOrderCommodity extends StatefulWidget {
final SettleOrderInfo settleOrderInfo; final SettleOrderInfo settleOrderInfo;
final MinOrderInfo minOrderInfo; final MinOrderInfo minOrderInfo;
final String pageType; final String pageType;
final bool useVipPriceSelect;
SettlementOrderCommodity( SettlementOrderCommodity(
this.isTakeOut, this.settleOrderInfo, this.minOrderInfo,this.tableId,this.pageType,); this.isTakeOut, this.settleOrderInfo, this.minOrderInfo,this.tableId,this.pageType,this.useVipPriceSelect);
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
@ -103,6 +104,10 @@ class _SettlementOrderCommodity extends State<SettlementOrderCommodity> {
); );
} }
if(widget.useVipPriceSelect){
widgets.add(vipItem(Color(0xFFFF7A1A), "VIP优惠", widget?.settleOrderInfo?.discountAmount ?? ""));
}
widgets.add(Container( widgets.add(Container(
margin: EdgeInsets.only( margin: EdgeInsets.only(
top: 24.h, top: 24.h,
@ -253,6 +258,45 @@ class _SettlementOrderCommodity extends State<SettlementOrderCommodity> {
); );
} }
Widget vipItem(Color color, textName, vipDiscount) {
return Container(
margin: EdgeInsets.only(top: 9.h, bottom: 9.h),
child: Row(
children: [
Container(
padding: EdgeInsets.fromLTRB(4.w, 2.h, 4.w, 2.h),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(2)),
border: Border.all(
width: 1,
color: color,
style: BorderStyle.solid,
),
),
child: Text(
textName,
style: TextStyle(
fontSize: 10.sp,
color: color,
),
),
),
SizedBox(
width: 27.w,
),
Spacer(),
Text(
S.of(context).yuan_("-¥$vipDiscount"),
style: TextStyle(
fontSize: 12.sp,
color: color,
),
),
],
),
);
}
Widget buildQrCode() { Widget buildQrCode() {
return Container( return Container(
margin: EdgeInsets.only(right: 16.w), margin: EdgeInsets.only(right: 16.w),

74
lib/store/store_view/shop_goods.dart

@ -309,44 +309,44 @@ class _ShopGoods extends State<ShopGoods> {
SizedBox( SizedBox(
height: 4.h, height: 4.h,
), ),
// if(widget.productListBean.vipPrice != null ) if(widget.productListBean.vipPrice != null )
// Row( Row(
// children: [ children: [
// Container( Container(
// alignment: Alignment.center, alignment: Alignment.center,
// padding: EdgeInsets.symmetric(horizontal:2.w), padding: EdgeInsets.symmetric(horizontal:2.w),
// margin: EdgeInsets.only(right: 4.w), margin: EdgeInsets.only(right: 4.w),
// decoration: new BoxDecoration( decoration: new BoxDecoration(
// color: Color(0xff32A060), color: Color(0xff32A060),
// borderRadius: BorderRadius.circular(4)), borderRadius: BorderRadius.circular(4)),
// child: Text( child: Text(
// "VIP", "VIP",
// style: TextStyle( style: TextStyle(
// fontSize: 12.sp, fontSize: 12.sp,
// fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
// color: Color(0xFFFFFFFF), color: Color(0xFFFFFFFF),
// ), ),
// ), ),
// ), ),
// Text( Text(
// "${AppUtils.calculateDouble(double.tryParse(widget.productListBean.vipPrice ?? "0") ?? 0)}", "${AppUtils.calculateDouble(double.tryParse(widget.productListBean.vipPrice ?? "0") ?? 0)}",
// style: TextStyle( style: TextStyle(
// fontSize: 16.sp, fontSize: 16.sp,
// fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
// color: Color(0xff32A060), color: Color(0xff32A060),
// ), ),
// ), ),
// ], ],
// ),
Text(
"${AppUtils.calculateDouble(double.tryParse(widget.isShopCart ? widget.shoppingCartSkuItemListBean.skuPrice : widget.productListBean.applyPrice) ?? 0)}",
style: TextStyle(
color: Color(0xFFA29E9E),
fontSize: 12.sp,
decoration: TextDecoration.lineThrough,
fontWeight: MyFontWeight.regular,
),
), ),
// Text(
// "${AppUtils.calculateDouble(double.tryParse(widget.isShopCart ? widget.shoppingCartSkuItemListBean.skuPrice : widget.productListBean.applyPrice) ?? 0)}",
// style: TextStyle(
// color: Color(0xFFA29E9E),
// fontSize: 12.sp,
// decoration: TextDecoration.lineThrough,
// fontWeight: MyFontWeight.regular,
// ),
// ),
], ],
), ),
), ),

49
lib/vip/user_vip_service_page.dart

@ -0,0 +1,49 @@
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.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';
class UserVipServicePage extends StatefulWidget {
@override
State<StatefulWidget> createState() {
return _UserVipServicePage();
}
}
class _UserVipServicePage extends State<UserVipServicePage> with WidgetsBindingObserver {
var controller = new ScrollController();
@override
void initState() {
super.initState();
WidgetsBinding.instance.addObserver(this);
if (Platform.isAndroid) WebView.platform = SurfaceAndroidWebView();
if (Platform.isIOS) WebView.platform = CupertinoWebView();
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: MyAppBar(
title:"回乡VIP会员卡规则协议",
titleColor: Colors.black,
background: Color(0xFFFFFFFF),
leadingColor: Colors.black,
),
body: Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
alignment: Alignment.center,
child:
WebView(
initialUrl: "http://huixiang.lotus-wallet.com/vip.html",
javascriptMode: JavascriptMode.unrestricted,
)),
);
}
}

59
lib/vip/vip_page.dart

@ -77,36 +77,39 @@ class _VipPageState extends State<VipPage> with AutomaticKeepAliveClientMixin {
backgroundColor: Color(0xFFF9FAF7), backgroundColor: Color(0xFFF9FAF7),
body: Container( body: Container(
padding: EdgeInsets.only(bottom: 76.h), padding: EdgeInsets.only(bottom: 76.h),
child: SmartRefresher( child: Container(
controller: _refreshController, child: FutureBuilder(
enablePullDown: true, future:queryVipHome(),
enablePullUp: false, builder: (context, snapshot) {
header: MyHeader(), return SmartRefresher(
physics: BouncingScrollPhysics(), controller: _refreshController,
onRefresh: () { enablePullDown: true,
setState(() { enablePullUp: false,
_onRefresh(); header: MyHeader(),
}); physics: BouncingScrollPhysics(),
}, onRefresh: () {
child: SingleChildScrollView( setState(() {
child: Container( _onRefresh();
child: FutureBuilder( });
future:queryVipHome(), },
builder: (context, snapshot) { child: SingleChildScrollView(
return Column( child: Container(
mainAxisAlignment: MainAxisAlignment.start, child:Column(
crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ crossAxisAlignment: CrossAxisAlignment.start,
VipTop(vipHome), children: [
VipTop(vipHome,_onRefresh()),
VipGoodsDiscount(vipHome), if(vipHome !=null)
VipGoodsDiscount(vipHome),
ExclusiveCoupon(), ExclusiveCoupon(),
], ],
); ),
}, ),
), ),
), );
},
), ),
), ),
), ),

9
lib/vip/vip_view/exclusive_coupon.dart

@ -3,6 +3,8 @@ import 'package:flutter/material.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import '../../generated/l10n.dart';
class ExclusiveCoupon extends StatefulWidget { class ExclusiveCoupon extends StatefulWidget {
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
@ -14,9 +16,9 @@ class _ExclusiveCoupon extends State<ExclusiveCoupon> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
margin: EdgeInsets.only(left: 16.w, right: 16.w, bottom: 40.h), margin: EdgeInsets.only(left: 14.w, right: 14.w, bottom: 40.h),
width: double.infinity, width: double.infinity,
padding: EdgeInsets.all(16.w), padding: EdgeInsets.only(top: 16.h,left: 8.h,bottom: 10.h),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6.w), borderRadius: BorderRadius.circular(6.w),
color: Colors.white, color: Colors.white,
@ -34,7 +36,7 @@ class _ExclusiveCoupon extends State<ExclusiveCoupon> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"专享优惠券", S.of(context).zhuanxiangyouhuiquan,
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 15.sp, fontSize: 15.sp,
@ -46,6 +48,7 @@ class _ExclusiveCoupon extends State<ExclusiveCoupon> {
), ),
Row( Row(
children: [ children: [
SizedBox(width: 2.w,),
Expanded( Expanded(
child: Stack( child: Stack(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,

29
lib/vip/vip_view/vip_goods_discount.dart

@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import '../../generated/l10n.dart';
import '../../retrofit/data/vip_card_home.dart'; import '../../retrofit/data/vip_card_home.dart';
import '../../view_widget/custom_image.dart'; import '../../view_widget/custom_image.dart';
@ -21,12 +22,11 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
margin: EdgeInsets.symmetric(vertical: 25.h,horizontal: 16.w), margin: EdgeInsets.symmetric(vertical: 25.h,horizontal: 14.w),
child:Column( child:Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if(widget?.vipCardHome!=null)
(widget?.vipCardHome?.member?.isVip ?? false)? (widget?.vipCardHome?.member?.isVip ?? false)?
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
@ -40,7 +40,7 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
), ),
SizedBox(width: 11.w,), SizedBox(width: 11.w,),
Text( Text(
"回乡VIP卡专享权益", S.of(context).huixiangvipkazhuanxiang,
style: TextStyle( style: TextStyle(
color: Color(0xff32A060), color: Color(0xff32A060),
fontSize:15.sp, fontSize:15.sp,
@ -67,7 +67,7 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
), ),
SizedBox(width: 2.w,), SizedBox(width: 2.w,),
Text( Text(
"开通回乡VIP卡获取更多权益", S.of(context).kaitonghuixianghuoququanyi,
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize:15.sp, fontSize:15.sp,
@ -84,10 +84,10 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
Widget vipGoodsRecommend(){ Widget vipGoodsRecommend(){
return Container( return Container(
margin: EdgeInsets.only(top: 10.h), margin: EdgeInsets.only(top: 12.h),
height: 200.h, height: 195.h,
width: double.infinity, width: double.infinity,
padding: EdgeInsets.all(16.w), padding: EdgeInsets.only(top: 16.h,left: 8.h),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6.w), borderRadius: BorderRadius.circular(6.w),
color: Colors.white, color: Colors.white,
@ -105,7 +105,7 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
"会员专享价格", S.of(context).huiyuanzhuanxiangjiage,
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize:15.sp, fontSize:15.sp,
@ -145,7 +145,7 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
Widget vipGoodsRecommendItem(ProductVips productVips){ Widget vipGoodsRecommendItem(ProductVips productVips){
return Container( return Container(
width: 70.w, width: 70.w,
margin: EdgeInsets.only(right:10.w,left:6.w), margin: EdgeInsets.only(right:40.w,left:6.w),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -158,6 +158,7 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
width: 70, width: 70,
height: 70, height: 70,
fit: BoxFit.cover, fit: BoxFit.cover,
radius: BorderRadius.circular(2),
errorSrc: "assets/image/default_1.webp", errorSrc: "assets/image/default_1.webp",
fadeSrc: "assets/image/default_1.webp", fadeSrc: "assets/image/default_1.webp",
), ),
@ -168,13 +169,13 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
alignment: Alignment.center, alignment: Alignment.center,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(
bottomRight: Radius.circular(4.r), bottomRight: Radius.circular(2.r),
bottomLeft: Radius.circular(4.r), bottomLeft: Radius.circular(2.r),
), ),
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
child: Text( child: Text(
"${productVips.vipDiscount ?? ""}", "${productVips.vipDiscount ?? "0"}",
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize:13.sp, fontSize:13.sp,
@ -195,10 +196,10 @@ class _VipGoodsDiscount extends State<VipGoodsDiscount> {
),), ),),
), ),
Text( Text(
"${productVips.vipPrice ?? ""}", "${productVips.vipPrice ?? "0.00"}",
style: TextStyle( style: TextStyle(
color: Color(0xff0D0D0D), color: Color(0xff0D0D0D),
fontSize:15.sp, fontSize:14.sp,
fontWeight: MyFontWeight.medium, fontWeight: MyFontWeight.medium,
),) ),)
], ],

238
lib/vip/vip_view/vip_top.dart

@ -8,7 +8,6 @@ import 'package:fluwx/fluwx.dart';
import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/font_weight.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:tobias/tobias.dart';
import '../../generated/l10n.dart'; import '../../generated/l10n.dart';
import '../../retrofit/data/base_data.dart'; import '../../retrofit/data/base_data.dart';
@ -21,8 +20,10 @@ import 'package:tobias/tobias.dart' as tobias;
class VipTop extends StatefulWidget { class VipTop extends StatefulWidget {
final VipCardHome vipCardHome; final VipCardHome vipCardHome;
final Function onRefresh;
VipTop(this.vipCardHome);
VipTop(this.vipCardHome,this.onRefresh);
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
@ -35,7 +36,6 @@ class _VipTop extends State<VipTop> {
ApiService apiService; ApiService apiService;
var payType = 1; var payType = 1;
dynamic payListen; dynamic payListen;
int stateIndex = 0;
@override @override
void initState() { void initState() {
@ -43,6 +43,7 @@ class _VipTop extends State<VipTop> {
payListen = weChatResponseEventHandler.listen((event) async { payListen = weChatResponseEventHandler.listen((event) async {
print("payCallback: ${event.errCode}"); print("payCallback: ${event.errCode}");
if (event.errCode == 0) { if (event.errCode == 0) {
widget.onRefresh();
SmartDialog.showToast("支付成功", alignment: Alignment.center); SmartDialog.showToast("支付成功", alignment: Alignment.center);
} else { } else {
SmartDialog.showToast("支付失败", alignment: Alignment.center); SmartDialog.showToast("支付失败", alignment: Alignment.center);
@ -96,8 +97,8 @@ class _VipTop extends State<VipTop> {
tobias.aliPay(baseData.data["body"]).then((payRes) { tobias.aliPay(baseData.data["body"]).then((payRes) {
if (payRes['resultStatus'] == 9000 || if (payRes['resultStatus'] == 9000 ||
payRes['resultStatus'] == '9000') { payRes['resultStatus'] == '9000') {
SmartDialog.showToast("支付成功", widget.onRefresh();
alignment: Alignment.center); SmartDialog.showToast("支付成功", alignment: Alignment.center);
} else { } else {
SmartDialog.showToast(payRes['memo'], SmartDialog.showToast(payRes['memo'],
alignment: Alignment.center); alignment: Alignment.center);
@ -120,7 +121,7 @@ class _VipTop extends State<VipTop> {
SizedBox( SizedBox(
height: 15.h, height: 15.h,
), ),
(!(widget?.vipCardHome?.member?.isVip ?? false) || stateIndex== 1)? (!(widget?.vipCardHome?.member?.isVip ?? false))?
vipCardList(): vipCardList():
Padding( Padding(
padding: EdgeInsets.symmetric(horizontal: 16.w), padding: EdgeInsets.symmetric(horizontal: 16.w),
@ -147,7 +148,7 @@ class _VipTop extends State<VipTop> {
TextSpan( TextSpan(
children: [ children: [
TextSpan( TextSpan(
text: "已享会员权益 ", text: S.of(context).yixianghuiyuanquanyi,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 15.sp, fontSize: 15.sp,
@ -183,7 +184,7 @@ class _VipTop extends State<VipTop> {
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
setState(() { setState(() {
stateIndex = 1; vipRenewShowBottomSheet();
}); });
}, },
child: Container( child: Container(
@ -235,10 +236,11 @@ class _VipTop extends State<VipTop> {
); );
} }
///vip卡
Widget vipCard() { Widget vipCard() {
return Container( return Container(
margin: EdgeInsets.fromLTRB( margin: EdgeInsets.fromLTRB(
16.w, MediaQuery.of(context).padding.top + 25.h, 16.w, 8.h), 14.w, MediaQuery.of(context).padding.top + 25.h, 14.w, 8.h),
height: 167.h, height: 167.h,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w), borderRadius: BorderRadius.circular(8.w),
@ -268,7 +270,7 @@ class _VipTop extends State<VipTop> {
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
"回乡VIP卡", S.of(context).huixiangVIPka,
style: TextStyle( style: TextStyle(
color: Color(0xff32A060), color: Color(0xff32A060),
fontSize: 24.sp, fontSize: 24.sp,
@ -303,6 +305,7 @@ class _VipTop extends State<VipTop> {
); );
} }
///VIP购买套餐
Widget vipCardList() { Widget vipCardList() {
return Container( return Container(
height: 132.h, height: 132.h,
@ -316,11 +319,10 @@ class _VipTop extends State<VipTop> {
onTap: () { onTap: () {
setState(() { setState(() {
selectIndex = position; selectIndex = position;
if (widget?.vipCardHome?.cards[selectIndex]?.autoSubscribe ?? if(widget?.vipCardHome?.member?.isVip ?? false){
false) {
vipTreatyShowBottomSheet();
} else {
vipShowBottomSheet(); vipShowBottomSheet();
} else{
vipTreatyShowBottomSheet();
} }
}); });
}, },
@ -332,8 +334,7 @@ class _VipTop extends State<VipTop> {
} }
Widget vipCardItem(Cards cards, index) { Widget vipCardItem(Cards cards, index) {
return Expanded( return Stack(
child: Stack(
alignment: Alignment.topRight, alignment: Alignment.topRight,
children: [ children: [
Container( Container(
@ -343,7 +344,7 @@ class _VipTop extends State<VipTop> {
padding: EdgeInsets.symmetric(horizontal: 10.w, vertical: 25.h), padding: EdgeInsets.symmetric(horizontal: 10.w, vertical: 25.h),
margin: EdgeInsets.only(right: 15.w), margin: EdgeInsets.only(right: 15.w),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4.w), borderRadius: BorderRadius.circular(6.w),
color: Color(selectIndex == index ? 0xffF0FAF4 : 0xffffffff), color: Color(selectIndex == index ? 0xffF0FAF4 : 0xffffffff),
border: Border.all( border: Border.all(
color: Color(selectIndex == index ? 0xff32A060 : 0xFFEAEAEA), color: Color(selectIndex == index ? 0xff32A060 : 0xFFEAEAEA),
@ -415,7 +416,7 @@ class _VipTop extends State<VipTop> {
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
child: Text( child: Text(
"更优惠", S.of(context).gengyouhui,
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 12.sp, fontSize: 12.sp,
@ -424,7 +425,149 @@ class _VipTop extends State<VipTop> {
), ),
) )
], ],
)); );
}
///
vipRenewShowBottomSheet() {
showModalBottomSheet(
builder: (BuildContext context) {
return StatefulBuilder(builder: (
context,
state,
) {
return renewBuildBottomSheetWidget(context, state);
});
},
backgroundColor: Colors.transparent,
context: context);
}
Widget renewBuildBottomSheetWidget(BuildContext context, state) {
return Container(
padding: EdgeInsets.only(top: 10.h,),
decoration: new BoxDecoration(
color: Colors.white,
borderRadius: new BorderRadius.only(
topLeft: const Radius.circular(8.0),
topRight: const Radius.circular(8.0))),
child: Container(
height: 265.h,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Padding(padding:EdgeInsets.only(right:14.w),
child:
Row(
children: [
Expanded(
child: Text(
S.of(context).xuefeihuiyuan ,
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: MyFontWeight.medium,
fontSize: 15.sp,
color: Color(0xff0D0D0D),
),
)),
GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
child: Icon(
Icons.clear,
color: Colors.black,
),
),
],
)),
SizedBox(height:11.h,),
Container(
height: 132.h,
margin: EdgeInsets.symmetric(horizontal: 14.w),
child: ListView.builder(
scrollDirection: Axis.horizontal,
physics: BouncingScrollPhysics(),
itemCount: widget?.vipCardHome?.cards?.length ?? 0,
itemBuilder: (context, position) {
return GestureDetector(
onTap: () {
state(() {
selectIndex = position;
});
},
child: vipCardItem(widget?.vipCardHome?.cards[position], position),
);
},
),
),
Container(
width: double.infinity,
height: 40.h,
margin: EdgeInsets.only(top: 14.h,left: 14.w,right: 14.w,bottom:5.h),
decoration: new BoxDecoration(
color: Color(0xff383A38),
borderRadius: BorderRadius.circular(24)),
child: GestureDetector(
onTap: () {
Navigator.of(context).pop();
vipShowBottomSheet();
},
child: Container(
height: double.infinity,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(horizontal: 16.w),
decoration: new BoxDecoration(
color: Color(0xff32A060),
borderRadius: BorderRadius.circular(24)),
child: Text(
S.of(context).likexufei,
style: TextStyle(
fontSize: 16.sp,
height: 1.3.h,
fontWeight: MyFontWeight.regular,
color: Color(0xFFFFFFFF),
),
),
),
),
),
GestureDetector(
onTap: (){
Navigator.of(context).pushNamed(
'/router/user_vip_service_page');
},
child: Padding(
padding: EdgeInsets.only(left:14.w,bottom: 15.h),
child: Text.rich(
TextSpan(
children: [
TextSpan(
text: "开通即默认同意",
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xff4D4D4D),
),
),
TextSpan(
text: "《回乡VIP会员卡规则协议》",
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xff32A060),
),
),
],
),
textDirection: TextDirection.ltr,
),
),
),
],
),
));
} }
/// ///
@ -434,7 +577,6 @@ class _VipTop extends State<VipTop> {
return treatyBuildBottomSheetWidget(context); return treatyBuildBottomSheetWidget(context);
}, },
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
barrierColor: Colors.transparent,
context: context); context: context);
} }
@ -451,30 +593,36 @@ class _VipTop extends State<VipTop> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( GestureDetector(
padding: EdgeInsets.only(left: 4.w), onTap: (){
child: Text.rich( Navigator.of(context).pushNamed(
TextSpan( '/router/user_vip_service_page');
children: [ },
TextSpan( child: Padding(
text: "开通即默认同意", padding: EdgeInsets.only(left: 4.w),
style: TextStyle( child: Text.rich(
fontWeight: MyFontWeight.regular, TextSpan(
fontSize: 12.sp, children: [
color: Color(0xff4D4D4D), TextSpan(
text: "开通即默认同意",
style: TextStyle(
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
color: Color(0xff4D4D4D),
),
), ),
), TextSpan(
TextSpan( text: "《回乡VIP会员卡规则协议》",
text: "《回乡VIP会员卡规则协议》", style: TextStyle(
style: TextStyle( fontWeight: MyFontWeight.regular,
fontWeight: MyFontWeight.regular, fontSize: 12.sp,
fontSize: 12.sp, color: Color(0xff32A060),
color: Color(0xff32A060), ),
), ),
), ],
], ),
textDirection: TextDirection.ltr,
), ),
textDirection: TextDirection.ltr,
), ),
), ),
GestureDetector( GestureDetector(
@ -491,7 +639,7 @@ class _VipTop extends State<VipTop> {
color: Color(0xff32A060), color: Color(0xff32A060),
borderRadius: BorderRadius.circular(24)), borderRadius: BorderRadius.circular(24)),
child: Text( child: Text(
"立刻开通", S.of(context).likekaitong,
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
height: 1.3.h, height: 1.3.h,
@ -538,7 +686,7 @@ class _VipTop extends State<VipTop> {
children: [ children: [
Expanded( Expanded(
child: Text( child: Text(
"支付方式", S.of(context).zhifufangshi,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
@ -647,7 +795,7 @@ class _VipTop extends State<VipTop> {
width: 8.w, width: 8.w,
), ),
Text( Text(
"支付宝支付", S.of(context).zhifubaozhifu,
style: TextStyle( style: TextStyle(
fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
fontSize: 15.sp, fontSize: 15.sp,
@ -713,7 +861,7 @@ class _VipTop extends State<VipTop> {
color: Color(0xff32A060), color: Color(0xff32A060),
borderRadius: BorderRadius.circular(24)), borderRadius: BorderRadius.circular(24)),
child: Text( child: Text(
"立刻支付", S.of(context).likezhifu,
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
height: 1.3.h, height: 1.3.h,

2
pubspec.yaml

@ -3,7 +3,7 @@ description: 一心回乡.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 3.1.5+29 version: 3.1.5+32
environment: environment:
sdk: ">=2.7.0 <3.0.0" sdk: ">=2.7.0 <3.0.0"

Loading…
Cancel
Save