Browse Source

Merge branch 'master' into dev

# Conflicts:
#	lib/home/home_page.dart
#	lib/main.dart
null_safety
w-R 4 years ago
parent
commit
13933c9420
  1. BIN
      assets/image/2x/icon_guide_1.png
  2. BIN
      assets/image/2x/icon_guide_2.png
  3. BIN
      assets/image/2x/icon_guide_3.png
  4. BIN
      assets/image/2x/icon_guide_4.png
  5. BIN
      assets/image/2x/icon_zan.png
  6. BIN
      assets/image/3x/icon_guide_1.png
  7. BIN
      assets/image/3x/icon_guide_2.png
  8. BIN
      assets/image/3x/icon_guide_33.png
  9. BIN
      assets/image/3x/icon_guide_4.png
  10. BIN
      assets/image/3x/icon_zan.png
  11. BIN
      assets/image/icon_guide_1.png
  12. BIN
      assets/image/icon_guide_2.png
  13. BIN
      assets/image/icon_guide_3.png
  14. BIN
      assets/image/icon_guide_4.png
  15. BIN
      assets/image/icon_zan.png
  16. 2
      lib/article/hot_article_item.dart
  17. 2
      lib/generated/intl/messages_en.dart
  18. 2
      lib/generated/intl/messages_zh_CN.dart
  19. 2
      lib/generated/intl/messages_zh_Hans_CN.dart
  20. 2
      lib/generated/intl/messages_zh_Hant_CN.dart
  21. 2
      lib/generated/intl/messages_zh_TW.dart
  22. 20
      lib/generated/l10n.dart
  23. 356
      lib/home/guide_page.dart
  24. 91
      lib/home/home_page.dart
  25. 2
      lib/integral_store/integral_store_details_page.dart
  26. 3
      lib/l10n/intl_en.arb
  27. 3
      lib/l10n/intl_zh_CN.arb
  28. 3
      lib/l10n/intl_zh_Hans_CN.arb
  29. 3
      lib/l10n/intl_zh_Hant_CN.arb
  30. 3
      lib/l10n/intl_zh_TW.arb
  31. 8
      lib/main.dart
  32. 7
      lib/mine/mine_page.dart
  33. 4
      lib/mine/user_info_page.dart
  34. 34
      lib/view_widget/hot_item.dart
  35. 29
      pubspec.lock

BIN
assets/image/2x/icon_guide_1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

BIN
assets/image/2x/icon_guide_2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

BIN
assets/image/2x/icon_guide_3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

BIN
assets/image/2x/icon_guide_4.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

BIN
assets/image/2x/icon_zan.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 826 B

BIN
assets/image/3x/icon_guide_1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 KiB

BIN
assets/image/3x/icon_guide_2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 KiB

BIN
assets/image/3x/icon_guide_33.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

BIN
assets/image/3x/icon_guide_4.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

BIN
assets/image/3x/icon_zan.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
assets/image/icon_guide_1.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

BIN
assets/image/icon_guide_2.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
assets/image/icon_guide_3.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
assets/image/icon_guide_4.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
assets/image/icon_zan.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 387 B

2
lib/article/hot_article_item.dart

@ -80,7 +80,7 @@ class _HotArticlePage extends State<HotArticlePage> {
backgroundColor: Color(0xFFF7F7F7), backgroundColor: Color(0xFFF7F7F7),
elevation: 0, elevation: 0,
title: Text( title: Text(
S.of(context).remenwenzhangshipinliebiao, S.of(context).huixiangtoutiao,
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,

2
lib/generated/intl/messages_en.dart

@ -165,11 +165,13 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"), "guanyuchuangshiren" : MessageLookupByLibrary.simpleMessage("关于创始人"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"), "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
"huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"),
"huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"),

2
lib/generated/intl/messages_zh_CN.dart

@ -164,11 +164,13 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyu" : MessageLookupByLibrary.simpleMessage("关于"), "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"), "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
"huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"),
"huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"),

2
lib/generated/intl/messages_zh_Hans_CN.dart

