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 

 Conflicts:
	lib/mine/vip_card_page.dart
master
fmk 3 years ago
parent
9dfbbc79eb ed5b8effd3
commit
6c65ed784c
2 changed files with 34 additions and 32 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. 25
      lib/order/exchange_history_page.dart
  2. 41
      lib/union/union_details_page.dart

25
lib/order/exchange_history_page.dart
Unescape View File

@ -6,6 +6,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/exchange_order.dart';
import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/retrofit_api.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/icon_text.dart';
@ -90,7 +91,7 @@ class _ExchangeHistoryPage extends State<ExchangeHistoryPage>
labelStyle: TextStyle(
color: Colors.black,
fontSize: 16.sp,
fontWeight: FontWeight.bold),
fontWeight: MyFontWeight.semi_bold),
labelColor: Colors.black,
tabs: tabs,
),
@ -245,7 +246,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
S.of(context).chuangjianshijian(exchangeOrder.createTime),
style: TextStyle(
color: Colors.black,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp,
),
),
@ -253,7 +254,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
orderStatus(exchangeOrder.state),
style: TextStyle(
color: Color(0xFFFE951E),
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp,
),
)
@ -270,7 +271,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
S.of(context).zitidizhi + " :",
style: TextStyle(
color: Color(0xFF353535),
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
),
),
@ -282,7 +283,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
exchangeOrder.address ?? "",
style: TextStyle(
color: Colors.black,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
),
),
@ -298,7 +299,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
S.of(context).zitishijian + " :",
style: TextStyle(
color: Color(0xFF353535),
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
),
),
@ -310,7 +311,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
S.of(context).duihuanhouwugegongzuori,
style: TextStyle(
color: Colors.black,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
),
),
@ -350,7 +351,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF353535)),
),
SizedBox(
@ -364,7 +365,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
maxLines: 2,
style: TextStyle(
fontSize: 10.sp,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
color: Color(0xFF727272),
),
),
@ -377,7 +378,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
"x1",
style: TextStyle(
fontSize: 12.sp,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
color: Color(0xFF353535),
),
)
@ -401,7 +402,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
S.of(context).shifujifen(exchangeOrder.amount),
style: TextStyle(
fontSize: 12.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
color: Colors.black,
),
),
@ -420,7 +421,7 @@ class _ExchangeHistoryList extends State<ExchangeHistoryList> {
iconSize: 16,
textStyle: TextStyle(
fontSize: 12.sp,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
color: Color(0xFF353535),
),
),

41
lib/union/union_details_page.dart
Unescape View File

@ -16,6 +16,7 @@ import 'package:huixiang/retrofit/data/user_entity.dart';
import 'package:huixiang/retrofit/data/user_info.dart';
import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/flutter_utils.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/utils/min.dart';
import 'package:huixiang/view_widget/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart';
@ -154,7 +155,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
style: TextStyle(
fontSize: 16.sp,
color: Colors.black,
fontWeight: FontWeight.w500,
fontWeight: MyFontWeight.medium,
),
),
Expanded(
@ -170,7 +171,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
),
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
color: Color(0xFF353535),
),
),
@ -186,7 +187,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
textAlign: TextAlign.justify,
style: TextStyle(
color: Color(0xFF353535),
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
),
),
@ -218,7 +219,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
"- ${storeInfo.openEndTime.substring(0, storeInfo.openEndTime.lastIndexOf(":"))}"),
style: TextStyle(
color: Color(0xFF353535),
fontWeight: FontWeight.w400,
fontWeight: MyFontWeight.regular,
fontSize: 12.sp,
),
),
@ -294,7 +295,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
S.of(context).zanwuyouhuiquankelingqu,
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFFA0A0A0),
),
),
@ -323,7 +324,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
S.of(context).muqianzanwuxingdianhuodong,
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFFA0A0A0),
),
),
@ -352,7 +353,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
style: TextStyle(
fontSize: 16.sp,
color: isEnable() ? Colors.white : Color(0xFFA0A0A0),
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
),
),
),
@ -410,7 +411,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
S.of(context).huiyuanyue,
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.w500,
fontWeight: MyFontWeight.medium,
color: Colors.white,
),
),
@ -421,7 +422,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
"¥${(storeInfo != null && storeInfo.memberSource != null) ? storeInfo.memberSource.balance : ""}",
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.w500,
fontWeight: MyFontWeight.medium,
color: Colors.white,
),
),
@ -441,7 +442,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
S.of(context).huiyuanjifen,
style: TextStyle(
fontSize: 16.sp,
fontWeight: FontWeight.w500,
fontWeight: MyFontWeight.medium,
color: Colors.white,
),
),
@ -454,7 +455,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
: "",
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.w500,
fontWeight: MyFontWeight.medium,
color: Colors.white,
),
),
@ -469,7 +470,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
S.of(context).gongxinichengweibendianhuiyuan,
style: TextStyle(
fontSize: 10.sp,
fontWeight: FontWeight.w500,
fontWeight: MyFontWeight.medium,
color: Color(0xFFEDC98E),
),
)
@ -495,7 +496,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
style: TextStyle(
fontSize: 10.sp,
color: Color(0xCFFFFFFF),
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
),
),
],
@ -572,7 +573,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
style: TextStyle(
fontSize: 22.sp,
color: Color(0xFFFF7A1A),
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
),
),
TextSpan(
@ -592,7 +593,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
style: TextStyle(
fontSize: 36.sp,
color: Color(0xFFFF7A1A),
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
),
),
])),
@ -631,7 +632,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 10.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF727272),
),
),
@ -657,7 +658,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 12.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFFFF7A1A),
),
),
@ -826,7 +827,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
: "",
style: TextStyle(
fontSize: 14.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF000000),
),
),
@ -840,7 +841,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
: "",
style: TextStyle(
fontSize: 12.sp,
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF727272),
),
),
@ -870,7 +871,7 @@ class _UnionDetailsPage extends State<UnionDetailsPage> {
? activitys[position].startTime.split(" ")[0]
: "",
style: TextStyle(
fontWeight: FontWeight.bold,
fontWeight: MyFontWeight.semi_bold,
fontSize: 12.sp,
color: Color(0xD9FFFFFF),
),

Write Preview
Loading…
Cancel
Save