fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

微调更改

master
w-R 3 years ago
parent
356bdcd6a4
commit
c100fc7363
7 changed files with 52 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      lib/home/founder_story_page.dart
  2. 4
      lib/home/main_home_page.dart
  3. 37
      lib/integral/integral_detailed_page.dart
  4. 17
      lib/integral/integral_page.dart
  5. 5
      lib/login/login_page.dart
  6. 6
      lib/mine/edit_name.dart
  7. 8
      lib/mine/manage_address_page.dart

2
lib/home/founder_story_page.dart
Unescape View File

@ -73,7 +73,7 @@ class _FounderStoryPage extends State<FounderStoryPage> {
"他们致力于实践自然生态农耕，创造与环境共存共荣的绿色发展模式。经过多年探索，形成三产融合的完整产业链和成熟运营模式。", "他们致力于实践自然生态农耕，创造与环境共存共荣的绿色发展模式。经过多年探索，形成三产融合的完整产业链和成熟运营模式。",
style: TextStyle( style: TextStyle(
color: Color(0xFF1A1A1A), color: Color(0xFF1A1A1A),
fontSize: 12, fontSize: 12.sp,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
height: 1.5), height: 1.5),
)), )),

4
lib/home/main_home_page.dart
Unescape View File

@ -66,8 +66,8 @@ class _MainHomePage extends State<MainHomePage>
}, },
child: Image.asset( child: Image.asset(
"assets/image/icon_notices.png", "assets/image/icon_notices.png",
width: 24.w, width: 24,
height: 24.h, height: 24,
), ),
), ),
), ),

37
lib/integral/integral_detailed_page.dart
Unescape View File

@ -130,7 +130,8 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
elevation: 0, elevation: 0,
title: Text( title: Text(
S.of(context).mingxi, S.of(context).mingxi,
style: TextStyle(color: Colors.white), style:
TextStyle(fontWeight: FontWeight.w500, color: Colors.white),
), ),
centerTitle: false, centerTitle: false,
leading: GestureDetector( leading: GestureDetector(
@ -153,7 +154,7 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
flexibleSpace: FlexibleSpaceBar( flexibleSpace: FlexibleSpaceBar(
background: Container( background: Container(
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.only(top: 56), margin: EdgeInsets.only(top: 56.h),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -162,13 +163,15 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
userInfo != null ? userInfo.points : "0", userInfo != null ? userInfo.points : "0",
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.bold, fontWeight: FontWeight.w500,
fontSize: 48), fontSize: 48.sp),
), ),
Text( Text(
S.of(context).wodejifenzhi, S.of(context).wodejifenzhi,
style: style: TextStyle(
TextStyle(color: Color(0xFFF2F2F2), fontSize: 12), color: Color(0xFFF2F2F2),
fontSize: 12.sp,
fontWeight: FontWeight.w400),
), ),
], ],
), ),
@ -184,9 +187,9 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
indicatorSize: TabBarIndicatorSize.label, indicatorSize: TabBarIndicatorSize.label,
labelColor: Colors.white, labelColor: Colors.white,
labelStyle: labelStyle:
TextStyle(fontSize: 16, fontWeight: FontWeight.bold), TextStyle(fontSize: 16.sp, fontWeight: FontWeight.w500),
unselectedLabelStyle: unselectedLabelStyle:
TextStyle(fontSize: 16, fontWeight: FontWeight.bold), TextStyle(fontSize: 16.sp, fontWeight: FontWeight.w500),
indicatorColor: Colors.white, indicatorColor: Colors.white,
unselectedLabelColor: Color(0xFFE6E6E6), unselectedLabelColor: Color(0xFFE6E6E6),
), ),
@ -233,14 +236,14 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
Image.asset( Image.asset(
"assets/image/icon_intergral_sign.png", "assets/image/icon_intergral_sign.png",
width: 36.w, width: 36.w,
height: 34, height: 34.h,
), ),
SizedBox( SizedBox(
width: 15, width: 15,
), ),
Expanded( Expanded(
child: Container( child: Container(
height: 34, height: 34.h,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
@ -250,22 +253,28 @@ class _IntegralDetailedPage extends State<IntegralDetailedPage>
userBill[position].name ?? "", userBill[position].name ?? "",
// S.of(context).qiandao, // S.of(context).qiandao,
style: TextStyle( style: TextStyle(
color: Colors.black, fontSize: 12), color: Colors.black,
fontSize: 12.sp,
fontWeight: FontWeight.w400),
), ),
Text( Text(
userBill[position].createTime ?? "", userBill[position].createTime ?? "",
style: TextStyle( style: TextStyle(
color: Color(0xFF727272), fontSize: 10), color: Color(0xFF727272),
fontSize: 10.sp,
fontWeight: FontWeight.w400),
) )
], ],
), ),
)), )),
Container( Container(
margin: EdgeInsets.only(top: 2), margin: EdgeInsets.only(top: 2.h),
child: Text( child: Text(
"${tabController.index == 0 ? "+" : "-"}${double.tryParse(userBill[position].number ?? "0").toInt().toString()}", "${tabController.index == 0 ? "+" : "-"}${double.tryParse(userBill[position].number ?? "0").toInt().toString()}",
style: TextStyle( style: TextStyle(
color: Color(0xFF727272), fontSize: 12), color: Color(0xFF727272),
fontSize: 12.sp,
fontWeight: FontWeight.w400),
), ),
) )
], ],

