Merge branch 'regex' into amend

hmxc
张萌 4 years ago
commit 11712a80aa

@ -4,27 +4,27 @@ import 'package:akuCommunity/utils/screenutil.dart';
class BaseStyle {
///
static final double fontSize18 = Screenutil.size(18);
static final double fontSize18 = 18.sp;
static final double fontSize22 = Screenutil.size(22);
static final double fontSize22 = 22.sp;
static final double fontSize24 = Screenutil.size(24);
static final double fontSize24 = 24.sp;
static final double fontSize26 = Screenutil.size(26);
static final double fontSize26 = 26.sp;
static final double fontSize28 = Screenutil.size(28);
static final double fontSize28 = 28.sp;
static final double fontSize30 = Screenutil.size(30);
static final double fontSize30 = 30.sp;
static final double fontSize32 = Screenutil.size(32);
static final double fontSize32 = 32.sp;
static final double fontSize34 = Screenutil.size(34);
static final double fontSize34 = 34.sp;
static final double fontSize36 = Screenutil.size(36);
static final double fontSize36 = 36.sp;
static final double fontSize38 = Screenutil.size(38);
static final double fontSize38 = 38.sp;
static final double fontSize52 = Screenutil.size(52);
static final double fontSize52 = 52.sp;
///
static final Color color333333 = Color(0xff333333);

@ -93,7 +93,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
title: Text(
'是否确定投${url}一票',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff030303),
),
),
@ -102,7 +102,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
child: Text(
'取消',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff333333),
),
),
@ -115,7 +115,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
'确定',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xffff8200),
),
),
@ -143,9 +143,9 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
setState(() {});
},
child: Container(
margin: EdgeInsets.only(top: Screenutil.length(39)),
margin: EdgeInsets.only(top: 39.w),
padding: EdgeInsets.only(
left: Screenutil.length(41), bottom: Screenutil.length(40)),
left: 41.w, bottom: 40.w),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: BaseStyle.colord8d8d8, width: 0.5),
@ -156,7 +156,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
height: Screenutil.length(150),
height: 150.w,
alignment: Alignment.center,
child: Icon(
isOver
@ -169,20 +169,20 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
: _listView[index]['isCheck']
? Colors.red
: BaseStyle.color979797,
size: Screenutil.length(36),
size: 36.w,
),
),
Container(
margin: EdgeInsets.only(
left: Screenutil.length(17),
right: Screenutil.length(30),
left: 17.w,
right: 30.w,
),
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(4)),
child: CachedImageWrapper(
url: imagePath,
width: Screenutil.length(150),
height: Screenutil.length(150),
width: 150.w,
height: 150.w,
),
),
),
@ -197,7 +197,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
color: BaseStyle.color333333,
),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
name,
style: TextStyle(
@ -219,7 +219,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
Navigator.pushNamed(context, PageName.member_list_page.toString());
},
child: Container(
padding: EdgeInsets.only(bottom: Screenutil.length(24)),
padding: EdgeInsets.only(bottom: 24.w),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)),
@ -228,10 +228,10 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
margin: EdgeInsets.only(left: Screenutil.length(80)),
margin: EdgeInsets.only(left: 80.w),
child: ImageStack(
imageList: memberList,
imageRadius: Screenutil.size(44),
imageRadius: 44.sp,
imageCount: 3,
imageBorderWidth: 1,
totalCount: 3,
@ -240,7 +240,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
Row(
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(16)),
margin: EdgeInsets.only(right: 16.w),
child: Text(
'已有${320}人参加',
style: TextStyle(
@ -250,7 +250,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
),
Icon(
AntDesign.right,
size: Screenutil.size(36),
size: 36.sp,
color: BaseStyle.color999999,
),
],
@ -276,15 +276,14 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
color: Colors.white,
child: ListView(
padding: EdgeInsets.only(
bottom: Screenutil.length(
widget.bundle.getMap('details')['isVote'] ? 0 : 170)),
bottom: ( widget.bundle.getMap('details')['isVote'] ? 0 : 170).w),
children: [
Container(
padding: EdgeInsets.only(
top: Screenutil.length(26),
left: Screenutil.length(32),
right: Screenutil.length(32),
bottom: Screenutil.length(60)),
top: 26.w,
left: 32.w,
right: 32.w,
bottom: 60.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -296,19 +295,19 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
fontWeight: FontWeight.w600),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(45)),
margin: EdgeInsets.only(top: 45.w),
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(6)),
child: CachedImageWrapper(
url: widget.bundle.getMap('details')['imagePath'],
width: Screenutil.length(686),
height: Screenutil.length(228),
width: 686.w,
height: 228.w,
),
),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(44)),
width: Screenutil.length(647),
margin: EdgeInsets.only(top: 44.w),
width: 647.w,
child: Html(
data: widget.bundle.getMap('details')['isVote']
? htmlData
@ -320,23 +319,23 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
widget.bundle.getMap('details')['isVote']
? SizedBox()
: SizedBox(
height: Screenutil.length(24),
height: 24.w,
child: Container(color: BaseStyle.colorf9f9f9),
),
Container(
padding: EdgeInsets.only(
top: Screenutil.length(26),
left: Screenutil.length(32),
right: Screenutil.length(32),
bottom: Screenutil.length(60)),
top: 26.w,
left: 32.w,
right: 32.w,
bottom: 60.w),
child: widget.bundle.getMap('details')['isVote']
? Container(
margin: EdgeInsets.only(top: Screenutil.length(44)),
margin: EdgeInsets.only(top: 44.w),
padding: EdgeInsets.only(
top: Screenutil.length(50),
left: Screenutil.length(32),
right: Screenutil.length(25)),
width: Screenutil.length(686),
top: 50.w,
left: 32.w,
right: 25.w),
width: 686.w,
decoration: BoxDecoration(
color: BaseStyle.colorf3f3f3,
borderRadius: BorderRadius.all(Radius.circular(6)),
@ -354,7 +353,7 @@ class _ActivitiesDetailsPageState extends State<ActivitiesDetailsPage> {
),
Container(
padding:
EdgeInsets.only(left: Screenutil.length(3)),
EdgeInsets.only(left: 3.w),
child: Column(
children: _listView
.asMap()

@ -101,12 +101,12 @@ class _MemberListPageState extends State<MemberListPage> {
Container _memberCard(String imagePath, name, phone) {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(18),
bottom: Screenutil.length(18),
left: Screenutil.length(20),
right: Screenutil.length(10),
top: 18.w,
bottom: 18.w,
left: 20.w,
right: 10.w,
),
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)),
@ -117,12 +117,12 @@ class _MemberListPageState extends State<MemberListPage> {
Row(
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(18)),
margin: EdgeInsets.only(right: 18.w),
child: ClipOval(
child: CachedImageWrapper(
url: imagePath,
width: Screenutil.length(60),
height: Screenutil.length(60),
width: 60.w,
height: 60.w,
),
),
),

@ -22,10 +22,10 @@ class _AddressEditPageState extends State<AddressEditPage> {
Widget _containerSelectDefault() {
return Container(
color: Colors.white,
height: Screenutil.length(96),
height: 96.w,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(28),
horizontal: Screenutil.length(32),
vertical: 28.w,
horizontal: 32.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -33,7 +33,7 @@ class _AddressEditPageState extends State<AddressEditPage> {
Text(
'设为默认地址',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -63,16 +63,16 @@ class _AddressEditPageState extends State<AddressEditPage> {
onTap: () {},
child: Container(
color: Colors.white,
height: Screenutil.length(96),
height: 96.w,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(28),
horizontal: Screenutil.length(32),
vertical: 28.w,
horizontal: 32.w,
),
alignment: Alignment.center,
child: Text(
'删除地址',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xffe60e0e),
),
),
@ -113,9 +113,9 @@ class _AddressEditPageState extends State<AddressEditPage> {
],
),
),
SizedBox(height: Screenutil.length(66)),
SizedBox(height: 66.w),
_containerSelectDefault(),
SizedBox(height: Screenutil.length(66)),
SizedBox(height: 66.w),
widget.bundle.getMap('details')['isDelete']
? _containerDelete()
: SizedBox(),

@ -53,36 +53,36 @@ class _AddressEditItemState extends State<AddressEditItem> {
? TextInputType.number
: TextInputType.name,
cursorColor: Color(0xffffc40c),
style: TextStyle(fontSize: Screenutil.size(28)),
style: TextStyle(fontSize: 28.sp),
controller: item['controller'],
onChanged: (String value) {},
maxLines: item['title'] == '详细地址' ? 5 : 1,
decoration: InputDecoration(
contentPadding: EdgeInsets.only(
right: Screenutil.length(32),
top: Screenutil.length(28),
bottom: Screenutil.length(28),
right: 32.w,
top: 28.w,
bottom: 28.w,
),
hintText: item['hintText'],
border: InputBorder.none, //线
fillColor: Colors.white,
filled: true,
hintStyle: TextStyle(
color: Color(0xff999999), fontSize: Screenutil.size(28)),
color: Color(0xff999999), fontSize: 28.sp),
prefixIcon: Padding(
padding: EdgeInsets.only(
left: Screenutil.length(32),
left: 32.w,
right:
Screenutil.length(item['title'] == '收货人' ? 88 : 60),
top: Screenutil.length(28),
(item['title'] == '收货人' ? 88 : 60).w,
top: 28.w,
bottom:
Screenutil.length(item['title'] == '详细地址' ? 158 : 28),
(item['title'] == '详细地址' ? 158 : 28).w,
),
child: Text(
item['title'],
style: TextStyle(
color: Color(0xff333333),
fontSize: Screenutil.size(28),
fontSize: 28.sp,
fontWeight: FontWeight.w500,
),
),

@ -15,12 +15,12 @@ class AddressItem extends StatelessWidget {
Widget _containerImage() {
return Container(
alignment: Alignment.center,
width: Screenutil.length(76),
height: Screenutil.length(76),
width: 76.w,
height: 76.w,
margin: EdgeInsets.only(
right: Screenutil.length(20),
right: 20.w,
),
padding: EdgeInsets.symmetric(vertical: Screenutil.length(12)),
padding: EdgeInsets.symmetric(vertical: 12.w),
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.centerLeft,
@ -29,7 +29,7 @@ class AddressItem extends StatelessWidget {
? [Color(0xffffd000), Color(0xffff8500)]
: [Color(0xffd8d8d8), Color(0xffd8d8d8)],
),
borderRadius: BorderRadius.all(Radius.circular(Screenutil.length(76))),
borderRadius: BorderRadius.all(Radius.circular(76.w)),
),
child: Icon(SimpleLineIcons.location_pin, color: Colors.white),
);
@ -45,23 +45,23 @@ class AddressItem extends StatelessWidget {
Text(
name,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
SizedBox(width: Screenutil.length(20)),
SizedBox(width: 20.w),
Text(
phone,
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
],
),
SizedBox(height: Screenutil.length(12)),
SizedBox(height: 12.w),
Container(
width: Screenutil.length(432),
width: 432.w,
child: ExtendedText.rich(
TextSpan(
children: [
@ -69,7 +69,7 @@ class AddressItem extends StatelessWidget {
? ExtendedWidgetSpan(
child: Container(
margin:
EdgeInsets.only(right: Screenutil.length(16)),
EdgeInsets.only(right: 16.w),
decoration: BoxDecoration(
color: Color(0xfffff7d2),
border: Border.all(
@ -77,13 +77,13 @@ class AddressItem extends StatelessWidget {
borderRadius:
BorderRadius.all(Radius.circular(4))),
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(20),
vertical: Screenutil.length(4),
horizontal: 20.w,
vertical: 4.w,
),
child: Text(
'默认',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff333333),
),
),
@ -93,7 +93,7 @@ class AddressItem extends StatelessWidget {
TextSpan(
text: address,
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
height: 1.5),
)
@ -111,7 +111,7 @@ class AddressItem extends StatelessWidget {
Widget _positionedEdit(BuildContext context) {
return Positioned(
right: 0,
top: Screenutil.length(55),
top: 55.w,
child: InkWell(
onTap: () {
Navigator.pushNamed(context, PageName.address_edit_page.toString(),
@ -126,19 +126,19 @@ class AddressItem extends StatelessWidget {
},
child: Row(
children: [
SizedBox(width: Screenutil.length(13)),
SizedBox(width: 13.w),
SizedBox(
width: 1,
height: Screenutil.length(30),
height: 30.w,
child: DecoratedBox(
decoration: BoxDecoration(color: Color(0xffd8d8d8)),
),
),
SizedBox(width: Screenutil.length(13)),
SizedBox(width: 13.w),
Text(
'编辑',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
@ -156,13 +156,13 @@ class AddressItem extends StatelessWidget {
borderRadius: BorderRadius.all(Radius.circular(8)),
),
margin: EdgeInsets.only(
left: Screenutil.length(32),
right: Screenutil.length(32),
top: Screenutil.length(20),
left: 32.w,
right: 32.w,
top: 20.w,
),
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(20),
vertical: Screenutil.length(32),
horizontal: 20.w,
vertical: 32.w,
),
child: Stack(
children: [

@ -37,10 +37,10 @@ class _CertificationPageState extends State<CertificationPage> {
Widget _idCardType() {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
margin: EdgeInsets.only(bottom: Screenutil.length(60)),
margin: EdgeInsets.only(bottom: 60.w),
decoration: BoxDecoration(
border:
Border(bottom: BorderSide(color: Color(0xffeeeeee), width: 0.5)),
@ -51,15 +51,15 @@ class _CertificationPageState extends State<CertificationPage> {
Text(
'证件类型',
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
Container(
width: Screenutil.length(686),
width: 686.w,
child: Text(
'身份证',
style: TextStyle(
fontSize: Screenutil.size(36),
fontSize: 36.sp,
color: Color(0xff333333),
fontWeight: FontWeight.w600,
),
@ -73,19 +73,19 @@ class _CertificationPageState extends State<CertificationPage> {
Widget _upLoadImage() {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
margin: EdgeInsets.only(bottom: Screenutil.length(60)),
margin: EdgeInsets.only(bottom: 60.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'上传证件照片',
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(
@ -104,10 +104,10 @@ class _CertificationPageState extends State<CertificationPage> {
Widget _input(String title, hintText, TextEditingController controller) {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
margin: EdgeInsets.only(bottom: Screenutil.length(60)),
margin: EdgeInsets.only(bottom: 60.w),
decoration: BoxDecoration(
border:
Border(bottom: BorderSide(color: Color(0xffeeeeee), width: 0.5)),
@ -118,9 +118,9 @@ class _CertificationPageState extends State<CertificationPage> {
Text(
title,
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
CommonInput(inputController: controller, hintText: hintText)
],
),
@ -131,10 +131,10 @@ class _CertificationPageState extends State<CertificationPage> {
return InkWell(
child: Container(
alignment: Alignment.center,
height: Screenutil.length(96),
width: Screenutil.length(686),
height: 96.w,
width: 686.w,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(26),
vertical: 26.w,
),
decoration: BoxDecoration(
color: Color(0xffffc40c),
@ -143,7 +143,7 @@ class _CertificationPageState extends State<CertificationPage> {
'确认提交',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333)),
),
),
@ -161,9 +161,9 @@ class _CertificationPageState extends State<CertificationPage> {
),
body: Container(
padding: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
color: Colors.white,
child: ListView(

@ -145,11 +145,11 @@ class _CommonPageState extends State<CommonPage> {
showSearch(context: context, delegate: searchBarDelegate());
},
child: Container(
margin: EdgeInsets.only(right: Screenutil.length(32)),
margin: EdgeInsets.only(right: 32.w),
padding: EdgeInsets.only(
left: Screenutil.length(40),
top: Screenutil.length(15),
bottom: Screenutil.length(15)),
left: 40.w,
top: 15.w,
bottom: 15.w),
decoration: BoxDecoration(
color: BaseStyle.colorf3f3f3,
borderRadius: BorderRadius.all(Radius.circular(36)),
@ -179,7 +179,7 @@ class _CommonPageState extends State<CommonPage> {
backgroundColor: Color(0xffffffff),
leading: InkWell(
onTap: () => Navigator.pop(context),
child: Icon(AntDesign.left, size: Screenutil.size(40)),
child: Icon(AntDesign.left, size: 40.sp),
),
centerTitle: true,
title: Builder(builder: (_) {
@ -195,7 +195,7 @@ class _CommonPageState extends State<CommonPage> {
: widget.bundle.getMap('commentMap')['title'],
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
);
@ -249,7 +249,7 @@ class _CommonPageState extends State<CommonPage> {
}
},
child: Container(
margin: EdgeInsets.only(right: Screenutil.length(32)),
margin: EdgeInsets.only(right: 32.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
@ -294,7 +294,7 @@ class _CommonPageState extends State<CommonPage> {
return Text(
title,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
);

@ -74,7 +74,7 @@ class _CommunityIndexState extends State<CommunityIndex>
indicatorWeight: 2.0,
indicatorSize: TabBarIndicatorSize.label,
labelStyle: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
fontWeight: FontWeight.w600,
),
@ -96,7 +96,7 @@ class _CommunityIndexState extends State<CommunityIndex>
child: Icon(
Icons.add,
color: Colors.white,
size: Screenutil.size(40),
size: 40.sp,
),
onPressed: noteCreateRouter,
);

@ -34,19 +34,19 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
title: Text(
'社区',
style: TextStyle(
fontSize: Screenutil.size(36),
fontSize: 36.sp,
color: Color(0xff333333),
),
),
leading: InkWell(
onTap: () => Navigator.pop(context),
child: Container(
padding: EdgeInsets.only(left: Screenutil.length(32)),
padding: EdgeInsets.only(left: 32.w),
alignment: Alignment.center,
child: Text(
'取消',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff030303),
),
),
@ -55,12 +55,12 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
actions: [
Container(
alignment: Alignment.center,
padding: EdgeInsets.only(right: Screenutil.length(32)),
padding: EdgeInsets.only(right: 32.w),
child: InkWell(
onTap: () {},
child: Container(
height: Screenutil.length(64),
width: Screenutil.length(116),
height: 64.w,
width: 116.w,
alignment: Alignment.center,
decoration: BoxDecoration(
color: Color(0xffffd000),
@ -69,7 +69,7 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
child: Text(
'发表',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff030303),
),
),
@ -85,7 +85,7 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
child: TextFormField(
cursorColor: Color(0xffffc40c),
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
),
controller: _noteContent,
onChanged: (String value) {},
@ -93,8 +93,8 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
decoration: InputDecoration(
isDense: true,
contentPadding: EdgeInsets.only(
top: Screenutil.length(0),
bottom: Screenutil.length(0),
top: 0.w,
bottom: 0.w,
),
hintText: hintText,
border: InputBorder.none, //线
@ -102,7 +102,7 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
filled: true,
hintStyle: TextStyle(
color: Color(0xff999999),
fontSize: Screenutil.size(34),
fontSize: 34.sp,
fontWeight: FontWeight.normal,
),
),
@ -114,8 +114,8 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
return InkWell(
onTap: () {},
child: Container(
width: Screenutil.length(196),
height: Screenutil.length(196),
width: 196.w,
height: 196.w,
decoration: BoxDecoration(
color: Colors.white,
image: DecorationImage(
@ -134,7 +134,7 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
});
},
child: Container(
padding: EdgeInsets.symmetric(vertical: Screenutil.length(30)),
padding: EdgeInsets.symmetric(vertical: 30.w),
decoration: BoxDecoration(
border: Border(
top: BorderSide(color: Color(0xffd8d8d8), width: 1),
@ -150,13 +150,13 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
Icon(
AntDesign.message1,
color: Color(0xff333333),
size: Screenutil.size(28),
size: 28.sp,
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
'不可评论',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -166,9 +166,9 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
? Icon(
AntDesign.check,
color: Color(0xffffd003),
size: Screenutil.size(40),
size: 40.sp,
)
: SizedBox(height: Screenutil.size(40)),
: SizedBox(height: 40.sp),
],
),
),
@ -177,20 +177,20 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
Wrap _wrapThemeList() {
return Wrap(
spacing: Screenutil.length(15),
runSpacing: Screenutil.length(20),
spacing: 15.w,
runSpacing: 20.w,
children: _themeList
.asMap()
.keys
.map((index) => index == 0
? Container(
padding: EdgeInsets.only(top: Screenutil.length(10)),
width: Screenutil.length(156),
padding: EdgeInsets.only(top: 10.w),
width: 156.w,
alignment: Alignment.centerLeft,
child: Text(
_themeList[index]['title'],
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff333333),
),
),
@ -216,13 +216,13 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
width: 0.5),
borderRadius: BorderRadius.all(Radius.circular(36))),
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(29),
vertical: Screenutil.length(13),
horizontal: 29.w,
vertical: 13.w,
),
child: Text(
_themeList[index]['title'],
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: _themeList[index]['isSelect']
? Color(0xff333333)
: Color(0xff999999),
@ -251,18 +251,18 @@ class _NoteCreatePageState extends State<NoteCreatePage> {
},
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(49),
left: Screenutil.length(62),
right: Screenutil.length(62),
top: 49.w,
left: 62.w,
right: 62.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_containerTextField(),
_containerAddImage(),
SizedBox(height: Screenutil.length(202)),
SizedBox(height: 202.w),
_inkWellSelect(),
SizedBox(height: Screenutil.length(28)),
SizedBox(height: 28.w),
_wrapThemeList(),
],
),

@ -52,13 +52,13 @@ class _TopiceDetailPageState extends State<TopiceDetailPage> {
SliverAppBar _sliverAppBar(String imagePath) {
return SliverAppBar(
expandedHeight: Screenutil.length(500),
expandedHeight: 500.w,
pinned: true,
floating: true,
elevation: 0,
backgroundColor: Colors.white,
leading: IconButton(
icon: Icon(AntDesign.left, size: Screenutil.size(40)),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
},
@ -75,14 +75,14 @@ class _TopiceDetailPageState extends State<TopiceDetailPage> {
Positioned _positionedFloatActionButton(){
return Positioned(
bottom: Screenutil.length(124),
right: Screenutil.length(32),
bottom: 124.w,
right: 32.w,
child: FloatingActionButton(
backgroundColor: Color(0xffffd000),
child: Icon(
Icons.add,
color: Colors.white,
size: Screenutil.size(40),
size: 40.sp,
),
onPressed: noteCreateRouter,
));

@ -168,7 +168,7 @@ class _TabListState extends State<TabList> with AutomaticKeepAliveClientMixin {
hotNum: _topicList[index]['hotNum'],
)
: Container(
margin: EdgeInsets.only(top: Screenutil.length(32)),
margin: EdgeInsets.only(top: 32.w),
child: CircleTrend(
title: _circleList[index]['title'],
contentList: _circleList[index]['contentList'],

@ -15,15 +15,15 @@ class TopicCard extends StatefulWidget {
class _TopicCardState extends State<TopicCard> {
TextStyle _textStyleTitle() {
return TextStyle(fontSize: Screenutil.size(28), color: Color(0xff333333));
return TextStyle(fontSize: 28.sp, color: Color(0xff333333));
}
TextStyle _textStyleSubtitle() {
return TextStyle(fontSize: Screenutil.size(22), color: Color(0xff666666));
return TextStyle(fontSize: 22.sp, color: Color(0xff666666));
}
TextStyle _textStyleHot() {
return TextStyle(fontSize: Screenutil.size(22), color: Color(0xff333333));
return TextStyle(fontSize: 22.sp, color: Color(0xff333333));
}
void topiceDetailRouter(String subtitle, String imagePath) {
@ -38,16 +38,16 @@ class _TopicCardState extends State<TopicCard> {
children: [
Image.asset(
imagePath,
height: Screenutil.length(160),
width: Screenutil.length(250),
height: 160.w,
width: 250.w,
),
SizedBox(width: Screenutil.length(12)),
SizedBox(width: 12.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: Screenutil.length(383),
height: Screenutil.length(80),
width: 383.w,
height: 80.w,
child: Text(
title,
maxLines: 2,
@ -55,9 +55,9 @@ class _TopicCardState extends State<TopicCard> {
style: _textStyleTitle(),
),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Container(
width: Screenutil.length(365),
width: 365.w,
child: Text(
subtitle,
maxLines: 1,
@ -80,9 +80,9 @@ class _TopicCardState extends State<TopicCard> {
Icon(
MaterialIcons.whatshot,
color: Color(0xffd4270a),
size: Screenutil.size(23),
size: 23.sp,
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
hotNum,
style: _textStyleHot(),
@ -97,11 +97,11 @@ class _TopicCardState extends State<TopicCard> {
return Container(
color: Colors.white,
margin: EdgeInsets.only(
left: Screenutil.length(32),
right: Screenutil.length(32),
top: Screenutil.length(20),
left: 32.w,
right: 32.w,
top: 20.w,
),
padding: EdgeInsets.all(Screenutil.length(20)),
padding: EdgeInsets.all(20.w),
child: InkWell(
onTap: () {
topiceDetailRouter(

@ -36,7 +36,7 @@ class _TrendCardState extends State<TrendCard> {
title: Text(
'是否${url}?',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff030303),
),
),
@ -45,7 +45,7 @@ class _TrendCardState extends State<TrendCard> {
child: Text(
'取消',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff333333),
),
),
@ -58,7 +58,7 @@ class _TrendCardState extends State<TrendCard> {
'确定',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xffff8200),
),
),
@ -84,11 +84,11 @@ class _TrendCardState extends State<TrendCard> {
return Container(
color: Colors.white,
height:
Screenutil.length(300) + MediaQuery.of(context).viewPadding.bottom,
300.w + MediaQuery.of(context).viewPadding.bottom,
child: Stack(
children: [
Container(
height: Screenutil.length(160),
height: 160.w,
child: ListView.builder(
scrollDirection: Axis.horizontal,
itemBuilder: (BuildContext context, int index) {
@ -98,12 +98,12 @@ class _TrendCardState extends State<TrendCard> {
_showDialog(nameItems[index]['title']);
},
child: Container(
height: Screenutil.length(160),
width: Screenutil.length(160),
height: 160.w,
width: 160.w,
margin: EdgeInsets.only(
left: Screenutil.length(10),
right: Screenutil.length(10),
top: Screenutil.length(40),
left: 10.w,
right: 10.w,
top: 40.w,
),
alignment: Alignment.center,
child: Column(
@ -111,15 +111,15 @@ class _TrendCardState extends State<TrendCard> {
children: [
Image.asset(
nameItems[index]['image'],
width: Screenutil.length(65),
height: Screenutil.length(65),
width: 65.w,
height: 65.w,
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(10)),
margin: EdgeInsets.only(top: 10.w),
child: Text(
nameItems[index]['title'],
style: TextStyle(
fontSize: Screenutil.size(26),
fontSize: 26.sp,
color: Color(0xff333333),
),
),
@ -140,7 +140,7 @@ class _TrendCardState extends State<TrendCard> {
},
child: Container(
width: MediaQuery.of(context).size.width,
height: Screenutil.length(98),
height: 98.w,
alignment: Alignment.center,
decoration: BoxDecoration(
color: Colors.white,
@ -155,7 +155,7 @@ class _TrendCardState extends State<TrendCard> {
child: Text(
'取消',
style: TextStyle(
fontSize: Screenutil.size(38),
fontSize: 38.sp,
color: Color(0xff333333),
),
),
@ -175,28 +175,28 @@ class _TrendCardState extends State<TrendCard> {
TextStyle _textStyleName() {
return TextStyle(
fontSize: Screenutil.size(36),
fontSize: 36.sp,
color: Color(0xff333333),
);
}
TextStyle _textStyleContent() {
return TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
);
}
TextStyle _textStyleTag() {
return TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999),
);
}
TextStyle _textStylePopup() {
return TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
);
}
@ -211,7 +211,7 @@ class _TrendCardState extends State<TrendCard> {
elevation: 0,
offset: Offset(0, -53),
child: Container(
width: Screenutil.length(54),
width: 54.w,
decoration: BoxDecoration(
color: Color(0xffd8d8d8),
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -219,7 +219,7 @@ class _TrendCardState extends State<TrendCard> {
child: Icon(
Feather.more_horizontal,
color: Colors.white,
size: Screenutil.size(36),
size: 36.sp,
),
),
onSelected: (String value) {
@ -243,17 +243,17 @@ class _TrendCardState extends State<TrendCard> {
Navigator.pop(context);
},
child: Container(
height: Screenutil.length(68),
width: Screenutil.length(181),
height: 68.w,
width: 181.w,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
AntDesign.hearto,
size: Screenutil.size(30),
size: 30.sp,
color: Color(0xff000000),
),
SizedBox(width: Screenutil.length(11)),
SizedBox(width: 11.w),
Text(
'',
style: _textStylePopup(),
@ -264,7 +264,7 @@ class _TrendCardState extends State<TrendCard> {
),
SizedBox(
width: 1,
height: Screenutil.length(48),
height: 48.w,
child: DecoratedBox(
decoration: BoxDecoration(color: Color(0xff979797)),
),
@ -275,17 +275,17 @@ class _TrendCardState extends State<TrendCard> {
Navigator.pop(context);
},
child: Container(
height: Screenutil.length(68),
width: Screenutil.length(181),
height: 68.w,
width: 181.w,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Feather.message_square,
size: Screenutil.size(30),
size: 30.sp,
color: Color(0xff000000),
),
SizedBox(width: Screenutil.length(11)),
SizedBox(width: 11.w),
Text(
'评论',
style: _textStylePopup(),
@ -317,20 +317,20 @@ class _TrendCardState extends State<TrendCard> {
height: 86.w,
child: avatar,
),
SizedBox(width: Screenutil.length(9)),
SizedBox(width: 9.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: EdgeInsets.only(left: Screenutil.length(10)),
padding: EdgeInsets.only(left: 10.w),
child: Text(
name,
style: _textStyleName(),
),
),
SizedBox(height: Screenutil.length(6)),
SizedBox(height: 6.w),
Container(
padding: EdgeInsets.only(left: Screenutil.length(14)),
padding: EdgeInsets.only(left: 14.w),
child: ExpandableText(
text: content,
maxLines: 2,
@ -342,13 +342,13 @@ class _TrendCardState extends State<TrendCard> {
),
],
),
SizedBox(height: Screenutil.length(20)),
SizedBox(height: 20.w),
Padding(
padding: EdgeInsets.only(left: Screenutil.length(95)),
padding: EdgeInsets.only(left: 95.w),
child: Column(
children: [
ImageGrid(widget.imageUrl),
SizedBox(height: Screenutil.length(20)),
SizedBox(height: 20.w),
Stack(
children: [
Row(
@ -374,7 +374,7 @@ class _TrendCardState extends State<TrendCard> {
_isLike ? AntDesign.heart : AntDesign.hearto,
color:
_isLike ? Color(0xffff6666) : Color(0xffd8d8d8),
size: Screenutil.size(36),
size: 36.sp,
),
),
),
@ -386,7 +386,7 @@ class _TrendCardState extends State<TrendCard> {
child: Icon(
AntDesign.message1,
color: Color(0xffd8d8d8),
size: Screenutil.size(36),
size: 36.sp,
),
),
),
@ -426,10 +426,10 @@ class _TrendCardState extends State<TrendCard> {
),
),
padding: EdgeInsets.only(
top: Screenutil.length(46),
left: Screenutil.length(32),
bottom: Screenutil.length(22),
right: Screenutil.length(32),
top: 46.w,
left: 32.w,
bottom: 22.w,
right: 32.w,
),
child: _columnCard(widget.name, widget.content,widget.avatar)
);

@ -22,11 +22,11 @@ class ConfirmOrderPage extends StatelessWidget {
body: Stack(
children: [
ListView(
padding: EdgeInsets.only(bottom: Screenutil.length(98)),
padding: EdgeInsets.only(bottom: 98.w),
children: [
SizedBox(height: Screenutil.length(20)),
SizedBox(height: 20.w),
ConfirmAddress(),
SizedBox(height: Screenutil.length(20)),
SizedBox(height: 20.w),
ConfirmContent(cartMap: bundle.getMap('cartMap')),
],
),

@ -15,7 +15,7 @@ class PayOrderPage extends StatelessWidget {
isCloseButton: false,
isOverlayTapDismiss: false,
titleStyle:
TextStyle(fontSize: Screenutil.size(38), color: Color(0xff333333)),
TextStyle(fontSize: 38.sp, color: Color(0xff333333)),
);
List<Map<String, dynamic>> _listPay = [
@ -24,7 +24,7 @@ class PayOrderPage extends StatelessWidget {
'widget': Icon(
AntDesign.alipay_circle,
color: Color(0xff06b4fd),
size: Screenutil.length(50),
size: 50.w,
),
'id': 'alipay',
'isCheck': true
@ -33,8 +33,8 @@ class PayOrderPage extends StatelessWidget {
'title': '微信支付',
'widget': Image.asset(
AssetsImage.WXPAY,
height: Screenutil.length(60),
width: Screenutil.length(60),
height: 60.w,
width: 60.w,
),
'id': 'wxpay',
'isCheck': false
@ -57,9 +57,9 @@ class PayOrderPage extends StatelessWidget {
context: context,
title: "支付成功!~",
image: Container(
margin: EdgeInsets.only(top: Screenutil.length(40)),
height: Screenutil.length(200),
width: Screenutil.length(200),
margin: EdgeInsets.only(top: 40.w),
height: 200.w,
width: 200.w,
alignment: Alignment.center,
decoration: BoxDecoration(
gradient: LinearGradient(
@ -68,12 +68,12 @@ class PayOrderPage extends StatelessWidget {
colors: [Color(0xffffe16b), Color(0xffffc40d)],
),
borderRadius:
BorderRadius.all(Radius.circular(Screenutil.length(200))),
BorderRadius.all(Radius.circular(200.w)),
),
child: Icon(
Icons.check,
color: Colors.white,
size: Screenutil.length(150),
size: 150.w,
),
),
style: alertStyle,
@ -86,7 +86,7 @@ class PayOrderPage extends StatelessWidget {
),
onPressed: () => Navigator.pop(context),
color: Color(0xffffc40d),
radius: BorderRadius.circular(Screenutil.length(8)),
radius: BorderRadius.circular(8.w),
),
],
).show();
@ -94,8 +94,8 @@ class PayOrderPage extends StatelessWidget {
},
child: Container(
padding: EdgeInsets.only(
bottom: Screenutil.length(27),
top: Screenutil.length(28),
bottom: 27.w,
top: 28.w,
),
decoration: BoxDecoration(
border:
@ -107,18 +107,18 @@ class PayOrderPage extends StatelessWidget {
Row(
children: [
widget,
SizedBox(width: Screenutil.length(24)),
SizedBox(width: 24.w),
Text(
title,
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
],
),
Icon(
AntDesign.right,
color: Color(0xff999999),
size: Screenutil.length(32),
size: 32.w,
),
],
),
@ -139,21 +139,21 @@ class PayOrderPage extends StatelessWidget {
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(130),
bottom: Screenutil.length(130),
top: 130.w,
bottom: 130.w,
),
alignment: Alignment.center,
child: Text(
'¥${(double.parse(bundle.getMap('cartMap')["itemprice"]) * bundle.getMap('cartMap')["count"]).toStringAsFixed(2)}',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(48),
fontSize: 48.sp,
color: Color(0xffe60e0e),
),
),
),
Container(
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
child: Column(
children: List.generate(
_listPay.length,

@ -15,11 +15,11 @@ class ConfirmAddress extends StatefulWidget {
class _ConfirmAddressState extends State<ConfirmAddress> {
Container _containerImage() {
return Container(
padding: EdgeInsets.symmetric(vertical: Screenutil.length(12)),
padding: EdgeInsets.symmetric(vertical: 12.w),
child: Image.asset(
AssetsImage.LOCATION,
height: Screenutil.length(54),
width: Screenutil.length(54),
height: 54.w,
width: 54.w,
),
);
}
@ -34,27 +34,27 @@ class _ConfirmAddressState extends State<ConfirmAddress> {
Text(
'周玲慧',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
SizedBox(width: Screenutil.length(20)),
SizedBox(width: 20.w),
Text(
'18868945727',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
],
),
SizedBox(height: Screenutil.length(6)),
SizedBox(height: 6.w),
Text(
'浙江省 宁波市 江北区 工程学院阿库旅游f6',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
@ -65,11 +65,11 @@ class _ConfirmAddressState extends State<ConfirmAddress> {
Positioned _positionedIcon() {
return Positioned(
bottom: Screenutil.length(58),
bottom: 58.w,
right: 0,
child: Icon(
AntDesign.right,
size: Screenutil.size(34),
size: 34.sp,
color: Color(0xff999999),
),
);
@ -84,8 +84,8 @@ class _ConfirmAddressState extends State<ConfirmAddress> {
..putMap('commentMap', {'title': '我的地址', 'isActions': true}));
},
child: Container(
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
padding: EdgeInsets.symmetric(horizontal: Screenutil.length(18)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
padding: EdgeInsets.symmetric(horizontal: 18.w),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(8)),
@ -94,14 +94,14 @@ class _ConfirmAddressState extends State<ConfirmAddress> {
children: [
Padding(
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(18),
vertical: Screenutil.length(32),
horizontal: 18.w,
vertical: 32.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
_containerImage(),
SizedBox(width: Screenutil.length(18)),
SizedBox(width: 18.w),
_containerContent(),
],
),

@ -19,7 +19,7 @@ class ConfirmBottomBar extends StatelessWidget {
fontSize: BaseStyle.fontSize24,
),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
'合计:¥${(double.parse(cartMap["itemprice"]) * cartMap["count"]).toStringAsFixed(2)}',
style: TextStyle(
@ -43,8 +43,8 @@ class ConfirmBottomBar extends StatelessWidget {
borderRadius: BorderRadius.all(Radius.circular(33)),
),
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(39),
vertical: Screenutil.length(12),
horizontal: 39.w,
vertical: 12.w,
),
child: Text(
'提交订单',
@ -62,18 +62,18 @@ class ConfirmBottomBar extends StatelessWidget {
return Container(
color: Colors.white,
width: MediaQuery.of(context).size.width,
height: Screenutil.length(98),
height: 98.w,
padding: EdgeInsets.only(
top: Screenutil.length(15),
bottom: Screenutil.length(17),
right: Screenutil.length(34),
top: 15.w,
bottom: 17.w,
right: 34.w,
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.end,
children: [
_countPrice(),
SizedBox(width: Screenutil.length(12)),
SizedBox(width: 12.w),
_submit(context),
],
),

@ -16,28 +16,28 @@ class ConfirmContent extends StatelessWidget {
children: [
CachedImageWrapper(
url: cartMap["itempic"],
height: Screenutil.length(210),
width: Screenutil.length(210),
height: 210.w,
width: 210.w,
),
SizedBox(width: Screenutil.length(20)),
SizedBox(width: 20.w),
Column(
children: [
Container(
width: Screenutil.length(288),
width: 288.w,
child: Text(
cartMap["itemtitle"],
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff333333),
),
),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Container(
width: Screenutil.length(280),
padding: EdgeInsets.all(Screenutil.length(10)),
width: 280.w,
padding: EdgeInsets.all(10.w),
decoration: BoxDecoration(
color: Color(0xfff0f0f0),
borderRadius: BorderRadius.all(Radius.circular(2)),
@ -53,7 +53,7 @@ class ConfirmContent extends StatelessWidget {
overflow: TextOverflow.ellipsis,
maxLines: 2,
style: TextStyle(
fontSize: Screenutil.size(20),
fontSize: 20.sp,
color: Color(0xff666666),
),
),
@ -73,15 +73,15 @@ class ConfirmContent extends StatelessWidget {
Text(
'共计${cartMap["count"]}',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
'合计:¥${(double.parse(cartMap["itemprice"]) * cartMap["count"]).toStringAsFixed(2)}',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xffe60e0e),
),
)
@ -98,7 +98,7 @@ class ConfirmContent extends StatelessWidget {
child: Text(
'${cartMap["itemprice"]}',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xffe60e0e),
fontWeight: FontWeight.w600,
),
@ -110,12 +110,12 @@ class ConfirmContent extends StatelessWidget {
Widget _cartNum() {
return Positioned(
right: 0,
top: Screenutil.length(38),
top: 38.w,
child: Container(
child: Text(
'x${cartMap["count"]}',
style: TextStyle(
fontSize: Screenutil.size(20),
fontSize: 20.sp,
color: Color(0xff999999),
fontWeight: FontWeight.w600,
),
@ -131,10 +131,10 @@ class ConfirmContent extends StatelessWidget {
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(8)),
),
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(20),
vertical: Screenutil.length(32),
horizontal: 20.w,
vertical: 32.w,
),
child: Stack(
children: [
@ -144,15 +144,15 @@ class ConfirmContent extends StatelessWidget {
Container(
color: Colors.white,
padding: EdgeInsets.only(
left: Screenutil.length(30),
right: Screenutil.length(12),
left: 30.w,
right: 12.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(56),
top: 56.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
@ -160,14 +160,14 @@ class ConfirmContent extends StatelessWidget {
Text(
'配送方式',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333)),
),
SizedBox(width: Screenutil.length(26)),
SizedBox(width: 26.w),
Text(
'普通配送',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999)),
),
],
@ -175,7 +175,7 @@ class ConfirmContent extends StatelessWidget {
),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(56),
top: 56.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -183,7 +183,7 @@ class ConfirmContent extends StatelessWidget {
Text(
'开具发票',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333)),
),
InkWell(
@ -196,22 +196,22 @@ class ConfirmContent extends StatelessWidget {
child: Row(
children: [
Container(
height: Screenutil.length(80),
width: Screenutil.length(353),
height: 80.w,
width: 353.w,
child: Text(
'增值税电子普通发票-明显-企业-宁波阿库旅游有限公司',
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999),
),
),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Icon(
AntDesign.right,
size: Screenutil.size(30),
size: 30.sp,
color: Color(0xff999999),
),
],
@ -222,7 +222,7 @@ class ConfirmContent extends StatelessWidget {
),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(56),
top: 56.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
@ -230,14 +230,14 @@ class ConfirmContent extends StatelessWidget {
Text(
'订单备注',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333)),
),
SizedBox(width: Screenutil.length(14)),
SizedBox(width: 14.w),
Text(
'选填',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999)),
),
],
@ -246,7 +246,7 @@ class ConfirmContent extends StatelessWidget {
],
),
),
SizedBox(height: Screenutil.length(104)),
SizedBox(height: 104.w),
],
),
_cartFooter(),

@ -24,14 +24,14 @@ class _ConvenientPhonePageState extends State<ConvenientPhonePage> {
},
child: Container(
margin: EdgeInsets.only(
left: Screenutil.length(32),
right: Screenutil.length(32),
top: Screenutil.length(12),
bottom: Screenutil.length(20),
left: 32.w,
right: 32.w,
top: 12.w,
bottom: 20.w,
),
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(32),
vertical: Screenutil.length(16),
horizontal: 32.w,
vertical: 16.w,
),
decoration: BoxDecoration(
color: Color(0xfff9f9f9),
@ -54,7 +54,7 @@ class _ConvenientPhonePageState extends State<ConvenientPhonePage> {
List<Widget> _silverBuilder(BuildContext context, bool innerBoxIsScrolled) {
double statusBarHeight = MediaQuery.of(context).padding.top;
double _swiperHeight = Screenutil.length(122);
double _swiperHeight = 122.w;
double _spikeHeight = 25;
double _appBarHeight = _swiperHeight - _spikeHeight - statusBarHeight;
return <Widget>[
@ -63,7 +63,7 @@ class _ConvenientPhonePageState extends State<ConvenientPhonePage> {
automaticallyImplyLeading: false,
bottom: PreferredSize(
child: Container(),
preferredSize: Size.fromHeight(Screenutil.length(_appBarHeight))),
preferredSize: Size.fromHeight((_appBarHeight).h)),
flexibleSpace: Column(
children: <Widget>[
_containerSearch(),
@ -78,11 +78,11 @@ class _ConvenientPhonePageState extends State<ConvenientPhonePage> {
child: Container(
color: Colors.white,
alignment: Alignment.centerLeft,
padding: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
padding: EdgeInsets.symmetric(horizontal: 32.w),
child: Text(
'小区服务电话',
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
),
),
)),

@ -50,7 +50,7 @@ class _PhoneListState extends State<PhoneList> {
title: Text(
url,
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff030303),
),
),
@ -59,7 +59,7 @@ class _PhoneListState extends State<PhoneList> {
child: Text(
'取消',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff333333),
),
),
@ -72,7 +72,7 @@ class _PhoneListState extends State<PhoneList> {
'呼叫',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xffff8200),
),
),
@ -89,10 +89,10 @@ class _PhoneListState extends State<PhoneList> {
Widget _phoneCard(String name, String phone) {
return Container(
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(20),
top: 23.w,
bottom: 20.w,
),
decoration: BoxDecoration(
color: Color(0xffffffff),
@ -108,15 +108,15 @@ class _PhoneListState extends State<PhoneList> {
Text(
name,
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
SizedBox(height: Screenutil.length(12)),
SizedBox(height: 12.w),
Text(
phone,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999),
),
),
@ -128,8 +128,8 @@ class _PhoneListState extends State<PhoneList> {
},
child: Image.asset(
AssetsImage.PHONE,
height: Screenutil.length(60),
width: Screenutil.length(60),
height: 60.w,
width: 60.w,
),
),
],

@ -53,11 +53,11 @@ class _FitupManagePageState extends State<FitupManagePage>
fontSize: BaseStyle.fontSize28,
),
labelPadding:
EdgeInsets.symmetric(horizontal: Screenutil.length(131.5)),
EdgeInsets.symmetric(horizontal: (131.5).w),
indicatorColor: Color(0xffffc40c),
indicatorSize: TabBarIndicatorSize.label,
indicatorPadding:
EdgeInsets.symmetric(horizontal: Screenutil.length(21)),
EdgeInsets.symmetric(horizontal: 21.w),
isScrollable: true,
controller: _controller,
tabs: List.generate(

@ -47,16 +47,16 @@ class _CommonSelectState extends State<CommonSelect> {
title: Text(
"证件类型",
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
confirmTextStyle: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xffffc40c),
),
cancelTextStyle: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
onConfirm: (Picker picker, List value) {
@ -84,7 +84,7 @@ class _CommonSelectState extends State<CommonSelect> {
Icon(
AntDesign.right,
color: BaseStyle.color999999,
size: Screenutil.length(32),
size: 32.w,
),
],
),

@ -39,8 +39,8 @@ class _DecoratorInfoState extends State<DecoratorInfo> {
Widget _cardList(String title, Widget widget) {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
decoration: BoxDecoration(
border: Border(
@ -52,9 +52,9 @@ class _DecoratorInfoState extends State<DecoratorInfo> {
Text(
title,
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
widget
],
),
@ -64,8 +64,8 @@ class _DecoratorInfoState extends State<DecoratorInfo> {
Widget _upLoadImage() {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
decoration: BoxDecoration(
border: Border(
@ -77,9 +77,9 @@ class _DecoratorInfoState extends State<DecoratorInfo> {
Text(
'上传证件照片',
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(

@ -49,7 +49,7 @@ class _DirectorManageState extends State<DirectorManage>
Widget _doorIdCard() {
return Container(
width: Screenutil.length(686),
width: 686.w,
child: RichText(
text: TextSpan(children: <InlineSpan>[
TextSpan(
@ -76,8 +76,8 @@ class _DirectorManageState extends State<DirectorManage>
Widget _cardList(String title, Widget widget) {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
decoration: BoxDecoration(
border: Border(
@ -89,9 +89,9 @@ class _DirectorManageState extends State<DirectorManage>
Text(
title,
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
widget
],
),
@ -101,8 +101,8 @@ class _DirectorManageState extends State<DirectorManage>
Widget _upLoadImage() {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
decoration: BoxDecoration(
border: Border(
@ -114,9 +114,9 @@ class _DirectorManageState extends State<DirectorManage>
Text(
'上传凭证',
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(
@ -127,7 +127,7 @@ class _DirectorManageState extends State<DirectorManage>
),
),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(
@ -140,7 +140,7 @@ class _DirectorManageState extends State<DirectorManage>
),
),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(
@ -162,16 +162,16 @@ class _DirectorManageState extends State<DirectorManage>
return InkWell(
child: Center(
child: Container(
margin: EdgeInsets.only(bottom: Screenutil.length(64)),
margin: EdgeInsets.only(bottom: 64.w),
decoration: BoxDecoration(
color: BaseStyle.colorffc40c,
borderRadius: BorderRadius.all(Radius.circular(36)),
),
width: Screenutil.length(426),
height: Screenutil.length(82),
width: 426.w,
height: 82.w,
padding: EdgeInsets.only(
top: Screenutil.length(19),
bottom: Screenutil.length(18),
top: 19.w,
bottom: 18.w,
),
alignment: Alignment.center,
child: Text(
@ -201,9 +201,9 @@ class _DirectorManageState extends State<DirectorManage>
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -223,7 +223,7 @@ class _DirectorManageState extends State<DirectorManage>
hintText: '请输入公司名称')),
_cardList('门禁卡数量', _doorIdCard()),
_upLoadImage(),
SizedBox(height: Screenutil.length(78)),
SizedBox(height: 78.w),
Text(
'装修人员',
style: TextStyle(
@ -242,10 +242,10 @@ class _DirectorManageState extends State<DirectorManage>
});
},
child: Container(
margin: EdgeInsets.only(top: Screenutil.length(54)),
margin: EdgeInsets.only(top: 54.w),
padding: EdgeInsets.only(
top: Screenutil.length(16),
bottom: Screenutil.length(16),
top: 16.w,
bottom: 16.w,
),
alignment: Alignment.center,
child: Text(

@ -17,7 +17,7 @@ class _HouseInfoState extends State<HouseInfo> {
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.only(
bottom: Screenutil.length(32),
bottom: 32.w,
),
decoration: BoxDecoration(
border: Border(
@ -29,10 +29,10 @@ class _HouseInfoState extends State<HouseInfo> {
children: [
Image.asset(
AssetsImage.HOUSEATTESTATION,
height: Screenutil.length(48),
width: Screenutil.length(48),
height: 48.w,
width: 48.w,
),
SizedBox(width: Screenutil.length(20)),
SizedBox(width: 20.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -43,7 +43,7 @@ class _HouseInfoState extends State<HouseInfo> {
color: BaseStyle.color474747,
),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
widget.subtitle,
style: TextStyle(

@ -78,11 +78,11 @@ class _OwnerManageState extends State<OwnerManage>
.keys
.map((index) => Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
margin: EdgeInsets.only(
bottom: Screenutil.length(index == 2 ? 117 : 0)),
bottom:(index == 2 ? 117 : 0).w),
decoration: BoxDecoration(
border: Border(
bottom:
@ -97,7 +97,7 @@ class _OwnerManageState extends State<OwnerManage>
fontSize: BaseStyle.fontSize28,
color: BaseStyle.color333333),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
_listWidget[index]['widget'],
],
),
@ -120,9 +120,9 @@ class _OwnerManageState extends State<OwnerManage>
},
child: Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
@ -138,7 +138,7 @@ class _OwnerManageState extends State<OwnerManage>
Column(
children: _listView(),
),
SizedBox(height: Screenutil.length(89)),
SizedBox(height: 89.w),
],
),
),

@ -20,7 +20,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
'widget': Icon(
AntDesign.alipay_circle,
color: Color(0xff06b4fd),
size: Screenutil.length(50),
size: 50.w,
),
'id': 'alipay',
'isCheck': true
@ -29,8 +29,8 @@ class _PayModelSheetState extends State<PayModelSheet> {
'title': '微信支付',
'widget': Image.asset(
AssetsImage.WXPAY,
height: Screenutil.length(60),
width: Screenutil.length(60),
height: 60.w,
width: 60.w,
),
'id': 'wxpay',
'isCheck': false
@ -53,9 +53,9 @@ class _PayModelSheetState extends State<PayModelSheet> {
builder: (context) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(20),
left: Screenutil.length(20),
right: Screenutil.length(20),
top: 20.w,
left: 20.w,
right: 20.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -73,7 +73,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
IconButton(
icon: Icon(
AntDesign.left,
size: Screenutil.size(40),
size: 40.sp,
color: BaseStyle.color999999,
),
onPressed: () {
@ -81,7 +81,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
},
),
Container(
padding: EdgeInsets.only(left: Screenutil.length(190)),
padding: EdgeInsets.only(left: 190.w),
child: Text(
'选择付款方式',
style: TextStyle(
@ -123,18 +123,18 @@ class _PayModelSheetState extends State<PayModelSheet> {
},
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(10),
top: 10.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
logo,
SizedBox(width: Screenutil.length(24)),
SizedBox(width: 24.w),
Expanded(
child: Container(
padding: EdgeInsets.only(
bottom: Screenutil.length(27),
top: Screenutil.length(28),
bottom: 27.w,
top: 28.w,
),
decoration: BoxDecoration(
border: Border(
@ -154,7 +154,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
? Icon(
AntDesign.check,
color: BaseStyle.colorffc40c,
size: Screenutil.length(50),
size: 50.w,
)
: SizedBox(),
],
@ -172,8 +172,8 @@ class _PayModelSheetState extends State<PayModelSheet> {
onTap: _showModelBotoomSheet,
child: Container(
padding: EdgeInsets.only(
bottom: Screenutil.length(27),
top: Screenutil.length(28),
bottom: 27.w,
top: 28.w,
),
decoration: BoxDecoration(
border: Border(
@ -185,7 +185,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
Row(
children: [
_listPay[_currentindex]['widget'],
SizedBox(width: Screenutil.length(24)),
SizedBox(width: 24.w),
Text(
_listPay[_currentindex]['title'],
style: TextStyle(
@ -197,7 +197,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
Icon(
AntDesign.right,
color: BaseStyle.color999999,
size: Screenutil.length(32),
size: 32.w,
),
],
),
@ -212,9 +212,9 @@ class _PayModelSheetState extends State<PayModelSheet> {
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(36),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 36.w,
left: 32.w,
right: 32.w,
),
child: Column(
children: [
@ -225,7 +225,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
bottom: BorderSide(
color: BaseStyle.coloreeeeee, width: 0.5)),
),
padding: EdgeInsets.only(bottom: Screenutil.length(20)),
padding: EdgeInsets.only(bottom: 20.w),
child: Text(
'付款详情',
style: TextStyle(
@ -237,8 +237,8 @@ class _PayModelSheetState extends State<PayModelSheet> {
),
Container(
padding: EdgeInsets.only(
bottom: Screenutil.length(80),
top: Screenutil.length(89),
bottom: 80.w,
top: 89.w,
),
decoration: BoxDecoration(
border: Border(
@ -258,7 +258,7 @@ class _PayModelSheetState extends State<PayModelSheet> {
fontWeight: FontWeight.w600,
),
),
SizedBox(height: Screenutil.length(20)),
SizedBox(height: 20.w),
Text(
'注释:装修押金${5000}元,垃圾清理费${300}',
style: TextStyle(

@ -42,7 +42,7 @@ class _GoodsDetailsPageState extends State<GoodsDetailsPage> {
body: Stack(
children: [
ListView(
padding: EdgeInsets.only(bottom: Screenutil.length(100)),
padding: EdgeInsets.only(bottom: 100.w),
children: [
ProductSwiper(imageUrl: params),
ProductContent(

@ -108,16 +108,16 @@ class _ViewCommentsPageState extends State<ViewCommentsPage> {
return Container(
color: Colors.white,
padding: EdgeInsets.only(
top: Screenutil.length(29),
left: Screenutil.length(32),
bottom: Screenutil.length(40),
top: 29.w,
left: 32.w,
bottom: 40.w,
),
width: MediaQuery.of(context).size.width,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(25)),
margin: EdgeInsets.only(bottom: 25.w),
child: Text(
'按分类评价',
style: TextStyle(
@ -127,8 +127,8 @@ class _ViewCommentsPageState extends State<ViewCommentsPage> {
),
),
Wrap(
spacing: Screenutil.length(10),
runSpacing: Screenutil.length(20),
spacing: 10.w,
runSpacing: 20.w,
children: _commentsClassList
.map((item) => InkWell(
onTap: () {
@ -143,10 +143,10 @@ class _ViewCommentsPageState extends State<ViewCommentsPage> {
borderRadius: BorderRadius.all(Radius.circular(24)),
child: Container(
padding: EdgeInsets.only(
left: Screenutil.length(24),
right: Screenutil.length(23),
top: Screenutil.length(9),
bottom: Screenutil.length(10),
left: 24.w,
right: 23.w,
top: 9.w,
bottom: 10.w,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(24)),
@ -198,7 +198,7 @@ class _ViewCommentsPageState extends State<ViewCommentsPage> {
onLoading: _onLoading,
enablePullUp: true,
child: ListView.builder(
padding: EdgeInsets.only(top: Screenutil.length(30)),
padding: EdgeInsets.only(top: 30.w),
itemBuilder: (BuildContext context, int index) => Container(
color: Colors.white,
child: GoodsCommentsCard(

@ -24,15 +24,15 @@ class _GoodsAppBarState extends State<GoodsAppBar> {
backgroundColor: Color(0xffffffff),
titleSpacing: 0,
leading: IconButton(
icon: Icon(AntDesign.left, size: Screenutil.size(40)),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
},
),
title: Container(
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(40),
vertical: Screenutil.length(15),
horizontal: 40.w,
vertical: 15.w,
),
decoration: BoxDecoration(
color: Color(0xfff3f3f3),
@ -66,7 +66,7 @@ class _GoodsAppBarState extends State<GoodsAppBar> {
IconButton(
icon: Icon(
SimpleLineIcons.share,
size: Screenutil.size(40),
size: 40.sp,
color: Color(0xff666666),
),
onPressed: () {
@ -81,7 +81,7 @@ class _GoodsAppBarState extends State<GoodsAppBar> {
IconButton(
icon: Icon(
AntDesign.shoppingcart,
size: Screenutil.size(40),
size: 40.sp,
color: Color(0xff666666),
),
onPressed: () {

@ -41,12 +41,12 @@ class _GoodsCommentsCardState extends State<GoodsCommentsCard> {
child: Row(
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(12)),
margin: EdgeInsets.only(right: 12.w),
child: ClipOval(
child: CachedImageWrapper(
url: imagePath,
width: Screenutil.length(50),
height: Screenutil.length(50),
width: 50.w,
height: 50.w,
),
),
),
@ -60,7 +60,7 @@ class _GoodsCommentsCardState extends State<GoodsCommentsCard> {
color: BaseStyle.color333333,
),
),
SizedBox(height: Screenutil.length(4)),
SizedBox(height: 4.w),
Text(
subtitle,
style: TextStyle(
@ -80,13 +80,13 @@ class _GoodsCommentsCardState extends State<GoodsCommentsCard> {
List<String> contentImageList,
) {
return Container(
margin: EdgeInsets.only(top: Screenutil.length(15)),
padding: EdgeInsets.only(bottom: Screenutil.length(20)),
margin: EdgeInsets.only(top: 15.w),
padding: EdgeInsets.only(bottom: 20.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(20)),
margin: EdgeInsets.only(bottom: 20.w),
child: ExpandableText(
text: content,
maxLines: 3,
@ -124,7 +124,7 @@ class _GoodsCommentsCardState extends State<GoodsCommentsCard> {
size: BaseStyle.fontSize22,
color: BaseStyle.color333333,
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
'有用',
style: TextStyle(
@ -144,11 +144,11 @@ class _GoodsCommentsCardState extends State<GoodsCommentsCard> {
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(bottom: Screenutil.length(32)),
padding: EdgeInsets.only(bottom: 32.w),
decoration: BoxDecoration(
border:
Border(bottom: BorderSide(color: Color(0xffd8d8d8), width: 0.5)),

@ -12,12 +12,12 @@ class ProductDetail extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
color: Color(0xffffffff),
margin: EdgeInsets.only(top: Screenutil.length(30)),
margin: EdgeInsets.only(top: 30.w),
padding: EdgeInsets.only(
top: Screenutil.length(20),
left: Screenutil.length(32),
right: Screenutil.length(32),
bottom: Screenutil.length(32),
top: 20.w,
left: 32.w,
right: 32.w,
bottom: 32.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -29,7 +29,7 @@ class ProductDetail extends StatelessWidget {
color: Color(0xff333333),
),
),
SizedBox(height: Screenutil.length(12)),
SizedBox(height: 12.w),
Container(
child: AspectRatio(
aspectRatio: 1,

@ -18,13 +18,13 @@ class DetoCodePage extends StatelessWidget {
Text(
'宁波华茂悦峰',
style: TextStyle(
fontSize: Screenutil.size(40), color: Color(0xffffffff)),
fontSize: 40.sp, color: Color(0xffffffff)),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
'1幢-1单元-702室',
style: TextStyle(
fontSize: Screenutil.size(26), color: Color(0xffffffff)),
fontSize: 26.sp, color: Color(0xffffffff)),
),
],
),
@ -35,7 +35,7 @@ class DetoCodePage extends StatelessWidget {
return Container(
decoration: BoxDecoration(
color: Color(0xffffffff),
borderRadius: BorderRadius.all(Radius.circular(Screenutil.length(16))),
borderRadius: BorderRadius.all(Radius.circular(16.w)),
boxShadow: <BoxShadow>[
BoxShadow(
color: Colors.grey.withOpacity(0.2),
@ -44,14 +44,14 @@ class DetoCodePage extends StatelessWidget {
],
),
margin: EdgeInsets.symmetric(
horizontal: Screenutil.length(75),
vertical: Screenutil.length(32),
horizontal: 75.w,
vertical: 32.w,
),
padding: EdgeInsets.only(
bottom: Screenutil.length(16),
left: Screenutil.length(32),
right: Screenutil.length(21),
top: Screenutil.length(25),
bottom: 16.w,
left: 32.w,
right: 21.w,
top: 25.w,
),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
@ -64,39 +64,39 @@ class DetoCodePage extends StatelessWidget {
children: [
Icon(
AntDesign.contacts,
size: Screenutil.size(40),
size: 40.sp,
color: Color(0xff999999),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
'马成泽先生',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(36),
fontSize: 36.sp,
color: Color(0xff333333)),
),
],
),
],
),
SizedBox(height: Screenutil.length(13)),
SizedBox(height: 13.w),
Text(
'有限时间2020年6月30日',
style: TextStyle(
fontSize: Screenutil.size(26),
fontSize: 26.sp,
color: Color(0xff999999),
),
),
SizedBox(height: Screenutil.length(23)),
SizedBox(height: 23.w),
DottedLine(color: Color(0xfff5f5f5)),
Container(
padding: EdgeInsets.only(
top: Screenutil.length(30),
bottom: Screenutil.length(38),
top: 30.w,
bottom: 38.w,
),
height: Screenutil.length(389),
height: 389.w,
alignment: Alignment.center,
child: Column(
children: [
@ -104,27 +104,27 @@ class DetoCodePage extends StatelessWidget {
'020-598-230',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(36),
fontSize: 36.sp,
color: Color(0xff333333),
),
),
SizedBox(height: Screenutil.length(11)),
SizedBox(height: 11.w),
QrImage(
padding: EdgeInsets.zero,
data: '智慧社区开门码',
size: Screenutil.length(260),
size: 260.w,
),
],
),
),
DottedLine(color: Color(0xfff5f5f5)),
SizedBox(height: Screenutil.length(16)),
SizedBox(height: 16.w),
Container(
alignment: Alignment.center,
child: Text(
'出户时,请出示此证给门岗',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
@ -149,9 +149,9 @@ class DetoCodePage extends StatelessWidget {
children: [
Column(
children: [
SizedBox(height: Screenutil.length(192) - kToolbarHeight),
SizedBox(height: 192.w - kToolbarHeight),
_header(),
SizedBox(height: Screenutil.length(32)),
SizedBox(height: 32.w),
_card(),
],
),

@ -32,8 +32,8 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
Widget _houseAddress(String title, subtitle) {
return Container(
padding: EdgeInsets.only(bottom: Screenutil.length(24)),
margin: EdgeInsets.only(bottom: Screenutil.length(40)),
padding: EdgeInsets.only(bottom: 24.w),
margin: EdgeInsets.only(bottom: 40.w),
decoration: BoxDecoration(
border:
Border(bottom: BorderSide(color: Color(0xffeeeeee), width: 0.5)),
@ -42,11 +42,11 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(32)),
margin: EdgeInsets.only(bottom: 32.w),
child: Text(
'出户房屋',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -56,11 +56,11 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(42)),
margin: EdgeInsets.only(right: 42.w),
child: Image.asset(
AssetsImage.HOUSEATTESTATION,
height: Screenutil.length(59),
width: Screenutil.length(59),
height: 59.w,
width: 59.w,
),
),
Column(
@ -70,16 +70,16 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
title,
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
subtitle,
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
)
@ -95,7 +95,7 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
Widget _inkWellCheckbox() {
return InkWell(
child: Container(
padding: EdgeInsets.only(bottom: Screenutil.length(24)),
padding: EdgeInsets.only(bottom: 24.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
@ -112,7 +112,7 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
child: Text(
'是否需要物业提供搬家公司联系方式',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -125,8 +125,8 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
Widget _checkCard(String title, List<Map<String, dynamic>> list) {
return Container(
height: Screenutil.length(96),
padding: EdgeInsets.symmetric(vertical: Screenutil.length(28)),
height: 96.w,
padding: EdgeInsets.symmetric(vertical: 28.w),
decoration: BoxDecoration(
border:
Border(bottom: BorderSide(color: Color(0xffeeeeee), width: 0.5)),
@ -134,11 +134,11 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
child: Row(
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(30)),
margin: EdgeInsets.only(right: 30.w),
child: Text(
title,
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
),
CommonRadio(
@ -172,9 +172,9 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
children: [
Container(
padding: EdgeInsets.only(
left: Screenutil.length(32),
right: Screenutil.length(32),
top: Screenutil.length(32),
left: 32.w,
right: 32.w,
top: 32.w,
),
child: ListView(
children: [
@ -186,12 +186,12 @@ class _DetoCreatePageState extends State<DetoCreatePage> {
_inkWellCheckbox(),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(54),
bottom: Screenutil.length(24)),
top: 54.w,
bottom: 24.w),
child: Text(
'添加图片信息(0/9)',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),

@ -18,8 +18,8 @@ class _CommonPickerState extends State<CommonPicker> {
@override
Widget build(BuildContext context) {
return Container(
height: Screenutil.length(96),
padding: EdgeInsets.symmetric(vertical: Screenutil.length(28)),
height: 96.w,
padding: EdgeInsets.symmetric(vertical: 28.w),
decoration: BoxDecoration(
border:
Border(bottom: BorderSide(color: Color(0xffeeeeee), width: 0.5)),
@ -27,11 +27,11 @@ class _CommonPickerState extends State<CommonPicker> {
child: Row(
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(30)),
margin: EdgeInsets.only(right: 30.w),
child: Text(
widget.title,
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
),
InkWell(
@ -62,16 +62,16 @@ class _CommonPickerState extends State<CommonPicker> {
title: Text(
"物品名称",
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
confirmTextStyle: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xffffc40c),
),
cancelTextStyle: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
onConfirm: (Picker picker, List value) {
@ -85,21 +85,21 @@ class _CommonPickerState extends State<CommonPicker> {
}
},
child: Container(
width: Screenutil.length(538),
height: Screenutil.length(40),
width: 538.w,
height: 40.w,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
pickerData,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999)),
),
Icon(
AntDesign.right,
color: Color(0xff999999),
size: Screenutil.size(32),
size: 32.sp,
),
],
),

@ -19,17 +19,17 @@ class _CommonRadioState extends State<CommonRadio> {
fun(index);
},
child: Container(
margin: EdgeInsets.only(left: Screenutil.length(20)),
margin: EdgeInsets.only(left: 20.w),
child: Row(
children: [
Icon(
isCheck
? Icons.radio_button_checked
: Icons.radio_button_unchecked,
size: Screenutil.length(32),
size: 32.w,
color: isCheck ? BaseStyle.colorffc40c : BaseStyle.color979797,
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
title,
style: TextStyle(

@ -105,7 +105,7 @@ class _GoodsDetoPageState extends State<GoodsDetoPage> {
body: Stack(
children: [
Padding(
padding: EdgeInsets.only(bottom: Screenutil.length(98)),
padding: EdgeInsets.only(bottom: 98.w),
child: RefreshConfiguration(
hideFooterWhenNotFull: true,
child: SmartRefresher(

@ -14,9 +14,9 @@ class GoodsInfoCard extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
decoration: BoxDecoration(
color: Colors.white,
@ -39,13 +39,13 @@ class GoodsInfoCard extends StatelessWidget {
],
),
padding: EdgeInsets.only(
top: Screenutil.length(25),
left: Screenutil.length(24),
right: Screenutil.length(24)),
top: 25.w,
left: 24.w,
right: 24.w),
child: Column(
children: [
Container(
padding: EdgeInsets.only(bottom: Screenutil.length(24)),
padding: EdgeInsets.only(bottom: 24.w),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
@ -58,14 +58,14 @@ class GoodsInfoCard extends StatelessWidget {
'出户信息',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333)),
),
Text(
status,
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333))
),
],
@ -73,8 +73,8 @@ class GoodsInfoCard extends StatelessWidget {
),
Container(
padding: EdgeInsets.only(
bottom: Screenutil.length(33),
top: Screenutil.length(16),
bottom: 33.w,
top: 16.w,
),
decoration: BoxDecoration(
border: Border(
@ -85,20 +85,20 @@ class GoodsInfoCard extends StatelessWidget {
children: detoInfoList
.map(
(item) => Container(
padding: EdgeInsets.only(top: Screenutil.length(8)),
padding: EdgeInsets.only(top: 8.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
item['title'],
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999)),
),
Text(
item['content'],
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333)),
),
],
@ -110,18 +110,18 @@ class GoodsInfoCard extends StatelessWidget {
),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(19),
bottom: Screenutil.length(30),
top: 19.w,
bottom: 30.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(25)),
margin: EdgeInsets.only(bottom: 25.w),
child: Text(
'图片信息',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333)),
),
),

@ -28,7 +28,7 @@ class GoodsInfoCardButton extends StatelessWidget {
title: Text(
url,
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff030303),
),
),
@ -37,7 +37,7 @@ class GoodsInfoCardButton extends StatelessWidget {
child: Text(
'取消',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff333333),
),
),
@ -50,7 +50,7 @@ class GoodsInfoCardButton extends StatelessWidget {
'呼叫',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xffff8200),
),
),
@ -75,7 +75,7 @@ class GoodsInfoCardButton extends StatelessWidget {
bottomRight: Radius.circular(6),
),
),
height: Screenutil.length(96),
height: 96.w,
child: Row(
children: _listButton
.asMap()
@ -97,7 +97,7 @@ class GoodsInfoCardButton extends StatelessWidget {
child: Container(
alignment: Alignment.center,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(26.5),
vertical: 26.5.w,
),
decoration: BoxDecoration(
border: Border(
@ -112,17 +112,17 @@ class GoodsInfoCardButton extends StatelessWidget {
children: [
Icon(
_listButton[index]['icon'],
size: Screenutil.size(36),
size: 36.sp,
color: Color(0xff333333),
),
Container(
margin:
EdgeInsets.only(left: Screenutil.length(14)),
EdgeInsets.only(left: 14.w),
child: Text(
_listButton[index]['title'],
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),

@ -26,7 +26,7 @@ class ImageHorizontalList extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
height: Screenutil.length(184),
height: 184.w,
child: ListView.builder(
shrinkWrap: true,
scrollDirection: Axis.horizontal,
@ -34,7 +34,7 @@ class ImageHorizontalList extends StatelessWidget {
return AspectRatio(
aspectRatio: 1,
child: Container(
margin: EdgeInsets.only(right: Screenutil.length(16)),
margin: EdgeInsets.only(right: 16.w),
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(4)),
child: GalleryExampleItemThumbnail(

@ -60,15 +60,15 @@ class _GoodsManagePageState extends State<GoodsManagePage> {
Container _goodsCard(String imagePath, title, int goodsNum) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(20),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 20.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
top: Screenutil.length(12),
left: Screenutil.length(10),
right: Screenutil.length(10),
bottom: Screenutil.length(17),
top: 12.w,
left: 10.w,
right: 10.w,
bottom: 17.w,
),
decoration: BoxDecoration(
color: Colors.white,
@ -79,12 +79,12 @@ class _GoodsManagePageState extends State<GoodsManagePage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(20)),
margin: EdgeInsets.only(right: 20.w),
child: ClipRRect(
child: CachedImageWrapper(
url: imagePath,
width: Screenutil.length(160),
height: Screenutil.length(120),
width: 160.w,
height: 120.w,
),
),
),
@ -95,15 +95,15 @@ class _GoodsManagePageState extends State<GoodsManagePage> {
Text(
'物品名称:${title}',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff4a4b51),
),
),
SizedBox(height: Screenutil.length(20)),
SizedBox(height: 20.w),
Text(
'数量剩余:${goodsNum}',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),

@ -88,17 +88,17 @@ class _MineGoodsPageState extends State<MineGoodsPage> {
return InkWell(
onTap: () {},
child: Container(
width: Screenutil.length(120),
height: Screenutil.length(44),
width: 120.w,
height: 44.w,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: Screenutil.length(7)),
padding: EdgeInsets.symmetric(vertical: 7.w),
decoration: BoxDecoration(
color: Color(0xff2a2a2a),
borderRadius: BorderRadius.all(Radius.circular(20)),
),
child: Text(
'报损',
style: TextStyle(fontSize: Screenutil.size(22), color: Colors.white),
style: TextStyle(fontSize: 22.sp, color: Colors.white),
),
),
);
@ -108,14 +108,14 @@ class _MineGoodsPageState extends State<MineGoodsPage> {
String title, borrowTime, timeLength, status, int goodsNum) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(20),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 20.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
top: Screenutil.length(30),
left: Screenutil.length(38),
right: Screenutil.length(34),
top: 30.w,
left: 38.w,
right: 34.w,
),
decoration: BoxDecoration(
color: Colors.white,
@ -133,49 +133,49 @@ class _MineGoodsPageState extends State<MineGoodsPage> {
Text(
'物品名称:${title}',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff4a4b51),
),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(16)),
margin: EdgeInsets.only(top: 16.w),
child: Text(
'借还数量:${goodsNum}',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff333333),
),
),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(16)),
margin: EdgeInsets.only(top: 16.w),
child: Text(
'借用时间: ${borrowTime}',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(16)),
margin: EdgeInsets.only(top: 16.w),
child: Text(
'借用时长: ${timeLength}',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(16)),
margin: EdgeInsets.only(top: 16.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'借用状态: ${status}',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
@ -183,15 +183,15 @@ class _MineGoodsPageState extends State<MineGoodsPage> {
],
),
),
SizedBox(height: Screenutil.length(12)),
SizedBox(height: 12.w),
Divider(color: Color(0xfff9f9f9)),
status == '未还'
? Container(
margin: EdgeInsets.only(bottom: Screenutil.length(9)),
margin: EdgeInsets.only(bottom: 9.w),
child: Text(
'温馨提示:您的物品已借用${timeLength}天,如果用完,请及时归还',
style: TextStyle(
fontSize: Screenutil.size(22),
fontSize: 22.sp,
color: Color(0xff999999),
),
),

@ -98,7 +98,7 @@ class _HomePageState extends State<HomePage>
children: [
HomeSearch(),
HomeSwiper(),
SizedBox(height: Screenutil.length(100)),
SizedBox(height: 100.w),
ContainerComment(
radius: 8,
customWidget: GridButton(
@ -136,7 +136,7 @@ class _HomePageState extends State<HomePage>
),
],
),
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
Column(
children: [
HomeTagBar(
@ -162,7 +162,7 @@ class _HomePageState extends State<HomePage>
),
],
),
SizedBox(height: Screenutil.length(30)),
SizedBox(height: 30.w),
HomeTagBar(
title: '社区商城',
tag: '团购',
@ -174,9 +174,9 @@ class _HomePageState extends State<HomePage>
),
SliverPadding(
padding: EdgeInsets.only(
top: Screenutil.length(30),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 30.w,
left: 32.w,
right: 32.w,
),
sliver: _shopList.length == 0
? SliverToBoxAdapter(child: GoodsCardSkeleton())

@ -42,14 +42,14 @@ class _HomeAppBarState extends State<HomeAppBar> {
'皇冠花园二期',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(36),
fontSize: 36.sp,
color: Color(0xff333333),
),
),
centerTitle: true,
backgroundColor: Colors.transparent,
leading: Container(
margin: EdgeInsets.only(left: Screenutil.length(32)),
margin: EdgeInsets.only(left: 32.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
@ -58,14 +58,14 @@ class _HomeAppBarState extends State<HomeAppBar> {
'深圳',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff333333),
),
),
Text(
'阴 27℃',
style: TextStyle(
fontSize: Screenutil.size(20),
fontSize: 20.sp,
color: Color(0xff333333),
),
)

@ -35,35 +35,35 @@ class _HomeCardState extends State<HomeCard> {
Widget _countDown() {
return Container(
width: Screenutil.length(638),
width: 638.w,
color: Color(0xff333333).withOpacity(0.8),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
padding: EdgeInsets.only(
left: Screenutil.length(24),
top: Screenutil.length(11),
bottom: Screenutil.length(12),
left: 24.w,
top: 11.w,
bottom: 12.w,
),
child: Text(
'剩余时间:09天13时46分',
style: TextStyle(
fontWeight: FontWeight.w600,
color: Color(0xffffffff),
fontSize: Screenutil.size(24)),
fontSize: 24.sp),
),
),
Container(
padding: EdgeInsets.only(
right: Screenutil.length(24),
top: Screenutil.length(7),
bottom: Screenutil.length(7),
right: 24.w,
top: 7.w,
bottom: 7.w,
),
child: Text(
'¥99.9',
style: TextStyle(
color: Color(0xffff8200), fontSize: Screenutil.size(36)),
color: Color(0xffff8200), fontSize: 36.sp),
),
),
],
@ -109,21 +109,21 @@ class _HomeCardState extends State<HomeCard> {
}
},
child: Container(
height: Screenutil.length(44),
width: Screenutil.length(120),
height: 44.w,
width: 120.w,
alignment: Alignment.center,
decoration: BoxDecoration(
color: Color(0xffffc40c),
borderRadius:
BorderRadius.all(Radius.circular(Screenutil.length(22))),
BorderRadius.all(Radius.circular(22.w)),
),
padding: EdgeInsets.symmetric(vertical: Screenutil.length(8)),
padding: EdgeInsets.symmetric(vertical: 8.w),
child: Text(
buttonName,
style: TextStyle(
fontWeight: FontWeight.w600,
color: Color(0xff4a4b51),
fontSize: Screenutil.size(20)),
fontSize: 20.sp),
),
),
);
@ -134,21 +134,21 @@ class _HomeCardState extends State<HomeCard> {
return Container(
color: Colors.white,
margin: EdgeInsets.symmetric(
horizontal: Screenutil.length(32),
horizontal: 32.w,
),
padding: EdgeInsets.only(
left: Screenutil.length(24),
right: Screenutil.length(24),
bottom: Screenutil.length(40),
left: 24.w,
right: 24.w,
bottom: 40.w,
),
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(Screenutil.length(8))),
borderRadius: BorderRadius.all(Radius.circular(8.w)),
border:
Border.all(color: Color(0xffe8e8e8), width: Screenutil.length(2)),
Border.all(color: Color(0xffe8e8e8), width: 2.w),
),
padding: EdgeInsets.only(bottom: Screenutil.length(24)),
padding: EdgeInsets.only(bottom: 24.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -157,13 +157,13 @@ class _HomeCardState extends State<HomeCard> {
Container(
child: ClipRRect(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(Screenutil.length(8)),
topRight: Radius.circular(Screenutil.length(8)),
topLeft: Radius.circular(8.w),
topRight: Radius.circular(8.w),
),
child: CachedImageWrapper(
url: widget.imagePath,
width: Screenutil.length(638),
height: Screenutil.length(210),
width: 638.w,
height: 210.w,
),
),
),
@ -171,22 +171,22 @@ class _HomeCardState extends State<HomeCard> {
),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(16),
left: Screenutil.length(24),
top: 16.w,
left: 24.w,
),
child: Text(
widget.title,
style: TextStyle(
fontWeight: FontWeight.w600,
color: Color(0xff4a4b51),
fontSize: Screenutil.size(28)),
fontSize: 28.sp),
),
),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(16),
left: Screenutil.length(24),
right: Screenutil.length(24),
top: 16.w,
left: 24.w,
right: 24.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -196,7 +196,7 @@ class _HomeCardState extends State<HomeCard> {
children: [
RichText(
text: TextSpan(
style: TextStyle(fontSize: Screenutil.size(24)),
style: TextStyle(fontSize: 24.sp),
children: <InlineSpan>[
TextSpan(
text: widget.isActivity ? '地点:' : '原产地区:',
@ -208,10 +208,10 @@ class _HomeCardState extends State<HomeCard> {
),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(8)),
margin: EdgeInsets.only(top: 8.w),
child: RichText(
text: TextSpan(
style: TextStyle(fontSize: Screenutil.size(24)),
style: TextStyle(fontSize: 24.sp),
children: <InlineSpan>[
TextSpan(
text: widget.isActivity ? '活动时间:' : '预计到货:',
@ -232,17 +232,17 @@ class _HomeCardState extends State<HomeCard> {
widget.isActivity
? Container(
margin: EdgeInsets.only(
top: Screenutil.length(16),
right: Screenutil.length(24),
top: 16.w,
right: 24.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Container(
margin: EdgeInsets.only(left: Screenutil.length(80)),
margin: EdgeInsets.only(left: 80.w),
child: ImageStack(
imageList: images,
imageRadius: Screenutil.size(44),
imageRadius: 44.sp,
imageCount: 3,
imageBorderWidth: 1,
totalCount: 3,

@ -23,39 +23,39 @@ class _HomeSearchState extends State<HomeSearch> {
),
),
padding: EdgeInsets.only(
top: Screenutil.length(9),
left: Screenutil.length(32),
right: Screenutil.length(32),
bottom: Screenutil.length(17),
top: 9.w,
left: 32.w,
right: 32.w,
bottom: 17.w,
),
child: InkWell(
onTap: () {
showSearch(context: context, delegate: searchBarDelegate());
},
child: Container(
width: Screenutil.length(686),
height: Screenutil.length(72),
width: 686.w,
height: 72.w,
padding: EdgeInsets.only(
top: Screenutil.length(16),
bottom: Screenutil.length(16),
left: Screenutil.length(24),
top: 16.w,
bottom: 16.w,
left: 24.w,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius:
BorderRadius.all(Radius.circular(Screenutil.length(36))),
BorderRadius.all(Radius.circular(36.w)),
),
child: Row(children: [
Icon(
AntDesign.search1,
color: Color(0xff999999),
size: Screenutil.size(28),
size: 28.sp,
),
SizedBox(width: Screenutil.length(16)),
SizedBox(width: 16.w),
Text(
'搜索商品、活动、帖子、应用',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999),
),
)

@ -23,7 +23,7 @@ class _HomeSwiperState extends State<HomeSwiper> {
overflow: Overflow.visible,
children: [
Container(
height: Screenutil.length(181),
height: 181.w,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.centerLeft,
@ -33,10 +33,10 @@ class _HomeSwiperState extends State<HomeSwiper> {
),
),
Positioned(
top: Screenutil.length(17),
top: 17.w,
left: 0,
right: 0,
bottom: -Screenutil.length(76),
bottom: -76.w,
child: Swiper(
itemBuilder: (BuildContext context, int index) {
return Container(
@ -51,8 +51,8 @@ class _HomeSwiperState extends State<HomeSwiper> {
),
child: CachedImageWrapper(
url: imageList[index],
height: Screenutil.length(240),
width: Screenutil.length(686),
height: 240.w,
width: 686.w,
),
);
},
@ -74,9 +74,9 @@ class _HomeSwiperState extends State<HomeSwiper> {
builder: DotSwiperPaginationBuilder(
activeColor: Color(0xffFEC200),
color: Colors.white,
size: Screenutil.length(15),
activeSize: Screenutil.length(20),
space: Screenutil.length(10),
size: 15.w,
activeSize: 20.w,
space: 10.w,
),
),
autoplayDelay: 5000,

@ -22,9 +22,9 @@ class _HomeTagBarState extends State<HomeTagBar> {
return Container(
color: widget.isShowTitle ? Colors.transparent : Colors.white,
margin: EdgeInsets.symmetric(
horizontal: Screenutil.length(32),
horizontal: 32.w,
),
padding: EdgeInsets.all(Screenutil.length(24)),
padding: EdgeInsets.all(24.w),
child: Stack(
children: <Widget>[
Row(
@ -34,11 +34,11 @@ class _HomeTagBarState extends State<HomeTagBar> {
children: [
widget.isShowImage
? Container(
margin: EdgeInsets.only(right: Screenutil.length(24)),
margin: EdgeInsets.only(right: 24.w),
child: Image.asset(
AssetsImage.NOTIFICATION,
height: Screenutil.length(38),
width: Screenutil.length(38),
height: 38.w,
width: 38.w,
),
)
: SizedBox(),
@ -46,8 +46,8 @@ class _HomeTagBarState extends State<HomeTagBar> {
widget.title,
style: TextStyle(
fontSize: widget.isShowImage
? Screenutil.size(28)
: Screenutil.size(32),
? 28.sp
: 32.sp,
fontWeight: widget.isShowImage
? FontWeight.normal
: FontWeight.w600,
@ -64,13 +64,13 @@ class _HomeTagBarState extends State<HomeTagBar> {
'更多${widget.tag}',
style: TextStyle(
color: Color(0xff999999),
fontSize: Screenutil.size(20)),
fontSize: 20.sp),
),
SizedBox(width: Screenutil.length(8)),
SizedBox(width: 8.w),
Icon(
AntDesign.right,
color: Color(0xff999999),
size: Screenutil.size(20),
size: 20.sp,
),
]),
),
@ -79,7 +79,7 @@ class _HomeTagBarState extends State<HomeTagBar> {
widget.isShowImage
? SizedBox()
: Positioned(
top: Screenutil.length(30),
top: 30.w,
left: 0,
child: Container(
decoration: BoxDecoration(
@ -91,8 +91,8 @@ class _HomeTagBarState extends State<HomeTagBar> {
blurRadius: 10.0),
],
),
width: Screenutil.length(126),
height: Screenutil.length(8)),
width: 126.w,
height: 8.w),
)
],
),

@ -16,9 +16,9 @@ class _CommitteeMailboxPageState extends State<CommitteeMailboxPage> {
Widget _input() {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(22),
right: Screenutil.length(35)),
top: 32.w,
left: 22.w,
right: 35.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(8)),
border: Border.all(color: Color(0xffd4cfbe), width: 1.0),
@ -26,7 +26,7 @@ class _CommitteeMailboxPageState extends State<CommitteeMailboxPage> {
child: TextFormField(
cursorColor: Color(0xffffc40c),
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
fontWeight: FontWeight.w600,
),
controller: _thingsContent,
@ -35,8 +35,8 @@ class _CommitteeMailboxPageState extends State<CommitteeMailboxPage> {
decoration: InputDecoration(
isDense: true,
contentPadding: EdgeInsets.only(
top: Screenutil.length(0),
bottom: Screenutil.length(0),
top: 0.w,
bottom: 0.w,
),
hintText: '',
border: InputBorder.none, //线
@ -44,7 +44,7 @@ class _CommitteeMailboxPageState extends State<CommitteeMailboxPage> {
filled: true,
hintStyle: TextStyle(
color: Color(0xff999999),
fontSize: Screenutil.size(28),
fontSize: 28.sp,
fontWeight: FontWeight.normal,
),
),
@ -56,21 +56,21 @@ class _CommitteeMailboxPageState extends State<CommitteeMailboxPage> {
return InkWell(
child: Container(
alignment: Alignment.center,
height: Screenutil.length(96),
width: Screenutil.length(686),
height: 96.w,
width: 686.w,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(26),
vertical: 26.w,
),
margin: EdgeInsets.only(top: Screenutil.length(40)),
margin: EdgeInsets.only(top: 40.w),
decoration: BoxDecoration(
color: Color(0xffffc40c),
borderRadius:
BorderRadius.all(Radius.circular(Screenutil.length(48)))),
BorderRadius.all(Radius.circular(48.w))),
child: Text(
'确认提交',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333)),
),
),
@ -89,7 +89,7 @@ class _CommitteeMailboxPageState extends State<CommitteeMailboxPage> {
body: Container(
color: Colors.white,
child: ListView(
padding: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
padding: EdgeInsets.symmetric(horizontal: 32.w),
children: [
SingleChildScrollView(
child: GestureDetector(
@ -102,12 +102,12 @@ class _CommitteeMailboxPageState extends State<CommitteeMailboxPage> {
children: [
Container(
margin: EdgeInsets.symmetric(
vertical: Screenutil.length(48),
vertical: 48.w,
),
child: Text(
'您对园区的规约、管理、环境、活动等各方面有何宝贵建议,请写在下方为园区建设贡献一份力量。',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),

@ -42,7 +42,7 @@ class _IndustryCommitteePageState extends State<IndustryCommitteePage> {
title: Text(
'0574-88478909',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff030303),
),
),
@ -51,7 +51,7 @@ class _IndustryCommitteePageState extends State<IndustryCommitteePage> {
child: Text(
'取消',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff333333),
),
),
@ -64,7 +64,7 @@ class _IndustryCommitteePageState extends State<IndustryCommitteePage> {
'呼叫',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xffff8200),
),
),
@ -97,12 +97,12 @@ class _IndustryCommitteePageState extends State<IndustryCommitteePage> {
color: color,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(26.5),
vertical: 26.5.w,
),
child: Text(
title,
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: fontColor,
),
),
@ -115,7 +115,7 @@ class _IndustryCommitteePageState extends State<IndustryCommitteePage> {
bottom: 0,
child: Container(
height:
Screenutil.length(98) + MediaQuery.of(context).viewPadding.bottom,
98.w + MediaQuery.of(context).viewPadding.bottom,
width: MediaQuery.of(context).size.width,
child: Row(
children: _listBottom

@ -65,7 +65,7 @@ class _StaffListState extends State<StaffList> {
TextStyle _subStyle() {
return TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
);
}
@ -73,11 +73,11 @@ class _StaffListState extends State<StaffList> {
Positioned _positionedTag(String tag) {
return Positioned(
top: 0,
right: Screenutil.length(20),
right: 20.w,
child: Container(
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(21.5),
vertical: Screenutil.length(5.5)),
horizontal: 21.5.w,
vertical: 5.5.w),
decoration: BoxDecoration(
color: Color(0xfffff3cd),
border: Border.all(color: Color(0xffffc40c), width: 0.5),
@ -85,7 +85,7 @@ class _StaffListState extends State<StaffList> {
child: Text(
tag,
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff333333),
),
),
@ -97,14 +97,14 @@ class _StaffListState extends State<StaffList> {
String tenure, String post, String tag) {
return Container(
margin: EdgeInsets.only(
left: Screenutil.length(32),
right: Screenutil.length(32),
top: Screenutil.length(20),
left: 32.w,
right: 32.w,
top: 20.w,
),
padding: EdgeInsets.only(
left: Screenutil.length(20),
top: Screenutil.length(20),
bottom: Screenutil.length(20),
left: 20.w,
top: 20.w,
bottom: 20.w,
),
decoration: BoxDecoration(
color: Color(0xffffffff),
@ -116,10 +116,10 @@ class _StaffListState extends State<StaffList> {
children: [
CachedImageWrapper(
url: imagePath,
height: Screenutil.length(150),
width: Screenutil.length(150),
height: 150.w,
width: 150.w,
),
SizedBox(width: Screenutil.length(24)),
SizedBox(width: 24.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -127,21 +127,21 @@ class _StaffListState extends State<StaffList> {
name,
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
'住址:${address}',
style: _subStyle(),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
'任职期限:${tenure}',
style: _subStyle(),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
'从事岗位:${post}',
style: _subStyle(),

@ -37,7 +37,7 @@ class _InvoicePageState extends State<InvoicePage> {
elevation: 0,
backgroundColor: Color(0xffffffff),
leading: IconButton(
icon: Icon(AntDesign.left, size: Screenutil.size(40)),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
},
@ -47,7 +47,7 @@ class _InvoicePageState extends State<InvoicePage> {
'开具发票',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
@ -57,10 +57,10 @@ class _InvoicePageState extends State<InvoicePage> {
Container _containerInvoiceDetailCheck() {
return Container(
color: Colors.white,
height: Screenutil.length(96),
height: 96.w,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(28),
horizontal: Screenutil.length(32),
vertical: 28.w,
horizontal: 32.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -72,14 +72,14 @@ class _InvoicePageState extends State<InvoicePage> {
Text(
'发票内容',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
SizedBox(width: Screenutil.length(6)),
SizedBox(width: 6.w),
Icon(
AntDesign.exclamationcircleo,
size: Screenutil.size(20),
size: 20.sp,
color: Color(0xff999999),
),
],
@ -100,18 +100,18 @@ class _InvoicePageState extends State<InvoicePage> {
onTap: () {},
child: Container(
color: Color(0xffffc40c),
height: Screenutil.length(85),
height: 85.w,
margin: EdgeInsets.symmetric(
horizontal: Screenutil.length(43),
horizontal: 43.w,
),
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(20),
vertical: 20.w,
),
alignment: Alignment.center,
child: Text(
'确认',
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
@ -132,14 +132,14 @@ class _InvoicePageState extends State<InvoicePage> {
Text(
'增值税电子普票',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
SizedBox(width: Screenutil.length(12)),
SizedBox(width: 12.w),
Icon(
AntDesign.right,
size: Screenutil.size(20),
size: 20.sp,
color: Color(0xff333333),
),
],
@ -165,7 +165,7 @@ class _InvoicePageState extends State<InvoicePage> {
},
title: '个人/事业单位',
),
SizedBox(width: Screenutil.length(12)),
SizedBox(width: 12.w),
RoundCheckBox(
value: _checkRise[1],
onChanged: () {
@ -200,10 +200,10 @@ class _InvoicePageState extends State<InvoicePage> {
children: _listHeader
.map((item) => Container(
padding: EdgeInsets.only(
left: Screenutil.length(77),
right: Screenutil.length(32),
top: Screenutil.length(28),
// bottom: Screenutil.length(28),
left: 77.w,
right: 32.w,
top: 28.w,
// bottom: 28.w,
),
child: Column(
children: [
@ -213,14 +213,14 @@ class _InvoicePageState extends State<InvoicePage> {
Text(
item['title'],
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
item['rightWidget']
],
),
SizedBox(height: Screenutil.length(28)),
SizedBox(height: 28.w),
Divider(height: 1),
],
),
@ -235,7 +235,7 @@ class _InvoicePageState extends State<InvoicePage> {
appBar: _appBar(),
body: SingleChildScrollView(
child: Container(
height: Screenutil.length(1334),
height: 1334.w,
child: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
@ -251,9 +251,9 @@ class _InvoicePageState extends State<InvoicePage> {
children: [InvoiceInput(isEnterprise: isEnterprise)],
),
),
SizedBox(height: Screenutil.length(66)),
SizedBox(height: 66.w),
_containerInvoiceDetailCheck(),
SizedBox(height: Screenutil.length(92)),
SizedBox(height: 92.w),
_containerSubmit(),
],
),

@ -36,10 +36,10 @@ class _InvoiceInputState extends State<InvoiceInput> {
return listInput
.map((item) => Container(
padding: EdgeInsets.only(
left: Screenutil.length(77),
right: Screenutil.length(32),
top: Screenutil.length(28),
// bottom: Screenutil.length(28),
left: 77.w,
right: 32.w,
top: 28.w,
// bottom: 28.w,
),
child: Column(
children: [
@ -49,7 +49,7 @@ class _InvoiceInputState extends State<InvoiceInput> {
Text(
item['title'],
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -61,15 +61,15 @@ class _InvoiceInputState extends State<InvoiceInput> {
// ]
// : [],
cursorColor: Color(0xffffc40c),
style: TextStyle(fontSize: Screenutil.size(28)),
style: TextStyle(fontSize: 28.sp),
controller: item['controller'],
onChanged: (String value) {},
textAlign: TextAlign.end,
decoration: InputDecoration(
isDense: true,
contentPadding: EdgeInsets.only(
top: Screenutil.length(0),
bottom: Screenutil.length(0),
top: 0.w,
bottom: 0.w,
),
hintText: item['hintText'],
border: InputBorder.none, //线
@ -77,13 +77,13 @@ class _InvoiceInputState extends State<InvoiceInput> {
filled: true,
hintStyle: TextStyle(
color: Color(0xff999999),
fontSize: Screenutil.size(24)),
fontSize: 24.sp),
),
),
),
],
),
SizedBox(height: Screenutil.length(28)),
SizedBox(height: 28.w),
Divider(height: 1),
],
),

@ -19,7 +19,7 @@ class _LifePayBillPageState extends State<LifePayBillPage> {
Text(
title,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff666666),
),
),
@ -27,7 +27,7 @@ class _LifePayBillPageState extends State<LifePayBillPage> {
subtitle,
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -48,21 +48,21 @@ class _LifePayBillPageState extends State<LifePayBillPage> {
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32)),
top: 32.w,
left: 32.w,
right: 32.w),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(6)),
),
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(20),
vertical: Screenutil.length(32),
horizontal: 20.w,
vertical: 32.w,
),
child: Column(
children: [
_cardList('收费项目', '公共能耗费'),
SizedBox(height: Screenutil.length(30)),
SizedBox(height: 30.w),
_cardList('收费地址', '深蓝公寓 1幢1单元306室'),
],
),

@ -19,7 +19,7 @@ class BillCard extends StatelessWidget {
Container _billItem(String title, value) {
return Container(
margin: EdgeInsets.only(top: Screenutil.length(30)),
margin: EdgeInsets.only(top: 30.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -47,15 +47,15 @@ class BillCard extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
left: Screenutil.length(20),
right: Screenutil.length(20),
bottom: Screenutil.length(32),
top: Screenutil.length(2),
left: 20.w,
right: 20.w,
bottom: 32.w,
top: 2.w,
),
decoration: BoxDecoration(
color: Colors.white,

@ -31,7 +31,7 @@ class _LifePayInfoPageState extends State<LifePayInfoPage> {
body: Stack(
children: [
ListView(
padding: EdgeInsets.only(bottom: Screenutil.length(130)),
padding: EdgeInsets.only(bottom: 130.w),
children: [
DetailsCard(fun: billRouter),
],

@ -16,8 +16,8 @@ class _DetailsCardState extends State<DetailsCard> {
Container _detailHeader() {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(20),
bottom: Screenutil.length(18),
top: 20.w,
bottom: 18.w,
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
@ -47,7 +47,7 @@ class _DetailsCardState extends State<DetailsCard> {
return InkWell(
onTap: fun,
child:Container(
margin: EdgeInsets.only(top: Screenutil.length(32)),
margin: EdgeInsets.only(top: 32.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -56,9 +56,9 @@ class _DetailsCardState extends State<DetailsCard> {
Icon(
Icons.radio_button_unchecked,
color: BaseStyle.color999999,
size: Screenutil.length(40),
size: 40.w,
),
SizedBox(width: Screenutil.length(24)),
SizedBox(width: 24.w),
Text(
'2019上半年',
style: TextStyle(
@ -78,11 +78,11 @@ class _DetailsCardState extends State<DetailsCard> {
color: Color(0xfffc361d),
),
),
SizedBox(width: Screenutil.length(28)),
SizedBox(width: 28.w),
Icon(
AntDesign.right,
color: BaseStyle.color999999,
size: Screenutil.length(30),
size: 30.w,
),
],
),
@ -96,14 +96,14 @@ class _DetailsCardState extends State<DetailsCard> {
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
left: Screenutil.length(32),
right: Screenutil.length(32),
bottom: Screenutil.length(32),
left: 32.w,
right: 32.w,
bottom: 32.w,
),
decoration: BoxDecoration(
color: Colors.white,

@ -33,18 +33,18 @@ class _LifePayPageState extends State<LifePayPage> {
body: Stack(
children: [
ListView(
padding: EdgeInsets.only(bottom: Screenutil.length(130)),
padding: EdgeInsets.only(bottom: 130.w),
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
child: RichText(
text: TextSpan(
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff666666)),
children: <InlineSpan>[
TextSpan(

@ -67,13 +67,13 @@ class _LifePayRecordPageState extends State<LifePayRecordPage> {
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(34),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 34.w,
left: 32.w,
right: 32.w,
),
child: RichText(
text: TextSpan(
style: TextStyle(fontSize: Screenutil.size(24)),
style: TextStyle(fontSize: 24.sp),
children: <InlineSpan>[
TextSpan(
text: '如果有疑问,请联系物业客服',

@ -85,7 +85,7 @@ class RecordCard extends StatelessWidget {
Container _billItem(String title, value, TextStyle titleStyle, valueStyle,
double top, bool isShow, Function fun) {
return Container(
margin: EdgeInsets.only(top: Screenutil.length(top)),
margin: EdgeInsets.only(top: top.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -103,11 +103,11 @@ class RecordCard extends StatelessWidget {
style: valueStyle,
),
Container(
margin: EdgeInsets.only(left: Screenutil.length(24)),
margin: EdgeInsets.only(left: 24.w),
child: Icon(
AntDesign.right,
color: BaseStyle.color999999,
size: Screenutil.length(30),
size: 30.w,
),
),
],
@ -126,15 +126,15 @@ class RecordCard extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
left: Screenutil.length(20),
right: Screenutil.length(20),
bottom: Screenutil.length(32),
top: Screenutil.length(2),
left: 20.w,
right: 20.w,
bottom: 32.w,
top: 2.w,
),
decoration: BoxDecoration(
color: Colors.white,

@ -16,9 +16,9 @@ class _OrderCardState extends State<OrderCard> {
Container _orderInfo() {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(20),
bottom: Screenutil.length(20),
left: Screenutil.length(24),
top: 20.w,
bottom: 20.w,
left: 24.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -31,7 +31,7 @@ class _OrderCardState extends State<OrderCard> {
),
),
Container(
margin: EdgeInsets.symmetric(vertical: Screenutil.length(24)),
margin: EdgeInsets.symmetric(vertical: 24.w),
child: Row(
children: [
Text(
@ -41,7 +41,7 @@ class _OrderCardState extends State<OrderCard> {
color: BaseStyle.color333333,
),
),
SizedBox(width: Screenutil.length(40)),
SizedBox(width: 40.w),
Text(
'已选4项',
style: TextStyle(
@ -81,11 +81,11 @@ class _OrderCardState extends State<OrderCard> {
..putMap('detailMap', {'title': '去年2019年'}));
},
child: Container(
margin: EdgeInsets.only(top: Screenutil.length(20)),
margin: EdgeInsets.only(top: 20.w),
alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: Screenutil.length(7)),
height: Screenutil.length(44),
width: Screenutil.length(128),
padding: EdgeInsets.symmetric(vertical: 7.w),
height: 44.w,
width: 128.w,
decoration: BoxDecoration(
color: Color(0xff2a2a2a),
borderRadius: BorderRadius.all(Radius.circular(20)),
@ -105,11 +105,11 @@ class _OrderCardState extends State<OrderCard> {
Widget build(BuildContext context) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
padding: EdgeInsets.symmetric(horizontal: 32.w),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(6)),
@ -122,7 +122,7 @@ class _OrderCardState extends State<OrderCard> {
Icon(
Icons.radio_button_unchecked,
color: BaseStyle.color999999,
size: Screenutil.length(40),
size: 40.w,
),
Expanded(
child: Row(

@ -15,16 +15,16 @@ class _SubmitBarState extends State<SubmitBar> {
InkWell _selectAll() {
return InkWell(
child: Container(
margin: EdgeInsets.symmetric(vertical: Screenutil.length(29)),
margin: EdgeInsets.symmetric(vertical: 29.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Icon(
Icons.radio_button_unchecked,
color: BaseStyle.color999999,
size: Screenutil.length(40),
size: 40.w,
),
SizedBox(width: Screenutil.length(16)),
SizedBox(width: 16.w),
Text(
'全选',
style: TextStyle(
@ -38,11 +38,11 @@ class _SubmitBarState extends State<SubmitBar> {
Container _submitOrder(String title) {
return Container(
margin: EdgeInsets.symmetric(vertical: Screenutil.length(12)),
margin: EdgeInsets.symmetric(vertical: 12.w),
child: Row(
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(16)),
margin: EdgeInsets.only(right: 16.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
@ -76,11 +76,11 @@ class _SubmitBarState extends State<SubmitBar> {
child: Container(
alignment: Alignment.center,
padding: EdgeInsets.only(
top: Screenutil.length(15),
bottom: Screenutil.length(14),
top: 15.w,
bottom: 14.w,
),
height: Screenutil.length(74),
width: Screenutil.length(198),
height: 74.w,
width: 198.w,
decoration: BoxDecoration(
color: BaseStyle.colorffc40c,
borderRadius: BorderRadius.all(Radius.circular(36)),
@ -104,9 +104,9 @@ class _SubmitBarState extends State<SubmitBar> {
Widget build(BuildContext context) {
return Container(
color: Colors.white,
height: Screenutil.length(98),
height: 98.w,
width: MediaQuery.of(context).size.width,
padding: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
padding: EdgeInsets.symmetric(horizontal: 32.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [

@ -1,4 +1,3 @@
import 'package:akuCommunity/model/aku_shop_class_model.dart';
import 'package:akuCommunity/model/aku_shop_model.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
@ -39,7 +38,7 @@ class _MarketCartPageState extends State<MarketCartPage> {
child: Icon(
Icons.check_circle,
color: cartItem.isCheck ? Color(0xffdb0000) : Color(0xff999999),
size: Screenutil.length(36),
size: 36.w,
),
),
);
@ -47,13 +46,13 @@ class _MarketCartPageState extends State<MarketCartPage> {
Widget _image(String imagePath) {
return Container(
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(20)),
margin: EdgeInsets.symmetric(horizontal: 20.w),
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(2)),
child: CachedImageWrapper(
url: imagePath,
width: Screenutil.length(180),
height: Screenutil.length(180),
width: 180.w,
height: 180.w,
),
),
);
@ -66,23 +65,23 @@ class _MarketCartPageState extends State<MarketCartPage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: Screenutil.length(394),
width: 394.w,
child: Text(
content,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff333333),
),
),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(40)),
margin: EdgeInsets.only(top: 40.w),
child: Text(
'${price}',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xffe60e0e),
),
),
@ -235,7 +234,7 @@ class _MarketCartPageState extends State<MarketCartPage> {
});
},
child: Container(
margin: EdgeInsets.symmetric(vertical: Screenutil.length(29)),
margin: EdgeInsets.symmetric(vertical: 29.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
@ -244,14 +243,14 @@ class _MarketCartPageState extends State<MarketCartPage> {
? Icons.radio_button_checked
: Icons.radio_button_unchecked,
color: model.isAllCheck ? Color(0xffdb0000) : Color(0xff999999),
size: Screenutil.length(40),
size: 40.w,
),
Container(
margin: EdgeInsets.only(left: Screenutil.length(18)),
margin: EdgeInsets.only(left: 18.w),
child: Text(
'全选',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -267,11 +266,11 @@ class _MarketCartPageState extends State<MarketCartPage> {
children: [
model.allPrice != null
? Container(
margin: EdgeInsets.only(right: Screenutil.length(10)),
margin: EdgeInsets.only(right: 10.w),
child: Text(
'合计:¥${_allprice.toStringAsFixed(2)}',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xffe60e0e),
),
),
@ -287,13 +286,13 @@ class _MarketCartPageState extends State<MarketCartPage> {
: Color(0xffd8d8d8),
borderRadius: BorderRadius.all(Radius.circular(30)),
),
width: Screenutil.length(198),
margin: EdgeInsets.symmetric(vertical: Screenutil.length(16)),
padding: EdgeInsets.symmetric(vertical: Screenutil.length(12)),
width: 198.w,
margin: EdgeInsets.symmetric(vertical: 16.w),
padding: EdgeInsets.symmetric(vertical: 12.w),
child: Text(
'结算(${_goodsCount})',
style: TextStyle(
fontSize: Screenutil.size(30),
fontSize: 30.sp,
color:
model.allGoodsCount != 0 ? Color(0xff333333) : Colors.white,
),
@ -308,9 +307,9 @@ class _MarketCartPageState extends State<MarketCartPage> {
return Consumer<CartProvidde>(builder: (context, model, child) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(20),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 20.w,
left: 32.w,
right: 32.w,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6)),
@ -326,7 +325,7 @@ class _MarketCartPageState extends State<MarketCartPage> {
child: Text(
'移至收藏夹',
style: TextStyle(
fontSize: Screenutil.size(28), color: Colors.white),
fontSize: 28.sp, color: Colors.white),
),
color: renderingMode == SlidableRenderingMode.slide
? Color(0xffffc40c).withOpacity(animation.value)
@ -351,7 +350,7 @@ class _MarketCartPageState extends State<MarketCartPage> {
child: Text(
'删除',
style: TextStyle(
fontSize: Screenutil.size(28), color: Colors.white),
fontSize: 28.sp, color: Colors.white),
),
// onTap: () => _showSnackBar(context, 'Delete'),
);
@ -361,9 +360,9 @@ class _MarketCartPageState extends State<MarketCartPage> {
child: Container(
color: Colors.white,
padding: EdgeInsets.only(
top: Screenutil.length(30),
left: Screenutil.length(15),
bottom: Screenutil.length(37),
top: 30.w,
left: 15.w,
bottom: 37.w,
),
child: Stack(
children: [
@ -376,7 +375,7 @@ class _MarketCartPageState extends State<MarketCartPage> {
),
Positioned(
bottom: 0,
right: Screenutil.length(16),
right: 16.w,
child: CartCount(
cartItem: cartItem,
// goodsNum: widget.goodsNum,
@ -404,9 +403,9 @@ class _MarketCartPageState extends State<MarketCartPage> {
Consumer<CartProvidde>(builder: (context, model, child) {
return Container(
color: Colors.white,
height: Screenutil.length(98),
height: 98.w,
width: MediaQuery.of(context).size.width,
padding: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
padding: EdgeInsets.symmetric(horizontal: 32.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [

@ -14,7 +14,7 @@ class MarketCartAppBar extends StatelessWidget {
backgroundColor: Colors.white,
leading: IconButton(
padding: EdgeInsets.all(0),
icon: Icon(AntDesign.left, size: Screenutil.size(40)),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
},
@ -29,12 +29,12 @@ class MarketCartAppBar extends StatelessWidget {
TextSpan(
text: '购物车 ',
style: TextStyle(
fontSize: Screenutil.size(38),
fontSize: 38.sp,
),
),
TextSpan(
text: '业主尊享,购物更省心',
style: TextStyle(fontSize: Screenutil.size(24)),
style: TextStyle(fontSize: 24.sp),
),
],
),

@ -0,0 +1,107 @@
import 'package:akuCommunity/pages/confirm_order_page/confirm_order_page.dart';
import 'package:akuCommunity/routers/page_routers.dart';
import 'package:ani_route/ani_route.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:provider/provider.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/provider/cart.dart';
class MarketCartBottomBar extends StatelessWidget {
const MarketCartBottomBar({Key key}) : super(key: key);
Widget _selectAll(CartProvidde model) {
return InkWell(
onTap: () {
model.changeALlCheckState(!model.isAllCheck);
},
child: Container(
margin: EdgeInsets.symmetric(vertical: 29.w),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Icon(
model.isAllCheck
? Icons.radio_button_checked
: Icons.radio_button_unchecked,
color: model.isAllCheck ? Color(0xffdb0000) : Color(0xff999999),
size: 40.w,
),
Container(
margin: EdgeInsets.only(left: 18.w),
child: Text(
'全选',
style: TextStyle(
fontSize: 28.sp,
color: Color(0xff333333),
),
),
),
],
),
),
);
}
Widget _settlement(CartProvidde model,BuildContext context) {
return Row(
children: [
model.allPrice != 0
? Container(
margin: EdgeInsets.only(right: 10.w),
child: Text(
'合计:¥${model.allPrice.toStringAsFixed(2)}',
style: TextStyle(
fontSize: 28.sp,
color: Color(0xffe60e0e),
),
),
)
: SizedBox(),
InkWell(
onTap: model.allGoodsCount != 0 ? () {} : null,
child: Container(
alignment: Alignment.center,
decoration: BoxDecoration(
color: model.allGoodsCount != 0
? Color(0xffffc40c)
: Color(0xffd8d8d8),
borderRadius: BorderRadius.all(Radius.circular(30)),
),
width: 198.w,
margin: EdgeInsets.symmetric(vertical: 16.w),
padding: EdgeInsets.symmetric(vertical: 12.w),
child: Text(
'结算(${model.allGoodsCount})',
style: TextStyle(
fontSize: 30.sp,
color:
model.allGoodsCount != 0 ? Color(0xff333333) : Colors.white,
),
),
),
),
],
);
}
@override
Widget build(BuildContext context) {
return Consumer<CartProvidde>(builder: (context, model, child) {
return Container(
color: Colors.white,
height: 98.w,
width: MediaQuery.of(context).size.width,
padding: EdgeInsets.symmetric(horizontal: 32.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_selectAll(model),
_settlement(model,context,)
],
),
);
});
}
}

@ -0,0 +1,225 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_icons/flutter_icons.dart';
import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:akuCommunity/widget/cached_image_wrapper.dart';
import 'package:akuCommunity/widget/cart_count.dart';
import 'package:akuCommunity/utils/screenutil.dart';
import 'package:akuCommunity/widget/goods_specs_sheet.dart';
import 'package:akuCommunity/model/aku_shop_model.dart';
import 'package:provider/provider.dart';
import 'package:akuCommunity/provider/cart.dart';
class MarketCartCard extends StatelessWidget {
final AkuShopModel cartItem;
MarketCartCard({Key key, this.cartItem}) : super(key: key);
void _showGoodsSpecsSheet() {
// showModalBottomSheet(
// isScrollControlled: true,
// context: context,
// backgroundColor: Colors.white,
// builder: (context) {
// return GoodsSpecsSheet(
// goodsNum: widget.goodsNum,
// index: widget.index,
// reduce: widget.reduce,
// add: widget.add,
// );
// },
// );
}
Widget _cardRadio(
BuildContext context, AkuShopModel cartItem, CartProvidde model) {
return InkWell(
onTap: () {
cartItem.isCheck = !cartItem.isCheck;
model.changeCheckState(cartItem);
},
child: Container(
alignment: Alignment.center,
child: Icon(
Icons.check_circle,
color: cartItem.isCheck ? Color(0xffdb0000) : Color(0xff999999),
size: 36.w,
),
),
);
}
Widget _image(String imagePath) {
return Container(
margin: EdgeInsets.symmetric(horizontal: 20.w),
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(2)),
child: CachedImageWrapper(
url: imagePath,
width: 180.w,
height: 180.w,
),
),
);
}
Widget _content(String content, specs, price) {
return Container(
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: 394.w,
child: Text(
content,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: 24.sp,
color: Color(0xff333333),
),
),
),
// InkWell(
// onTap: _showGoodsSpecsSheet,
// child: Container(
// margin: EdgeInsets.only(top: 10.w),
// padding: EdgeInsets.symmetric(
// vertical: 5.w,
// horizontal: 19.w,
// ),
// alignment: Alignment.center,
// decoration: BoxDecoration(
// color: Color(0xfff5f5f5),
// border: Border.all(color: Color(0xffd3d3d3), width: 0.5),
// borderRadius: BorderRadius.all(Radius.circular(15)),
// ),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.center,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// Text(
// specs,
// style: TextStyle(
// fontSize: 18.sp,
// color: Color(0xff333333),
// ),
// ),
// Container(
// alignment: Alignment.center,
// margin: EdgeInsets.only(left: 16.w),
// child: Icon(
// AntDesign.down,
// color: Color(0xff333333),
// size: 22.sp,
// ),
// ),
// ],
// ),
// ),
// ),
Container(
margin: EdgeInsets.only(top: 40.w),
child: Text(
'${price}',
style: TextStyle(
fontSize: 28.sp,
color: Color(0xffe60e0e),
),
),
),
],
),
);
}
@override
Widget build(BuildContext context) {
return Consumer<CartProvidde>(builder: (context, model, child) {
return Container(
margin: EdgeInsets.only(
top: 20.w,
left: 32.w,
right: 32.w,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6)),
),
child: Slidable.builder(
actionPane: SlidableBehindActionPane(),
actionExtentRatio: 0.25,
secondaryActionDelegate: SlideActionBuilderDelegate(
actionCount: 2,
builder: (context, index, animation, renderingMode) {
if (index == 0) {
return SlideAction(
child: Text(
'移至收藏夹',
style: TextStyle(
fontSize: 28.sp, color: Colors.white),
),
color: renderingMode == SlidableRenderingMode.slide
? Color(0xffffc40c).withOpacity(animation.value)
: Color(0xffffc40c),
// onTap: () => _showSnackBar(context, 'More'),
closeOnTap: false,
);
} else {
return SlideAction(
onTap: () {
model.deleteGoods(cartItem.itemid);
},
decoration: BoxDecoration(
color: renderingMode == SlidableRenderingMode.slide
? Color(0xffe60e0e).withOpacity(animation.value)
: Color(0xffe60e0e),
borderRadius: BorderRadius.only(
topRight: Radius.circular(6),
bottomRight: Radius.circular(6),
),
),
child: Text(
'删除',
style: TextStyle(
fontSize: 28.sp, color: Colors.white),
),
// onTap: () => _showSnackBar(context, 'Delete'),
);
}
},
),
child: Container(
color: Colors.white,
padding: EdgeInsets.only(
top: 30.w,
left: 15.w,
bottom: 37.w,
),
child: Stack(
children: [
Row(
children: [
_cardRadio(context, cartItem, model),
_image(cartItem.itempic),
_content(cartItem.itemtitle, '默认', cartItem.itemprice),
],
),
Positioned(
bottom: 0,
right: 16.w,
child: CartCount(
cartItem: cartItem,
// goodsNum: widget.goodsNum,
// index: widget.index,
// reduce: widget.reduce,
// add: widget.add,
),
),
],
),
),
),
);
});
}
}

@ -38,20 +38,20 @@ class _MarketDetailsAppBarState extends State<MarketDetailsAppBar> {
Container(
alignment:
Alignment.lerp(Alignment.topCenter, Alignment.center, 0.25),
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
child: Material(
color: Color(0xffffffff),
child: Container(
alignment: Alignment.topCenter,
height: Screenutil.length(282),
width: Screenutil.length(686),
height: 282.w,
width: 686.w,
color: Colors.black.withOpacity(animation.value),
child: GridView.builder(
padding: EdgeInsets.only(
top: Screenutil.length(36),
left: Screenutil.length(25),
right: Screenutil.length(25),
bottom: Screenutil.length(30),
top: 36.w,
left: 25.w,
right: 25.w,
bottom: 30.w,
),
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
@ -68,7 +68,7 @@ class _MarketDetailsAppBarState extends State<MarketDetailsAppBar> {
color: _classList[index]['title'] == widget.title
? Color(0xffe60e0e)
: Color(0xff979797),
width: Screenutil.length(1),
width: 1.w,
),
),
child: Center(
@ -79,17 +79,17 @@ class _MarketDetailsAppBarState extends State<MarketDetailsAppBar> {
_classList[index]['title'] == widget.title
? Color(0xffe60e0e)
: Color(0xff333333),
fontSize: Screenutil.size(24)),
fontSize: 24.sp),
)),
),
);
},
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
mainAxisSpacing: Screenutil.length(20),
crossAxisSpacing: Screenutil.length(30),
mainAxisSpacing: 20.w,
crossAxisSpacing: 30.w,
childAspectRatio:
Screenutil.length(192) / Screenutil.length(58)),
192.w / 58.w),
),
),
),
@ -103,7 +103,7 @@ class _MarketDetailsAppBarState extends State<MarketDetailsAppBar> {
child: Icon(
AntDesign.caretup,
color: Color(0xffffffff),
size: Screenutil.size(36),
size: 36.sp,
),
),
),
@ -130,7 +130,7 @@ class _MarketDetailsAppBarState extends State<MarketDetailsAppBar> {
backgroundColor: Color(0xffffffff),
leading: IconButton(
padding: EdgeInsets.all(0),
icon: Icon(AntDesign.left, size: Screenutil.size(37)),
icon: Icon(AntDesign.left, size: 37.sp),
onPressed: () {
Navigator.pop(context);
}),
@ -143,14 +143,14 @@ class _MarketDetailsAppBarState extends State<MarketDetailsAppBar> {
Text(
widget.title,
style: TextStyle(
fontSize: Screenutil.size(32), color: Color(0xff333333)),
fontSize: 32.sp, color: Color(0xff333333)),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Container(
padding: EdgeInsets.only(top: 1),
child: Icon(
AntDesign.caretdown,
size: Screenutil.size(18),
size: 18.sp,
color: Color(0xff000000),
),
)
@ -162,7 +162,7 @@ class _MarketDetailsAppBarState extends State<MarketDetailsAppBar> {
IconButton(
icon: Icon(
AntDesign.search1,
size: Screenutil.size(38),
size: 38.sp,
color: Color(0xff666666),
),
onPressed: () {},

@ -114,7 +114,7 @@ class _MarketPageState extends State<MarketPage>
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
return <Widget>[
SliverAppBar(
expandedHeight: Screenutil.length(676),
expandedHeight: 676.w,
backgroundColor: Colors.transparent,
elevation: 0,
flexibleSpace: Stack(

@ -221,9 +221,9 @@ class _MarketListState extends State<MarketList>
? SliverGoodsGroupCard()
: SliverPadding(
padding: EdgeInsets.only(
top: Screenutil.length(30),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 30.w,
left: 32.w,
right: 32.w,
),
sliver: _shopList.length == 0
? SliverToBoxAdapter(child: GoodsCardSkeleton())

@ -53,8 +53,8 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
borderRadius: BorderRadius.circular(6),
child: CachedImageWrapper(
url: image,
height: Screenutil.length(120),
width: Screenutil.length(160),
height: 120.w,
width: 160.w,
),
);
}
@ -63,16 +63,16 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
return InkWell(
onTap: () {},
child: Container(
height: Screenutil.length(52),
width: Screenutil.length(170),
height: 52.w,
width: 170.w,
alignment: Alignment.center,
padding: EdgeInsets.only(
top: Screenutil.length(10),
bottom: Screenutil.length(9),
top: 10.w,
bottom: 9.w,
),
decoration: BoxDecoration(
color: isOverTime ? Color(0xffd9d9d9) : Color(0xffffc40c),
borderRadius: BorderRadius.all(Radius.circular(Screenutil.length(4))),
borderRadius: BorderRadius.all(Radius.circular(4.w)),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
@ -81,16 +81,16 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
'¥${price}',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: isOverTime ? Color(0xff333333) : Color(0xffe60e0e),
),
),
SizedBox(width: Screenutil.length(10)),
SizedBox(width: 10.w),
Text(
isOverTime ? '已过期' : '去团购',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff333333)),
),
],
@ -102,52 +102,52 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
Widget _content(String title, subtitle, remainingTime, address, arrivalTime,
price, isOverTime) {
return Container(
margin: EdgeInsets.only(left: Screenutil.length(20)),
margin: EdgeInsets.only(left: 20.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(8)),
width: Screenutil.length(474),
margin: EdgeInsets.only(bottom: 8.w),
width: 474.w,
child: Text(
title,
textAlign: TextAlign.left,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: Screenutil.size(30),
fontSize: 30.sp,
color: Color(0xff333333),
),
),
),
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(12)),
margin: EdgeInsets.only(bottom: 12.w),
child: Text(
subtitle,
style: TextStyle(
fontSize: Screenutil.size(20),
fontSize: 20.sp,
color: Color(0xff333333),
),
),
),
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(16)),
margin: EdgeInsets.only(bottom: 16.w),
padding: EdgeInsets.only(
top: Screenutil.length(6),
left: Screenutil.length(11),
bottom: Screenutil.length(7),
right: Screenutil.length(20),
top: 6.w,
left: 11.w,
bottom: 7.w,
right: 20.w,
),
decoration: BoxDecoration(
color: isOverTime ? Color(0xffd9d9d9) : Color(0xffffeee3),
borderRadius:
BorderRadius.all(Radius.circular(Screenutil.length(4))),
BorderRadius.all(Radius.circular(4.w)),
),
child: Row(
children: [
Icon(
MaterialIcons.access_time,
size: Screenutil.size(18),
size: 18.sp,
color: isOverTime ? Color(0xff333333) : Color(0xffff7f00),
),
Text(
@ -156,15 +156,15 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: isOverTime ? Color(0xff333333) : Color(0xffff7f00),
fontSize: Screenutil.size(18),
fontSize: 18.sp,
),
),
],
),
),
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(30)),
width: Screenutil.length(474),
margin: EdgeInsets.only(bottom: 30.w),
width: 474.w,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -175,14 +175,14 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
'原产地:${address}',
style: TextStyle(
color: Color(0xff999999),
fontSize: Screenutil.size(20)),
fontSize: 20.sp),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
'预计到货:${arrivalTime}',
style: TextStyle(
color: Color(0xff999999),
fontSize: Screenutil.size(20)),
fontSize: 20.sp),
)
],
),
@ -201,19 +201,19 @@ class _SliverGoodsGroupCardState extends State<SliverGoodsGroupCard> {
delegate: SliverChildBuilderDelegate((BuildContext content, int index) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(20),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 20.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
top: Screenutil.length(12),
left: Screenutil.length(12),
right: Screenutil.length(20),
top: 12.w,
left: 12.w,
right: 20.w,
),
decoration: BoxDecoration(
color: Colors.white,
borderRadius:
BorderRadius.all(Radius.circular(Screenutil.length(8))),
BorderRadius.all(Radius.circular(8.w)),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,

@ -73,10 +73,10 @@ class _MarketClassPageState extends State<MarketClassPage> {
child: Stack(
children: [
Container(
height: Screenutil.length(120),
height: 120.w,
alignment: Alignment.center,
color: _currentIndex == index ? Colors.white : Colors.transparent,
padding: EdgeInsets.symmetric(vertical: Screenutil.length(24)),
padding: EdgeInsets.symmetric(vertical: 24.w),
child: Text(
_shopClassList[index].mainName,
style: TextStyle(
@ -89,11 +89,11 @@ class _MarketClassPageState extends State<MarketClassPage> {
),
_currentIndex == index
? Positioned(
top: Screenutil.length(42),
top: 42.w,
left: 1,
child: SizedBox(
width: Screenutil.length(8),
height: Screenutil.length(40),
width: 8.w,
height: 40.w,
child: DecoratedBox(
decoration: BoxDecoration(color: BaseStyle.colorffc40c),
),
@ -127,11 +127,11 @@ class _MarketClassPageState extends State<MarketClassPage> {
children: [
CachedImageWrapper(
url: infoList[index].imgurl,
width: Screenutil.length(152),
height: Screenutil.length(152),
width: 152.w,
height: 152.w,
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(14)),
margin: EdgeInsets.only(top: 14.w),
child: Text(
infoList[index].sonName,
style: TextStyle(
@ -146,7 +146,7 @@ class _MarketClassPageState extends State<MarketClassPage> {
},
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
childAspectRatio: Screenutil.length(152) / Screenutil.length(210),
childAspectRatio: 152.w / 210.w,
),
),
);
@ -154,14 +154,14 @@ class _MarketClassPageState extends State<MarketClassPage> {
Widget _classList(String nextName, List<Info> infoList) {
return Container(
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(24)),
padding: EdgeInsets.symmetric(vertical: Screenutil.length(14)),
width: Screenutil.length(476),
margin: EdgeInsets.only(bottom: 24.w),
padding: EdgeInsets.symmetric(vertical: 14.w),
width: 476.w,
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: Color(0xffe8e8e8), width: 0.5),
@ -202,7 +202,7 @@ class _MarketClassPageState extends State<MarketClassPage> {
mainAxisAlignment: MainAxisAlignment.start,
children: [
Container(
width: Screenutil.length(203),
width: 203.w,
height: MediaQuery.of(context).size.height -
kToolbarHeight -
_statusHeight,
@ -219,7 +219,7 @@ class _MarketClassPageState extends State<MarketClassPage> {
}),
),
Container(
width: Screenutil.length(547),
width: 547.w,
height: MediaQuery.of(context).size.height -
kToolbarHeight -
_statusHeight,

@ -12,11 +12,11 @@ class MarketClassBar extends StatelessWidget {
showSearch(context: context, delegate: searchBarDelegate());
},
child: Container(
margin: EdgeInsets.only(right: Screenutil.length(32)),
margin: EdgeInsets.only(right: 32.w),
padding: EdgeInsets.only(
left: Screenutil.length(40),
top: Screenutil.length(15),
bottom: Screenutil.length(15)),
left: 40.w,
top: 15.w,
bottom: 15.w),
decoration: BoxDecoration(
color: Color(0xfff3f3f3),
borderRadius: BorderRadius.all(Radius.circular(36)),
@ -24,14 +24,14 @@ class MarketClassBar extends StatelessWidget {
child: Row(children: [
Icon(
AntDesign.search1,
size: Screenutil.size(28),
size: 28.sp,
color: Color(0xff999999),
),
SizedBox(width: 5),
Text(
'搜索商品、活动、帖子、应用',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999),
),
)
@ -49,7 +49,7 @@ class MarketClassBar extends StatelessWidget {
backgroundColor: Color(0xffffffff),
leading: InkWell(
onTap: () => Navigator.pop(context),
child: Icon(AntDesign.left, size: Screenutil.size(40)),
child: Icon(AntDesign.left, size: 40.sp),
),
centerTitle: true,
title: _inkWellSearch(context),

@ -78,10 +78,10 @@ class _CommentMessagePageState extends State<CommentMessagePage> {
Container _containerCommentCard(
String name, imageHeader, content, time, imagePath) {
return Container(
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
padding: EdgeInsets.only(
top: Screenutil.length(32),
bottom: Screenutil.length(16),
top: 32.w,
bottom: 16.w,
),
decoration: BoxDecoration(
border: Border(
@ -98,50 +98,50 @@ class _CommentMessagePageState extends State<CommentMessagePage> {
),
child: Image.asset(
imageHeader,
height: Screenutil.length(86),
width: Screenutil.length(86),
height: 86.w,
width: 86.w,
fit: BoxFit.fill,
),
),
SizedBox(width: Screenutil.length(20)),
SizedBox(width: 20.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
name,
style: TextStyle(
fontSize: Screenutil.size(36),
fontSize: 36.sp,
color: Color(0xff333333),
),
),
SizedBox(height: Screenutil.length(6)),
SizedBox(height: 6.w),
Container(
width: Screenutil.length(392),
width: 392.w,
child: Text(
content,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
),
SizedBox(height: Screenutil.length(16)),
SizedBox(height: 16.w),
Text(
time,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999),
),
),
],
),
SizedBox(width: Screenutil.length(12)),
SizedBox(width: 12.w),
Image.asset(
imagePath,
height: Screenutil.length(158),
width: Screenutil.length(158),
height: 158.w,
width: 158.w,
fit: BoxFit.fill,
),
],

@ -34,14 +34,14 @@ class _MessageCenterPageState extends State<MessageCenterPage> {
TextStyle _textStyleTitle() {
return TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
);
}
TextStyle _textStyleSubtitle() {
return TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
);
}
@ -78,11 +78,11 @@ class _MessageCenterPageState extends State<MessageCenterPage> {
},
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(36),
bottom: Screenutil.length(19),
top: 36.w,
bottom: 19.w,
),
margin: EdgeInsets.symmetric(
horizontal: Screenutil.length(32)),
horizontal: 32.w),
decoration: BoxDecoration(
border: Border(
bottom: Divider.createBorderSide(context,
@ -94,10 +94,10 @@ class _MessageCenterPageState extends State<MessageCenterPage> {
children: [
Image.asset(
_messageList[index]['imagePath'],
height: Screenutil.length(90),
width: Screenutil.length(90),
height: 90.w,
width: 90.w,
),
SizedBox(width: Screenutil.length(14)),
SizedBox(width: 14.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -105,7 +105,7 @@ class _MessageCenterPageState extends State<MessageCenterPage> {
_messageList[index]['title'],
style: _textStyleTitle(),
),
SizedBox(height: Screenutil.length(5)),
SizedBox(height: 5.w),
Text(
_messageList[index]['subtitle'],
maxLines: 1,

@ -12,9 +12,9 @@ class RefundDetails extends StatelessWidget {
width: double.infinity,
color: Color(0xffffd000),
padding: EdgeInsets.only(
top: Screenutil.length(44),
bottom: Screenutil.length(44),
left: Screenutil.length(33),
top: 44.w,
bottom: 44.w,
left: 33.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -27,7 +27,7 @@ class RefundDetails extends StatelessWidget {
color: BaseStyle.color333333,
),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
'2020年7月8日 13:28',
style: TextStyle(
@ -44,10 +44,10 @@ class RefundDetails extends StatelessWidget {
return Container(
color: Color(0xffffffff),
padding: EdgeInsets.only(
top: Screenutil.length(24),
bottom: Screenutil.length(24),
left: Screenutil.length(33),
right: Screenutil.length(32),
top: 24.w,
bottom: 24.w,
left: 33.w,
right: 32.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -81,9 +81,9 @@ class RefundDetails extends StatelessWidget {
color: Color(0xffffffff),
width: double.infinity,
padding: EdgeInsets.only(
top: Screenutil.length(25),
bottom: Screenutil.length(22),
left: Screenutil.length(33),
top: 25.w,
bottom: 22.w,
left: 33.w,
),
child: Text(
'退款信息',
@ -96,24 +96,24 @@ class RefundDetails extends StatelessWidget {
Container(
color: Color(0xfff2f2f2),
padding: EdgeInsets.only(
top: Screenutil.length(30),
bottom: Screenutil.length(24),
left: Screenutil.length(33),
top: 30.w,
bottom: 24.w,
left: 33.w,
),
child: Row(
children: [
Image.asset(
'assets/example/tz1.png',
height: Screenutil.length(120),
width: Screenutil.length(120),
height: 120.w,
width: 120.w,
fit: BoxFit.fill,
),
SizedBox(width: Screenutil.length(20)),
SizedBox(width: 20.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: Screenutil.length(544),
width: 544.w,
child: Text(
'轻便自由 男士针织休闲西装 全身羊毛修身意大利进口精致裁剪',
maxLines: 2,
@ -124,7 +124,7 @@ class RefundDetails extends StatelessWidget {
),
),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
'规格分类M 黑色',
style: TextStyle(
@ -141,9 +141,9 @@ class RefundDetails extends StatelessWidget {
color: Color(0xffffffff),
width: double.infinity,
padding: EdgeInsets.only(
top: Screenutil.length(22),
left: Screenutil.length(33),
bottom: Screenutil.length(22),
top: 22.w,
left: 33.w,
bottom: 22.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -155,7 +155,7 @@ class RefundDetails extends StatelessWidget {
color: BaseStyle.color999999,
),
),
SizedBox(height: Screenutil.length(22)),
SizedBox(height: 22.w),
Text(
'退款金额:${'¥1123.60'}',
style: TextStyle(
@ -163,7 +163,7 @@ class RefundDetails extends StatelessWidget {
color: BaseStyle.color999999,
),
),
SizedBox(height: Screenutil.length(22)),
SizedBox(height: 22.w),
Text(
'申请时间:${'2020-7-7 21:09'}',
style: TextStyle(
@ -171,7 +171,7 @@ class RefundDetails extends StatelessWidget {
color: BaseStyle.color999999,
),
),
SizedBox(height: Screenutil.length(22)),
SizedBox(height: 22.w),
Text(
'退款编号:${'8324982349230293'}',
style: TextStyle(
@ -198,7 +198,7 @@ class RefundDetails extends StatelessWidget {
children: [
_containerHeader(),
_containerPrice(),
SizedBox(height: Screenutil.length(44)),
SizedBox(height: 44.w),
_containerContent(),
],
),

@ -96,9 +96,9 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
Text(
lookType,
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
Icon(AntDesign.right, size: Screenutil.size(40)),
Icon(AntDesign.right, size: 40.sp),
],
),
);
@ -107,15 +107,15 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
Container _containerCard(String status, type, imagePath, content, lookType) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
top: Screenutil.length(21),
bottom: Screenutil.length(14),
left: Screenutil.length(30),
right: Screenutil.length(20)),
top: 21.w,
bottom: 14.w,
left: 30.w,
right: 20.w),
decoration: BoxDecoration(
color: Color(0xffffffff),
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -130,7 +130,7 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: EdgeInsets.only(left: Screenutil.length(2)),
padding: EdgeInsets.only(left: 2.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -141,39 +141,39 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
'商城通知',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333)),
),
Text(
status,
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff999999)),
),
],
),
SizedBox(height: Screenutil.length(5)),
SizedBox(height: 5.w),
Text(type,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333))),
SizedBox(height: Screenutil.length(8)),
SizedBox(height: 8.w),
Row(
children: [
Image.asset(
imagePath,
height: Screenutil.length(120),
width: Screenutil.length(120),
height: 120.w,
width: 120.w,
),
SizedBox(width: Screenutil.length(32)),
SizedBox(width: 32.w),
Container(
width: Screenutil.length(439),
width: 439.w,
child: Text(
content,
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999)),
),
),
@ -182,7 +182,7 @@ class _ShopMessagePageState extends State<ShopMessagePage> {
],
),
),
SizedBox(height: Screenutil.length(30)),
SizedBox(height: 30.w),
Divider(),
_inkWellLook(type, content, lookType),
],

@ -23,9 +23,9 @@ class SystemDetailsPage extends StatelessWidget {
children: [
Container(
padding: EdgeInsets.only(
top: Screenutil.length(42),
left: Screenutil.length(34),
right: Screenutil.length(44),
top: 42.w,
left: 34.w,
right: 44.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -34,23 +34,23 @@ class SystemDetailsPage extends StatelessWidget {
'系统通知',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
SizedBox(height: Screenutil.length(5)),
SizedBox(height: 5.w),
Text(
bundle.getMap('detailsMap')['type'],
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
SizedBox(height: Screenutil.length(110)),
SizedBox(height: 110.w),
Text(
bundle.getMap('detailsMap')['content'],
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),

@ -77,9 +77,9 @@ class _SystemMessagePageState extends State<SystemMessagePage> {
Text(
'查看详情',
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
Icon(AntDesign.right, size: Screenutil.size(40)),
Icon(AntDesign.right, size: 40.sp),
],
),
);
@ -88,15 +88,15 @@ class _SystemMessagePageState extends State<SystemMessagePage> {
Container _containerCard(String status, String type, String content) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
padding: EdgeInsets.only(
top: Screenutil.length(21),
bottom: Screenutil.length(14),
left: Screenutil.length(30),
right: Screenutil.length(20)),
top: 21.w,
bottom: 14.w,
left: 30.w,
right: 20.w),
decoration: BoxDecoration(
color: Color(0xffffffff),
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -111,7 +111,7 @@ class _SystemMessagePageState extends State<SystemMessagePage> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
padding: EdgeInsets.only(left: Screenutil.length(2)),
padding: EdgeInsets.only(left: 2.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -122,35 +122,35 @@ class _SystemMessagePageState extends State<SystemMessagePage> {
'系统通知',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333)),
),
Text(
status,
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff999999)),
),
],
),
SizedBox(height: Screenutil.length(5)),
SizedBox(height: 5.w),
Text(
type,
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(8)),
SizedBox(height: 8.w),
Text(
'驳回理由:${content}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
fontSize: Screenutil.size(28), color: Color(0xff333333)),
fontSize: 28.sp, color: Color(0xff333333)),
),
],
),
),
SizedBox(height: Screenutil.length(30)),
SizedBox(height: 30.w),
Divider(),
_inkWellLook(type, content),
],

@ -18,11 +18,11 @@ class _CarAddPageState extends State<CarAddPage> {
return InkWell(
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(19),
bottom: Screenutil.length(21),
top: 19.w,
bottom: 21.w,
),
alignment: Alignment.center,
width: Screenutil.length(686),
width: 686.w,
decoration: BoxDecoration(
color: Color(0xffffd000),
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -37,7 +37,7 @@ class _CarAddPageState extends State<CarAddPage> {
'保存',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
@ -64,17 +64,17 @@ class _CarAddPageState extends State<CarAddPage> {
},
child: Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
decoration: BoxDecoration(
border: Border(
@ -87,10 +87,10 @@ class _CarAddPageState extends State<CarAddPage> {
Text(
'您的车牌号',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
CommonInput(
hintText: '请输入您的车牌号',
inputController: _carNum,
@ -98,7 +98,7 @@ class _CarAddPageState extends State<CarAddPage> {
],
),
),
SizedBox(height: Screenutil.length(89)),
SizedBox(height: 89.w),
_inkWellSave(),
],
),

@ -25,15 +25,15 @@ class _MineCarPageState extends State<MineCarPage> {
Widget _containerHouseCard(String title, subtitle) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(24),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 24.w,
left: 32.w,
right: 32.w,
),
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(41),
bottom: Screenutil.length(41),
left: Screenutil.length(27),
top: 41.w,
bottom: 41.w,
left: 27.w,
),
decoration: BoxDecoration(
border:
@ -45,25 +45,25 @@ class _MineCarPageState extends State<MineCarPage> {
children: [
Image.asset(
AssetsImage.HOUSEATTESTATION,
height: Screenutil.length(48),
width: Screenutil.length(48),
height: 48.w,
width: 48.w,
),
SizedBox(width: Screenutil.length(20)),
SizedBox(width: 20.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
title,
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff474747),
),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
subtitle,
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff474747),
),
)
@ -91,11 +91,11 @@ class _MineCarPageState extends State<MineCarPage> {
},
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(11),
bottom: Screenutil.length(10),
top: 11.w,
bottom: 10.w,
),
alignment: Alignment.center,
width: Screenutil.length(167),
width: 167.w,
decoration: BoxDecoration(
color: Color(0xffffd000),
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -110,7 +110,7 @@ class _MineCarPageState extends State<MineCarPage> {
'去添加',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
@ -120,34 +120,34 @@ class _MineCarPageState extends State<MineCarPage> {
Widget _containerAttestation(String tag) {
return Container(
margin: EdgeInsets.only(top: Screenutil.length(156)),
margin: EdgeInsets.only(top: 156.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Image.asset(
AssetsImage.CARHEADER,
height: Screenutil.length(240),
width: Screenutil.length(130),
height: 240.w,
width: 130.w,
),
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
Text(
'马泽鹏',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff474747),
),
),
SizedBox(height: Screenutil.length(8)),
SizedBox(height: 8.w),
Text(
'尊敬的业主/租客,您还没有添加您的${tag}',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
SizedBox(height: Screenutil.length(39)),
SizedBox(height: 39.w),
_inkWellCheck(widget.bundle.getMap('carType')['type']),
],
),
@ -157,16 +157,16 @@ class _MineCarPageState extends State<MineCarPage> {
Widget _containerInfoCard(String title, bool isDelete) {
return Container(
margin: EdgeInsets.only(
left: Screenutil.length(32),
top: Screenutil.length(26),
right: Screenutil.length(32),
left: 32.w,
top: 26.w,
right: 32.w,
),
child: Container(
padding: EdgeInsets.only(
left: Screenutil.length(40),
right: Screenutil.length(26),
top: Screenutil.length(26),
bottom: Screenutil.length(25),
left: 40.w,
right: 26.w,
top: 26.w,
bottom: 25.w,
),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -179,7 +179,7 @@ class _MineCarPageState extends State<MineCarPage> {
title,
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
@ -188,7 +188,7 @@ class _MineCarPageState extends State<MineCarPage> {
child: Text(
'移除',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff999999),
),
),
@ -207,18 +207,18 @@ class _MineCarPageState extends State<MineCarPage> {
onTap: () {},
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(22),
top: 23.w,
bottom: 22.w,
),
color: Color(0xffffd000),
alignment: Alignment.center,
height: Screenutil.length(85),
height: 85.w,
width: MediaQuery.of(context).size.width,
child: Text(
buttonName,
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -243,7 +243,7 @@ class _MineCarPageState extends State<MineCarPage> {
ListView(
children: [
Container(
margin: EdgeInsets.only(bottom: Screenutil.length(85)),
margin: EdgeInsets.only(bottom: 85.w),
child: Column(
children: [
Column(
@ -255,7 +255,7 @@ class _MineCarPageState extends State<MineCarPage> {
.toList(),
),
// Container(
// margin: EdgeInsets.only(top: Screenutil.length(64)),
// margin: EdgeInsets.only(top: 64.w),
// child: Column(
// children: _listCart
// .map((item) => _containerInfoCard(

@ -29,10 +29,10 @@ class _SelectCommunityPageState extends State<SelectCommunityPage> {
Container(
width: MediaQuery.of(context).size.width,
color: Colors.white,
margin: EdgeInsets.only(top: Screenutil.length(32)),
margin: EdgeInsets.only(top: 32.w),
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(28),
horizontal: Screenutil.length(32)),
vertical: 28.w,
horizontal: 32.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -41,13 +41,13 @@ class _SelectCommunityPageState extends State<SelectCommunityPage> {
Icon(
EvilIcons.location,
color: Color(0xff333333),
size: Screenutil.size(40),
size: 40.sp,
),
SizedBox(width: Screenutil.length(18)),
SizedBox(width: 18.w),
Text(
'深圳市',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
)
@ -57,18 +57,18 @@ class _SelectCommunityPageState extends State<SelectCommunityPage> {
child: Icon(
MaterialIcons.refresh,
color: Color(0xff333333),
size: Screenutil.size(40),
size: 40.sp,
),
),
],
),
),
Container(
margin: EdgeInsets.all(Screenutil.length(32)),
margin: EdgeInsets.all(32.w),
child: Text(
'所有社区',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -87,12 +87,12 @@ class _SelectCommunityPageState extends State<SelectCommunityPage> {
width: MediaQuery.of(context).size.width,
color: Colors.white,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(28),
horizontal: Screenutil.length(32)),
vertical: 28.w,
horizontal: 32.w),
child: Text(
_communityList[index],
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),

@ -25,11 +25,11 @@ class _SelectParkingPageState extends State<SelectParkingPage> {
body: ListView(
children: [
Container(
margin: EdgeInsets.all(Screenutil.length(32)),
margin: EdgeInsets.all(32.w),
child: Text(
'所有社区',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),
@ -42,12 +42,12 @@ class _SelectParkingPageState extends State<SelectParkingPage> {
width: MediaQuery.of(context).size.width,
color: Colors.white,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(28),
horizontal: Screenutil.length(32)),
vertical: 28.w,
horizontal: 32.w),
child: Text(
'${widget.bundle.getString('title')}地下车库11号${index + 1}',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333),
),
),

@ -32,11 +32,11 @@ class _HouseAuthenticatePageState extends State<HouseAuthenticatePage> {
return InkWell(
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(19),
bottom: Screenutil.length(21),
top: 19.w,
bottom: 21.w,
),
alignment: Alignment.center,
width: Screenutil.length(686),
width: 686.w,
decoration: BoxDecoration(
color: Color(0xffffd000),
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -51,7 +51,7 @@ class _HouseAuthenticatePageState extends State<HouseAuthenticatePage> {
'保存',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.length(32),
fontSize: 32.w,
color: Color(0xff333333),
),
),
@ -78,9 +78,9 @@ class _HouseAuthenticatePageState extends State<HouseAuthenticatePage> {
},
child: Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 32.w,
left: 32.w,
right: 32.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
@ -90,8 +90,8 @@ class _HouseAuthenticatePageState extends State<HouseAuthenticatePage> {
_inputList.length,
(index) => Container(
padding: EdgeInsets.only(
top: Screenutil.length(23),
bottom: Screenutil.length(24),
top: 23.w,
bottom: 24.w,
),
decoration: BoxDecoration(
border: Border(
@ -104,10 +104,10 @@ class _HouseAuthenticatePageState extends State<HouseAuthenticatePage> {
Text(
_inputList[index]['title'],
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff333333)),
),
SizedBox(height: Screenutil.length(25)),
SizedBox(height: 25.w),
CommonInput(
hintText: _inputList[index]['hintText'],
inputController: _inputList[index]
@ -119,7 +119,7 @@ class _HouseAuthenticatePageState extends State<HouseAuthenticatePage> {
),
),
),
SizedBox(height: Screenutil.length(89)),
SizedBox(height: 89.w),
_inkWellSave(),
],
),

@ -20,15 +20,15 @@ class _MineHousePageState extends State<MineHousePage> {
Widget _containerHouseCard(String title, subtitle) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(24),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 24.w,
left: 32.w,
right: 32.w,
),
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(41),
bottom: Screenutil.length(41),
left: Screenutil.length(27),
top: 41.w,
bottom: 41.w,
left: 27.w,
),
decoration: BoxDecoration(
border:
@ -40,25 +40,25 @@ class _MineHousePageState extends State<MineHousePage> {
children: [
Image.asset(
AssetsImage.HOUSEATTESTATION,
height: Screenutil.length(48),
width: Screenutil.length(48),
height: 48.w,
width: 48.w,
),
SizedBox(width: Screenutil.length(20)),
SizedBox(width: 20.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
title,
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff474747),
),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
subtitle,
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff474747),
),
)
@ -78,11 +78,11 @@ class _MineHousePageState extends State<MineHousePage> {
},
child: Container(
padding: EdgeInsets.only(
top: Screenutil.length(11),
bottom: Screenutil.length(10),
top: 11.w,
bottom: 10.w,
),
alignment: Alignment.center,
width: Screenutil.length(167),
width: 167.w,
decoration: BoxDecoration(
color: Color(0xffffd000),
borderRadius: BorderRadius.all(Radius.circular(4)),
@ -97,7 +97,7 @@ class _MineHousePageState extends State<MineHousePage> {
'去认证',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
),
),
@ -113,27 +113,27 @@ class _MineHousePageState extends State<MineHousePage> {
children: [
Image.asset(
AssetsImage.HOUSEHEADER,
height: Screenutil.length(124),
width: Screenutil.length(124),
height: 124.w,
width: 124.w,
),
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
Text(
'马泽鹏',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff474747),
),
),
SizedBox(height: Screenutil.length(8)),
SizedBox(height: 8.w),
Text(
'经过产权人审核成为住户,开启更多功能',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
SizedBox(height: Screenutil.length(39)),
SizedBox(height: 39.w),
_inkWellCheck(),
],
),
@ -161,7 +161,7 @@ class _MineHousePageState extends State<MineHousePage> {
))
.toList(),
),
SizedBox(height: Screenutil.length(156)),
SizedBox(height: 156.w),
_containerAttestation(),
],
),

@ -65,13 +65,13 @@ class NoticePage extends StatelessWidget {
child: Row(
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(12)),
margin: EdgeInsets.only(right: 12.w),
child: ClipOval(
child: CachedImageWrapper(
url:
'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=1380335538,732392216&fm=26&gp=0.jpg',
width: Screenutil.length(45),
height: Screenutil.length(45),
width: 45.w,
height: 45.w,
),
),
),
@ -81,21 +81,21 @@ class NoticePage extends StatelessWidget {
TextSpan(
text: '管理员 ',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
TextSpan(
text: ' 发布于 ',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff666666),
),
),
TextSpan(
text: '2020-08-12',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),
@ -122,32 +122,32 @@ class NoticePage extends StatelessWidget {
color: Colors.white,
child: ListView(
padding: EdgeInsets.only(
top: Screenutil.length(26),
left: Screenutil.length(32),
right: Screenutil.length(32),
bottom: Screenutil.length(60)),
top: 26.w,
left: 32.w,
right: 32.w,
bottom: 60.w),
children: [
Text(
bundle.getMap('details')['title'],
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff333333),
fontWeight: FontWeight.w600,),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(45)),
margin: EdgeInsets.only(top: 45.w),
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(6)),
child: CachedImageWrapper(
url: bundle.getMap('details')['imagePath'],
width: Screenutil.length(686),
height: Screenutil.length(228),
width: 686.w,
height: 228.w,
),
),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(44)),
width: Screenutil.length(647),
margin: EdgeInsets.only(top: 44.w),
width: 647.w,
child: Html(data: htmlData),
),
_creater(),

@ -74,9 +74,9 @@ class _AlarmPageState extends State<AlarmPage> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
margin: EdgeInsets.only(top: Screenutil.length(32)),
margin: EdgeInsets.only(top: 32.w),
width: 686.w,
height: Screenutil.length(148),
height: 148.w,
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.9),
borderRadius: BorderRadius.circular(16),
@ -88,41 +88,41 @@ class _AlarmPageState extends State<AlarmPage> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(24),
left: Screenutil.length(32)),
top: 24.w,
left: 32.w),
child: Text(
'当前位置(仅供参考)',
style: TextStyle(
fontWeight: FontWeight.w600,
color: Color(0xff333333),
fontSize: Screenutil.size(28)),
fontSize: 28.sp),
),
),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(20),
left: Screenutil.length(32)),
top: 20.w,
left: 32.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: [
Icon(
Entypo.location_pin,
color: Color(0xff666666),
size: Screenutil.size(29),
size: 29.sp,
),
Container(
margin:
EdgeInsets.only(left: Screenutil.length(5)),
EdgeInsets.only(left: 5.w),
child: Text(
(_location == null)
? '加载中……'
: _location.aoiName,
style: TextStyle(
color: Color(0xff666666),
fontSize: Screenutil.size(28),
fontSize: 28.sp,
),
),
),
@ -137,11 +137,11 @@ class _AlarmPageState extends State<AlarmPage> {
Spacer(),
Container(
alignment: Alignment.center,
width: Screenutil.length(66),
height: Screenutil.length(66),
width: 66.w,
height: 66.w,
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(Screenutil.length(66)),
BorderRadius.circular(66.w),
boxShadow: <BoxShadow>[
BoxShadow(
color: Color(0x1F000000),
@ -154,7 +154,7 @@ class _AlarmPageState extends State<AlarmPage> {
padding: EdgeInsets.zero,
shape: RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(Screenutil.length(66))),
BorderRadius.circular(66.w)),
color: Color(0xFFFFFFFF),
onPressed: () {
_amapController?.setCenterCoordinate(
@ -165,19 +165,19 @@ class _AlarmPageState extends State<AlarmPage> {
},
child: Icon(
Icons.location_searching,
size: Screenutil.length(44),
size: 44.w,
),
),
),
SizedBox(width: Screenutil.length(34)),
SizedBox(width: 34.w),
],
),
SizedBox(
height: Screenutil.length(29),
height: 29.w,
),
Container(
width: double.infinity,
height: Screenutil.length(271),
height: 271.w,
alignment: Alignment.center,
decoration:
BoxDecoration(color: Color(0xFFFFFFFF).withOpacity(0.9)),
@ -186,19 +186,19 @@ class _AlarmPageState extends State<AlarmPage> {
alignment: Alignment.topCenter,
children: [
Positioned(
bottom: Screenutil.length(173),
bottom: 173.w,
child: Container(
padding: EdgeInsets.all(Screenutil.length(12)),
height: Screenutil.length(196),
width: Screenutil.length(196),
padding: EdgeInsets.all(12.w),
height: 196.w,
width: 196.w,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(Screenutil.length(196))),
Radius.circular(196.w)),
),
child: Container(
height: Screenutil.length(172),
width: Screenutil.length(172),
height: 172.w,
width: 172.w,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.bottomLeft,
@ -206,20 +206,20 @@ class _AlarmPageState extends State<AlarmPage> {
colors: [Color(0xffef0909), Color(0xffff8880)],
),
borderRadius: BorderRadius.all(
Radius.circular(Screenutil.length(172))),
Radius.circular(172.w)),
boxShadow: <BoxShadow>[
BoxShadow(
color: Color(0xfffd7770).withOpacity(0.33),
offset: Offset(0, Screenutil.length(10)),
blurRadius: Screenutil.length(20),
spreadRadius: Screenutil.length(4),
offset: Offset(0, 10.w),
blurRadius: 20.w,
spreadRadius: 4.w,
)
],
),
child: FlatButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(
Screenutil.length(172))),
172.w)),
onPressed: () {
setState(() {
_makephonenum('tel:110');
@ -228,7 +228,7 @@ class _AlarmPageState extends State<AlarmPage> {
child: Icon(
Feather.phone_call,
color: Colors.white,
size: Screenutil.size(87),
size: 87.sp,
),
),
),
@ -236,12 +236,12 @@ class _AlarmPageState extends State<AlarmPage> {
),
Column(
children: [
SizedBox(height: Screenutil.length(146)),
SizedBox(height: 146.w),
Text(
'谎报警情,依法追责',
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xffe02020),
),
),
@ -249,7 +249,7 @@ class _AlarmPageState extends State<AlarmPage> {
Text(
'谎报警情将可能被处以五日以上十日以下拘留',
style: TextStyle(
fontSize: Screenutil.size(24),
fontSize: 24.sp,
color: Color(0xff999999),
),
),

@ -17,7 +17,7 @@ class ExplainTemplate extends BeautifulPopupTemplate {
@override
final maxWidth = 400.w;
@override
final maxHeight = Screenutil.length(617);
final maxHeight = 617.w;
@override
final bodyMargin = 0;
@override
@ -55,9 +55,9 @@ class ExplainTemplate extends BeautifulPopupTemplate {
// return Container(
// color: Colors.white,
// padding: EdgeInsets.only(
// top: Screenutil.length(32),
// left: Screenutil.length(32),
// right: Screenutil.length(32),
// top: 32.w,
// left: 32.w,
// right: 32.w,
// ),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
@ -71,7 +71,7 @@ class ExplainTemplate extends BeautifulPopupTemplate {
// ),
// ),
// Container(
// margin: EdgeInsets.only(top: Screenutil.length(20)),
// margin: EdgeInsets.only(top: 20.w),
// child: Text(
// '点击“呼叫110”后您可以直接拨打本地110。页面中提供了您当前所在位置以便您与警方沟通。GPS信号弱时位置可能存在偏移',
// style: TextStyle(

@ -20,14 +20,14 @@ class _OpenDoorPageState extends State<OpenDoorPage> {
title: Text(
'实名认证',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff030303),
),
),
content: Text(
'\n为了小区的安全,需要先进行实名认证',
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff030303),
),
),
@ -36,7 +36,7 @@ class _OpenDoorPageState extends State<OpenDoorPage> {
child: Text(
'考虑考虑',
style: TextStyle(
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xff333333),
),
),
@ -49,7 +49,7 @@ class _OpenDoorPageState extends State<OpenDoorPage> {
'前去认证',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: Screenutil.size(34),
fontSize: 34.sp,
color: Color(0xffff8200),
),
),
@ -80,7 +80,7 @@ class _OpenDoorPageState extends State<OpenDoorPage> {
child: ListView(
children: [
Container(
margin: EdgeInsets.only(top: Screenutil.length(220)),
margin: EdgeInsets.only(top: 220.w),
child: Column(
children: [
InkWell(
@ -89,22 +89,22 @@ class _OpenDoorPageState extends State<OpenDoorPage> {
children: [
Container(
alignment: Alignment.center,
width: Screenutil.length(400),
height: Screenutil.length(420),
width: 400.w,
height: 420.w,
child: Image.asset(
'assets/images/open_door.png',
width: Screenutil.length(400),
height: Screenutil.length(420),
width: 400.w,
height: 420.w,
fit: BoxFit.fill,
),
),
Positioned(
top: Screenutil.length(120),
left: Screenutil.length(137.5),
top: 120.w,
left:137.5.w,
child: Image.asset(
'assets/images/lock.png',
width: Screenutil.length(125),
height: Screenutil.length(150),
width: 125.w,
height: 150.w,
fit: BoxFit.fill,
),
),
@ -112,11 +112,11 @@ class _OpenDoorPageState extends State<OpenDoorPage> {
),
),
Container(
margin: EdgeInsets.only(top: Screenutil.length(40)),
margin: EdgeInsets.only(top: 40.w),
child: Text(
'未检测到相关设备',
style: TextStyle(
fontSize: Screenutil.length(44),
fontSize: 44.w,
color: Color(0xff999999),
fontWeight: FontWeight.w600,
),

@ -28,54 +28,54 @@ class _OpeningCodePageState extends State<OpeningCodePage> {
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(70),
left: Screenutil.length(32),
right: Screenutil.length(32),
bottom: Screenutil.length(76),
top: 70.w,
left: 32.w,
right: 32.w,
bottom: 76.w,
),
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(20),
vertical: Screenutil.length(32),
horizontal: 20.w,
vertical: 32.w,
),
decoration: BoxDecoration(
color: Color(0xffffffff),
borderRadius:
BorderRadius.all(Radius.circular(Screenutil.length(8))),
BorderRadius.all(Radius.circular(8.w)),
),
height: Screenutil.length(746),
width: Screenutil.length(686),
height: 746.w,
width: 686.w,
child: Column(
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(44),
bottom: Screenutil.length(32),
top: 44.w,
bottom: 32.w,
),
height: Screenutil.length(460),
width: Screenutil.length(460),
height: 460.w,
width: 460.w,
child: QrImage(
padding: EdgeInsets.zero,
data: '智慧社区开门码',
size: Screenutil.length(460),
size: 460.w,
),
),
Container(
padding: EdgeInsets.symmetric(
horizontal: Screenutil.length(29),
vertical: Screenutil.length(33),
horizontal: 29.w,
vertical: 33.w,
),
decoration: BoxDecoration(
color: Color(0xfffffbf6),
borderRadius: BorderRadius.all(
Radius.circular(Screenutil.length(8))),
Radius.circular(8.w)),
),
width: Screenutil.length(646),
height: Screenutil.length(146),
width: 646.w,
height: 146.w,
child: Text(
'扫一扫,你的专属二维码,人人文明出行,路路畅通安宁,智慧社区祝您一路顺风',
maxLines: 2,
style: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
color: Color(0xff666666),
),
),
@ -91,13 +91,13 @@ class _OpeningCodePageState extends State<OpeningCodePage> {
Icon(
AntDesign.checkcircleo,
color: Color(0xffffc40c),
size: Screenutil.size(32),
size: 32.sp,
),
SizedBox(width: Screenutil.length(19)),
SizedBox(width: 19.w),
Text(
'已刷新',
style: TextStyle(
fontSize: Screenutil.size(32),
fontSize: 32.sp,
color: Color(0xff999999),
),
),

@ -29,7 +29,7 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
elevation: 0,
backgroundColor: Colors.white,
leading: IconButton(
icon: Icon(AntDesign.left, size: Screenutil.size(40)),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
},
@ -63,10 +63,10 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
Container _containerRadio() {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(8),
top: 8.w,
),
padding: EdgeInsets.only(
left: Screenutil.length(32),
left: 32.w,
),
child: Row(
children: [
@ -75,11 +75,11 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
style: TextStyle(
fontSize: BaseStyle.fontSize28, color: BaseStyle.color333333),
),
SizedBox(width: Screenutil.length(34)),
SizedBox(width: 34.w),
Row(
children: _listRadio
.map((item) => Container(
margin: EdgeInsets.only(left: Screenutil.length(44)),
margin: EdgeInsets.only(left: 44.w),
child: InkWell(
onTap: () {
setState(() {
@ -98,7 +98,7 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
? BaseStyle.colorff8500
: BaseStyle.colord8d8d8,
),
SizedBox(width: Screenutil.length(16)),
SizedBox(width: 16.w),
Text(
item['radioName'],
style: TextStyle(
@ -122,12 +122,12 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
Container _containerEvaluateTextField() {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(70),
top: 70.w,
),
padding: EdgeInsets.only(
top: Screenutil.length(22),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 22.w,
left: 32.w,
right: 32.w,
),
color: Colors.white,
child: Container(
@ -145,8 +145,8 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
decoration: InputDecoration(
isDense: true,
contentPadding: EdgeInsets.only(
top: Screenutil.length(0),
bottom: Screenutil.length(0),
top: 0.w,
bottom: 0.w,
),
hintText: hintText,
border: InputBorder.none, //线
@ -168,10 +168,10 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
Container _containerAddImage() {
return Container(
padding: EdgeInsets.only(
left: Screenutil.length(36),
right: Screenutil.length(36),
top: Screenutil.length(32),
bottom: Screenutil.length(24)),
left: 36.w,
right: 36.w,
top: 32.w,
bottom: 24.w),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -180,12 +180,12 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
style: TextStyle(
fontSize: BaseStyle.fontSize28, color: BaseStyle.color333333),
),
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
InkWell(
onTap: () {},
child: Container(
width: Screenutil.length(218),
height: Screenutil.length(218),
width: 218.w,
height: 218.w,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(8)),
@ -205,10 +205,10 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
return InkWell(
child: Container(
alignment: Alignment.center,
height: Screenutil.length(85),
width: Screenutil.length(686),
height: 85.w,
width: 686.w,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(20),
vertical: 20.w,
),
decoration: BoxDecoration(
color: Color(0xffffc40c),
@ -243,9 +243,9 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
children: [
Container(
margin: EdgeInsets.only(
top: Screenutil.length(21),
left: Screenutil.length(24),
right: Screenutil.length(24),
top: 21.w,
left: 24.w,
right: 24.w,
),
decoration: BoxDecoration(
color: Colors.white,
@ -268,7 +268,7 @@ class _EvaluateGoodPageState extends State<EvaluateGoodPage> {
],
),
),
SizedBox(height: Screenutil.length(26)),
SizedBox(height: 26.w),
_inkWellRelease(),
],
),

@ -32,7 +32,7 @@ class _LookLogisticsPageState extends State<LookLogisticsPage> {
children: <Widget>[
_body(),
SlidingUpPanel(
margin: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
margin: EdgeInsets.symmetric(horizontal: 32.w),
maxHeight: _panelHeightOpen,
minHeight: _panelHeightClosed,
parallaxEnabled: true,
@ -45,10 +45,10 @@ class _LookLogisticsPageState extends State<LookLogisticsPage> {
),
),
Positioned(
top: Screenutil.length(32) + _statusHeight,
top: 32.w + _statusHeight,
child: Container(
width: Screenutil.length(686),
padding: EdgeInsets.symmetric(horizontal: Screenutil.length(32)),
width: 686.w,
padding: EdgeInsets.symmetric(horizontal: 32.w),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(6),
@ -64,7 +64,7 @@ class _LookLogisticsPageState extends State<LookLogisticsPage> {
child: IconButton(
padding: EdgeInsets.all(0),
alignment: Alignment.centerLeft,
icon: Icon(AntDesign.left, size: Screenutil.size(40)),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
},
@ -76,13 +76,13 @@ class _LookLogisticsPageState extends State<LookLogisticsPage> {
child: CachedImageWrapper(
url:
'https://ns-strategy.cdn.bcebos.com/ns-strategy/upload/fc_big_pic/part-00412-2241.jpg',
width: Screenutil.length(72),
height: Screenutil.length(72),
width: 72.w,
height: 72.w,
),
),
),
Container(
margin: EdgeInsets.only(left: Screenutil.length(20)),
margin: EdgeInsets.only(left: 20.w),
child: Text(
'已签收',
style: TextStyle(
@ -96,8 +96,8 @@ class _LookLogisticsPageState extends State<LookLogisticsPage> {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(
width: Screenutil.length(1),
height: Screenutil.length(50),
width: 1.w,
height: 50.w,
child: DecoratedBox(
decoration:
BoxDecoration(color: BaseStyle.color999999),
@ -106,7 +106,7 @@ class _LookLogisticsPageState extends State<LookLogisticsPage> {
InkWell(
onTap: () {},
child: Container(
margin: EdgeInsets.only(left: Screenutil.length(20)),
margin: EdgeInsets.only(left: 20.w),
child: Column(
children: [
Icon(
@ -116,7 +116,7 @@ class _LookLogisticsPageState extends State<LookLogisticsPage> {
),
Container(
margin:
EdgeInsets.only(top: Screenutil.length(8)),
EdgeInsets.only(top: 8.w),
child: Text(
'物流投诉',
style: TextStyle(
@ -147,7 +147,7 @@ class _LookLogisticsPageState extends State<LookLogisticsPage> {
controller: sc,
children: <Widget>[
Container(
height: Screenutil.length(40),
height: 40.w,
alignment: Alignment.centerLeft,
decoration: BoxDecoration(
color: Color(0xfff0f0f0),

@ -21,7 +21,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
elevation: 0,
backgroundColor: BaseStyle.colorffd000,
leading: IconButton(
icon: Icon(AntDesign.left, size: Screenutil.size(40)),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
},
@ -43,9 +43,9 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
width: double.infinity,
color: Color(0xffffd000),
padding: EdgeInsets.only(
top: Screenutil.length(44),
bottom: Screenutil.length(44),
left: Screenutil.length(33),
top: 44.w,
bottom: 44.w,
left: 33.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -58,7 +58,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
color: BaseStyle.color333333,
),
),
SizedBox(height: Screenutil.length(10)),
SizedBox(height: 10.w),
Text(
'还剩9小时33分自动确认',
style: TextStyle(
@ -75,19 +75,19 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
return Container(
color: Color(0xffffffff),
padding: EdgeInsets.only(
left: Screenutil.length(32),
top: Screenutil.length(24),
bottom: Screenutil.length(24),
left: 32.w,
top: 24.w,
bottom: 24.w,
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Image.asset(
AssetsImage.LOCATION,
height: Screenutil.length(78),
width: Screenutil.length(78),
height: 78.w,
width: 78.w,
),
SizedBox(width: Screenutil.length(24)),
SizedBox(width: 24.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -101,7 +101,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
color: BaseStyle.color333333,
),
),
SizedBox(width: Screenutil.length(16)),
SizedBox(width: 16.w),
Text(
'18809801254',
style: TextStyle(
@ -111,9 +111,9 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
),
],
),
SizedBox(height: Screenutil.length(16)),
SizedBox(height: 16.w),
Container(
width: Screenutil.length(584),
width: 584.w,
child: ExtendedText.rich(
TextSpan(
children: [
@ -150,8 +150,8 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
},
child: Container(
alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: Screenutil.length(6)),
width: Screenutil.length(134),
padding: EdgeInsets.symmetric(vertical: 6.w),
width: 134.w,
decoration: BoxDecoration(
border: Border.all(color: BaseStyle.color999999, width: 0.5),
borderRadius: BorderRadius.all(Radius.circular(36)),
@ -185,16 +185,16 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
children: [
Image.asset(
imagePath,
height: Screenutil.length(179),
width: Screenutil.length(173),
height: 179.w,
width: 173.w,
fit: BoxFit.fill,
),
SizedBox(width: Screenutil.length(24)),
SizedBox(width: 24.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: Screenutil.length(252),
width: 252.w,
child: Text(
content,
overflow: TextOverflow.ellipsis,
@ -205,7 +205,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
),
),
),
SizedBox(height: Screenutil.length(16)),
SizedBox(height: 16.w),
Text(
specs,
style: TextStyle(
@ -217,12 +217,12 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
),
],
),
SizedBox(height: Screenutil.length(73)),
SizedBox(height: 73.w),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Container(
margin: EdgeInsets.only(right: Screenutil.length(25)),
margin: EdgeInsets.only(right: 25.w),
child: Text(
'实付款¥${payPrice}',
style: TextStyle(
@ -238,7 +238,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
),
Positioned(
top: 0,
right: Screenutil.length(23),
right: 23.w,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.end,
@ -262,7 +262,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
),
),
Positioned(
top: Screenutil.length(103),
top: 103.w,
right: 0,
child: _inkWellRefund(listContent,payPrice),
),
@ -275,12 +275,12 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
List<Map<String, dynamic>> listContent, double payPrice) {
return Container(
color: Color(0xffffffff),
margin: EdgeInsets.only(top: Screenutil.length(32)),
margin: EdgeInsets.only(top: 32.w),
padding: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32),
bottom: Screenutil.length(24),
top: 32.w,
left: 32.w,
right: 32.w,
bottom: 24.w,
),
child: Column(
children: listContent
@ -302,11 +302,11 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
return Container(
color: Color(0xffffffff),
width: double.infinity,
margin: EdgeInsets.only(top: Screenutil.length(24)),
margin: EdgeInsets.only(top: 24.w),
padding: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(31),
bottom: Screenutil.length(39),
top: 32.w,
left: 31.w,
bottom: 39.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -321,7 +321,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
Column(
children: listOrderDetail
.map((item) => Container(
margin: EdgeInsets.only(top: Screenutil.length(22)),
margin: EdgeInsets.only(top: 22.w),
child: Row(
children: [
Text(
@ -330,7 +330,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
fontSize: BaseStyle.fontSize24,
color: BaseStyle.color999999),
),
SizedBox(width: Screenutil.length(75)),
SizedBox(width: 75.w),
Text(
item['subtitle'],
style: TextStyle(
@ -354,7 +354,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
alignment: Alignment.center,
color: color,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(26.5),
vertical: 26.5.w,
),
child: Text(
title,
@ -438,7 +438,7 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
bottom: 0,
child: Container(
alignment: Alignment.center,
height: Screenutil.length(98),
height: 98.w,
width: MediaQuery.of(context).size.width,
child: Row(
children: _listBottom

@ -46,11 +46,11 @@ class _OrderPageState extends State<OrderPage>
labelColor: BaseStyle.colorff8500,
unselectedLabelColor: BaseStyle.color333333,
labelStyle: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
fontWeight: FontWeight.w600,
),
unselectedLabelStyle: TextStyle(
fontSize: Screenutil.size(28),
fontSize: 28.sp,
fontWeight: FontWeight.w500,
),
tabs: List.generate(
@ -68,11 +68,11 @@ class _OrderPageState extends State<OrderPage>
return InkWell(
onTap: () {},
child: Container(
margin: EdgeInsets.only(right: Screenutil.length(32)),
margin: EdgeInsets.only(right: 32.w),
padding: EdgeInsets.only(
left: Screenutil.length(40),
top: Screenutil.length(20),
bottom: Screenutil.length(20)),
left: 40.w,
top: 20.w,
bottom: 20.w),
decoration: BoxDecoration(
color: BaseStyle.colorf3f3f3,
borderRadius: BorderRadius.all(Radius.circular(36)),
@ -109,7 +109,7 @@ class _OrderPageState extends State<OrderPage>
backgroundColor: Color(0xffffffff),
leading: InkWell(
onTap: () => Navigator.pop(context),
child: Icon(AntDesign.left, size: Screenutil.size(40)),
child: Icon(AntDesign.left, size: 40.sp),
),
centerTitle: false,
title: _inkWellSearch(),

@ -41,7 +41,7 @@ class _PersonalIndexState extends State<PersonalIndex>
elevation: 0,
stretch: true,
floating: true,
expandedHeight: Screenutil.length(450) - height,
expandedHeight: 450.w - height,
backgroundColor: Colors.white,
flexibleSpace: FlexibleSpaceBar(
background: Stack(
@ -63,8 +63,8 @@ class _PersonalIndexState extends State<PersonalIndex>
Spacer(),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(175),
left: Screenutil.length(32)),
top: 175.w,
left: 32.w),
child: Row(
children: [
Container(
@ -72,8 +72,8 @@ class _PersonalIndexState extends State<PersonalIndex>
child: CachedImageWrapper(
url:
'https://dss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1851283359,3457678391&fm=26&gp=0.jpg',
width: Screenutil.length(106),
height: Screenutil.length(106),
width: 106.w,
height: 106.w,
isSigned: userProvider.isSigned,
),
),
@ -84,7 +84,7 @@ class _PersonalIndexState extends State<PersonalIndex>
},
child: Container(
margin: EdgeInsets.only(
left: Screenutil.length(16)),
left: 16.w),
child: userProvider.isSigned
? Text(
'Cheailune',
@ -106,14 +106,14 @@ class _PersonalIndexState extends State<PersonalIndex>
),
Container(
margin: EdgeInsets.only(
top: Screenutil.length(38),
left: Screenutil.length(36),
right: Screenutil.length(36),
top: 38.w,
left: 36.w,
right: 36.w,
),
child: Image.asset(
'assets/images/member_bg.png',
width: Screenutil.length(678),
height: Screenutil.length(129),
width: 678.w,
height: 129.w,
),
),
],
@ -129,7 +129,7 @@ class _PersonalIndexState extends State<PersonalIndex>
Container _containerBar(String title) {
return Container(
color: title == '我的物业' ? Colors.white : BaseStyle.colorf9f9f9,
padding: EdgeInsets.all(title == '我的物业' ? 0 : Screenutil.length(32)),
padding: EdgeInsets.all(title == '我的物业' ? 0 : 32.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -159,7 +159,7 @@ class _PersonalIndexState extends State<PersonalIndex>
color: BaseStyle.color333333,
),
),
SizedBox(width: Screenutil.length(8)),
SizedBox(width: 8.w),
Icon(
AntDesign.right,
size: BaseStyle.fontSize28,
@ -186,7 +186,7 @@ class _PersonalIndexState extends State<PersonalIndex>
),
SliverToBoxAdapter(
child: Container(
margin: EdgeInsets.only(top: Screenutil.length(10)),
margin: EdgeInsets.only(top: 10.w),
color: BaseStyle.colorf9f9f9,
child: GridButton(
gridList: AssetsImage.orderGridList,
@ -197,9 +197,9 @@ class _PersonalIndexState extends State<PersonalIndex>
SliverToBoxAdapter(
child: Container(
margin: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
right: Screenutil.length(32)),
top: 32.w,
left: 32.w,
right: 32.w),
child: Divider(
color: Color(0xffd8d8d8),
),
@ -211,7 +211,7 @@ class _PersonalIndexState extends State<PersonalIndex>
SliverToBoxAdapter(
child: Container(
color: BaseStyle.colorf9f9f9,
margin: EdgeInsets.only(top: Screenutil.length(10)),
margin: EdgeInsets.only(top: 10.w),
alignment: Alignment.center,
child: GridButton(
gridList: AssetsImage.orderGridList.take(3).skip(1).toList(),
@ -236,8 +236,8 @@ class _PersonalIndexState extends State<PersonalIndex>
),
],
),
margin: EdgeInsets.all(Screenutil.length(20)),
padding: EdgeInsets.all(Screenutil.length(12)),
margin: EdgeInsets.all(20.w),
padding: EdgeInsets.all(12.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [

@ -25,7 +25,7 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
elevation: 0,
backgroundColor: BaseStyle.colorffd000,
leading: IconButton(
icon: Icon(AntDesign.left, size: Screenutil.size(40)),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
},
@ -59,13 +59,13 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
Container _containerRefundPrice(double payPrice) {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(22),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 22.w,
left: 32.w,
right: 32.w,
),
color: Colors.white,
child: Container(
padding: EdgeInsets.only(bottom: Screenutil.length(26)),
padding: EdgeInsets.only(bottom: 26.w),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)),
@ -97,13 +97,13 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
Container _containerRefundTextField() {
return Container(
padding: EdgeInsets.only(
top: Screenutil.length(22),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 22.w,
left: 32.w,
right: 32.w,
),
color: Colors.white,
child: Container(
padding: EdgeInsets.only(bottom: Screenutil.length(26)),
padding: EdgeInsets.only(bottom: 26.w),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)),
@ -118,7 +118,7 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
color: BaseStyle.color333333,
),
),
SizedBox(height: Screenutil.length(23)),
SizedBox(height: 23.w),
TextFormField(
cursorColor: Color(0xffffc40c),
style: TextStyle(
@ -130,8 +130,8 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
decoration: InputDecoration(
isDense: true,
contentPadding: EdgeInsets.only(
top: Screenutil.length(0),
bottom: Screenutil.length(0),
top: 0.w,
bottom: 0.w,
),
hintText: hintText,
border: InputBorder.none, //线
@ -157,7 +157,7 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
alignment: Alignment.center,
color: BaseStyle.colorffc40c,
padding: EdgeInsets.symmetric(
vertical: Screenutil.length(26.5),
vertical: 26.5.w,
),
child: Text(
'提交',
@ -193,11 +193,11 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
children: [
Column(
children: [
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
_containerContentList(
widget.bundle.getMap('details')['listContent'],
),
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
RefundTileCard(
listTile:
widget.bundle.getMap('details')['isRefundGood']
@ -205,7 +205,7 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
: _listTile.take(1).toList()),
_containerRefundPrice(
widget.bundle.getMap('details')['payPrice']),
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
_containerRefundTextField(),
],
),
@ -213,7 +213,7 @@ class _RefundApplyPageState extends State<RefundApplyPage> {
bottom: 0,
child: Container(
alignment: Alignment.center,
height: Screenutil.length(98),
height: 98.w,
width: MediaQuery.of(context).size.width,
child: Row(children: [Expanded(child: _inkWellBottom())]),
),

@ -22,7 +22,7 @@ class _RefundSelectPageState extends State<RefundSelectPage> {
elevation: 0,
backgroundColor: BaseStyle.colorffd000,
leading: IconButton(
icon: Icon(AntDesign.left, size: Screenutil.size(40)),
icon: Icon(AntDesign.left, size: 40.sp),
onPressed: () {
Navigator.pop(context);
},
@ -89,11 +89,11 @@ class _RefundSelectPageState extends State<RefundSelectPage> {
appBar: _appBar(),
body: ListView(
children: [
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
_containerContentList(
widget.bundle.getMap('details')['listContent'],
),
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
RefundTileCard(listTile: _listTile)
],
),

@ -26,7 +26,7 @@ class _OrderCardState extends State<OrderCard> {
Container _containerStatus(String status) {
return Container(
width: double.infinity,
padding: EdgeInsets.only(bottom: Screenutil.length(13)),
padding: EdgeInsets.only(bottom: 13.w),
decoration: BoxDecoration(
border:
Border(bottom: BorderSide(color: Color(0xffd8d8d8), width: 0.5)),
@ -45,7 +45,7 @@ class _OrderCardState extends State<OrderCard> {
Container _containerContent(
String imagePath, content, specs, double price, int shopNum) {
return Container(
margin: EdgeInsets.only(top: Screenutil.length(24)),
margin: EdgeInsets.only(top: 24.w),
child: Stack(
children: [
Row(
@ -54,16 +54,16 @@ class _OrderCardState extends State<OrderCard> {
children: [
Image.asset(
imagePath,
height: Screenutil.length(179),
width: Screenutil.length(173),
height: 179.w,
width: 173.w,
fit: BoxFit.fill,
),
SizedBox(width: Screenutil.length(24)),
SizedBox(width: 24.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: Screenutil.length(262),
width: 262.w,
child: Text(
content,
overflow: TextOverflow.ellipsis,
@ -74,7 +74,7 @@ class _OrderCardState extends State<OrderCard> {
),
),
),
SizedBox(height: Screenutil.length(16)),
SizedBox(height: 16.w),
Text(
specs,
style: TextStyle(
@ -88,7 +88,7 @@ class _OrderCardState extends State<OrderCard> {
),
Positioned(
top: 0,
right: Screenutil.length(8),
right: 8.w,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.end,
@ -134,7 +134,7 @@ class _OrderCardState extends State<OrderCard> {
Container _containerPayInfo(double totalPrice, payPrice) {
return Container(
margin: EdgeInsets.only(right: Screenutil.length(8)),
margin: EdgeInsets.only(right: 8.w),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
@ -145,7 +145,7 @@ class _OrderCardState extends State<OrderCard> {
color: BaseStyle.color999999,
),
),
SizedBox(width: Screenutil.length(16)),
SizedBox(width: 16.w),
Text(
'实付款¥${payPrice}',
style: TextStyle(
@ -188,10 +188,10 @@ class _OrderCardState extends State<OrderCard> {
}
},
child: Container(
margin: EdgeInsets.only(left: Screenutil.length(16)),
margin: EdgeInsets.only(left: 16.w),
alignment: Alignment.center,
width: Screenutil.length(171),
height: Screenutil.length(60),
width: 171.w,
height: 60.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(30)),
border: Border.all(color: buttonColor, width: 1),
@ -210,8 +210,8 @@ class _OrderCardState extends State<OrderCard> {
Container _containerButtonList(List<Map<String, dynamic>> listButton) {
return Container(
margin: EdgeInsets.only(
top: Screenutil.length(42),
right: Screenutil.length(8),
top: 42.w,
right: 8.w,
),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
@ -249,15 +249,15 @@ class _OrderCardState extends State<OrderCard> {
],
),
padding: EdgeInsets.only(
top: Screenutil.length(18),
left: Screenutil.length(20),
right: Screenutil.length(16),
bottom: Screenutil.length(42),
top: 18.w,
left: 20.w,
right: 16.w,
bottom: 42.w,
),
margin: EdgeInsets.only(
top: Screenutil.length(24),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 24.w,
left: 32.w,
right: 32.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,

@ -13,9 +13,9 @@ class RefundShopCard extends StatelessWidget {
return Container(
color: Colors.white,
padding: EdgeInsets.only(
top: Screenutil.length(32),
left: Screenutil.length(32),
bottom: Screenutil.length(32),
top: 32.w,
left: 32.w,
bottom: 32.w,
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
@ -23,16 +23,16 @@ class RefundShopCard extends StatelessWidget {
children: [
Image.asset(
imagePath,
height: Screenutil.length(179),
width: Screenutil.length(173),
height: 179.w,
width: 173.w,
fit: BoxFit.fill,
),
SizedBox(width: Screenutil.length(24)),
SizedBox(width: 24.w),
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: Screenutil.length(458),
width: 458.w,
child: Text(
content,
overflow: TextOverflow.ellipsis,
@ -43,9 +43,9 @@ class RefundShopCard extends StatelessWidget {
),
),
),
SizedBox(height: Screenutil.length(8)),
SizedBox(height: 8.w),
Container(
width: Screenutil.length(456),
width: 456.w,
child: Text(
specs,
overflow: TextOverflow.ellipsis,

@ -16,7 +16,7 @@ class _RefundTileCardState extends State<RefundTileCard> {
Container _refundTile(String title, subtitle) {
return Container(
width: double.infinity,
padding: EdgeInsets.only(bottom: Screenutil.length(26)),
padding: EdgeInsets.only(bottom: 26.w),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: BaseStyle.coloreeeeee, width: 0.5)),
@ -31,7 +31,7 @@ class _RefundTileCardState extends State<RefundTileCard> {
color: BaseStyle.color333333,
),
),
SizedBox(height: Screenutil.length(24)),
SizedBox(height: 24.w),
Text(
subtitle,
style: TextStyle(
@ -56,9 +56,9 @@ class _RefundTileCardState extends State<RefundTileCard> {
child: Container(
width: double.infinity,
padding: EdgeInsets.only(
top: Screenutil.length(22),
left: Screenutil.length(32),
right: Screenutil.length(32),
top: 22.w,
left: 32.w,
right: 32.w,
),
color: Colors.white,
child: Stack(
@ -69,11 +69,11 @@ class _RefundTileCardState extends State<RefundTileCard> {
),
item['isRight']
? Positioned(
top: Screenutil.length(45),
top: 45.w,
right: 0,
child: Icon(
AntDesign.right,
size: Screenutil.size(40),
size: 40.sp,
color: BaseStyle.colord8d8d8,
),
)

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save