Skip to content

B
book-app
提交 2ee406b4 authored 作者: 岳维路's avatar 岳维路
浏览文件
操作

合并分支 'test' 到 'sim'

Test 查看合并请求 kiwitap/zijing-app!23
上级 e41717c4 04ff9c16
隐藏空白字符变更
内嵌 并排
正在显示 包含 80 行增加 和 55 行删除
lib/pages/book_category/widgets/item.dart
浏览文件 @ 2ee406b4
...@@ -134,32 +134,42 @@ class _BuildItemState extends State<BuildItem> { ...@@ -134,32 +134,42 @@ class _BuildItemState extends State<BuildItem> {
// }); // });
}, },
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 15.w), padding: EdgeInsets.only(left: 15.w),
height: 40.w, height: 40.w,
color: Colors.white, color: Colors.white,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Row( Expanded(
crossAxisAlignment: CrossAxisAlignment.center, child: Row(
children: [ crossAxisAlignment: CrossAxisAlignment.center,
Text(chapterModel.name??'',style: TextStyle(fontSize: 14.w,color: chapterModel.currentRead?AppTheme.primary:chapterModel.seen ==0? Colours.c3:Colours.c9,fontWeight: Fonts.medium,height: 2),), children: [
Gaps.hGaps5, Expanded(child: Container(
chapterModel.isReading == 1? Container( color: Colors.white,
margin: const EdgeInsets.fromLTRB(0, 6, 0, 0), child: Text(chapterModel.name??'',style: TextStyle(fontSize: 14.w,color: chapterModel.currentRead?AppTheme.primary:chapterModel.seen ==0? Colours.c3:Colours.c9,fontWeight: Fonts.medium,height: 2),maxLines: 1,overflow:TextOverflow.ellipsis))),
height: 18, Gaps.hGaps5,
width: 18, chapterModel.isReading == 1? Container(
alignment: Alignment.center, margin: const EdgeInsets.fromLTRB(0, 6, 0, 0),
decoration: BoxDecoration( height: 18,
borderRadius: BorderRadius.circular(8.5.w), width: 18,
border: Border.all(width:1,color: AppTheme.primary) alignment: Alignment.center,
), decoration: BoxDecoration(
child: Text('试',style: TextStyle(fontSize: 11.w,color: AppTheme.primary),), borderRadius: BorderRadius.circular(8.5.w),
):const SizedBox(), border: Border.all(width:1,color: AppTheme.primary)
], ),
child: Text('试',style: TextStyle(fontSize: 11.w,color: AppTheme.primary),),
):const SizedBox(),
],
),
), ),
chapterModel.children!.isEmpty?const SizedBox(): Transform.rotate( chapterModel.children!.isEmpty?Container(
margin: EdgeInsets.only(left: 15.w,right: 15.w),
width: 12.w,
height: 6.w,
// color: Colors.red,
// child: Image.asset('assets/images/down.png')
): Transform.rotate(
angle: chapterModel.selected?0:-90 * (3.141592653589793 / 180), angle: chapterModel.selected?0:-90 * (3.141592653589793 / 180),
child: GestureDetector( child: GestureDetector(
onTap: (){ onTap: (){
...@@ -167,7 +177,8 @@ class _BuildItemState extends State<BuildItem> { ...@@ -167,7 +177,8 @@ class _BuildItemState extends State<BuildItem> {
chapterModel.selected = !chapterModel.selected; chapterModel.selected = !chapterModel.selected;
}); });
}, },
child: SizedBox( child: Container(
margin: EdgeInsets.only(left: 15.w,right: 15.w),
width: 12.w, width: 12.w,
height: 6.w, height: 6.w,
// color: Colors.red, // color: Colors.red,
......
lib/pages/login/view.dart
浏览文件 @ 2ee406b4
...@@ -118,23 +118,27 @@ class _LoginPageState extends State<LoginPage> { ...@@ -118,23 +118,27 @@ class _LoginPageState extends State<LoginPage> {
}, },
), ),
Positioned( Positioned(
right: 10.w, right: 0.w,
child: Row( child: GestureDetector(
children: [ onTap: (){
Container(height: 20.w,width: 1,color: const Color(0xFFEBEBEB),), if (controller.isCounting == false){
Gaps.hGaps10, controller.sendCode();
GestureDetector( }
child: Container( },
padding: EdgeInsets.symmetric(vertical: 10.w), child: Container(
// color: Colors.yellow, color: Colors.transparent,
child: Text(controller.isCounting?'${controller.countDown}':'获取验证码',style: TextStyle(fontSize: 11.w,color: AppTheme.primary,height: 1.4),)), child: Row(
onTap: (){ children: [
if (controller.isCounting == false){ Container(height: 20.w,width: 1,color: const Color(0xFFEBEBEB),),
controller.sendCode(); Gaps.hGaps10,
} Container(
}, // color: Colors.red,
padding: EdgeInsets.only(top: 10.w,bottom: 10.w,right: 10.w),
// color: Colors.yellow,
child: Text(controller.isCounting?'${controller.countDown}':'获取验证码',style: TextStyle(fontSize: 11.w,color: AppTheme.primary,height: 1.4),)),
],
), ),
], ),
) )
) )
], ],
...@@ -193,16 +197,19 @@ class _LoginPageState extends State<LoginPage> { ...@@ -193,16 +197,19 @@ class _LoginPageState extends State<LoginPage> {
controller.setAgree(); controller.setAgree();
}, },
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
SizedBox( Container(
width: 14.w, color: Colors.white,
height: 14.w, width: 30.w,
height: 30.w,
// color: AppTheme.primary, // color: AppTheme.primary,
padding: EdgeInsets.only(left: 9.w,top: 8.w,bottom: 6.w,right: 5.w),
child: Image.asset( child: Image.asset(
controller.agree?'assets/images/check_box_select.png':'assets/images/uncheck.png',fit: BoxFit.contain, controller.agree?'assets/images/check_box_select.png':'assets/images/uncheck.png',fit: BoxFit.contain
), ),
), ),
Gaps.hGaps5, // Gaps.hGaps5,
Text('我已阅读并同意',style: TextStyle(color: Colours.c9,fontSize:14.w,height: 1.4)), Text('我已阅读并同意',style: TextStyle(color: Colours.c9,fontSize:14.w,height: 1.4)),
], ],
), ),
......
lib/pages/read_web/view.dart
浏览文件 @ 2ee406b4
...@@ -45,15 +45,15 @@ class _ReadPageState extends State<ReadPage> { ...@@ -45,15 +45,15 @@ class _ReadPageState extends State<ReadPage> {
), ),
centerTitle: false, centerTitle: false,
actions: [ actions: [
GestureDetector( // GestureDetector(
onTap: () { // onTap: () {
readController.getBookDown(); // readController.getBookDown();
}, // },
child: Text( // child: Text(
readController.existDownFile == true?'':'离线阅读', // readController.existDownFile == true?'':'离线阅读',
style: TextStyle( // style: TextStyle(
fontSize: 14.w, color: Colours.c3), // fontSize: 14.w, color: Colours.c3),
)) // ))
], ],
), ),
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
......
lib/pages/read_web/widgets/item.dart
浏览文件 @ 2ee406b4
...@@ -121,17 +121,18 @@ class _BuildItemState extends State<BuildItem> { ...@@ -121,17 +121,18 @@ class _BuildItemState extends State<BuildItem> {
// }); // });
}, },
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 15.w), padding: EdgeInsets.only(left: 15.w),
height: 40.w, height: 40.w,
color: Colors.white, color: Colors.white,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Row( Expanded(child: Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text(chapterModel.name??'',style: TextStyle(fontSize: 14.w,color: chapterModel.currentRead ?AppTheme.primary: chapterModel.seen ==0? Colours.c3:Colours.c9,fontWeight: Fonts.medium,height: 2),), Expanded(child:Text(chapterModel.name??'',style: TextStyle(fontSize: 14.w,color: chapterModel.currentRead ?AppTheme.primary: chapterModel.seen ==0? Colours.c3:Colours.c9,fontWeight: Fonts.medium,height: 2,),maxLines: 1,overflow: TextOverflow.ellipsis,),
),
Gaps.hGaps5, Gaps.hGaps5,
chapterModel.isReading == 1? Container( chapterModel.isReading == 1? Container(
margin: const EdgeInsets.fromLTRB(0, 6, 0, 0), margin: const EdgeInsets.fromLTRB(0, 6, 0, 0),
...@@ -145,8 +146,13 @@ class _BuildItemState extends State<BuildItem> { ...@@ -145,8 +146,13 @@ class _BuildItemState extends State<BuildItem> {
child: Text('试',style: TextStyle(fontSize: 11.w,color: AppTheme.primary),), child: Text('试',style: TextStyle(fontSize: 11.w,color: AppTheme.primary),),
):const SizedBox(), ):const SizedBox(),
], ],
), ),),
chapterModel.children!.isEmpty?const SizedBox(): Transform.rotate( chapterModel.children!.isEmpty?Container(
margin: EdgeInsets.only(left: 15.w,right: 15.w),
width: 12.w,
height: 6.w,
// color: Colors.red,
): Transform.rotate(
angle: chapterModel.selected?0:-90 * (3.141592653589793 / 180), angle: chapterModel.selected?0:-90 * (3.141592653589793 / 180),
child: GestureDetector( child: GestureDetector(
onTap: (){ onTap: (){
...@@ -155,6 +161,7 @@ class _BuildItemState extends State<BuildItem> { ...@@ -155,6 +161,7 @@ class _BuildItemState extends State<BuildItem> {
}); });
}, },
child: Container( child: Container(
margin: EdgeInsets.only(left: 15.w,right: 15.w),
width: 12.w, width: 12.w,
height: 6.w, height: 6.w,
// color: Colors.red, // color: Colors.red,
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论