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
95bfa08821 23f6c6b3cc
commit
5d2638a4d2
8 changed files with 41 additions and 42 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. 5
      lib/home/huixiang_brand_page.dart
  2. 1
      lib/home/huixiang_view/huixiang_banner.dart
  3. 6
      lib/home/huixiang_view/origin_info.dart
  4. 11
      lib/mine/manage_address_page.dart
  5. 19
      lib/mine/mine_vip_level_page.dart
  6. 5
      lib/order/store_selector_page.dart
  7. 5
      lib/view_widget/cupertino_date_picker.dart
  8. 31
      lib/view_widget/new_coupon_widget.dart

5
lib/home/huixiang_brand_page.dart
Unescape View File

@ -1,12 +1,10 @@
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_html/flutter_html.dart';
import 'package:flutter_html/image_render.dart'; import 'package:flutter_html/image_render.dart';
import 'package:flutter_swiper/flutter_swiper.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/main.dart'; import 'package:huixiang/main.dart';
import 'package:huixiang/retrofit/data/banner.dart'; import 'package:huixiang/retrofit/data/banner.dart';
@ -15,11 +13,8 @@ import 'package:huixiang/retrofit/data/brand.dart';
import 'package:huixiang/retrofit/data/brand_data.dart'; import 'package:huixiang/retrofit/data/brand_data.dart';
import 'package:huixiang/retrofit/data/page.dart'; import 'package:huixiang/retrofit/data/page.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.dart';
import 'package:huixiang/utils/MyPainter.dart';
import 'package:huixiang/utils/event_type.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/classic_header.dart';
import 'package:huixiang/view_widget/custom_image.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/store_title_tab.dart'; import 'package:huixiang/view_widget/store_title_tab.dart';
import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:pull_to_refresh/pull_to_refresh.dart';

1
lib/home/huixiang_view/huixiang_banner.dart
Unescape View File

@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:flutter_swiper/flutter_swiper.dart';
import 'package:huixiang/retrofit/data/banner.dart'; import 'package:huixiang/retrofit/data/banner.dart';
import 'package:huixiang/view_widget/custom_image.dart'; import 'package:huixiang/view_widget/custom_image.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class HuiXiangBanner extends StatefulWidget { class HuiXiangBanner extends StatefulWidget {

6
lib/home/huixiang_view/origin_info.dart
Unescape View File

