Skip to content

B
book-app
提交 07d61e7a authored 作者: maodou's avatar maodou
浏览文件
操作

页面修改

上级 ce4a0087
显示空白字符变更
内嵌 并排
正在显示 包含 102 行增加 和 64 行删除
lib/pages/book_category/widgets/item.dart
浏览文件 @ 07d61e7a
......@@ -37,6 +37,7 @@ class _BuildItemState extends State<BuildItem> {
color: Colors.white,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Row(
crossAxisAlignment: CrossAxisAlignment.center,
......@@ -44,14 +45,15 @@ class _BuildItemState extends State<BuildItem> {
Text(widget.model.name??'',style: TextStyle(fontSize: 14.w,color: widget.model.seen ==0? Colours.c3:Colours.c9,fontWeight: Fonts.medium,height: 2),),
Gaps.hGaps5,
widget.model.isReading == 1? Container(
height: 17,
width: 17,
margin: const EdgeInsets.fromLTRB(0, 6, 0, 0),
height: 18,
width: 18,
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.5.w),
border: Border.all(width:1,color: AppTheme.primary)
),
child: Text('试',style: TextStyle(fontSize: 12.w,color: AppTheme.primary),),
child: Text('试',style: TextStyle(fontSize: 11.w,color: AppTheme.primary),),
):const SizedBox(),
],
),
......
lib/pages/book_detail/widgets/book.dart
浏览文件 @ 07d61e7a
......@@ -2,10 +2,8 @@ part of book_detail;
class BuildBook extends StatelessWidget {
final BookDetailModel model;
const BuildBook({
Key? key,
required this.model
}) : super(key: key);
const BuildBook({Key? key, required this.model}) : super(key: key);
@override
Widget build(BuildContext context) {
......@@ -19,27 +17,31 @@ class BuildBook extends StatelessWidget {
// ),
// ),
// margin: const EdgeInsets.only(left: 10,right: 10,top: 10),
width: double.infinity,
height: 150,
color: const Color(0xFFAB1941).withOpacity(0.02),
child: Row(
children: [
///左侧
Container(
margin: EdgeInsets.only(left: 15.w,right: 15.w),
margin: EdgeInsets.only(left: 15.w, right: 15.w),
child: Row(
children: [
CustomCard(
url: model.img??'',
url: model.img ?? '',
height: 110.w,
width: 100.w,
)
],
),
),
///右侧
Expanded(
child: Container(
// color: Colors.cyan,
padding: EdgeInsets.only(top: 12.w,bottom: 15.w),
padding: EdgeInsets.only(top: 12.w, bottom: 15.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
......@@ -47,21 +49,41 @@ class BuildBook extends StatelessWidget {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(model.bookName??'',style: TextStyle(fontSize: 17.w,fontWeight: Fonts.medium,color: Colours.c3),maxLines: 1,overflow: TextOverflow.ellipsis,),
SizedBox(height: 5.w,),
Text(model.authors??'',style: TextStyle(fontSize: 14.w,fontWeight: FontWeight.w400,color: Colours.c6)),
Text(
model.bookName ?? '',
style: TextStyle(
fontSize: 17.w,
fontWeight: Fonts.medium,
color: Colours.c3),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
SizedBox(
height: 5.w,
),
Text(model.authors ?? '',
style: TextStyle(
fontSize: 14.w,
fontWeight: FontWeight.w400,
color: Colours.c6)),
],
),
Row(
children: [
Text('￥${model.vipPrice}',style: TextStyle(fontSize: 15.w,fontWeight: FontWeight.w500,color: AppTheme.primary)),
Text('￥${model.vipPrice}',
style: TextStyle(
fontSize: 15.w,
fontWeight: FontWeight.w500,
color: AppTheme.primary)),
Gaps.hGaps10,
Text('￥${model.price}',style: TextStyle(
fontSize: 13.w,color: Colours.c9,
Text('￥${model.price}',
style: TextStyle(
fontSize: 13.w,
color: Colours.c9,
decoration: TextDecoration.lineThrough,
decorationColor: Colours.c9, // 可选，指定删除线的颜色
decorationThickness: 1
)),
decorationColor: Colours.c9,
// 可选，指定删除线的颜色
decorationThickness: 1)),
],
)
],
......@@ -69,7 +91,6 @@ class BuildBook extends StatelessWidget {
),
)
],
)
);
));
}
}
lib/pages/book_shop/widgets/count.dart
浏览文件 @ 07d61e7a
......@@ -31,10 +31,10 @@ class BuildCounter extends StatelessWidget {
SizedBox(
height: 17.w,
width: 17.w,
child: Image.asset(controller.all?'assets/images/pay_check.png':'assets/images/pay_uncheck.png'),
child: Image.asset(controller.all?'assets/images/pay_check.png':'assets/images/pay_uncheck.png',fit: BoxFit.cover,),
),
SizedBox(width: 11.w),
Text('全选',style: TextStyle(color: const Color(0xFF333333),fontSize: 12.w,fontWeight: FontWeight.w500)),
Text('全选',style: TextStyle(color: const Color(0xFF333333),fontSize: 14.w,fontWeight: Fonts.boldSemi)),
],
),
),
......@@ -43,8 +43,8 @@ class BuildCounter extends StatelessWidget {
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('合计 ￥${controller.allPrice.toStringAsFixed(2)}',style: const TextStyle(color: AppTheme.primary,fontSize: 12,fontWeight: FontWeight.w500)),
Text('已选 ${controller.num} 件',style: const TextStyle(color: Color(0xFF999999),fontSize: 10,))
Text('合计 ￥${controller.allPrice.toStringAsFixed(2)}',style: const TextStyle(color: AppTheme.primary,fontSize: 14,fontWeight: Fonts.boldSemi)),
Text('已选 ${controller.num} 件',style: const TextStyle(color: Color(0xFF999999),fontSize: 12,))
],
)
],
......@@ -67,7 +67,7 @@ class BuildCounter extends StatelessWidget {
// height: 35,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: 8.w,horizontal: 20.w),
child: Text('结算(${controller.num})',style: TextStyle(fontSize: 14.w,color: Colors.white,height: 1.1,fontWeight: Fonts.medium),),
child: Text('结算(${controller.num})',style: TextStyle(fontSize: 12.w,color: Colors.white,height: 1.1,fontWeight: Fonts.medium),),
),
)
],
......
lib/pages/library/view.dart
浏览文件 @ 07d61e7a
......@@ -161,7 +161,7 @@ class _LibraryPageState extends State<LibraryPage> {
padding: EdgeInsets.symmetric(vertical: 10.w,horizontal: 10.w),
color: model.selected?const Color(0xFFC02D55).withOpacity(0.08):Colors.white,
alignment: Alignment.center,
child: Text(model.name??'',style: model.selected?TextStyle(fontSize: 14.w,color: AppTheme.primary,fontWeight: Fonts.medium,):TextStyle(fontSize: 14.w,color: Colours.c9,),),
child: Text(model.name??'',style: model.selected?TextStyle(fontSize: 14.w,color: AppTheme.primary,fontWeight: Fonts.boldSemi,):TextStyle(fontSize: 14.w,color: Colours.c9,),),
),
);
},
......
lib/pages/library/widgets/filter.dart
浏览文件 @ 07d61e7a
......@@ -102,13 +102,12 @@ class _FilterPageState extends State<FilterPage> {
}
Widget _buildWrapWidget(String title,List<FilterModel> data){
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
margin: EdgeInsets.only(left: 10.w,bottom: 10.w,top: 10.w),
child: Text(title,style: TextStyle(fontSize: 15.w,height:1.6,color: Colours.c3,fontWeight: Fonts.medium),)
child: Text(title,style: TextStyle(fontSize: 15.w,height:1.6,color: Colours.c3,fontWeight: Fonts.boldSemi),)
),
Wrap(
spacing: 10,
......@@ -134,7 +133,7 @@ class _FilterPageState extends State<FilterPage> {
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal:15,vertical: 5),
padding: const EdgeInsets.symmetric(horizontal:15),
child: model.name == '读过' || model.name == '评分'?Row(
mainAxisSize: MainAxisSize.min,
children: [
......
lib/pages/library/widgets/subject.dart
浏览文件 @ 07d61e7a
......@@ -33,7 +33,7 @@ class BuildLabelWidget extends StatelessWidget {
),
]:null,
),
child: Text(model.name??'',style: TextStyle(fontSize: 13.w,height: 1.5,color: model.selected?AppTheme.primary:Colours.c9,fontWeight: Fonts.medium),)
child: Text(model.name??'',style: TextStyle(fontSize: 13.w,height: 1.5,color: model.selected?AppTheme.primary:Colours.c9,fontWeight: model.selected?Fonts.boldSemi:Fonts.medium),)
),
);
}
......
lib/pages/mine/view.dart
浏览文件 @ 07d61e7a
......@@ -52,7 +52,7 @@ class _MinePageState extends State<MinePage> {
child: badges.Badge(
position: badges.BadgePosition.topEnd(top: -5, end: 0),
showBadge: controller.num == 0?false:true,
badgeContent: Text(controller.num.toString(),style: const TextStyle(fontSize: 7,color: Colors.white),),
badgeContent: Text(controller.num.toString(),style: const TextStyle(fontSize: 8,color: Colors.white),),
badgeStyle: const badges.BadgeStyle(
badgeColor: AppTheme.primary,
shape: badges.BadgeShape.circle
......
lib/pages/mine/widgets/account.dart
浏览文件 @ 07d61e7a
......@@ -30,7 +30,7 @@ class BuildAccount extends StatelessWidget {
children: [
Container(
padding: EdgeInsets.only(left: 17.w,top: 14.w,bottom: 14.w,right: 17.w),
child: Text('我的账户',style: TextStyle(color: Colours.c3,fontSize: 16.w,height: 1.6,fontWeight: Fonts.medium),),
child: Text('我的账户',style: TextStyle(color: Colours.c3,fontSize: 14.w,height: 1.6,fontWeight: Fonts.boldSemi),),
),
Container(
padding: EdgeInsets.only(bottom: 13.w,top: 5.w),
......
lib/pages/mine/widgets/user.dart
浏览文件 @ 07d61e7a
......@@ -21,8 +21,8 @@ class BuildUser extends StatelessWidget {
Row(
children: [
Container(
width: 45.w,
height: 45.w,
width: 50.w,
height: 50.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(22.5.w),
color: Colors.cyan,
......@@ -110,9 +110,9 @@ class BuildUser extends StatelessWidget {
],
),
SizedBox(
width: 5.w,
height: 9.w,
child: Image.asset('assets/images/right_arrow.png'),
width: 7.w,
height: 12.w,
child: Image.asset('assets/images/right_arrow.png',fit: BoxFit.cover,),
)
],
),
......
lib/pages/read_web/view.dart
浏览文件 @ 07d61e7a
......@@ -165,7 +165,7 @@ class _ReadPageState extends State<ReadPage> {
left: 0,
right: 0,
top: 0,
bottom: 49,
bottom: 69,
child: _showContent(readController,readController.toolModel)
),
// AnimatedPositioned(
......@@ -190,7 +190,7 @@ class _ReadPageState extends State<ReadPage> {
bottom: 0,
child: SafeArea(
child: Container(
height: 49,
height: 69,
color: Colors.limeAccent,
alignment: Alignment.center,
child: _createToolBar(readController)
......@@ -252,18 +252,19 @@ class _ReadPageState extends State<ReadPage> {
},
child: Container(
color: Colors.white,
padding: EdgeInsets.only(bottom: 15.w),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.max,
children: [
SizedBox(
width: 17,
height: 17,
child: Image.asset(model.selected?model.activeIcon:model.icon)
width: 25,
height: 25,
child: Image.asset(model.selected?model.activeIcon:model.icon,fit: BoxFit.cover,)
),
// SizedBox(height: 2.5.w,),
model.selected?Text(model.name,style: TextStyle(fontSize: 10.w,height: 1.4,fontWeight: Fonts.medium,color: AppTheme.primary),)
:Text(model.name,style: TextStyle(fontSize: 10.w,height: 1.4,fontWeight: Fonts.medium,color: Colours.c6))
SizedBox(height: 2.5.w,),
model.selected?Text(model.name,style: TextStyle(fontSize: 12.w,height: 1.4,fontWeight: Fonts.medium,color: AppTheme.primary),)
:Text(model.name,style: TextStyle(fontSize: 12.w,height: 1.4,fontWeight: Fonts.medium,color: Colours.c6))
],
),
),
......
lib/pages/read_web/widgets/item.dart
浏览文件 @ 07d61e7a
......@@ -35,17 +35,18 @@ class _BuildItemState extends State<BuildItem> {
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(widget.model.name??'',style: TextStyle(fontSize: 14.w,color: widget.model.seen ==0? Colours.c3:Colours.c9,fontWeight: Fonts.medium,height: 2),),
Text(widget.model.name??'',style: TextStyle(fontSize: 14.w,color: widget.model.seen ==0? Colours.c3:Colours.c9,fontWeight: Fonts.boldSemi,height: 2),),
Gaps.hGaps5,
widget.model.isReading == 1? Container(
height: 17,
width: 17,
height: 18,
width: 18,
margin: EdgeInsets.only(top: 6.w),
alignment: Alignment.center,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.5.w),
border: Border.all(width:1,color: AppTheme.primary)
),
child: Text('试',style: TextStyle(fontSize: 12.w,color: AppTheme.primary),),
child: Text('试',style: TextStyle(fontSize: 11.w,color: AppTheme.primary),),
):const SizedBox(),
],
),
......@@ -95,7 +96,7 @@ class _BuildItemState extends State<BuildItem> {
return Container(
color: Colors.white,
padding: const EdgeInsets.only(left: 60),
child: Text(model.name??'',style:TextStyle(fontSize: 12,color: model.seen ==0? Colours.c3:Colours.c9,height: 2),),
child: Text(model.name??'',style:TextStyle(fontSize: 14,color: model.seen ==0? Colours.c3:Colours.c9,height: 2),),
);
}
}
lib/pages/study_report/view.dart
浏览文件 @ 07d61e7a
......@@ -57,10 +57,10 @@ class _StudyReportPageState extends State<StudyReportPage> {
width: 26.w,
height: 26.w,
// color: Colors.cyan,
child: Image.asset('assets/images/report_note.png'),
child: Image.asset('assets/images/report_note.png',fit: BoxFit.cover,),
),
Gaps.hGaps10,
Text('笔记',style: TextStyle(fontSize: 16.w,height: 1.3,color: Colours.c3,fontWeight: Fonts.medium),)
Text('笔记',style: TextStyle(fontSize: 18.w,height: 1.3,color: Colours.c3,fontWeight: Fonts.boldSemi),)
],
),
......@@ -102,11 +102,11 @@ class _StudyReportPageState extends State<StudyReportPage> {
Container(
width: 26.w,
height: 26.w,
child: Image.asset('assets/images/report_study.png')
child: Image.asset('assets/images/report_study.png',fit: BoxFit.cover,)
// color: Colors.cyan,
),
Gaps.hGaps10,
Text('距离连续学习',style: TextStyle(fontSize: 16.w,height: 1.3,color: Colours.c3,fontWeight: Fonts.medium),)
Text('距离连续学习',style: TextStyle(fontSize: 18.w,height: 1.3,color: Colours.c3,fontWeight: Fonts.boldSemi),)
],
),
......@@ -150,11 +150,11 @@ class _StudyReportPageState extends State<StudyReportPage> {
Container(
width: 26.w,
height: 26.w,
child: Image.asset('assets/images/report_test.png')
child: Image.asset('assets/images/report_test.png',fit: BoxFit.cover,)
// color: Colors.cyan,
),
Gaps.hGaps10,
Text('知识测评',style: TextStyle(fontSize: 16.w,height: 1.3,color: Colours.c3,fontWeight: Fonts.medium),)
Text('知识测评',style: TextStyle(fontSize: 18.w,height: 1.3,color: Colours.c3,fontWeight: Fonts.boldSemi),)
],
),
......@@ -222,10 +222,10 @@ class _StudyReportPageState extends State<StudyReportPage> {
width: 26.w,
height: 26.w,
// color: Colors.cyan,
child: Image.asset('assets/images/report_discuss.png')
child: Image.asset('assets/images/report_discuss.png',fit: BoxFit.cover,)
),
Gaps.hGaps10,
Text('讨论',style: TextStyle(fontSize: 16.w,height: 1.3,color: Colours.c3,fontWeight: Fonts.medium),)
Text('讨论',style: TextStyle(fontSize: 18.w,height: 1.3,color: Colours.c3,fontWeight: Fonts.boldSemi),)
],
),
......
lib/pages/study_report/widgets/card.dart
浏览文件 @ 07d61e7a
......@@ -37,7 +37,7 @@ class BuildCard extends StatelessWidget {
Gaps.vGaps15,
Row(
children: [
Text('学习总进度',style: TextStyle(fontSize: 13.w,height: 1.4,color: Colors.white),),
Text('学习总进度',style: TextStyle(fontSize: 15.w,height: 1.4,color: Colors.white),),
Gaps.hGaps15,
Text(model.progress??'',style: TextStyle(fontSize: 16.w,height: 1.4,color: Colors.white,fontWeight: Fonts.medium),),
]
......@@ -45,13 +45,13 @@ class BuildCard extends StatelessWidget {
Gaps.vGaps10,
Row(
children: [
Text('学习总时长',style: TextStyle(fontSize: 13.w,height: 1.4,color: Colors.white),),
Text('学习总时长',style: TextStyle(fontSize: 15.w,height: 1.4,color: Colors.white),),
Gaps.hGaps15,
Text('${model.readSecond??''}分钟',style: TextStyle(fontSize: 16.w,height: 1.4,color: Colors.white,fontWeight: Fonts.medium),),
]
),
Gaps.vGaps10,
Text('上次读到',style: TextStyle(fontSize: 13.w,height: 1.4,color: Colors.white),),
Text('上次读到',style: TextStyle(fontSize: 15.w,height: 1.4,color: Colors.white),),
Gaps.vGaps5,
Text(model.lastChapter??'',style: TextStyle(fontSize: 16.w,height: 1.4,color: Colors.white,fontWeight: Fonts.medium),maxLines: 1,overflow: TextOverflow.ellipsis,),
]
......
lib/widgets/input.dart
浏览文件 @ 07d61e7a
......@@ -358,7 +358,20 @@ class CustomInputSearch extends StatelessWidget {
@override
Widget build(BuildContext context) {
final inputDecoration = Theme.of(context).inputDecorationTheme;
return TextField(
return Container(
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colours.c3.withOpacity(0.1), // 阴影颜色
spreadRadius: 2, // 阴影扩散程度
blurRadius: 4, // 阴影模糊程度
offset: Offset(0, 2), // 阴影位置
),
],
borderRadius: BorderRadius.circular(360), // 容器圆角
),
child: TextField(
onEditingComplete: onEditingComplete,
readOnly: readOnly,
controller: controller,
......@@ -396,6 +409,7 @@ class CustomInputSearch extends StatelessWidget {
"assets/images/search.png",
height: 18.w,
width: 18.w,
fit: BoxFit.cover,
),
),
hintStyle: TextStyle(
......@@ -415,7 +429,7 @@ class CustomInputSearch extends StatelessWidget {
borderSide: const BorderSide(color: Colors.transparent),
),
),
);
),);
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论