@ -164,11 +164,13 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyu" : MessageLookupByLibrary.simpleMessage("关于"), "guanyu" : MessageLookupByLibrary.simpleMessage("关于"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("过健康有机生活"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峡姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合计:"), "heji" : MessageLookupByLibrary.simpleMessage("合计:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核销成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核销码详情"),
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黄金会员"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回乡头条"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("会员等级"),
"huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("会员等级说明"),
"huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("会员积分"),

2
lib/generated/intl/messages_zh_Hant_CN.dart

@ -164,11 +164,13 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyu" : MessageLookupByLibrary.simpleMessage("關於"), "guanyu" : MessageLookupByLibrary.simpleMessage("關於"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合計:"), "heji" : MessageLookupByLibrary.simpleMessage("合計:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"),
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"),
"huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"),
"huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"),

2
lib/generated/intl/messages_zh_TW.dart

@ -164,11 +164,13 @@ class MessageLookup extends MessageLookupByLibrary {
"guanyu" : MessageLookupByLibrary.simpleMessage("關於"), "guanyu" : MessageLookupByLibrary.simpleMessage("關於"),
"guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"), "guojiankangyoujishenghuo" : MessageLookupByLibrary.simpleMessage("過健康有機生活"),
"haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"), "haixiajiemei" : MessageLookupByLibrary.simpleMessage("海峽姐妹"),
"haowu" : MessageLookupByLibrary.simpleMessage("好物"),
"heji" : MessageLookupByLibrary.simpleMessage("合計:"), "heji" : MessageLookupByLibrary.simpleMessage("合計:"),
"hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"), "hexiaochenggong" : MessageLookupByLibrary.simpleMessage("核銷成功"),
"hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"), "hexiaomaxiangqing" : MessageLookupByLibrary.simpleMessage("核銷碼詳情"),
"huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"), "huangjinhuiyuan" : MessageLookupByLibrary.simpleMessage("黃金會員"),
"huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"), "huixiangrenyimendian" : MessageLookupByLibrary.simpleMessage("适用于:一心回乡任意门店"),
"huixiangtoutiao" : MessageLookupByLibrary.simpleMessage("回鄉頭條"),
"huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"), "huiyuandengji" : MessageLookupByLibrary.simpleMessage("會員等級"),
"huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"), "huiyuandengjishuoming" : MessageLookupByLibrary.simpleMessage("會員等級説明"),
"huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"), "huiyuanjifen" : MessageLookupByLibrary.simpleMessage("會員積分"),

20
lib/generated/l10n.dart