@ -225,7 +225,7 @@ class _OriginInfo extends State<OriginInfo> {
alignment: Alignment.center, alignment: Alignment.center,
children: [ children: [
Container( Container(
width: 63.h, width: 63.w,
height: 63.h, height: 63.h,
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
@ -239,7 +239,7 @@ class _OriginInfo extends State<OriginInfo> {
Text( Text(
text, text,
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18.sp,
fontWeight: MyFontWeight.light, fontWeight: MyFontWeight.light,
color: Colors.white, color: Colors.white,
), ),
@ -248,7 +248,7 @@ class _OriginInfo extends State<OriginInfo> {
), ),
), ),
Container( Container(
width: 73, width: 73.w,
height: 73.h, height: 73.h,
child: CustomPaint( child: CustomPaint(
painter: MyPainter( painter: MyPainter(

11
lib/mine/manage_address_page.dart
Unescape View File

@ -5,6 +5,7 @@ import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/address.dart'; import 'package:huixiang/retrofit/data/address.dart';
import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/data/base_data.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/icon_text.dart'; import 'package:huixiang/view_widget/icon_text.dart';
import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_appbar.dart';
@ -101,7 +102,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
child: Text( child: Text(
"新增地址", "新增地址",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 16.sp, fontSize: 16.sp,
color: Colors.white, color: Colors.white,
), ),
@ -152,7 +153,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
address.username, address.username,
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Colors.black, color: Colors.black,
), ),
), ),
@ -191,7 +192,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
textAxisAlignment: CrossAxisAlignment.start, textAxisAlignment: CrossAxisAlignment.start,
textStyle: TextStyle( textStyle: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
leftIcon: Icons.location_on, leftIcon: Icons.location_on,
@ -228,7 +229,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
"", "",
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: address.isDefault color: address.isDefault
? Color(0xFF39B54A) ? Color(0xFF39B54A)
: Color(0xFFA29E9E), : Color(0xFFA29E9E),
@ -244,7 +245,7 @@ class _ManageAddressPage extends State<ManageAddressPage> {
"删除", "删除",
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Colors.black, color: Colors.black,
), ),
), ),

19
lib/mine/mine_vip_level_page.dart
Unescape View File

@ -7,6 +7,7 @@ import 'package:huixiang/retrofit/data/base_data.dart';
import 'package:huixiang/retrofit/data/rank.dart'; import 'package:huixiang/retrofit/data/rank.dart';
import 'package:huixiang/retrofit/retrofit_api.dart'; import 'package:huixiang/retrofit/retrofit_api.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/mine_vip_view.dart'; import 'package:huixiang/view_widget/mine_vip_view.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_appbar.dart';
@ -107,7 +108,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
Text( Text(
S.of(context).huiyuandengjishuoming, S.of(context).huiyuandengjishuoming,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 16.sp, fontSize: 16.sp,
color: Colors.black, color: Colors.black,
), ),
@ -134,7 +135,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
style: TextStyle( style: TextStyle(
textBaseline: TextBaseline.alphabetic, textBaseline: TextBaseline.alphabetic,
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
), ),
@ -154,7 +155,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
S.of(context).huiyuandengji, S.of(context).huiyuandengji,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
@ -166,7 +167,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
S.of(context).jifen, S.of(context).jifen,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 14.sp, fontSize: 14.sp,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
@ -198,7 +199,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
Text( Text(
S.of(context).jifendejisuanshuoming, S.of(context).jifendejisuanshuoming,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
fontSize: 16.sp, fontSize: 16.sp,
color: Colors.black, color: Colors.black,
), ),
@ -224,7 +225,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
style: TextStyle( style: TextStyle(
textBaseline: TextBaseline.alphabetic, textBaseline: TextBaseline.alphabetic,
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
), ),
@ -252,7 +253,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
S.of(context).youhuiquanwufajileijifen, S.of(context).youhuiquanwufajileijifen,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
), ),
@ -282,7 +283,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
), ),
@ -294,7 +295,7 @@ class _MineVipLevelPage extends State<MineVipLevelPage> {
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
fontWeight: FontWeight.w400, fontWeight: MyFontWeight.regular,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
), ),

5
lib/order/store_selector_page.dart
Unescape View File

@ -13,6 +13,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/store.dart'; import 'package:huixiang/retrofit/data/store.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/icon_text.dart'; import 'package:huixiang/view_widget/icon_text.dart';
import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/my_appbar.dart';
import 'package:huixiang/view_widget/request_permission.dart'; import 'package:huixiang/view_widget/request_permission.dart';
@ -282,7 +283,7 @@ class _StoreSelectorPage extends State<StoreSelectorPage> {
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
color: Color(0xFFFFFFFF), color: Color(0xFFFFFFFF),
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
), ),
), ),
), ),
@ -320,7 +321,7 @@ class _StoreSelectorPage extends State<StoreSelectorPage> {
store.storeName, store.storeName,
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF353535), color: Color(0xFF353535),
), ),
), ),

5
lib/view_widget/cupertino_date_picker.dart
Unescape View File

@ -1,6 +1,7 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:huixiang/utils/font_weight.dart';
class CupertinoDatePickerWidget extends StatelessWidget { class CupertinoDatePickerWidget extends StatelessWidget {
@ -34,7 +35,7 @@ class CupertinoDatePickerWidget extends StatelessWidget {
"取消", "取消",
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Colors.black), color: Colors.black),
), ),
margin: EdgeInsets.only(left: 6), margin: EdgeInsets.only(left: 6),
@ -50,7 +51,7 @@ class CupertinoDatePickerWidget extends StatelessWidget {
"确认", "确认",
style: TextStyle( style: TextStyle(
fontSize: 16, fontSize: 16,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xFF32A060)), color: Color(0xFF32A060)),
), ),
margin: EdgeInsets.only(left: 6), margin: EdgeInsets.only(left: 6),