17
lib/integral/integral_page.dart
Unescape View File

@ -156,7 +156,7 @@ class _IntegralPage extends State<IntegralPage> {
S.of(context).zuorenwudejifen, S.of(context).zuorenwudejifen,
style: TextStyle( style: TextStyle(
color: Color(0xFF353535), color: Color(0xFF353535),
fontWeight: FontWeight.bold, fontWeight: FontWeight.w500,
fontSize: 16.sp, fontSize: 16.sp,
), ),
), ),
@ -263,6 +263,7 @@ class _IntegralPage extends State<IntegralPage> {
"+${double.tryParse(task.rewardValue).toInt()}", "+${double.tryParse(task.rewardValue).toInt()}",
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w400,
color: Color(0xFF727272), color: Color(0xFF727272),
), ),
), ),
@ -348,8 +349,8 @@ class _IntegralPage extends State<IntegralPage> {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
"assets/image/icon_gold_blessing.png", "assets/image/icon_gold_blessing.png",
width: 59.w, width: 59,
height: 59.h, height: 59,
), ),
), ),
], ],
@ -386,8 +387,8 @@ class _IntegralPage extends State<IntegralPage> {
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset( child: Image.asset(
"assets/image/icon_gold_coin.png", "assets/image/icon_gold_coin.png",
width: 30.w, width: 30,
height: 30.h, height: 30,
), ),
), ),
Container( Container(
@ -408,7 +409,7 @@ class _IntegralPage extends State<IntegralPage> {
? Colors.white ? Colors.white
: Color(0xFF727272), : Color(0xFF727272),
fontSize: 12.sp, fontSize: 12.sp,
), fontWeight: FontWeight.w400),
), ),
), ),
], ],
@ -442,7 +443,7 @@ class _IntegralPage extends State<IntegralPage> {
Text( Text(
S.of(context).qiandaolingjifen, S.of(context).qiandaolingjifen,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.w500,
fontSize: 16.sp, fontSize: 16.sp,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
@ -453,7 +454,7 @@ class _IntegralPage extends State<IntegralPage> {
Text( Text(
S.of(context).lianxuqiandaolingqushuangbeijifen, S.of(context).lianxuqiandaolingqushuangbeijifen,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.w500,
fontSize: 11.sp, fontSize: 11.sp,
color: Color(0xFF727272), color: Color(0xFF727272),
), ),

5
lib/login/login_page.dart
Unescape View File

@ -397,7 +397,8 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
secondChild: uiPage(), secondChild: uiPage(),
firstCurve: Curves.easeInQuart, firstCurve: Curves.easeInQuart,
secondCurve: Curves.easeInQuart, secondCurve: Curves.easeInQuart,
crossFadeState: isShowLogin ? CrossFadeState.showSecond : CrossFadeState.showFirst, crossFadeState:
isShowLogin ? CrossFadeState.showSecond : CrossFadeState.showFirst,
duration: Duration(milliseconds: Platform.isIOS ? 1000 : 1000), duration: Duration(milliseconds: Platform.isIOS ? 1000 : 1000),
); );
} }
@ -517,7 +518,7 @@ class _MyLoginPageState extends State<LoginPage> with TickerProviderStateMixin {
), ),
), ),
SizedBox( SizedBox(
height: 8, height: 8.h,
), ),
Opacity( Opacity(
opacity: (255 - changeAlpha) / 255, opacity: (255 - changeAlpha) / 255,

6
lib/mine/edit_name.dart
Unescape View File

@ -28,7 +28,7 @@ class _EditName extends State<EditName> {
background: Colors.white, background: Colors.white,
action: Container( action: Container(
alignment: Alignment.center, alignment: Alignment.center,
margin: EdgeInsets.only(right: 16), margin: EdgeInsets.only(right: 16.w),
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
String name = _controller.text; String name = _controller.text;
@ -42,7 +42,7 @@ class _EditName extends State<EditName> {
"保存", "保存",
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 18, fontSize: 18.sp,
fontWeight: FontWeight.bold), fontWeight: FontWeight.bold),
), ),
), ),
@ -76,7 +76,7 @@ class _EditName extends State<EditName> {
maxLines: 1, maxLines: 1,
), ),
Container( Container(
height: 1, height: 1.h,
color: Color(0xFF32A060), color: Color(0xFF32A060),
), ),
], ],

8
lib/mine/manage_address_page.dart
Unescape View File

@ -66,8 +66,8 @@ class _ManageAddressPage extends State<ManageAddressPage> {
? NoDataView( ? NoDataView(
isShowBtn: false, isShowBtn: false,
text: "目前暂无送货地址，请添加", text: "目前暂无送货地址，请添加",
fontSize: 16, fontSize: 16.sp,
margin: EdgeInsets.only(top: 120), margin: EdgeInsets.only(top: 120.h),
) )
: ListView.builder( : ListView.builder(
itemCount: addressList == null ? 0 : addressList.length, itemCount: addressList == null ? 0 : addressList.length,
@ -102,7 +102,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
"新增地址", "新增地址",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 16, fontSize: 16.sp,
color: Colors.white, color: Colors.white,
), ),
), ),
@ -151,7 +151,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
Text( Text(
address.username, address.username,
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: Colors.black, color: Colors.black,
), ),

Write Preview
Loading…
Cancel
Save