@ -3755,6 +3755,26 @@ class S {
); );
} }
/// ``
String get haowu {
return Intl.message(
'好物',
name: 'haowu',
desc: '',
args: [],
);
}
/// ``
String get huixiangtoutiao {
return Intl.message(
'回乡头条',
name: 'huixiangtoutiao',
desc: '',
args: [],
);
}
/// `使` /// `使`
String get privacy_policy4 { String get privacy_policy4 {
return Intl.message( return Intl.message(

356
lib/home/guide_page.dart

@ -0,0 +1,356 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:huixiang/view_widget/border_text.dart';
class GuidePage extends StatefulWidget {
@override
State<StatefulWidget> createState() {
return _GuidePage();
}
}
class _GuidePage extends State<GuidePage> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: PageView(
scrollDirection: Axis.horizontal,
reverse: false,
controller: PageController(
initialPage: 0,
viewportFraction: 1,
keepPage: true,
),
physics: BouncingScrollPhysics(),
pageSnapping: true,
onPageChanged: (index) {
//
print('index=====$index');
},
children: <Widget>[
Container(
alignment: Alignment.center,
color: Colors.white,
child: Center(
child: Container(
margin: EdgeInsets.only(top: 125, left: 19, right: 19),
child: Stack(
children: [
Column(
children: [
Align(
alignment: Alignment.center,
child: Image.asset(
"assets/image/icon_guide_1.png",
// height: 307,
),
),
SizedBox(
height: 66,
),
Padding(
padding: EdgeInsets.only(left: 37, right: 37),
child: Text(
"会员最新资讯抢先看",
style: TextStyle(
fontSize: 24,
fontWeight: FontWeight.bold,
color: Color(0XFF32A060)),
),
),
SizedBox(
height: 23,
),
Padding(
padding: EdgeInsets.only(left: 19, right: 19),
child: Text(
"新增多项功能,海量优惠资讯实时推送",
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 16,
height:1.5,
fontWeight: FontWeight.w600,
color: Color(0XFF727272)),
),
),
],
),
Container(
alignment: Alignment.bottomCenter,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"",
style: TextStyle(fontSize: 8, color: Colors.black),
),
SizedBox(
width: 10,
),
Text(
"",
style: TextStyle(
fontSize: 8, color: Color(0xffB2B2B2)),
),
SizedBox(
width: 10,
),
Text(
"",
style: TextStyle(
fontSize: 8, color: Color(0xffB2B2B2)),
),
SizedBox(
height: 98,
),
],
),
),
],
),
),
),
),
Container(
alignment: Alignment.center,
color: Colors.white,
child: Center(
child: Container(
margin: EdgeInsets.only(top: 125, left: 19, right: 19),
child: Stack(
children: [
Column(
children: [
Align(
alignment: Alignment.center,
child: Image.asset(
"assets/image/icon_guide_2.png",
// height: 307,
),
),
SizedBox(
height: 66,
),
Padding(
padding: EdgeInsets.only(left: 37, right: 37),
child: Text(
"全新集团联盟店会员点餐",
style: TextStyle(
fontSize: 24,
fontWeight: FontWeight.bold,
color: Color(0XFF32A060)),
),
),
SizedBox(
height: 23,
),
Padding(
padding: EdgeInsets.only(left: 19, right: 19),
child: Text(
"新增多项功能,使用平台钱包优惠多多,更有充值优惠享不停",
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 16,
height:1.5,
fontWeight: FontWeight.w600,
color: Color(0XFF727272)),
),
),
],
),
Container(
alignment: Alignment.bottomCenter,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"",
style: TextStyle(
fontSize: 8, color: Color(0xffB2B2B2)),
),
SizedBox(
width: 10,
),
Text(
"",
style: TextStyle(fontSize: 8, color: Colors.black),
),
SizedBox(
width: 10,
),
Text(
"",
style: TextStyle(
fontSize: 8, color: Color(0xffB2B2B2)),
),
SizedBox(
height: 98,
),
],
),
),
],
),
),
),
),
Container(
alignment: Alignment.center,
color: Colors.white,
child: Center(
child: Container(
margin: EdgeInsets.only(top: 125, left: 19, right: 19),
child: Stack(
children: [
Column(
children: [
Align(
alignment: Alignment.center,
child: Image.asset(
"assets/image/icon_guide_3.png",
// height: 307,
),
),
SizedBox(
height: 66,
),
Padding(
padding: EdgeInsets.only(left: 37, right: 37),
child: Text(
"会员活动专区",
style: TextStyle(
fontSize: 24,
fontWeight: FontWeight.bold,
color: Color(0XFF32A060)),
),
),
SizedBox(
height: 23,
),
Padding(
padding: EdgeInsets.only(left: 19, right: 19),
child: Text(
"新增会员任务得积分,消费可得绿金、积分商城换购",
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 16,
height:1.5,
fontWeight: FontWeight.w600,
color: Color(0XFF727272)),
),
),
],
),
Container(
alignment: Alignment.bottomCenter,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
"",
style: TextStyle(
fontSize: 8, color: Color(0xffB2B2B2)),
),
SizedBox(
width: 10,
),
Text(
"",
style: TextStyle(
fontSize: 8, color: Color(0xffB2B2B2)),
),
SizedBox(
width: 10,
),
Text(
"",
style: TextStyle(fontSize: 8, color: Colors.black),
),
SizedBox(
height: 98,
),
],
),
),
],
),
),
),
),
Container(
alignment: Alignment.center,
color: Colors.white,
child: Center(
child: Container(
margin: EdgeInsets.only(top: 108),
child:
Column(
children: [
Image.asset(
"assets/image/icon_guide_4.png",
width: double.infinity,
fit: BoxFit.fill,
),
SizedBox(
height: 66,
),
Padding(
padding: EdgeInsets.only(left: 104, right: 104),
child: Text(
"会员活动专区",
style: TextStyle(
fontSize: 24,
fontWeight: FontWeight.bold,
color: Color(0XFF32A060)),
),
),
SizedBox(
height: 23,
),
Padding(
padding: EdgeInsets.only(left: 52, right: 52),
child: Text(
"传递友爱纯净健康有机环保智慧理念",
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 16,
height:1.5,
fontWeight: FontWeight.w600,
color: Color(0XFF727272)),
),
),
SizedBox(
height: 50,
),
GestureDetector(
onTap: (){
Navigator.of(context).pushNamed('/router/login_page');
},
child:Container(
margin: EdgeInsets.only(left: 71,right: 71),
alignment: Alignment.bottomCenter,
child:BorderText(
padding: EdgeInsets.all(11),
text: "立即体验",
fontSize: 20,
textColor: Color(0xFF32A060),
borderColor: Color(0xFF32A060),
borderWidth: 1,
radius: 26.5,
),
),
),
],
),
),
),
)
],
),
);
}
}

