Skip to content

G
gmalpha_flutter
Commit 3ccaf436 authored by 杜欣's avatar 杜欣
Browse files
Options

样式调整

parent e046c269
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 63 deletions
lib/ActivityReportModel/page/ActivityReportPage.dart
View file @ 3ccaf436
......@@ -88,7 +88,7 @@ class ActivityReportState extends State<ActivityReportPage> {
child: Column(
children: <Widget>[
TopCard(share: data.data.data.report?.share),
SizedBox(height: ScreenUtil().setHeight(41)),
SizedBox(height: ScreenUtil().setHeight(8)),
PictorialCard(pictorialList: data.data.data.report?.cards, id: _model.id),
SizedBox(height: ScreenUtil().setHeight(38))
],
......@@ -131,7 +131,7 @@ class TopCard extends StatelessWidget {
border: Border(
bottom: BorderSide(color: Color(0xffeeeeee), width: 1.0))),
margin: EdgeInsets.only(left: 18, right: 18),
height: 62,
height: ScreenUtil().setHeight(62),
child: Row(children: <Widget>[
Text('¥',
style: TextStyle(
......@@ -142,7 +142,7 @@ class TopCard extends StatelessWidget {
Text('$val',
style: TextStyle(
color: _goldenColor,
fontSize: 45,
fontSize: ScreenUtil().setSp(45),
fontWeight: FontWeight.bold)),
]),
)
......@@ -179,14 +179,6 @@ class TopCard extends StatelessWidget {
return Container(
child: Row(
children: <Widget>[
Text(
'第',
style: TextStyle(
fontSize: 11,
color: _goldenColor,
fontWeight: FontWeight.bold,
height: 2),
),
SizedBox(width: 4),
Text(
'$val',
......@@ -246,6 +238,7 @@ class TopCard extends StatelessWidget {
style: TextStyle(
color: ALColors.Color323232,
fontSize: ScreenUtil().setSp(12),
height: 17/12,
fontWeight: FontWeight.bold,
letterSpacing: 1.5,
),
......@@ -271,7 +264,7 @@ class TopCard extends StatelessWidget {
children: <Widget>[
Container(
color: Color(0xFFF6F6F6),
width: ScreenUtil().setWidth(139),
width: ScreenUtil().setWidth(140),
height: ScreenUtil().setHeight(55),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
......@@ -307,7 +300,7 @@ class TopCard extends StatelessWidget {
),
Container(
color: Color(0xFFF6F6F6),
width: ScreenUtil().setWidth(139),
width: ScreenUtil().setWidth(140),
height: ScreenUtil().setHeight(55),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
......@@ -316,7 +309,7 @@ class TopCard extends StatelessWidget {
Container(
margin: EdgeInsets.only(
top: ScreenUtil().setHeight(4),
left: ScreenUtil().setWidth(14)),
left: ScreenUtil().setWidth(8)),
child: Text('你的氪金排名为全国',
style: TextStyle(
fontSize: ScreenUtil().setSp(11),
......@@ -329,7 +322,7 @@ class TopCard extends StatelessWidget {
height: ScreenUtil().setHeight(32),
),
Positioned(
right: ScreenUtil().setWidth(11),
right: ScreenUtil().setWidth(8),
bottom: 0,
child: AnimationNumber(
targetNmber: share.rank.toDouble(),
......@@ -357,7 +350,7 @@ class PictorialCard extends StatelessWidget {
Widget _gridViewItemUI(BuildContext context, item) {
return Container(
padding: EdgeInsets.all(3),
padding: EdgeInsets.only(right: 3, bottom: 3, left: 3),
child: CachedNetworkImage(
imageUrl: '${item.image}-w',
width: ScreenUtil().setWidth(110),
......@@ -370,53 +363,55 @@ class PictorialCard extends StatelessWidget {
list.add(_gridViewItemUI(context, item));
});
return Container(
child: GestureDetector(
onTap: () {
print('${item.protocol}&survey_record_id=$id');
jumpToPictorial('${item.protocol}&survey_record_id=$id');
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(bottom: 14.0),
child: Wrap(children: list),
),
Container(
width: ScreenUtil().setWidth(343),
height: ScreenUtil().setHeight(53),
color: Colors.white,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Stack(
children: <Widget>[
Container(
padding: EdgeInsets.only(right: 12),
child: Text(
'${item.guide}',
style: TextStyle(
color: Color(0xFF323232),
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(14)),
),
margin: EdgeInsets.only(top: ScreenUtil().setHeight(32)),
child: GestureDetector(
onTap: () {
jumpToPictorial('${item.protocol}&survey_record_id=$id');
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: EdgeInsets.only(bottom: 11.0),
child: Wrap(children: list),
),
Container(
width: ScreenUtil().setWidth(343),
height: ScreenUtil().setHeight(53),
color: Colors.white,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Stack(
children: <Widget>[
Container(
padding: EdgeInsets.only(right: 12),
child: Text(
'${item.guide}',
style: TextStyle(
color: Color(0xFF323232),
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(14)),
),
Positioned(
width: ScreenUtil().setWidth(5),
height: ScreenUtil().setHeight(10),
top: ScreenUtil().setHeight(4),
right: 0,
child: IMAGE.Image.asset('images/right_icon.png',
width: ScreenUtil().setWidth(5),
height: ScreenUtil().setHeight(10)),
)
],
)
],
))
],
)));
),
Positioned(
width: ScreenUtil().setWidth(10),
height: ScreenUtil().setHeight(20),
top: ScreenUtil().setHeight(-2),
right: 0,
child: IMAGE.Image.asset('images/right_icon.png',
width: ScreenUtil().setWidth(10),
height: ScreenUtil().setHeight(20)),
)
],
)
],
))
],
)
)
);
}
@override
......@@ -517,7 +512,7 @@ class _AnimationCharacterState extends State<AnimationCharacter>
{'url': 'images/light_grey_person.png', 'width': 14.0, 'height': 36.0}
];
final target = widget.targetNmber.ceil() / 10;
final target = (widget.targetNmber / 10).ceil();
_animationController.addListener(() {
var value = _animationController.value;
double percent = value / 10;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment