提交 98c8b12c authored 作者: maodou's avatar maodou

ui修改

上级 5d689120
...@@ -50,7 +50,7 @@ class _CoursePageState extends State<CoursePage> { ...@@ -50,7 +50,7 @@ class _CoursePageState extends State<CoursePage> {
badgeStyle: const badges.BadgeStyle( badgeStyle: const badges.BadgeStyle(
badgeColor: AppTheme.primary, badgeColor: AppTheme.primary,
shape: badges.BadgeShape.circle, shape: badges.BadgeShape.circle,
padding: EdgeInsets.all(3), padding: EdgeInsets.all(2),
), ),
child: CustomButton.icon( child: CustomButton.icon(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
......
...@@ -126,7 +126,7 @@ class _FilterPageState extends State<FilterPage> { ...@@ -126,7 +126,7 @@ class _FilterPageState extends State<FilterPage> {
}, },
child: Container( child: Container(
height: 27, height: 27,
padding: const EdgeInsets.only(left: 15,right: 15,top: 4), padding: const EdgeInsets.only(left: 15,right: 15),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(13.5), borderRadius: BorderRadius.circular(13.5),
color: model.selected?const Color(0xFFC02D55).withOpacity(0.08): Colours.cF4, color: model.selected?const Color(0xFFC02D55).withOpacity(0.08): Colours.cF4,
...@@ -139,7 +139,8 @@ class _FilterPageState extends State<FilterPage> { ...@@ -139,7 +139,8 @@ class _FilterPageState extends State<FilterPage> {
Text(model.name??'',style: TextStyle(fontSize: 13,height: 1.4,color: model.selected?AppTheme.primary: Colours.c3),textAlign: TextAlign.center,), Text(model.name??'',style: TextStyle(fontSize: 13,height: 1.4,color: model.selected?AppTheme.primary: Colours.c3),textAlign: TextAlign.center,),
Image.asset(model.selected?'assets/images/filter_select.png':'assets/images/filter_unselect.png'), Image.asset(model.selected?'assets/images/filter_select.png':'assets/images/filter_unselect.png'),
], ],
):Text(model.name??'',style: TextStyle(fontSize: 13,height: 1.4,color: model.selected?AppTheme.primary: Colours.c3),textAlign: TextAlign.end,), ):Padding(padding: EdgeInsets.only(top: 4.w),child: Text(model.name??'',style: TextStyle(fontSize: 13,height: 1.4,color: model.selected?AppTheme.primary: Colours.c3),textAlign: TextAlign.end,),),
), ),
); );
......
...@@ -199,7 +199,7 @@ class _LoginPageState extends State<LoginPage> { ...@@ -199,7 +199,7 @@ class _LoginPageState extends State<LoginPage> {
height: 14.w, height: 14.w,
// color: AppTheme.primary, // color: AppTheme.primary,
child: Image.asset( child: Image.asset(
controller.agree?'assets/images/check_box_select.png':'assets/images/uncheck.png', controller.agree?'assets/images/check_box_select.png':'assets/images/uncheck.png',fit: BoxFit.contain,
), ),
), ),
Gaps.hGaps5, Gaps.hGaps5,
......
...@@ -56,7 +56,7 @@ class _MinePageState extends State<MinePage> { ...@@ -56,7 +56,7 @@ class _MinePageState extends State<MinePage> {
badgeStyle: const badges.BadgeStyle( badgeStyle: const badges.BadgeStyle(
badgeColor: AppTheme.primary, badgeColor: AppTheme.primary,
shape: badges.BadgeShape.circle, shape: badges.BadgeShape.circle,
padding: EdgeInsets.all(3), padding: EdgeInsets.all(2),
), ),
child: CustomButton.icon( child: CustomButton.icon(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
......
...@@ -33,13 +33,13 @@ class BuildCard extends StatelessWidget { ...@@ -33,13 +33,13 @@ class BuildCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text(model.bookName??'',style: TextStyle(fontSize: 20.w,height: 1.4,color: Colors.white,fontWeight: Fonts.medium),), Text(model.bookName??'',style: TextStyle(fontSize: 18.w,height: 1.4,color: Colors.white,fontWeight: Fonts.boldSemi),),
Gaps.vGaps15, Gaps.vGaps15,
Row( Row(
children: [ children: [
Text('学习总进度',style: TextStyle(fontSize: 15.w,height: 1.4,color: Colors.white),), Text('学习总进度',style: TextStyle(fontSize: 15.w,height: 1.4,color: Colors.white),),
Gaps.hGaps15, Gaps.hGaps15,
Text(model.progress??'',style: TextStyle(fontSize: 16.w,height: 1.4,color: Colors.white,fontWeight: Fonts.medium),), Text(model.progress??'',style: TextStyle(fontSize: 16.w,height: 1.4,color: Colors.white,fontWeight: Fonts.boldSemi),),
] ]
), ),
Gaps.vGaps10, Gaps.vGaps10,
...@@ -47,13 +47,13 @@ class BuildCard extends StatelessWidget { ...@@ -47,13 +47,13 @@ class BuildCard extends StatelessWidget {
children: [ children: [
Text('学习总时长',style: TextStyle(fontSize: 15.w,height: 1.4,color: Colors.white),), Text('学习总时长',style: TextStyle(fontSize: 15.w,height: 1.4,color: Colors.white),),
Gaps.hGaps15, Gaps.hGaps15,
Text('${model.readSecond??''}分钟',style: TextStyle(fontSize: 16.w,height: 1.4,color: Colors.white,fontWeight: Fonts.medium),), Text('${model.readSecond??''}分钟',style: TextStyle(fontSize: 16.w,height: 1.4,color: Colors.white,fontWeight: Fonts.boldSemi),),
] ]
), ),
Gaps.vGaps10, Gaps.vGaps10,
Text('上次读到',style: TextStyle(fontSize: 15.w,height: 1.4,color: Colors.white),), Text('上次读到',style: TextStyle(fontSize: 15.w,height: 1.4,color: Colors.white),),
Gaps.vGaps5, Gaps.vGaps5,
Text(model.lastChapter??'',style: TextStyle(fontSize: 16.w,height: 1.4,color: Colors.white,fontWeight: Fonts.medium),maxLines: 1,overflow: TextOverflow.ellipsis,), Text(model.lastChapter??'',style: TextStyle(fontSize: 16.w,height: 1.4,color: Colors.white,fontWeight: Fonts.boldSemi),maxLines: 1,overflow: TextOverflow.ellipsis,),
] ]
), ),
), ),
......
...@@ -96,14 +96,14 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto ...@@ -96,14 +96,14 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
List<OrderEvaluate> orderEvaluates, List<OrderEvaluate> orderEvaluates,
List<TextEditingController> controllers) { List<TextEditingController> controllers) {
int indexToUpdate = orderEvaluates.indexWhere((obj) => obj.recordId == bookListModel.recordId); int indexToUpdate = orderEvaluates.indexWhere((obj) => obj.recordId == bookListModel.recordId);
TextEditingController textFieldController= TextEditingController(); // TextEditingController textFieldController= TextEditingController();
if(indexToUpdate==-1){ // if(indexToUpdate==-1){
OrderEvaluate evaluate = OrderEvaluate(recordId: bookListModel.recordId); // OrderEvaluate evaluate = OrderEvaluate(recordId: bookListModel.recordId);
orderEvaluates.add(evaluate); // orderEvaluates.add(evaluate);
controllers.add(textFieldController); // controllers.add(textFieldController);
}else{ // }else{
textFieldController = controllers[indexToUpdate]; // textFieldController = controllers[indexToUpdate];
} // }
int index = orderEvaluates.length-1; int index = orderEvaluates.length-1;
return Container( return Container(
...@@ -225,7 +225,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto ...@@ -225,7 +225,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
hintStyle: TextStyle( hintStyle: TextStyle(
fontSize: 14.w, height: 1.5, color: Colours.c6)), fontSize: 14.w, height: 1.5, color: Colours.c6)),
maxLines: 5, maxLines: 5,
controller: textFieldController, // controller: textFieldController,
hintText: '请简要描述', hintText: '请简要描述',
), ),
), ),
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论