91
lib/home/home_page.dart

@ -195,7 +195,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
child: signIn(), child: signIn(),
), ),
ItemTitle( ItemTitle(
text: S.of(context).remenwenzhangshipin, text: S.of(context).huixiangtoutiao,
imgPath: "assets/image/icon_today_video.png", imgPath: "assets/image/icon_today_video.png",
moreText: S.of(context).chakangengduo, moreText: S.of(context).chakangengduo,
onTap: () { onTap: () {
@ -203,10 +203,10 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
}, },
), ),
hotList(), hotList(),
ItemTitle( // ItemTitle(
text: S.of(context).chuangshirendegushi, // text: S.of(context).chuangshirendegushi,
imgPath: "assets/image/icon_founder.png", // imgPath: "assets/image/icon_founder.png",
), // ),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
Navigator.of(context).pushNamed('/router/founder_story_page'); Navigator.of(context).pushNamed('/router/founder_story_page');
@ -332,7 +332,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
MImage( MImage(
founder != null ? founder.imgUrl : "", founder != null ? founder.imgUrl : "",
aspectRatio: 2, aspectRatio: 2,
radius: BorderRadius.circular(4), // radius: BorderRadius.circular(4),
fit: BoxFit.cover, fit: BoxFit.cover,
errorSrc: "assets/image/default_2_1.png", errorSrc: "assets/image/default_2_1.png",
fadeSrc: "assets/image/default_2_1.png", fadeSrc: "assets/image/default_2_1.png",
@ -357,49 +357,48 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
crossAxisAlignment: CrossAxisAlignment.baseline, crossAxisAlignment: CrossAxisAlignment.baseline,
textBaseline: TextBaseline.alphabetic, textBaseline: TextBaseline.alphabetic,
children: [ children: [
Text( Expanded(
founder != null ? founder.name : "", child:
style: TextStyle( Row(
fontSize: 14.sp, children: [
fontWeight: FontWeight.bold, Text(
color: Colors.white, "创始人的故事-",
), style: TextStyle(
), fontSize: 14.sp,
SizedBox( color: Colors.white,
width: 10.w, ),
), ),
Text( Text(
S.of(context).jituanchuangshiren, founder != null ? founder.name : "",
style: TextStyle( style: TextStyle(
fontSize: 8.sp, fontSize: 14.sp,
color: Colors.white, color: Colors.white,
),
),
],
), ),
flex: 1,
), ),
SizedBox( Row(
width: 20.w, children: [
), Text(
Expanded( "查看详情",
child: Text( style: TextStyle(
S.of(context).jianjie( fontSize: 10.sp,
"${founder != null ? founder.description : ""}"), color: Colors.white,
maxLines: 1, ),
overflow: TextOverflow.ellipsis, ),
style: TextStyle( Icon(
fontSize: 10.sp, Icons.keyboard_arrow_right,
size: 12,
color: Colors.white, color: Colors.white,
), ),
), ],
flex: 1, ),
)
], ],
), ),
flex: 1, flex: 1,
), ),
Icon(
Icons.keyboard_arrow_right,
size: 12,
color: Colors.white,
),
], ],
), ),
), ),
@ -490,7 +489,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
bottomRight: Radius.circular(4), bottomRight: Radius.circular(4),
bottomLeft: Radius.circular(4), bottomLeft: Radius.circular(4),
), ),
fit: BoxFit.fill, fit: BoxFit.cover,
errorSrc: "assets/image/default_1.png", errorSrc: "assets/image/default_1.png",
fadeSrc: "assets/image/default_1.png", fadeSrc: "assets/image/default_1.png",
), ),
@ -506,7 +505,7 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
SizedBox(height: 14,), SizedBox(height: 14,),
Row( Row(
children: [ children: [
Text( Expanded(flex: 1,child:Text(
goods.name, goods.name,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
@ -514,11 +513,11 @@ class _HomePage extends State<HomePage> with AutomaticKeepAliveClientMixin {
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 14.sp, fontSize: 14.sp,
), ),
), ) )
SizedBox(width: 8,), ,
BorderText( BorderText(
padding: EdgeInsets.all(2.h), padding: EdgeInsets.all(2.h),
text: "好物", text: S.of(context).haowu,
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
textColor: Color(0xFF32A060), textColor: Color(0xFF32A060),

2
lib/integral_store/integral_store_details_page.dart

@ -226,7 +226,7 @@ class _IntegralStoreDetailsPage extends State {
Text( Text(
goods == null goods == null
? "" ? ""
: S.of(context).yiduihuanjian("${goods.sales}"), : S.of(context).yiduihuanjian("${goods.sales}"),
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 10,
color: Color(0xFFA29E9E), color: Color(0xFFA29E9E),

3
lib/l10n/intl_en.arb

@ -389,6 +389,9 @@
"yinshi": "饮食", "yinshi": "饮食",
"shenghuoyule": "生活娱乐", "shenghuoyule": "生活娱乐",
"bangong": "办公", "bangong": "办公",
"haowu": "好物",
"huixiangtoutiao": "回乡头条",

3
lib/l10n/intl_zh_CN.arb

@ -390,6 +390,9 @@
"yinshi": "饮食", "yinshi": "饮食",
"shenghuoyule": "生活娱乐", "shenghuoyule": "生活娱乐",
"bangong": "办公", "bangong": "办公",
"haowu": "好物",
"huixiangtoutiao": "回乡头条",

3
lib/l10n/intl_zh_Hans_CN.arb

@ -390,7 +390,8 @@
"yinshi": "饮食", "yinshi": "饮食",
"shenghuoyule": "生活娱乐", "shenghuoyule": "生活娱乐",
"bangong": "办公", "bangong": "办公",
"haowu": "好物",
"huixiangtoutiao": "回乡头条",

3
lib/l10n/intl_zh_Hant_CN.arb

@ -382,6 +382,9 @@
"yinshi": "飲食", "yinshi": "飲食",
"shenghuoyule": "生活娛樂", "shenghuoyule": "生活娛樂",
"bangong": "辦公", "bangong": "辦公",
"haowu": "好物",
"huixiangtoutiao": "回鄉頭條",
"privacy_policy4": "并使用本機號碼登錄" "privacy_policy4": "并使用本機號碼登錄"

3
lib/l10n/intl_zh_TW.arb

@ -382,6 +382,9 @@
"yinshi": "飲食", "yinshi": "飲食",
"shenghuoyule": "生活娛樂", "shenghuoyule": "生活娛樂",
"bangong": "辦公", "bangong": "辦公",
"haowu": "好物",
"huixiangtoutiao": "回鄉頭條",
"privacy_policy4": "并使用本機號碼登錄" "privacy_policy4": "并使用本機號碼登錄"

8
lib/main.dart

@ -55,7 +55,8 @@ import 'package:shared_preferences/shared_preferences.dart';
import 'package:sharesdk_plugin/sharesdk_interface.dart'; import 'package:sharesdk_plugin/sharesdk_interface.dart';
import 'package:sharesdk_plugin/sharesdk_register.dart'; import 'package:sharesdk_plugin/sharesdk_register.dart';
import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart'; import 'package:tpns_flutter_plugin/tpns_flutter_plugin.dart';
import 'home/points_mall_page.dart';
import 'home/guide_page.dart';
import 'main_page.dart'; import 'main_page.dart';
import 'mine/manage_address_page.dart'; import 'mine/manage_address_page.dart';
import 'mine/roll_center_page.dart'; import 'mine/roll_center_page.dart';
@ -139,7 +140,7 @@ class MyApp extends StatelessWidget {
return appLocale ?? locales[0]; return appLocale ?? locales[0];
}, },
supportedLocales: S.delegate.supportedLocales, supportedLocales: S.delegate.supportedLocales,
home: LoginPage(), home: GuidePage(),
// home: MainPage(), // home: MainPage(),
builder: (context, widget) { builder: (context, widget) {
double textScaleFactor = MediaQuery.of(context).textScaleFactor; double textScaleFactor = MediaQuery.of(context).textScaleFactor;
@ -167,7 +168,7 @@ class MyApp extends StatelessWidget {
return MaterialPageRoute( return MaterialPageRoute(
// //
builder: (context) { builder: (context) {
return LoginPage(); return GuidePage();
}, },
settings: settings, settings: settings,
); );
@ -180,6 +181,7 @@ class MyApp extends StatelessWidget {
Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{ Map<String, WidgetBuilder> routers = <String, WidgetBuilder>{
'/router/login_page': (context, {arguments}) => LoginPage(arguments: arguments), '/router/login_page': (context, {arguments}) => LoginPage(arguments: arguments),
'/router/main_page': (context, {arguments}) => MainPage(), '/router/main_page': (context, {arguments}) => MainPage(),
'/router/guide_Page': (context, {arguments}) => GuidePage(),
'/router/msg_page': (context, {arguments}) => MainMessagePage(), '/router/msg_page': (context, {arguments}) => MainMessagePage(),
'/router/system_msg_page': (context, {arguments}) => SystemMessagePage(), '/router/system_msg_page': (context, {arguments}) => SystemMessagePage(),
'/router/exchange_order_details': (context, {arguments}) => '/router/exchange_order_details': (context, {arguments}) =>

7
lib/mine/mine_page.dart

@ -52,6 +52,12 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
); );
} }
@override
void dispose() {
super.dispose();
_refreshController.dispose();
}
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -521,6 +527,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
Expanded( Expanded(
child: InkWell( child: InkWell(
onTap: () { onTap: () {
if(userinfo == null)
SmartDialog.show( SmartDialog.show(
widget: LoginTips( widget: LoginTips(
click: () { click: () {

4
lib/mine/user_info_page.dart

@ -196,7 +196,7 @@ class _UserInfoPage extends State<UserInfoPage> {
(modifyInfo["nickname"]) == "" ? "回乡" : modifyInfo["nickname"]), (modifyInfo["nickname"]) == "" ? "回乡" : modifyInfo["nickname"]),
), ),
InkWell( InkWell(
onTap: showDateSelector, onTap:(modifyInfo["birth"] == "")?showDateSelector:(){},
child: avatarItem( child: avatarItem(
2, 2,
(modifyInfo["birth"] != null && modifyInfo["birth"] != "") (modifyInfo["birth"] != null && modifyInfo["birth"] != "")
@ -239,7 +239,7 @@ class _UserInfoPage extends State<UserInfoPage> {
builder: (_) { builder: (_) {
return CupertinoDatePickerWidget(); return CupertinoDatePickerWidget();
}); });
if (dateTime != null) { if (dateTime != null ) {
modifyInfo["birth"] = DateFormat("yyyy-MM-dd").format(dateTime); modifyInfo["birth"] = DateFormat("yyyy-MM-dd").format(dateTime);
user.birth = modifyInfo["birth"]; user.birth = modifyInfo["birth"];
age = AppUtils.getAge(dateTime); age = AppUtils.getAge(dateTime);

34
lib/view_widget/hot_item.dart

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/article.dart'; import 'package:huixiang/retrofit/data/article.dart';
@ -104,17 +105,28 @@ class HotArticleItem extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Expanded( Expanded(
child: IconText( child: Row(
article != null children: [
? (article.createTime.split(" ")[0]) IconText(
: "", article != null
textStyle: TextStyle( ? (article.createTime.split(" ")[0])
fontSize: 10.sp, : "",
color: Color(0xFFB2B2B2), textStyle: TextStyle(
), fontSize: 10.sp,
leftIcon: Icons.access_time_rounded, color: Color(0xFFB2B2B2),
iconSize: 10, ),
iconColor: Color(0xFFB2B2B2), leftIcon: Icons.access_time_rounded,
iconSize: 10,
iconColor: Color(0xFFB2B2B2),
),
SizedBox(width: 8,),
Image.asset(
"assets/image/icon_zan.png",
width: 14.w,
height: 14.h,
),
Text("58",style: TextStyle(fontSize:10,color:Color(0xffB9B9B9)),)
],
), ),
flex: 1, flex: 1,
), ),

29
pubspec.lock

@ -56,7 +56,7 @@ packages:
name: async name: async
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.5.0" version: "2.6.1"
barcode: barcode:
dependency: transitive dependency: transitive
description: description:
@ -594,7 +594,7 @@ packages:
name: path_provider_linux name: path_provider_linux
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.0" version: "2.0.2"
path_provider_platform_interface: path_provider_platform_interface:
dependency: transitive dependency: transitive
description: description:
@ -608,7 +608,7 @@ packages:
name: path_provider_windows name: path_provider_windows
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.1" version: "2.0.3"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:
@ -637,13 +637,6 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.1.0" version: "4.1.0"
photo_view:
dependency: "direct main"
description:
name: photo_view
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.11.1"
platform: platform:
dependency: transitive dependency: transitive
description: description:
@ -741,14 +734,14 @@ packages:
name: shared_preferences_linux name: shared_preferences_linux
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.0" version: "2.0.2"
shared_preferences_macos: shared_preferences_macos:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_macos name: shared_preferences_macos
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.0" version: "2.0.2"
shared_preferences_platform_interface: shared_preferences_platform_interface:
dependency: transitive dependency: transitive
description: description:
@ -762,14 +755,14 @@ packages:
name: shared_preferences_web name: shared_preferences_web
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.0" version: "2.0.1"
shared_preferences_windows: shared_preferences_windows:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_windows name: shared_preferences_windows
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.0" version: "2.0.2"
sharesdk_plugin: sharesdk_plugin:
dependency: "direct main" dependency: "direct main"
description: description:
@ -872,7 +865,7 @@ packages:
name: test_api name: test_api
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.2.19" version: "0.3.0"
timing: timing:
dependency: transitive dependency: transitive
description: description:
@ -886,7 +879,7 @@ packages:
path: "." path: "."
ref: "V1.1.2" ref: "V1.1.2"
resolved-ref: b814d62f4b82422459f786671f23dd535062d503 resolved-ref: b814d62f4b82422459f786671f23dd535062d503
url: "https://github.com/TencentCloud/TPNS-Flutter-Plugin" url: "git://github.com/TencentCloud/TPNS-Flutter-Plugin"
source: git source: git
version: "1.1.2" version: "1.1.2"
transformer_page_view: transformer_page_view:
@ -993,7 +986,7 @@ packages:
name: win32 name: win32
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.5" version: "2.2.5"
xdg_directories: xdg_directories:
dependency: transitive dependency: transitive
description: description:
@ -1016,5 +1009,5 @@ packages:
source: hosted source: hosted
version: "3.1.0" version: "3.1.0"
sdks: sdks:
dart: ">=2.12.0 <3.0.0" dart: ">=2.13.0 <3.0.0"
flutter: ">=2.0.0" flutter: ">=2.0.0"

Loading…
Cancel
Save