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
a45a99851f e65cfa00dc
commit
b83fe921ba
4 changed files with 22 additions and 20 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. 8
      lib/integral_store/integral_store_details_page.dart
  2. 10
      lib/mine/vip_detail_page.dart
  3. 11
      lib/order/exchange_order_success_page.dart
  4. 13
      lib/view_widget/mine_vip_view.dart

8
lib/integral_store/integral_store_details_page.dart
Unescape View File

@ -86,7 +86,7 @@ class _IntegralStoreDetailsPage extends State {
child: Text( child: Text(
S.of(context).duihuanguize, S.of(context).duihuanguize,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 16.sp, fontSize: 16.sp,
color: Color(0xFFFF7A1A), color: Color(0xFFFF7A1A),
), ),
@ -152,7 +152,7 @@ class _IntegralStoreDetailsPage extends State {
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
color: Color(0xFFFFFFFF), color: Color(0xFFFFFFFF),
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
), ),
), ),
), ),
@ -213,7 +213,7 @@ class _IntegralStoreDetailsPage extends State {
goods == null ? "" : goods.name, goods == null ? "" : goods.name,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 18.sp, fontSize: 18.sp,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
@ -253,7 +253,7 @@ class _IntegralStoreDetailsPage extends State {
Text( Text(
goods == null ? "" : S.of(context).jifen_(goods.price), goods == null ? "" : S.of(context).jifen_(goods.price),
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 16.sp, fontSize: 16.sp,
color: Color(0xFF32A060), color: Color(0xFF32A060),
), ),

10
lib/mine/vip_detail_page.dart
Unescape View File

@ -128,7 +128,7 @@ class _VipDetailPage extends State<VipDetailPage> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -234,7 +234,7 @@ class _VipDetailPage extends State<VipDetailPage> {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -309,7 +309,7 @@ class _VipDetailPage extends State<VipDetailPage> {
text: S.of(context).yue, text: S.of(context).yue,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -352,7 +352,7 @@ class _VipDetailPage extends State<VipDetailPage> {
text: S.of(context).jifen, text: S.of(context).jifen,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -425,7 +425,7 @@ class _VipDetailPage extends State<VipDetailPage> {
(store != null) ? store.storeName : "", (store != null) ? store.storeName : "",
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Colors.black, color: Colors.black,
), ),
), ),

11
lib/order/exchange_order_success_page.dart
Unescape View File

@ -6,6 +6,7 @@ import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/data/user_info.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/view_widget/border_text.dart'; import 'package:huixiang/view_widget/border_text.dart';
import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/round_button.dart'; import 'package:huixiang/view_widget/round_button.dart';
@ -76,7 +77,7 @@ class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
style: TextStyle( style: TextStyle(
color: Color(0xFF353535), color: Color(0xFF353535),
fontSize: 21.sp, fontSize: 21.sp,
fontWeight: FontWeight.bold), fontWeight: MyFontWeight.semi_bold),
), ),
SizedBox( SizedBox(
height: 70.h, height: 70.h,
@ -91,7 +92,7 @@ class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 21.sp, fontSize: 21.sp,
fontWeight: FontWeight.bold), fontWeight: MyFontWeight.semi_bold),
), ),
SizedBox( SizedBox(
height: 14.h, height: 14.h,
@ -121,7 +122,7 @@ class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 21.sp, fontSize: 21.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
), ),
), ),
SizedBox( SizedBox(
@ -160,7 +161,7 @@ class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
text: S.of(context).jixuduihuan, text: S.of(context).jixuduihuan,
textColor: Color(0xFF32A060), textColor: Color(0xFF32A060),
fontSize: 16.sp, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
borderColor: Color(0xFF32A060), borderColor: Color(0xFF32A060),
borderWidth: 1, borderWidth: 1,
padding: EdgeInsets.only(top: 12.h, bottom: 12.h), padding: EdgeInsets.only(top: 12.h, bottom: 12.h),
@ -181,7 +182,7 @@ class _ExchangeOrderSuccessPage extends State<ExchangeOrderSuccessPage> {
textColor: Colors.white, textColor: Colors.white,
backgroup: Color(0xFF32A060), backgroup: Color(0xFF32A060),
radius: 4, radius: 4,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 16.sp, fontSize: 16.sp,
padding: EdgeInsets.only(top: 12.h, bottom: 12.h), padding: EdgeInsets.only(top: 12.h, bottom: 12.h),
), ),

13
lib/view_widget/mine_vip_view.dart
Unescape View File

@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/retrofit/data/rank.dart'; import 'package:huixiang/retrofit/data/rank.dart';
import 'package:huixiang/retrofit/data/user_info.dart'; import 'package:huixiang/retrofit/data/user_info.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/view_widget/login_tips_dialog.dart'; import 'package:huixiang/view_widget/login_tips_dialog.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
@ -162,7 +163,7 @@ class MineVipView extends StatelessWidget {
topLeft, topLeft,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Colors.white, color: Colors.white,
), ),
), ),
@ -173,7 +174,7 @@ class MineVipView extends StatelessWidget {
levelText, levelText,
style: TextStyle( style: TextStyle(
color: textColor, color: textColor,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 23.sp, fontSize: 23.sp,
), ),
), ),
@ -215,7 +216,7 @@ class MineVipView extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: textColor, color: textColor,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
fontSize: 14.sp, fontSize: 14.sp,
), ),
), ),
@ -228,7 +229,7 @@ class MineVipView extends StatelessWidget {
text: "$rank", text: "$rank",
style: TextStyle( style: TextStyle(
fontSize: 26.sp, fontSize: 26.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: textColor, color: textColor,
), ),
), ),
@ -237,7 +238,7 @@ class MineVipView extends StatelessWidget {
text: rankMax > 0 ? "/$rankMax" : "/0", text: rankMax > 0 ? "/$rankMax" : "/0",
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: textColor, color: textColor,
), ),
), ),
@ -268,7 +269,7 @@ class MineVipView extends StatelessWidget {
: "$createTime"), : "$createTime"),
style: TextStyle( style: TextStyle(
color: textColor, color: textColor,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
fontSize: 12.sp, fontSize: 12.sp,
), ),
), ),

Write Preview
Loading…
Cancel
Save