Skip to content

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

ui修改

上级 bd686d99
隐藏空白字符变更
内嵌 并排
正在显示 包含 46 行增加 和 50 行删除
lib/models/order.dart
浏览文件 @ e33cd36c
...@@ -214,7 +214,7 @@ class CartListModel { ...@@ -214,7 +214,7 @@ class CartListModel {
String? introduction; // 简介 String? introduction; // 简介
num? rating; // 评价星级 num? rating; // 评价星级
String? comments; // 评价内容 String? comments; // 评价内容
String? commentId; // 评价id num? commentId; // 评价id
CartListModel copyWith({ CartListModel copyWith({
num? recordId, //书籍记录id num? recordId, //书籍记录id
...@@ -228,7 +228,7 @@ class CartListModel { ...@@ -228,7 +228,7 @@ class CartListModel {
String? introduction, // 简介 String? introduction, // 简介
num? rating, // 评价星级 num? rating, // 评价星级
String? comments, // 评价内容 String? comments, // 评价内容
String? commentId, // 评价id num? commentId, // 评价id
}) => }) =>
CartListModel( CartListModel(
recordId: recordId ?? this.recordId, recordId: recordId ?? this.recordId,
...@@ -432,8 +432,8 @@ class BookListModel { ...@@ -432,8 +432,8 @@ class BookListModel {
String? introduction; String? introduction;
String? price; String? price;
num? rating; num? rating;
num? comments; String? comments;
num? createTime; String? createTime;
BookListModel copyWith({ num? bookId, BookListModel copyWith({ num? bookId,
num? recordId, num? recordId,
String? name, String? name,
...@@ -441,8 +441,8 @@ class BookListModel { ...@@ -441,8 +441,8 @@ class BookListModel {
String? introduction, String? introduction,
String? price, String? price,
num? rating, num? rating,
num? comments, String? comments,
num? createTime, String? createTime,
}) => BookListModel( bookId: bookId ?? this.bookId, }) => BookListModel( bookId: bookId ?? this.bookId,
recordId: recordId ?? this.recordId, recordId: recordId ?? this.recordId,
name: name ?? this.name, name: name ?? this.name,
......
lib/pages/library/widgets/filter.dart
浏览文件 @ e33cd36c
...@@ -126,22 +126,21 @@ class _FilterPageState extends State<FilterPage> { ...@@ -126,22 +126,21 @@ class _FilterPageState extends State<FilterPage> {
}, },
child: Container( child: Container(
height: 27, height: 27,
padding: const EdgeInsets.only(left: 15,right: 15,top: 4),
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,
border: model.selected?Border.all(width: 0.5.w,color: AppTheme.primary):null border: model.selected?Border.all(width: 0.5.w,color: AppTheme.primary):null
), ),
child: Padding( child: model.name == '读过' || model.name == '评分'?Row(
padding: const EdgeInsets.symmetric(horizontal:15),
child: model.name == '读过' || model.name == '评分'?Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
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.center,), ):Text(model.name??'',style: TextStyle(fontSize: 13,height: 1.4,color: model.selected?AppTheme.primary: Colours.c3),textAlign: TextAlign.end,),
),
), ),
); );
}).toList(), }).toList(),
......
lib/pages/pay_coupon/view.dart
浏览文件 @ e33cd36c
...@@ -39,12 +39,13 @@ class _PayCouponPageState extends State<PayCouponPage> with SingleTickerProvide ...@@ -39,12 +39,13 @@ class _PayCouponPageState extends State<PayCouponPage> with SingleTickerProvide
children: [ children: [
Container( Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colours.cC8.withOpacity(0.1), // 设置阴影颜色 color: const Color(0xFFC7C7C7).withOpacity(0.3),
spreadRadius: 5, // 设置阴影扩散程度 spreadRadius: 2.w,
blurRadius: 7, // 设置阴影模糊程度 blurRadius: 5.w,
offset: Offset(0, 5), // 设置阴影位置 offset: Offset(3.w, 0), //
), ),
], ],
), ),
......
lib/pages/study_report/view.dart
浏览文件 @ e33cd36c
...@@ -130,7 +130,7 @@ class _StudyReportPageState extends State<StudyReportPage> { ...@@ -130,7 +130,7 @@ class _StudyReportPageState extends State<StudyReportPage> {
children: [ children: [
Container( Container(
padding: EdgeInsets.only(left: 15.w,top: 15.w,bottom: 15.w,right: 30), padding: EdgeInsets.only(left: 15.w,top: 15.w,bottom: 15.w,right: 30),
height: 165, height: 172,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w), borderRadius: BorderRadius.circular(8.w),
color: Colors.white, color: Colors.white,
...@@ -165,12 +165,10 @@ class _StudyReportPageState extends State<StudyReportPage> { ...@@ -165,12 +165,10 @@ class _StudyReportPageState extends State<StudyReportPage> {
Row( Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
SizedBox(
width: 80.w,
child: Text('总回顾',style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9),),
),
RichText(text: TextSpan( RichText(text: TextSpan(
children: [ children: [
TextSpan(text: '总回顾',style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9),),
WidgetSpan(child: SizedBox(width: 36.w),),
TextSpan(text:controller.model.questionAllNums !=null? controller.model.questionAllNums.toString():'' ,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)), TextSpan(text:controller.model.questionAllNums !=null? controller.model.questionAllNums.toString():'' ,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)),
TextSpan(text: '/条',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)), TextSpan(text: '/条',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)),
] ]
...@@ -180,12 +178,10 @@ class _StudyReportPageState extends State<StudyReportPage> { ...@@ -180,12 +178,10 @@ class _StudyReportPageState extends State<StudyReportPage> {
Row( Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
SizedBox(
width: 80.w,
child: Text('评论正确率',style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9),),
),
RichText(text: TextSpan( RichText(text: TextSpan(
children: [ children: [
TextSpan(text: '评论正确率',style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9),),
WidgetSpan(child: SizedBox(width: 8.w),),
TextSpan(text:controller.model.questionAccuracy!=null?controller.model.questionAccuracy.toString():'' ,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)), TextSpan(text:controller.model.questionAccuracy!=null?controller.model.questionAccuracy.toString():'' ,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)),
TextSpan(text: '%',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)), TextSpan(text: '%',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)),
] ]
...@@ -213,7 +209,7 @@ class _StudyReportPageState extends State<StudyReportPage> { ...@@ -213,7 +209,7 @@ class _StudyReportPageState extends State<StudyReportPage> {
), ),
], ],
), ),
height: 165.w, height: 172.w,
child: Column( child: Column(
children: [ children: [
Row( Row(
...@@ -261,10 +257,10 @@ class _StudyReportPageState extends State<StudyReportPage> { ...@@ -261,10 +257,10 @@ class _StudyReportPageState extends State<StudyReportPage> {
}){ }){
return Row( return Row(
children: [ children: [
Text(title,style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9),),
Gaps.hGaps5,
RichText(text: TextSpan( RichText(text: TextSpan(
children: [ children: [
TextSpan(text: title,style: TextStyle(fontSize: 14.w,height: 1.5,color: Colours.c9)),
WidgetSpan(child: SizedBox(width: 8.w),),
TextSpan(text: num=='null'?'':num,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)), TextSpan(text: num=='null'?'':num,style: TextStyle(fontSize: 21.w,height: 1.5,color: Colours.c3,fontWeight: Fonts.medium)),
TextSpan(text: '/条',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)), TextSpan(text: '/条',style: TextStyle(fontSize: 13.w,height: 1.5,color: Colours.c3)),
] ]
......
lib/pages/user_order/controller.dart
浏览文件 @ e33cd36c
...@@ -104,7 +104,7 @@ class UserOrderController extends GetxController ...@@ -104,7 +104,7 @@ class UserOrderController extends GetxController
introduction: "1一想到还有9", introduction: "1一想到还有9",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
])); ]));
orderList.add(OrderListModel( orderList.add(OrderListModel(
id: 1, id: 1,
...@@ -127,7 +127,7 @@ class UserOrderController extends GetxController ...@@ -127,7 +127,7 @@ class UserOrderController extends GetxController
introduction: "一想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给", introduction: "一想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -139,7 +139,7 @@ class UserOrderController extends GetxController ...@@ -139,7 +139,7 @@ class UserOrderController extends GetxController
introduction: "一想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给", introduction: "一想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -151,7 +151,7 @@ class UserOrderController extends GetxController ...@@ -151,7 +151,7 @@ class UserOrderController extends GetxController
introduction: "一想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给", introduction: "一想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -163,7 +163,7 @@ class UserOrderController extends GetxController ...@@ -163,7 +163,7 @@ class UserOrderController extends GetxController
introduction: "一想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给", introduction: "一想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId:2),
])); ]));
orderList.add(OrderListModel( orderList.add(OrderListModel(
id: 1, id: 1,
...@@ -186,7 +186,7 @@ class UserOrderController extends GetxController ...@@ -186,7 +186,7 @@ class UserOrderController extends GetxController
introduction: "2一想到还有95%的一想到", introduction: "2一想到还有95%的一想到",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 22),
])); ]));
orderList.add(OrderListModel( orderList.add(OrderListModel(
id: 1, id: 1,
...@@ -209,7 +209,7 @@ class UserOrderController extends GetxController ...@@ -209,7 +209,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -221,7 +221,7 @@ class UserOrderController extends GetxController ...@@ -221,7 +221,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -233,7 +233,7 @@ class UserOrderController extends GetxController ...@@ -233,7 +233,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -245,7 +245,7 @@ class UserOrderController extends GetxController ...@@ -245,7 +245,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
])); ]));
orderList.add(OrderListModel( orderList.add(OrderListModel(
id: 1, id: 1,
...@@ -268,7 +268,7 @@ class UserOrderController extends GetxController ...@@ -268,7 +268,7 @@ class UserOrderController extends GetxController
introduction: "3一想到还有95%的想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给", introduction: "3一想到还有95%的想到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
])); ]));
orderList.add(OrderListModel( orderList.add(OrderListModel(
id: 1, id: 1,
...@@ -291,7 +291,7 @@ class UserOrderController extends GetxController ...@@ -291,7 +291,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -303,7 +303,7 @@ class UserOrderController extends GetxController ...@@ -303,7 +303,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -315,7 +315,7 @@ class UserOrderController extends GetxController ...@@ -315,7 +315,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -327,7 +327,7 @@ class UserOrderController extends GetxController ...@@ -327,7 +327,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
])); ]));
orderList.add(OrderListModel( orderList.add(OrderListModel(
id: 1, id: 1,
...@@ -350,7 +350,7 @@ class UserOrderController extends GetxController ...@@ -350,7 +350,7 @@ class UserOrderController extends GetxController
introduction: "4一想到还有95%的问题到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给", introduction: "4一想到还有95%的问题到还有95%的问题留给人类，我就放一想到还有95%的问题留给问题留给",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
])); ]));
orderList.add(OrderListModel( orderList.add(OrderListModel(
id: 1, id: 1,
...@@ -373,7 +373,7 @@ class UserOrderController extends GetxController ...@@ -373,7 +373,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -385,7 +385,7 @@ class UserOrderController extends GetxController ...@@ -385,7 +385,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -397,7 +397,7 @@ class UserOrderController extends GetxController ...@@ -397,7 +397,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -409,7 +409,7 @@ class UserOrderController extends GetxController ...@@ -409,7 +409,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
CartListModel( CartListModel(
recordId: 876, recordId: 876,
orderId: 712, orderId: 712,
...@@ -421,7 +421,7 @@ class UserOrderController extends GetxController ...@@ -421,7 +421,7 @@ class UserOrderController extends GetxController
introduction: "这是一本书", introduction: "这是一本书",
rating: 4.5, rating: 4.5,
comments: "好好好", comments: "好好好",
commentId: '2'), commentId: 2),
])); ]));
orderList.add(OrderListModel( orderList.add(OrderListModel(
ordersnum: "aeewar34r", ordersnum: "aeewar34r",
......
lib/pages/user_security/view.dart
浏览文件 @ e33cd36c
...@@ -130,7 +130,7 @@ class _UserSecurityPageState extends State<UserSecurityPage> { ...@@ -130,7 +130,7 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
child: const Text( child: const Text(
'取消', '取消',
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 15,
fontWeight: Fonts.medium, fontWeight: Fonts.medium,
color: Colours.c6, color: Colours.c6,
), ),
...@@ -161,7 +161,7 @@ class _UserSecurityPageState extends State<UserSecurityPage> { ...@@ -161,7 +161,7 @@ class _UserSecurityPageState extends State<UserSecurityPage> {
child: const Text( child: const Text(
'确定', '确定',
style: TextStyle( style: TextStyle(
fontSize: 12, fontSize: 15,
fontWeight: Fonts.medium, fontWeight: Fonts.medium,
color: Colours.cAB1941, color: Colours.cAB1941,
), ),
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论