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

Merge branches 'dev' and 'master' of https://git.lotus-wallet.com/fmk/huixiang_app

master
fmk 3 years ago
parent
433e9e255c 6e80a574b5
commit
57c9431b42
5 changed files with 23 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      lib/home/activity_list_page.dart
  2. 2
      lib/mine/mine_page.dart
  3. 7
      lib/order/write_off_success_page.dart
  4. 8
      lib/setting/setting_page.dart
  5. 15
      lib/setting/treaty_page.dart

12
lib/home/activity_list_page.dart
Unescape View File

@ -7,9 +7,9 @@ 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/utils/event_type.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:huixiang/view_widget/my_footer.dart';
import 'package:keframe/frame_separate_widget.dart';
import 'package:keframe/size_cache_widget.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart';
@ -164,7 +164,7 @@ class _ActivityListPage extends State<ActivityListPage>
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: FontWeight.w500,
fontWeight: MyFontWeight.medium,
fontSize: 14.sp,
color: Colors.black,
),
@ -178,7 +178,7 @@ class _ActivityListPage extends State<ActivityListPage>
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 10.sp,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
color: Color(0xFF4C4C4C),
),
),
@ -198,7 +198,7 @@ class _ActivityListPage extends State<ActivityListPage>
activity.storeName == null ? "" : activity.storeName,
style: TextStyle(
color: Color(0xFF060606),
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
),
),
@ -211,7 +211,7 @@ class _ActivityListPage extends State<ActivityListPage>
style: TextStyle(
color: Color(0xFFB5B5B5),
fontSize: 12.sp,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
),
),
SizedBox(
@ -222,7 +222,7 @@ class _ActivityListPage extends State<ActivityListPage>
style: TextStyle(
color: Color(0xFFB5B5B5),
fontSize: 12.sp,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
),
),
],

2
lib/mine/mine_page.dart
Unescape View File

@ -676,7 +676,7 @@ class _MinePage extends State<MinePage> with AutomaticKeepAliveClientMixin {
style: TextStyle(
color: Colors.black,
fontSize: 12.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
),
),
Icon(

7
lib/order/write_off_success_page.dart
Unescape View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/round_button.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -45,7 +46,7 @@ class _WriteOffSuccessPage extends State<WriteOffSuccessPage> {
style: TextStyle(
color: Color(0xFF353535),
fontSize: 21.sp,
fontWeight: FontWeight.bold),
fontWeight: MyFontWeight.semi_bold),
),
SizedBox(
height: 12.h,
@ -55,7 +56,7 @@ class _WriteOffSuccessPage extends State<WriteOffSuccessPage> {
style: TextStyle(
color: Color(0xFF727272),
fontSize: 12.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
),
),
SizedBox(
@ -68,7 +69,7 @@ class _WriteOffSuccessPage extends State<WriteOffSuccessPage> {
textColor: Colors.white,
backgroup: Color(0xFF32A060),
radius: 4,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
fontSize: 16.sp,
padding: EdgeInsets.only(top: 12.h, bottom: 12.h),
),

8
lib/setting/setting_page.dart
Unescape View File

@ -164,7 +164,7 @@ class _SettingPage extends State<SettingPage> {
backgroup: Color(0xFF32A060),
textColor: Colors.white,
fontSize: 16.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
),
),
),
@ -262,7 +262,7 @@ class _SettingPage extends State<SettingPage> {
child: Text(
left,
style: TextStyle(
fontWeight: FontWeight.w500,
fontWeight: MyFontWeight.medium,
fontSize: 14.sp,
color: Color(0xFF353535),
),
@ -273,7 +273,7 @@ class _SettingPage extends State<SettingPage> {
right,
style: TextStyle(
fontSize: 12.sp,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
color: Color(0xFF727272)),
),
SizedBox(
@ -312,7 +312,7 @@ class _SettingPage extends State<SettingPage> {
style: TextStyle(
fontSize: 14.sp,
color: Color(0xFF353535),
fontWeight: FontWeight.w500,
fontWeight: MyFontWeight.medium,
),
),
),

15
lib/setting/treaty_page.dart
Unescape View File

@ -1,6 +1,7 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -58,7 +59,7 @@ class _TreatyPage extends State<TreatyPage> {
"用戶註冊及使用App隱私協議",
style: TextStyle(
fontSize: 18.sp,
fontWeight: FontWeight.w600,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xff00A359),
),
),
@ -80,7 +81,7 @@ class _TreatyPage extends State<TreatyPage> {
"一、賬號註冊",
style: TextStyle(
fontSize: 18.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
height: 1.2,
color: Color(0xff32A060)),
),
@ -97,7 +98,7 @@ class _TreatyPage extends State<TreatyPage> {
"二、用戶個人隱私信息保護",
style: TextStyle(
fontSize: 18.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
height: 1.2,
color: Color(0xff32A060)),
),
@ -117,7 +118,7 @@ class _TreatyPage extends State<TreatyPage> {
"三、用戶發佈內容規範",
style: TextStyle(
fontSize: 18.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
height: 1.2,
color: Color(0xff32A060)),
),
@ -142,7 +143,7 @@ class _TreatyPage extends State<TreatyPage> {
"四、使用規則",
style: TextStyle(
fontSize: 18.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
height: 1.2,
color: Color(0xff32A060)),
),
@ -164,7 +165,7 @@ class _TreatyPage extends State<TreatyPage> {
"五、其他",
style: TextStyle(
fontSize: 18.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
height: 1.2,
color: Color(0xff32A060)),
),
@ -191,7 +192,7 @@ class _TreatyPage extends State<TreatyPage> {
text,
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
height: 1.7,
color: Colors.black),
),

Write Preview
Loading…
Cancel
Save