Skip to content

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

Merge remote-tracking branch 'origin/test' into test

上级 15eff61b ea5b1d3f
隐藏空白字符变更
内嵌 并排
正在显示 包含 803 行增加 和 619 行删除
lib/apis/common.dart
浏览文件 @ 8c0a6049
...@@ -145,10 +145,10 @@ abstract class CommonAPI { ...@@ -145,10 +145,10 @@ abstract class CommonAPI {
'is_select':love 'is_select':love
}, },
); );
if (result.data is! Map && result.data['is_success'] == 1){ if (result.data is! Map || result.data['is_success'] == 0){
return true; return false;
} }
return false; return true;
} }
/// 10、上传文件 /// 10、上传文件
......
lib/apis/library.dart
浏览文件 @ 8c0a6049
...@@ -37,16 +37,34 @@ abstract class LibraryAPI { ...@@ -37,16 +37,34 @@ abstract class LibraryAPI {
String sortField = '', String sortField = '',
String sort = '', String sort = '',
String isFree = '', String isFree = '',
String labelId = '',
required String categoryId
}) async { }) async {
Map<String,dynamic> params = {
'page' : page,
'limit' : limit,
'category_id':categoryId
};
if (sortField.isNotEmpty){
params['sort_field'] = sortField;
}
if (sort.isNotEmpty){
params['sort'] = sort;
}
if (isFree.isNotEmpty){
params['is_free'] = isFree;
}
if (sort.isNotEmpty){
params['sort'] = sort;
}
if (labelId.isNotEmpty){
params['label_id'] = labelId;
}
final result = await HttpService.to.post( final result = await HttpService.to.post(
'/v1/book/category/getBookList', '/v1/book/category/getBookList',
params: { params: params
'page': page,
'page_size': limit,
// 'sort_field':sortField,
// 'sort':sort,
// 'is_free':isFree
},
); );
if (result.data is! Map && result.data['list'] is! List) return []; if (result.data is! Map && result.data['list'] is! List) return [];
return List.generate(result.data['list'].length, (index){ return List.generate(result.data['list'].length, (index){
......
lib/pages/book_category/widgets/item.dart
浏览文件 @ 8c0a6049
...@@ -24,7 +24,7 @@ class _BuildItemState extends State<BuildItem> { ...@@ -24,7 +24,7 @@ class _BuildItemState extends State<BuildItem> {
}); });
}, },
child: Container( child: Container(
margin: EdgeInsets.symmetric(horizontal: 15.w), padding: EdgeInsets.symmetric(horizontal: 15.w),
height: 30.w, height: 30.w,
color: Colors.white, color: Colors.white,
child: Row( child: Row(
...@@ -74,7 +74,8 @@ class _BuildItemState extends State<BuildItem> { ...@@ -74,7 +74,8 @@ class _BuildItemState extends State<BuildItem> {
Widget _buildSection(ChapterModel model){ Widget _buildSection(ChapterModel model){
return Container( return Container(
margin: const EdgeInsets.only(left: 60), 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: 1.6),), child: Text(model.name??'',style:TextStyle(fontSize: 12,color: model.seen ==0? Colours.c3:Colours.c9,height: 1.6),),
); );
} }
......
lib/pages/book_detail/controller.dart
浏览文件 @ 8c0a6049
...@@ -63,6 +63,7 @@ class BookDetailController extends GetxController with GetSingleTickerProviderSt ...@@ -63,6 +63,7 @@ class BookDetailController extends GetxController with GetSingleTickerProviderSt
} }
bool result = await CommonAPI.love( bool result = await CommonAPI.love(
bookId: bookId, love: isCollection.toString()); bookId: bookId, love: isCollection.toString());
print('================================$result');
if (result) { if (result) {
_getBookDetails(); _getBookDetails();
} }
......
lib/pages/book_detail/view.dart
浏览文件 @ 8c0a6049
...@@ -56,17 +56,20 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid ...@@ -56,17 +56,20 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid
height: 2, height: 2,
color: const Color(0xFFF9F9F9), color: const Color(0xFFF9F9F9),
), ),
TabBar( Container(
labelColor: AppTheme.primary, color: Colors.white,
// isScrollable: true, child: TabBar(
labelStyle: TextStyle(fontSize: 15.w,height: 1.4,fontWeight: Fonts.medium), labelColor: AppTheme.primary,
unselectedLabelColor: Colours.c9, // isScrollable: true,
unselectedLabelStyle: TextStyle(fontSize: 15.w,height: 1.4), labelStyle: TextStyle(fontSize: 15.w,height: 1.4,fontWeight: Fonts.medium),
indicatorSize: TabBarIndicatorSize.label, unselectedLabelColor: Colours.c9,
indicatorColor: AppTheme.primary, unselectedLabelStyle: TextStyle(fontSize: 15.w,height: 1.4),
tabs:controller.tabs, indicatorSize: TabBarIndicatorSize.label,
physics: const NeverScrollableScrollPhysics(), indicatorColor: AppTheme.primary,
controller: controller.tabController, tabs:controller.tabs,
physics: const NeverScrollableScrollPhysics(),
controller: controller.tabController,
),
), ),
Expanded( Expanded(
child: TabBarView( child: TabBarView(
...@@ -74,8 +77,8 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid ...@@ -74,8 +77,8 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid
children: [ children: [
BookCategoryPage(chapters: controller.chapters,), BookCategoryPage(chapters: controller.chapters,),
Container( Container(
margin: EdgeInsets.only(left: 15.w,right: 15.w,top:12.w), padding: EdgeInsets.only(left: 15.w,right: 15.w,top:12.w),
// color: Colors.lightBlue, color: Colors.white,
child: Text(controller.bookDetails.content??'',style: TextStyle(fontSize: 12.w,height: 1.5,color: Colours.c3),), child: Text(controller.bookDetails.content??'',style: TextStyle(fontSize: 12.w,height: 1.5,color: Colours.c3),),
), ),
BookInfoPage(model:controller.bookDetails,) BookInfoPage(model:controller.bookDetails,)
...@@ -87,7 +90,8 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid ...@@ -87,7 +90,8 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid
), ),
bottomNavigationBar: SafeArea( bottomNavigationBar: SafeArea(
child: Container( child: Container(
margin: EdgeInsets.symmetric(horizontal: 15.w), color: Colors.white,
padding: EdgeInsets.symmetric(horizontal: 15.w,vertical: 10.w),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [ children: [
......
lib/pages/book_info/view.dart
浏览文件 @ 8c0a6049
...@@ -10,7 +10,8 @@ class BookInfoPage extends StatelessWidget { ...@@ -10,7 +10,8 @@ class BookInfoPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
margin: EdgeInsets.symmetric(horizontal: 15.w,vertical: 18.w), color: Colors.white,
padding: EdgeInsets.symmetric(horizontal: 15.w,vertical: 18.w),
child: Column( child: Column(
children: [ children: [
// 评分容器 // 评分容器
......
lib/pages/book_pay/index.dart
浏览文件 @ 8c0a6049
...@@ -7,9 +7,11 @@ import 'package:flutter_book/theme.dart'; ...@@ -7,9 +7,11 @@ import 'package:flutter_book/theme.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:go_router/go_router.dart';
import '../../models/index.dart'; import '../../models/index.dart';
import '../../models/shop.dart'; import '../../models/shop.dart';
import '../../routes/index.dart';
import '../../utils/index.dart'; import '../../utils/index.dart';
import '../../widgets/index.dart'; import '../../widgets/index.dart';
import '../book_shop/index.dart'; import '../book_shop/index.dart';
......
lib/pages/book_pay/view.dart
浏览文件 @ 8c0a6049
...@@ -41,30 +41,40 @@ class _BookPayPageState extends State<BookPayPage> { ...@@ -41,30 +41,40 @@ class _BookPayPageState extends State<BookPayPage> {
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colours.cC7.withOpacity(0.5), color: Colours.cC7.withOpacity(0.5),
spreadRadius: 2, spreadRadius: 2.w,
blurRadius: 5, blurRadius: 5.w,
offset: Offset(3.w, 0), // changes the position of the shadow offset: Offset(3.w, 0), // changes the position of the shadow
), ),
] ]
), ),
child: Column( child: Column(
children: [ children: [
_buildPointWidget(), GestureDetector(
child: _buildWidget(title: '优惠券',icon: 'assets/images/pay_coupon.png',),
onTap: (){
context.pushNamed(Routes.payCoupon);
},
),
Container(height: 0.5.w,color: Colours.cF0,margin: EdgeInsets.only(left: 10.w),), Container(height: 0.5.w,color: Colours.cF0,margin: EdgeInsets.only(left: 10.w),),
_buildCouponWidget() GestureDetector(
child: _buildWidget(title: '积分抵扣',icon: 'assets/images/pay_point.png',),
onTap: (){
context.pushNamed(Routes.creditPoints);
},
),
], ],
), ),
), ),
Container( Container(
margin: const EdgeInsets.only(left: 10,right: 10,top: 10), margin: EdgeInsets.only(left: 10.w,right: 10.w,top: 10.w),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius:BorderRadius.circular(8), borderRadius:BorderRadius.circular(8.w),
color: Colors.white, color: Colors.white,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colours.cC7.withOpacity(0.5), color: Colours.cC7.withOpacity(0.5),
spreadRadius: 2, spreadRadius: 2.w,
blurRadius: 5, blurRadius: 5.w,
offset: const Offset(3, 0), // changes the position of the shadow offset: const Offset(3, 0), // changes the position of the shadow
), ),
] ]
...@@ -93,29 +103,33 @@ class _BookPayPageState extends State<BookPayPage> { ...@@ -93,29 +103,33 @@ class _BookPayPageState extends State<BookPayPage> {
} }
Widget _buildPointWidget(){ Widget _buildWidget({
required String title,
required String icon,
}){
return Container( return Container(
margin: EdgeInsets.only(left: 13,right: 13), margin: EdgeInsets.only(left: 13.w,right: 13.w),
color: Colors.white,
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Row( Row(
children: [ children: [
Container( Container(
margin: const EdgeInsets.symmetric(vertical: 12), margin: EdgeInsets.symmetric(vertical: 12.w),
// color: Colors.cyan, // color: Colors.cyan,
width:20, width:20.w,
height:20, height:20.w,
child: Image.asset('assets/images/pay_coupon.png'), child: Image.asset(icon),
), ),
const SizedBox(width: 7,), SizedBox(width: 7.w,),
const Text('优惠券',style: TextStyle(fontSize: 14,color: Colours.c3,height: 1.1)), Text(title,style: TextStyle(fontSize: 14.w,color: Colours.c3,height: 1.1)),
], ],
), ),
Container( SizedBox(
// color: Colors.cyan, // color: Colors.cyan,
width:5, width:5.w,
height:8, height:8.w,
child: Image.asset('assets/images/right_arrow.png'), child: Image.asset('assets/images/right_arrow.png'),
), ),
], ],
...@@ -123,33 +137,4 @@ class _BookPayPageState extends State<BookPayPage> { ...@@ -123,33 +137,4 @@ class _BookPayPageState extends State<BookPayPage> {
); );
} }
Widget _buildCouponWidget(){
return Container(
margin: EdgeInsets.only(left: 13,right: 13),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Container(
margin: const EdgeInsets.symmetric(vertical: 12),
// color: Colors.cyan,
width:20,
height:20,
child: Image.asset('assets/images/pay_point.png'),
),
const SizedBox(width: 7,),
const Text('积分抵扣',style: TextStyle(fontSize: 14,color: Colours.c3,height: 1.1)),
],
),
Container(
// color: Colors.cyan,
width:5,
height:8,
child: Image.asset('assets/images/right_arrow.png'),
),
],
),
);
}
} }
lib/pages/credit_points/view.dart
浏览文件 @ 8c0a6049
...@@ -11,117 +11,124 @@ class CreditPointsPage extends StatelessWidget { ...@@ -11,117 +11,124 @@ class CreditPointsPage extends StatelessWidget {
return false; return false;
}, },
child: Scaffold( child: Scaffold(
extendBodyBehindAppBar: true,
appBar: AppBar( appBar: AppBar(
centerTitle: true, centerTitle: true,
title: const Text('积分'), title: const Text('积分'),
backgroundColor: Colors.transparent,
), ),
body: Column( body:Stack(
children: [ children: [
// 积分卡片 Image.asset(
Container( 'assets/images/point_bg.png',
color: AppTheme.primary.withOpacity(0.02), fit: BoxFit.contain,
padding: EdgeInsets.all(10.w), width: double.infinity,
child: Container( ),
padding: EdgeInsets.only(left: 17.w,top: 18.w,bottom: 24.w,right: 17.w), SafeArea(
decoration: BoxDecoration( top: true,
color: Colors.white, child: Column(
boxShadow: [ children: [
BoxShadow( // 积分卡片
color: Colours.cC7.withOpacity(0.5), Container(
offset: Offset(0, 3.w), padding: EdgeInsets.symmetric(horizontal: 10.w),
blurRadius: 4.w, child: Container(
spreadRadius: 0, padding: EdgeInsets.only(left: 17.w,top: 18.w,bottom: 24.w,right: 17.w),
decoration: BoxDecoration(
color: Colors.white.withOpacity(0.58),
borderRadius: BorderRadius.circular(8.w),
border: Border.all(width: 2.w,color: Colors.white)
), ),
], height: 175.w,
borderRadius: BorderRadius.circular(8) child: Column(
), mainAxisAlignment: MainAxisAlignment.spaceBetween,
height: 175.w, crossAxisAlignment: CrossAxisAlignment.start,
child: Column( children: [
mainAxisAlignment: MainAxisAlignment.spaceBetween, Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Column( Text('可用积分',style: TextStyle(fontSize: 16.w,height: 1.4,fontWeight: Fonts.medium,color: Colours.c3),),
Gaps.vGaps13,
Text('999',style: TextStyle(fontSize: 25.w,height: 1.4,fontWeight: Fonts.medium,color: Colours.c3),),
],
),
Row(
children: [
Expanded(
child: Container(
height: 0.5.w,
color: Colours.cE7,
),
),
Gaps.hGaps15,
Text('积分支付不能超过每笔订单的20%',style: TextStyle(fontSize: 12.w,height: 1.4,color: Colours.c9),),
Gaps.hGaps15,
Expanded(
child: Container(
height: 0.5.w,
color: Colours.cE7,
),
),
],
)
],
),
),
),
// 使用积分
Container(
// height: 105,
margin: EdgeInsets.symmetric(horizontal: 10.w),
padding: EdgeInsets.all(20.w),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colours.cC7.withOpacity(0.5),
offset: Offset(3.w, 0.w),
blurRadius: 4.w,
spreadRadius: 0,
),
],
borderRadius: BorderRadius.circular(8.w)
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text('可用积分',style: TextStyle(fontSize: 16.w,height: 1.4,fontWeight: Fonts.medium,color: Colours.c3),), Text('可用积分',style: TextStyle(fontSize: 16.w,height: 1.4,fontWeight: Fonts.medium,color: Colours.c3),),
Gaps.vGaps13, Gaps.vGaps10,
Text('999',style: TextStyle(fontSize: 25.w,height: 1.4,fontWeight: Fonts.medium,color: Colours.c3),), Container(
], height: 0.5.w,
), color: Colours.cE7,
Row( // color: Colors.red,
children: [
Expanded(
child: Container(
height: 0.5.w,
color: Colours.cE7,
),
),
Gaps.hGaps15,
Text('积分支付不能超过每笔订单的20%',style: TextStyle(fontSize: 12.w,height: 1.4,color: Colours.c9),),
Gaps.hGaps15,
Expanded(
child: Container(
height: 0.5.w,
color: Colours.cE7,
),
), ),
Gaps.vGaps15,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
RichText(text: TextSpan(
children: [
TextSpan(text: '抵扣',style: TextStyle(color: Colours.c9,fontSize: 13.w,height: 1.4)),
TextSpan(text: '￥9.90',style: TextStyle(color: AppTheme.primary,fontSize: 13.w,height: 1.4,fontWeight: Fonts.medium)),
TextSpan(text: '使用9900积分',style: TextStyle(color: Colours.c9,fontSize: 13.w,height: 1.4)),
]
)),
SizedBox(
width: 15.w,
height: 15.w,
child: Image.asset(
'assets/images/uncheck.png',
),
)
],
)
], ],
)
],
),
),
),
// 使用积分
Container(
// height: 105,
padding: EdgeInsets.all(20.w),
decoration: BoxDecoration(
color: Colors.white,
boxShadow: [
BoxShadow(
color: Colours.cC7.withOpacity(0.5),
offset: Offset(0, 3.w),
blurRadius: 4.w,
spreadRadius: 0,
), ),
],
borderRadius: BorderRadius.circular(8.w)
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('可用积分',style: TextStyle(fontSize: 16.w,height: 1.4,fontWeight: Fonts.medium,color: Colours.c3),),
Gaps.vGaps10,
Container(
height: 0.5.w,
color: Colours.cE7,
// color: Colors.red,
),
Gaps.vGaps15,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
RichText(text: TextSpan(
children: [
TextSpan(text: '抵扣',style: TextStyle(color: Colours.c9,fontSize: 13.w,height: 1.4)),
TextSpan(text: '￥9.90',style: TextStyle(color: AppTheme.primary,fontSize: 13.w,height: 1.4,fontWeight: Fonts.medium)),
TextSpan(text: '使用9900积分',style: TextStyle(color: Colours.c9,fontSize: 13.w,height: 1.4)),
]
)),
SizedBox(
width: 15.w,
height: 15.w,
child: Image.asset(
'assets/images/uncheck.png',
),
)
],
) )
], ],
), ),
) ),
], ],
), )
), ),
); );
} }
......
lib/pages/forget_pwd/controller.dart
浏览文件 @ 8c0a6049
...@@ -43,7 +43,7 @@ class ForgetPwdController extends GetxController { ...@@ -43,7 +43,7 @@ class ForgetPwdController extends GetxController {
} }
void setCanClick(){ void setCanClick(){
if (phoneInput.text.length == 11 && codeInput.text.length == 6){ if (ValidatorTool.isValidPhoneNumber(phoneInput.text)&& codeInput.text.length == 6){
_enable = true; _enable = true;
} }
else{ else{
......
lib/pages/forget_pwd/view.dart
浏览文件 @ 8c0a6049
...@@ -55,7 +55,7 @@ class _ForgetPwdPageState extends State<ForgetPwdPage> { ...@@ -55,7 +55,7 @@ class _ForgetPwdPageState extends State<ForgetPwdPage> {
GestureDetector( GestureDetector(
child: Container( child: Container(
padding: EdgeInsets.symmetric(vertical: 10.w), padding: EdgeInsets.symmetric(vertical: 10.w),
color: Colors.yellow, // color: Colors.yellow,
child: Text(controller.isCounting?'${controller.countDown}':'获取验证码',style: TextStyle(fontSize: 11.w,color: AppTheme.primary,height: 1.4),)), child: Text(controller.isCounting?'${controller.countDown}':'获取验证码',style: TextStyle(fontSize: 11.w,color: AppTheme.primary,height: 1.4),)),
onTap: (){ onTap: (){
if (controller.isCounting == false){ if (controller.isCounting == false){
......
lib/pages/library/content_controller.dart 0 → 100644
浏览文件 @ 8c0a6049
part of library;
class LibraryContentController extends GetxController {
final EasyRefreshController refreshController = EasyRefreshController(
controlFinishLoad: true,
controlFinishRefresh: true,
);
// 图书列表数据
List<CourseModel> books = [];
final int _limit = 20;
int _page = 1;
bool _noMore = false;
@override
void onClose() {
refreshController.dispose();
super.onClose();
}
/// 收藏 与 取消收藏
void love({
required String bookId,
required num isCollection
}) async {
if (isCollection == 0){
isCollection = 1;
}
else{
isCollection = 0;
}
bool result = await CommonAPI.love(bookId: bookId, love: isCollection.toString());
if (result) {
onRefresh();
}
}
/// 获取图书列表数据
Future<void> _getBooks([bool isRefresh = false]) async {
if (isRefresh) _page = 1;
// 网路请求
final result = await LibraryAPI.books(
page: _page,
limit: _limit, categoryId: '',
);
// 如果是刷新 清理数据
if (isRefresh) books.clear();
books.addAll(result);
_page ++;
_noMore = result.length < _limit;
update();
}
void onRefresh() async {
try {
await _getBooks(true);
refreshController.finishRefresh(IndicatorResult.success);
refreshController.resetFooter();
} catch (error) {
refreshController.finishRefresh(IndicatorResult.fail);
}
}
void onLoading() async {
if (_noMore) {
refreshController.finishLoad(IndicatorResult.noMore);
return;
}
try {
await _getBooks();
refreshController.finishLoad();
} catch (error) {
refreshController.finishLoad(IndicatorResult.fail);
}
}
}
\ No newline at end of file
lib/pages/library/controller.dart
浏览文件 @ 8c0a6049
part of library; part of library;
class LibraryController extends GetxController with GetTickerProviderStateMixin{ class LibraryController extends GetxController with GetTickerProviderStateMixin{
final EasyRefreshController refreshController = EasyRefreshController(
controlFinishLoad: true,
controlFinishRefresh: true,
);
// 分类数据 // 分类数据
List<CategoryModel> categories = []; List<CategoryModel> categories = [];
// 标签数据 // 标签数据
List<LabelModel> labels = []; List<LabelModel> labels = [];
// 图书列表数据
List<CourseModel> books = [];
// 广告数组 // 广告数组
List<AdModel> ads = []; List<AdModel> ads = [];
...@@ -20,9 +14,7 @@ class LibraryController extends GetxController with GetTickerProviderStateMixin{ ...@@ -20,9 +14,7 @@ class LibraryController extends GetxController with GetTickerProviderStateMixin{
late TabController tabController = TabController(length:categories.length, vsync: this); late TabController tabController = TabController(length:categories.length, vsync: this);
final int _limit = 20;
int _page = 1;
bool _noMore = false;
late AnimationController _controller; late AnimationController _controller;
bool _show = false; bool _show = false;
...@@ -62,33 +54,15 @@ class LibraryController extends GetxController with GetTickerProviderStateMixin{ ...@@ -62,33 +54,15 @@ class LibraryController extends GetxController with GetTickerProviderStateMixin{
// 获取标签数据 // 获取标签数据
_getLabels(); _getLabels();
_getAds(); _getAds();
onRefresh();
super.onReady(); super.onReady();
} }
@override @override
void onClose() { void onClose() {
tabController.dispose(); tabController.dispose();
refreshController.dispose();
super.onClose(); super.onClose();
} }
/// 收藏 与 取消收藏
void love({
required String bookId,
required num isCollection
}) async {
if (isCollection == 0){
isCollection = 1;
}
else{
isCollection = 0;
}
bool result = await CommonAPI.love(bookId: bookId, love: isCollection.toString());
if (result) {
onRefresh();
}
}
//
void selectLabel(LabelModel model){ void selectLabel(LabelModel model){
for (LabelModel m in labels){ for (LabelModel m in labels){
...@@ -118,52 +92,9 @@ class LibraryController extends GetxController with GetTickerProviderStateMixin{ ...@@ -118,52 +92,9 @@ class LibraryController extends GetxController with GetTickerProviderStateMixin{
labels = await LibraryAPI.labels(); labels = await LibraryAPI.labels();
selectedLabel = labels.first; selectedLabel = labels.first;
selectedLabel.selected = true; selectedLabel.selected = true;
update(); update(['label']);
}
/// 获取图书列表数据
Future<void> _getBooks([bool isRefresh = false]) async {
if (isRefresh) _page = 1;
// 网路请求
final result = await LibraryAPI.books(
page: _page,
limit: _limit
);
// 如果是刷新 清理数据
if (isRefresh) books.clear();
books.addAll(result);
_page ++;
_noMore = result.length < _limit;
update();
}
void onRefresh() async {
try {
await _getBooks(true);
refreshController.finishRefresh(IndicatorResult.success);
refreshController.resetFooter();
} catch (error) {
refreshController.finishRefresh(IndicatorResult.fail);
}
} }
void onLoading() async {
if (_noMore) {
refreshController.finishLoad(IndicatorResult.noMore);
return;
}
try {
await _getBooks();
refreshController.finishLoad();
} catch (error) {
refreshController.finishLoad(IndicatorResult.fail);
}
}
} }
\ No newline at end of file
lib/pages/library/index.dart
浏览文件 @ 8c0a6049
...@@ -24,4 +24,6 @@ part 'controller.dart'; ...@@ -24,4 +24,6 @@ part 'controller.dart';
part 'widgets/cell.dart'; part 'widgets/cell.dart';
part 'widgets/content.dart'; part 'widgets/content.dart';
part 'widgets/subject.dart'; part 'widgets/subject.dart';
part 'widgets/filter.dart'; part 'widgets/filter.dart';
\ No newline at end of file part 'test.dart';
part 'content_controller.dart';
\ No newline at end of file
lib/pages/library/test.dart 0 → 100644
浏览文件 @ 8c0a6049
part of library;
class TestPage extends StatefulWidget {
const TestPage({Key? key}) : super(key: key);
@override
State<LibraryPage> createState() => _LibraryPageState();
}
class _TestPageState extends State<TestPage> with AutomaticKeepAliveClientMixin {
//AutomaticKeepAliveClientMixin
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('分类'),
bottom: PreferredSize(
preferredSize: Size.fromHeight(48.w),
child: Container(
child: Row(
children: [
// TabBar放在左侧
Expanded(
child: TabBar(
tabs: [
Tab(text: 'Tab 1'),
Tab(text: 'Tab 2'),
Tab(text: 'Tab 3'),
Tab(text: 'Tab 4'),
Tab(text: 'Tab 5'),
],
),
),
// 筛选按钮放在右侧
IconButton(
icon: Icon(Icons.filter_list),
onPressed: () {
// 处理筛选按钮点击事件
},
),
],
),
),
)
),
body: Column(
children: [
Container(
height: 43, // 设置标签栏的高度
color: Colors.cyan, // 设置标签栏的颜色
// child: // 添加你的横向滑动标签组件
),
Expanded(
child: CustomScrollView(
slivers: [
// // 横向滑动的标签
// SliverToBoxAdapter(
// child: Container(
// height: 43, // 设置标签栏的高度
// color: Colors.grey, // 设置标签栏的颜色
// // child: // 添加你的横向滑动标签组件
// ),
// ),
// 广告位
SliverToBoxAdapter(
child: Container(
height: 100, // 设置广告位的高度
color: Colors.grey, // 设置广告位的颜色
)
),
SliverFillRemaining(
child: TabBarView(
children: [
// Tab 1 对应的内容
Container(
color: Colors.red,
),
// Tab 2 对应的内容
Container(
color: Colors.green,
),
// Tab 3 对应的内容
Container(
color: Colors.blue,
),
Container(
color: Colors.blue,
),
Container(
color: Colors.blue,
),
],
),
),
],
),
),
],
),
);
}
@override
bool get wantKeepAlive => true;
}
lib/pages/library/view.dart
浏览文件 @ 8c0a6049
...@@ -7,9 +7,8 @@ class LibraryPage extends StatefulWidget { ...@@ -7,9 +7,8 @@ class LibraryPage extends StatefulWidget {
State<LibraryPage> createState() => _LibraryPageState(); State<LibraryPage> createState() => _LibraryPageState();
} }
class _LibraryPageState extends State<LibraryPage> with AutomaticKeepAliveClientMixin { class _LibraryPageState extends State<LibraryPage> {
//AutomaticKeepAliveClientMixin
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GetBuilder<LibraryController>( return GetBuilder<LibraryController>(
...@@ -27,130 +26,146 @@ class _LibraryPageState extends State<LibraryPage> with AutomaticKeepAliveClient ...@@ -27,130 +26,146 @@ class _LibraryPageState extends State<LibraryPage> with AutomaticKeepAliveClient
), ),
], ],
), ),
body: Stack( body: _buildBody(controller)
children: [ ),
Column( );
children: [ }
Container(
color: Colors.white, Widget _buildBody(LibraryController controller){
width: double.infinity, return Stack(
child: Container( children: [
decoration: BoxDecoration( Column(
border: Border.all(width: 0.5.w,color: Colours.cE5) children: [
_buildTab(controller),
_buildLabel(),
GetBuilder<LibraryContentController>(
init: LibraryContentController(),
builder:(contentController)=> Expanded(
child: CustomPullScrollView(
controller: contentController.refreshController,
onRefresh: contentController.onRefresh,
onLoading: contentController.onLoading,
child: CustomScrollView(
slivers: [
// 广告位
SliverToBoxAdapter(
child: Container(
color: Colors.red,
padding: EdgeInsets.symmetric(horizontal: 10.w),
child: BuildBanner(items: controller.ads,),
),
), ),
child: Row( SliverFillRemaining(
children: [ child: TabBarView(
Expanded( controller: controller.tabController,
child: TabBar( children: List.generate(controller.categories.length, (index){
indicator: BoxDecoration( print('=======================================$index');
border: const Border(bottom: BorderSide(color: Colors.transparent, width: 0.0)), // 将指示器的底边框颜色设置为透明 return LibraryContentPage(controller: contentController,);
color: const Color(0xFFC02D55).withOpacity(0.08) })
), ),
labelStyle: TextStyle(color: AppTheme.primary,fontSize: 14.w,height: 1.5,fontWeight: Fonts.medium),
unselectedLabelColor: Colours.c9,
unselectedLabelStyle: TextStyle(color: Colours.c9,fontSize: 14.w,height: 1.5),
controller: controller.tabController,
isScrollable: true,
tabs: controller.categories.map((model){
return Tab(text: model.name);
}).toList(),
),
),
GestureDetector(
onTap: (){
controller.setShow(controller.show);
// showModalBottomSheet(
// context: context,
// isScrollControlled: true, // 设置为 true
// builder: (BuildContext context) {
// return Container(
// height: MediaQuery.of(context).size.height * 0.9, // 设置高度
// decoration: BoxDecoration(
// color: Colors.white, // 替换为你的背景颜色
// ),
// child: FilterPage(),
// );
// },
// );
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.w),
alignment: Alignment.center,
// color: Colors.cyan,
height: 38.w,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
width: 12.w,
height: 12.w,
// color: Colors.red,
alignment: Alignment.center,
child: Image.asset(
'assets/images/filter.png',
),
),
Gaps.hGaps5,
Text('筛选',style: TextStyle(color: Colours.c9,fontSize: 14.w,height: 1.5),)
],
),
// width: 75,
),
)
],
), ),
), ],
),
Container(
height: 43.w,
color: Colours.cF9,
child: ListView.builder(
scrollDirection:Axis.horizontal ,
itemBuilder: (BuildContext context, int index){
return GestureDetector(
child: BuildLabelWidget(model: controller.labels[index],),
onTap: (){
controller.selectLabel( controller.labels[index]);
},
);
},
itemCount: controller.labels.length,
),
), ),
Container( ),
color: Colors.transparent,
padding: EdgeInsets.symmetric(horizontal: 10.w),
child: BuildBanner(items: controller.ads,),
),
Expanded(
child: TabBarView(
controller: controller.tabController,
children: List.generate(controller.categories.length, (index){
print('=======================================$index');
return LibraryContentPage(controller: controller,);
})
),
),
],
), ),
Visibility( ),
visible: controller.show, ],
child: FilterPage( ),
controller: controller, Visibility(
sureTap: (){ visible: controller.show,
controller.setShow(controller.show); child: FilterPage(
}, controller: controller,
resetTap: (){ sureTap: (){
controller.setShow(controller.show);
},
resetTap: (){
},), },),
),
],
)
), ),
],
); );
} }
Widget _buildLabel(){
return Container(
height: 43.w,
color: Colours.cF9,
child: GetBuilder<LibraryController>(
init: LibraryController(),
// id: 'label',
builder:(controller) =>ListView.builder(
scrollDirection:Axis.horizontal ,
itemBuilder: (BuildContext context, int index){
return GestureDetector(
child: BuildLabelWidget(model: controller.labels[index],),
onTap: (){
controller.selectLabel( controller.labels[index]);
},
);
},
itemCount: controller.labels.length,
),
),
);
}
@override PreferredSizeWidget _buildTab(LibraryController controller){
bool get wantKeepAlive => true; return PreferredSize(
preferredSize: Size.fromHeight(48.w),
child: Container(
color: Colors.white,
child: Row(
children: [
// TabBar放在左侧
Expanded(
child: TabBar(
indicator: BoxDecoration(
border: const Border(bottom: BorderSide(color: Colors.transparent, width: 0.0)), // 将指示器的底边框颜色设置为透明
color: const Color(0xFFC02D55).withOpacity(0.08)
),
labelStyle: TextStyle(color: AppTheme.primary,fontSize: 14.w,height: 1.5,fontWeight: Fonts.medium),
unselectedLabelColor: Colours.c9,
unselectedLabelStyle: TextStyle(color: Colours.c9,fontSize: 14.w,height: 1.5),
controller: controller.tabController,
isScrollable: true,
tabs: controller.categories.map((model){
return Tab(text: model.name);
}).toList(),
),
),
// 筛选按钮放在右侧
GestureDetector(
onTap: (){
controller.setShow(controller.show);
},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10.w),
alignment: Alignment.center,
height: 38.w,
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
width: 12.w,
height: 12.w,
// color: Colors.red,
alignment: Alignment.center,
child: Image.asset(
'assets/images/filter.png',
),
),
Gaps.hGaps5,
Text('筛选',style: TextStyle(color: Colours.c9,fontSize: 14.w,height: 1.5),)
],
),
// width: 75,
),
)
],
),
),
);
}
// @override
// bool get wantKeepAlive => true;
} }
lib/pages/library/widgets/content.dart
浏览文件 @ 8c0a6049
part of library; part of library;
class LibraryContentPage extends StatefulWidget { class LibraryContentPage extends StatefulWidget {
final LibraryController controller; final LibraryContentController controller;
// final CategoryModel categoryModel; // final CategoryModel categoryModel;
const LibraryContentPage({ const LibraryContentPage({
Key? key, Key? key,
...@@ -16,36 +16,21 @@ class LibraryContentPage extends StatefulWidget { ...@@ -16,36 +16,21 @@ class LibraryContentPage extends StatefulWidget {
class _LibraryContentPageState extends State<LibraryContentPage> with AutomaticKeepAliveClientMixin { class _LibraryContentPageState extends State<LibraryContentPage> with AutomaticKeepAliveClientMixin {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return CustomPullScrollView( return ListView.builder(
controller: widget.controller.refreshController, // shrinkWrap: true,
onRefresh: widget.controller.onRefresh, physics: const NeverScrollableScrollPhysics(),
onLoading: widget.controller.onLoading, itemCount: widget.controller.books.length,
child: ListView.builder( itemBuilder: (BuildContext context, int index) {
// shrinkWrap: true, CourseModel model = widget.controller.books[index];
// physics: NeverScrollableScrollPhysics(), return GestureDetector(
scrollDirection: Axis.vertical, onTap: (){
itemCount: widget.controller.books.length, context.pushNamed(Routes.bookDetail,queryParameters: {'book_id':model.bookId.toString()});
itemBuilder: (BuildContext context, int index) { },
// if (index == 0){ child: LibraryCell(model: model,onTap: (){
// return Container( widget.controller.love(bookId: model.bookId.toString(), isCollection: model.isCollection!);
// color: Colors.transparent, },),
// padding: const EdgeInsets.symmetric(horizontal: 10), );
// child: BuildBanner(items: widget.controller.ads,), }
// );
// }
// else {
CourseModel model = widget.controller.books[index];
return GestureDetector(
onTap: (){
context.pushNamed(Routes.bookDetail,queryParameters: {'book_id':model.bookId.toString()});
},
child: LibraryCell(model: model,onTap: (){
widget.controller.love(bookId: model.bookId.toString(), isCollection: model.isCollection!);
},),
);
}
// },
),
); );
} }
@override @override
......
lib/pages/library_content/controller.dart
浏览文件 @ 8c0a6049
part of library_content; // part of library_content;
//
class LibraryContentController extends GetxController { // class LibraryContentController extends GetxController {
final EasyRefreshController refreshController = EasyRefreshController( //
controlFinishLoad: true, // final CategoryModel categoryModel;
controlFinishRefresh: true, // late LabelModel labelModel;
); // LibraryContentController(this.categoryModel, this.labelModel);
//
final int _limit = 10; // final EasyRefreshController refreshController = EasyRefreshController(
int _page = 1; // controlFinishLoad: true,
bool _noMore = false; // controlFinishRefresh: true,
// );
//
// 图书列表数据 // // 广告数组
List<CourseModel> books = []; // List<AdModel> ads = [];
//
// final int _limit = 10;
@override // int _page = 1;
void onReady() { // bool _noMore = false;
super.onReady(); //
} //
// // 图书列表数据
// List<CourseModel> books = [];
@override //
void onClose() { //
refreshController.dispose(); // @override
super.onClose(); // void onReady() {
} //
// super.onReady();
// }
//
/// 收藏 与 取消收藏 //
void love({ // @override
required String bookId, // void onClose() {
required num isCollection // refreshController.dispose();
}) async { // super.onClose();
if (isCollection == 0){ // }
isCollection = 1; //
} //
else{ // /// 收藏 与 取消收藏
isCollection = 0; // void love({
} // required String bookId,
bool result = await CommonAPI.love(bookId: bookId, love: isCollection.toString()); // required num isCollection
if (result) { // }) async {
onRefresh(); // if (isCollection == 0){
} // isCollection = 1;
} // }
// else{
/// 获取图书列表数据 // isCollection = 0;
Future<void> _getBooks([bool isRefresh = false]) async { // }
if (isRefresh) _page = 1; // bool result = await CommonAPI.love(bookId: bookId, love: isCollection.toString());
// 网路请求 // if (result) {
final result = await LibraryAPI.books( // onRefresh();
page: _page, // }
limit: _limit // }
); //
// 如果是刷新 清理数据 // /// 获取图书列表数据
if (isRefresh) books.clear(); // Future<void> _getBooks([bool isRefresh = false]) async {
books.addAll(result); // if (isRefresh) _page = 1;
_page ++; // // 网路请求
_noMore = result.length < _limit; // final result = await LibraryAPI.books(
update(); // page: _page,
// limit: _limit,
} // categoryId: categoryModel.categoryId.toString(),
// labelId: labelModel.labelId.toString()
void onRefresh() async { // );
try { // // 如果是刷新 清理数据
await _getBooks(true); // if (isRefresh) books.clear();
refreshController.finishRefresh(IndicatorResult.success); // books.addAll(result);
refreshController.resetFooter(); // _page ++;
} catch (error) { // _noMore = result.length < _limit;
refreshController.finishRefresh(IndicatorResult.fail); // update();
} //
} // }
//
void onLoading() async { // void onRefresh() async {
if (_noMore) { // try {
refreshController.finishLoad(IndicatorResult.noMore); // await _getBooks(true);
return; // refreshController.finishRefresh(IndicatorResult.success);
} // refreshController.resetFooter();
try { // } catch (error) {
await _getBooks(); // refreshController.finishRefresh(IndicatorResult.fail);
refreshController.finishLoad(); // }
} catch (error) { // }
refreshController.finishLoad(IndicatorResult.fail); //
} // void onLoading() async {
} // if (_noMore) {
// refreshController.finishLoad(IndicatorResult.noMore);
} // return;
\ No newline at end of file // }
// try {
// await _getBooks();
// refreshController.finishLoad();
// } catch (error) {
// refreshController.finishLoad(IndicatorResult.fail);
// }
// }
//
// }
\ No newline at end of file
lib/pages/library_content/index.dart
浏览文件 @ 8c0a6049
library library_content; // library library_content;
//
import 'package:easy_refresh/easy_refresh.dart'; // import 'package:easy_refresh/easy_refresh.dart';
import 'package:flutter/material.dart'; // import 'package:flutter/material.dart';
import 'package:get/get.dart'; // import 'package:get/get.dart';
import 'package:get/get_state_manager/src/simple/get_controllers.dart'; // import 'package:get/get_state_manager/src/simple/get_controllers.dart';
import 'package:go_router/go_router.dart'; // import 'package:go_router/go_router.dart';
//
import '../../apis/index.dart'; // import '../../apis/index.dart';
import '../../models/index.dart'; // import '../../models/index.dart';
import '../../routes/index.dart'; // import '../../routes/index.dart';
import '../../widgets/index.dart'; // import '../../widgets/index.dart';
import '../course/index.dart'; // import '../course/index.dart';
import '../library/index.dart'; // import '../library/index.dart';
//
part 'view.dart'; // part 'view.dart';
part 'controller.dart'; // part 'controller.dart';
\ No newline at end of file \ No newline at end of file
lib/pages/library_content/view.dart
浏览文件 @ 8c0a6049
part of library_content; // part of library_content;
//
class LibraryContentPage extends StatefulWidget { // class LibraryContentPage extends StatefulWidget {
final CategoryModel categoryModel; // final CategoryModel categoryModel;
final LabelModel labelModel; // final LabelModel labelModel;
const LibraryContentPage({ // final String tag;
Key? key, // const LibraryContentPage({
required this.categoryModel, // Key? key,
required this.labelModel // required this.categoryModel,
}) : super(key: key); // required this.labelModel,
// required this.tag
@override // }) : super(key: key);
State<LibraryContentPage> createState() => _LibraryContentPageState(); //
} // @override
// State<LibraryContentPage> createState() => _LibraryContentPageState();
class _LibraryContentPageState extends State<LibraryContentPage> with AutomaticKeepAliveClientMixin { // }
@override //
Widget build(BuildContext context) { // class _LibraryContentPageState extends State<LibraryContentPage> {
return GetBuilder<LibraryContentController>( // @override
init: LibraryContentController(), // Widget build(BuildContext context) {
builder: (controller) => CustomPullScrollView( // return GetBuilder<LibraryContentController>(
controller: controller.refreshController, // // tag: widget.tag,
onRefresh: controller.onRefresh, // init: LibraryContentController(widget.categoryModel,widget.labelModel),
onLoading: controller.onLoading, // builder: (controller) => CustomPullScrollView(
child: ListView.builder( // controller: controller.refreshController,
itemCount: controller.books.length, // onRefresh: controller.onRefresh,
itemBuilder: (BuildContext context, int index) { // onLoading: controller.onLoading,
// if (index == 0){ // child: ListView.builder(
// return Container( // itemCount: controller.books.length+1,
// color: Colors.transparent, // itemBuilder: (BuildContext context, int index) {
// padding: const EdgeInsets.symmetric(horizontal: 10), // if (index == 0){
// child: BuildBanner(items: controller.ads,), // return Container(
// ); // color: Colors.red,
// } // padding: const EdgeInsets.symmetric(horizontal: 10),
// else { // child: BuildBanner(items: controller.ads,),
CourseModel model = controller.books[index]; // );
return GestureDetector( // }
onTap: (){ // else {
context.pushNamed(Routes.bookDetail,queryParameters: {'book_id':model.bookId.toString()}); // CourseModel model = controller.books[index-1];
}, // return GestureDetector(
child: LibraryCell(model: model,onTap: (){ // onTap: (){
controller.love(bookId: model.bookId.toString(), isCollection: model.isCollection!); // context.pushNamed(Routes.bookDetail,queryParameters: {'book_id':model.bookId.toString()});
},), // },
); // child: LibraryCell(model: model,onTap: (){
} // controller.love(bookId: model.bookId.toString(), isCollection: model.isCollection!);
// }, // },),
), // );
), // }
); // },
} // ),
@override // ),
bool get wantKeepAlive => true; // );
} // }
// // @override
// // bool get wantKeepAlive => true;
// }
lib/pages/login/controller.dart
浏览文件 @ 8c0a6049
...@@ -60,7 +60,7 @@ class LoginController extends GetxController { ...@@ -60,7 +60,7 @@ class LoginController extends GetxController {
} }
void setCanClick(){ void setCanClick(){
if (phoneInput.text.length == 11 && passwordInput.text.length == 6){ if (ValidatorTool.isValidPhoneNumber(phoneInput.text) && ValidatorTool.isValidPassword(passwordInput.text)){
_enable = true; _enable = true;
} }
else{ else{
......
lib/pages/login/view.dart
浏览文件 @ 8c0a6049
...@@ -21,6 +21,7 @@ class _LoginPageState extends State<LoginPage> { ...@@ -21,6 +21,7 @@ class _LoginPageState extends State<LoginPage> {
onTap: () => Tools.unfocus(), onTap: () => Tools.unfocus(),
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,
extendBodyBehindAppBar: true,
appBar: CustomAppBar( appBar: CustomAppBar(
systemOverlayStyle: Theme.of(context).brightness == Brightness.light systemOverlayStyle: Theme.of(context).brightness == Brightness.light
? SystemUiOverlayStyle.dark ? SystemUiOverlayStyle.dark
......
lib/pages/mine/view.dart
浏览文件 @ 8c0a6049
...@@ -71,19 +71,25 @@ class _MinePageState extends State<MinePage> { ...@@ -71,19 +71,25 @@ class _MinePageState extends State<MinePage> {
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
children: [ children: [
BuildUser(userInfo:controller.userInfo,onTap: () async{ Container(
final result = await context.pushNamed(Routes.userInfo,extra: controller.userInfo); margin: EdgeInsets.symmetric(horizontal: 10.w),
if (result == true){ child: BuildUser(userInfo:controller.userInfo,onTap: () async{
controller.getInfo(); final result = await context.pushNamed(Routes.userInfo,extra: controller.userInfo);
} if (result == true){
},), controller.getInfo();
}
},),
),
Gaps.vGaps10, Gaps.vGaps10,
BuildRead(items: controller.reads,onTap: (ReadModel model) async{ Container(
final result = await context.pushNamed(model.link??''); margin: EdgeInsets.symmetric(horizontal: 2.2.w),
if (result == true){ child: BuildRead(items: controller.reads,onTap: (ReadModel model) async{
controller.getInfo(); final result = await context.pushNamed(model.link??'');
} if (result == true){
}), controller.getInfo();
}
}),
),
controller.ads.isNotEmpty?Gaps.vGaps10:const SizedBox(), controller.ads.isNotEmpty?Gaps.vGaps10:const SizedBox(),
controller.ads.isNotEmpty? controller.ads.isNotEmpty?
Container( Container(
......
lib/pages/mine/widgets/account.dart
浏览文件 @ 8c0a6049
...@@ -37,30 +37,33 @@ class BuildAccount extends StatelessWidget { ...@@ -37,30 +37,33 @@ class BuildAccount extends StatelessWidget {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: items.map((model){ children: items.map((model){
return GestureDetector( return Expanded(
onTap: (){ child: GestureDetector(
if (model.link != null){ onTap: (){
context.pushNamed(model.link!); if (model.link != null){
if (onTap !=null) onTap; context.pushNamed(model.link!);
} if (onTap !=null) onTap;
}, }
child: Column( },
children: [ child: Column(
SizedBox( children: [
width: 25.w, SizedBox(
height: 25.w, width: 25.w,
// color: Colors.green, height: 25.w,
child: Image.asset(model.icon!), // color: Colors.green,
), child: Image.asset(model.icon!),
Gaps.vGaps5, ),
Text(model.name,style: TextStyle(fontSize:12.w,height: 1.6.w,color: Colours.c9),), Gaps.vGaps5,
items.indexOf(model) == 0?Row( Text(model.name,style: TextStyle(fontSize:12.w,height: 1.6.w,color: Colours.c9),),
children: [ items.indexOf(model) == 0?Row(
Text(model.value.toString(),style: TextStyle(fontSize: 16.w,height: 1.6,fontWeight: Fonts.medium,color: AppTheme.primary,),), mainAxisAlignment: MainAxisAlignment.center,
Text('张',style: TextStyle(fontSize: 12.w,height:1.6.w,color: Colours.c3),) children: [
], Text(model.value.toString(),style: TextStyle(fontSize: 16.w,height: 1.6,fontWeight: Fonts.medium,color: AppTheme.primary,),),
):Text(model.value.toString(),style: TextStyle(fontSize: 16.w,height:1.6.w,color: Colours.c3),) Text('张',style: TextStyle(fontSize: 12.w,height:1.6.w,color: Colours.c3),)
], ],
):Text(model.value.toString(),style: TextStyle(fontSize: 16.w,height:1.6.w,color: Colours.c3),)
],
),
), ),
); );
} ).toList(), } ).toList(),
......
lib/pages/mine/widgets/read.dart
浏览文件 @ 8c0a6049
...@@ -13,7 +13,7 @@ class BuildRead extends StatelessWidget { ...@@ -13,7 +13,7 @@ class BuildRead extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return GestureDetector( return Container(
child: Stack( child: Stack(
children: [ children: [
Container( Container(
...@@ -29,7 +29,7 @@ class BuildRead extends StatelessWidget { ...@@ -29,7 +29,7 @@ class BuildRead extends StatelessWidget {
left: 0, left: 0,
right: 0, right: 0,
child: Container( child: Container(
padding: EdgeInsets.symmetric(vertical: 16.5.w), padding: EdgeInsets.symmetric(vertical: 16.5.w,horizontal: 8),
color: Colors.transparent, color: Colors.transparent,
// decoration: BoxDecoration( // decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(8), // borderRadius: BorderRadius.circular(8),
...@@ -46,24 +46,26 @@ class BuildRead extends StatelessWidget { ...@@ -46,24 +46,26 @@ class BuildRead extends StatelessWidget {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: items.map((model){ children: items.map((model){
return GestureDetector( return Expanded(
behavior: HitTestBehavior.opaque, child: GestureDetector(
onTap: (){ behavior: HitTestBehavior.opaque,
if (model.link != null){ onTap: (){
if (model.link != Routes.love){ if (model.link != null){
context.pushNamed(model.link!); if (model.link != Routes.love){
context.pushNamed(model.link!);
}
else{
if (onTap !=null) onTap!(model);
}
} }
else{ },
if (onTap !=null) onTap!(model); child: Column(
} children: [
} Text(model.value,style: TextStyle(fontSize: 18.w,height: 1.6.w,fontWeight: Fonts.medium,color: Colours.c3),),
}, Gaps.vGaps5,
child: Column( Text(model.name,style: TextStyle(fontSize: 13.w,height:1.6.w,color: Colours.c6))
children: [ ],
Text(model.value,style: TextStyle(fontSize: 18.w,height: 1.6.w,fontWeight: Fonts.medium,color: Colours.c3),), ),
Gaps.vGaps5,
Text(model.name,style: TextStyle(fontSize: 13.w,height:1.6.w,color: Colours.c6))
],
), ),
); );
}).toList(), }).toList(),
......
lib/pages/reset_pwd/controller.dart
浏览文件 @ 8c0a6049
...@@ -47,8 +47,8 @@ class ResetPwdController extends GetxController { ...@@ -47,8 +47,8 @@ class ResetPwdController extends GetxController {
final result = await AccountAPI.resetPassword( final result = await AccountAPI.resetPassword(
phone: phone, phone: phone,
code: code, code: code,
password: pwdInput.text, password: EncryptUtil.encodeMd5(EncryptUtil.encodeMd5(pwdInput.text)),
rePassword: pwd2Input.text rePassword: EncryptUtil.encodeMd5(EncryptUtil.encodeMd5(pwd2Input.text))
); );
if (result){ if (result){
if (context.mounted){ if (context.mounted){
......
lib/pages/reset_pwd/view.dart
浏览文件 @ 8c0a6049
...@@ -68,7 +68,7 @@ class _ResetPwdPageState extends State<ResetPwdPage> { ...@@ -68,7 +68,7 @@ class _ResetPwdPageState extends State<ResetPwdPage> {
), ),
Container( Container(
margin: EdgeInsets.only(left: 5.w,top: 5.w), margin: EdgeInsets.only(left: 5.w,top: 5.w),
child: Text('密码必须是6-20个英文字母、数字或符号',style: TextStyle(fontSize: 10.w,color: Colours.c9),), child: Text('密码必须是8-20个英文字母、数字或符号',style: TextStyle(fontSize: 10.w,color: Colours.c9),),
), ),
Gaps.vGaps40, Gaps.vGaps40,
CustomGradientButton( CustomGradientButton(
......
lib/routes/index.dart
浏览文件 @ 8c0a6049
...@@ -42,6 +42,7 @@ import 'package:go_router/go_router.dart'; ...@@ -42,6 +42,7 @@ import 'package:go_router/go_router.dart';
import '../models/index.dart'; import '../models/index.dart';
import '../pages/order_evaluate/index.dart'; import '../pages/order_evaluate/index.dart';
import '../pages/pay_coupon/index.dart';
import '../pages/user_about/index.dart'; import '../pages/user_about/index.dart';
import '../pages/user_terms/index.dart'; import '../pages/user_terms/index.dart';
import '../pages/version/index.dart'; import '../pages/version/index.dart';
......
lib/routes/routes.dart
浏览文件 @ 8c0a6049
...@@ -42,6 +42,7 @@ abstract class Routes { ...@@ -42,6 +42,7 @@ abstract class Routes {
/// 书架模块 /// 书架模块
static const creditPoints = 'credit_points'; static const creditPoints = 'credit_points';
static const shop = 'shop'; static const shop = 'shop';
static const payCoupon = 'pay_coupon';
...@@ -278,6 +279,15 @@ abstract class Routes { ...@@ -278,6 +279,15 @@ abstract class Routes {
child: const CreditPointsPage() child: const CreditPointsPage()
) )
), ),
GoRoute(
path: '/$payCoupon',
name: payCoupon,
pageBuilder: (context, state) =>CupertinoPage(
name: state.uri.toString(),
key: state.pageKey,
child: const PayCouponPage()
)
),
GoRoute( GoRoute(
path: '/$search', path: '/$search',
name: search, name: search,
......
lib/utils/validator.dart
浏览文件 @ 8c0a6049
...@@ -89,9 +89,11 @@ class ValidatorTool { ...@@ -89,9 +89,11 @@ class ValidatorTool {
return phonePattern.hasMatch(value); return phonePattern.hasMatch(value);
} }
// 验证密码 // 密码
static bool isValidPassword(String value) { static bool isValidPassword(String value) {
RegExp passwordPattern = RegExp(r'^[A-Za-z0-9!@#\$%^&*()_+{}\[\]:;<>,.?~\\/-]{6,20}$');; // RegExp passwordPattern = RegExp(r'^[A-Za-z0-9!@#\$%^&*()_+{}\[\]:;<>,.?~\\/-]{8,12}$');
// RegExp passwordPattern = RegExp(r'^(?=.*[A-Za-z])(?=.*\d)(?=.*[~@#%$*()_+{}\[\]:;<>,.?\\/-])[A-Za-z0-9~@#%$*()_+{}\[\]:;<>,.?\\/-]{8,12}$');
RegExp passwordPattern = RegExp(r'^\d{6}$');
return passwordPattern.hasMatch(value); return passwordPattern.hasMatch(value);
} }
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论