Commit 8eb118fe authored by 杜欣's avatar 杜欣

ui update

parent b520118e
......@@ -12,7 +12,7 @@ import 'package:gmalpha_flutter/ActivityReportModel/page/ActivityReportModel.dar
import 'package:gmalpha_flutter/commonModel/base/Temp.dart';
import 'package:gmalpha_flutter/commonModel/ui/ALColors.dart';
final _goldenColor = Color(0xFFB59C64);
final _goldenColor = Color(0xFFB9A689);
class ActivityReportPage extends StatefulWidget {
ActivityReportModel _model;
......@@ -44,7 +44,7 @@ class ActivityReportState extends State<ActivityReportPage> {
appBar: AppBar(
title: Text(''),
centerTitle: true,
leading: IMAGE.GestureDetector(
leading: GestureDetector(
onTap: (){
Navigator.pop(context,"");
jumpToSearch();
......@@ -81,6 +81,7 @@ class ActivityReportState extends State<ActivityReportPage> {
return errorItem(data.data.message);
}
return Container(
color: Color(0xfff5f5f5),
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(16),
right: ScreenUtil().setWidth(16)),
......@@ -169,8 +170,7 @@ class TopCard extends StatelessWidget {
style: TextStyle(
fontSize: 11,
color: _goldenColor,
fontWeight: FontWeight.bold,
height: 2),
fontWeight: FontWeight.bold),
)
],
));
......@@ -196,8 +196,7 @@ class TopCard extends StatelessWidget {
style: TextStyle(
fontSize: 11,
color: _goldenColor,
fontWeight: FontWeight.bold,
height: 2),
fontWeight: FontWeight.bold),
)
],
),
......@@ -269,7 +268,7 @@ class TopCard extends StatelessWidget {
width: ScreenUtil().setWidth(140),
height: ScreenUtil().setHeight(55),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
......@@ -282,16 +281,19 @@ class TopCard extends StatelessWidget {
fontSize: ScreenUtil().setSp(11),
color: ALColors.Color8E8E8E,
fontWeight: FontWeight.bold)),
),
SizedBox(
width: double.maxFinite,
height: ScreenUtil().setHeight(4),
),
Stack(
children: <Widget>[
Container(
width: double.maxFinite,
height: ScreenUtil().setHeight(32),
height: ScreenUtil().setHeight(28),
),
Positioned(
right: ScreenUtil().setWidth(4),
bottom: ScreenUtil().setHeight(2),
child: AnimationNumber(
targetNmber: share.beat.toDouble(),
delay: 1000,
......@@ -306,7 +308,7 @@ class TopCard extends StatelessWidget {
width: ScreenUtil().setWidth(140),
height: ScreenUtil().setHeight(55),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
......@@ -319,15 +321,18 @@ class TopCard extends StatelessWidget {
fontSize: ScreenUtil().setSp(11),
color: Color(0xFF8E8E8E),
fontWeight: FontWeight.bold))),
SizedBox(
width: double.maxFinite,
height: ScreenUtil().setHeight(4),
),
Stack(
children: <Widget>[
Container(
width: double.maxFinite,
height: ScreenUtil().setHeight(32),
height: ScreenUtil().setHeight(28),
),
Positioned(
right: ScreenUtil().setWidth(6),
bottom: ScreenUtil().setHeight(2),
child: AnimationNumber(
targetNmber: share.rank.toDouble(),
delay: 1000,
......@@ -355,11 +360,14 @@ class PictorialCard extends StatelessWidget {
Widget _gridViewItemUI(BuildContext context, item) {
return Container(
margin: EdgeInsets.only(bottom: ScreenUtil().setHeight(3)),
width: ScreenUtil().setWidth(110),
height: ScreenUtil().setWidth(110),
child: CachedNetworkImage(
imageUrl: '${item.image}',
width: ScreenUtil().setWidth(110),
height: ScreenUtil().setHeight(110)));
imageUrl: '${item.image}',
width: ScreenUtil().setWidth(110),
fit: BoxFit.cover,
)
);
}
Widget _listViewUI(BuildContext context, item) {
......@@ -368,7 +376,7 @@ class PictorialCard extends StatelessWidget {
list.add(_gridViewItemUI(context, item));
});
return Container(
margin: EdgeInsets.only(top: ScreenUtil().setHeight(32)),
margin: EdgeInsets.only(top: 32),
child: GestureDetector(
onTap: () {
jumpToPictorial('${item.protocol}&survey_record_id=$id');
......@@ -378,14 +386,14 @@ class PictorialCard extends StatelessWidget {
children: <Widget>[
Container(
width: ScreenUtil().setWidth(343),
padding: EdgeInsets.only(bottom: ScreenUtil().setHeight(11.0)),
margin: EdgeInsets.only(bottom: ScreenUtil().setHeight(14)),
child: Wrap(
spacing: 6,
children: list),
),
Container(
width: ScreenUtil().setWidth(343),
height: ScreenUtil().setHeight(53),
width: double.maxFinite,
height: 53,
color: Colors.white,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
......
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