31
lib/view_widget/new_coupon_widget.dart
Unescape View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/generated/l10n.dart';
import 'package:huixiang/retrofit/data/coupon.dart'; import 'package:huixiang/retrofit/data/coupon.dart';
import 'package:huixiang/utils/font_weight.dart';
import 'package:huixiang/view_widget/separator.dart'; import 'package:huixiang/view_widget/separator.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -76,7 +77,7 @@ class NewCouponWidget extends StatelessWidget {
S.of(context).shangjiaquan, S.of(context).shangjiaquan,
style: TextStyle( style: TextStyle(
fontSize: 10.sp, fontSize: 10.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Color(0xFFFF7A1A), color: Color(0xFFFF7A1A),
), ),
), ),
@ -90,7 +91,7 @@ class NewCouponWidget extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 16.sp, fontSize: 16.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xff353535), color: Color(0xff353535),
), ),
), ),
@ -222,7 +223,7 @@ class NewCouponWidget extends StatelessWidget {
"¥", "¥",
style: TextStyle( style: TextStyle(
fontSize: 22.sp, fontSize: 22.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
), ),
@ -237,7 +238,7 @@ class NewCouponWidget extends StatelessWidget {
: "", : "",
style: TextStyle( style: TextStyle(
fontSize: 40.sp, fontSize: 40.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
), ),
@ -252,7 +253,7 @@ class NewCouponWidget extends StatelessWidget {
: ""), : ""),
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
), ),
@ -271,7 +272,7 @@ class NewCouponWidget extends StatelessWidget {
S.of(context).duihuanquan, S.of(context).duihuanquan,
style: TextStyle( style: TextStyle(
fontSize: 25.sp, fontSize: 25.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
), ),
@ -282,7 +283,7 @@ class NewCouponWidget extends StatelessWidget {
S.of(context).xianxiashiyong, S.of(context).xianxiashiyong,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
), ),
@ -306,7 +307,7 @@ class NewCouponWidget extends StatelessWidget {
: "", : "",
style: TextStyle( style: TextStyle(
fontSize: 40.sp, fontSize: 40.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
), ),
@ -317,7 +318,7 @@ class NewCouponWidget extends StatelessWidget {
"折", "折",
style: TextStyle( style: TextStyle(
fontSize: 20.sp, fontSize: 20.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
), ),
@ -328,7 +329,7 @@ class NewCouponWidget extends StatelessWidget {
S.of(context).quanchangtongyong, S.of(context).quanchangtongyong,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.bold, fontWeight: MyFontWeight.semi_bold,
color: Color(0xff32A060), color: Color(0xff32A060),
), ),
), ),
@ -356,7 +357,7 @@ class NewCouponWidget extends StatelessWidget {
S.of(context).lingqu, S.of(context).lingqu,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Colors.white, color: Colors.white,
), ),
), ),
@ -376,7 +377,7 @@ class NewCouponWidget extends StatelessWidget {
S.of(context).yilingqu, S.of(context).yilingqu,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Colors.white, color: Colors.white,
), ),
), ),
@ -403,7 +404,7 @@ class NewCouponWidget extends StatelessWidget {
: S.of(context).qushiyong, : S.of(context).qushiyong,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Colors.white, color: Colors.white,
), ),
), ),
@ -425,7 +426,7 @@ class NewCouponWidget extends StatelessWidget {
S.of(context).yishiyong, S.of(context).yishiyong,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Colors.white, color: Colors.white,
), ),
), ),
@ -446,7 +447,7 @@ class NewCouponWidget extends StatelessWidget {
S.of(context).yishixiao, S.of(context).yishixiao,
style: TextStyle( style: TextStyle(
fontSize: 12.sp, fontSize: 12.sp,
fontWeight: FontWeight.w500, fontWeight: MyFontWeight.medium,
color: Colors.white, color: Colors.white,
), ),
), ),

Write Preview
Loading…
Cancel
Save