Skip to content

B
book-app
提交 843d638a authored 作者: yueweilu's avatar yueweilu
浏览文件
操作

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

上级 e75e9cee f9b7be66
隐藏空白字符变更
内嵌 并排
正在显示 包含 68 行增加 和 85 行删除
lib/pages/library/widgets/filter.dart
浏览文件 @ 843d638a
......@@ -28,75 +28,77 @@ class _FilterPageState extends State<FilterPage> {
return Container(
color: const Color(0xFF000000).withOpacity(0.5),
child: Column(
children: [
Container(
color: Colors.white,
width: double.infinity,
padding: EdgeInsets.only(bottom: 10.w),
child: Column(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildWrapWidget('分类', widget.controller.filterCategories),
_buildWrapWidget('标签', widget.controller.filterLabels),
_buildWrapWidget('是否收费', widget.controller.filterFree),
_buildWrapWidget('排序', widget.controller.filterDown),
],
)
],
),
child: SingleChildScrollView(
child: Column(
children: [
Container(
color: Colors.white,
width: double.infinity,
padding: EdgeInsets.only(bottom: 10.w),
child: Column(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildWrapWidget('分类', widget.controller.filterCategories),
_buildWrapWidget('标签', widget.controller.filterLabels),
_buildWrapWidget('是否收费', widget.controller.filterFree),
_buildWrapWidget('排序', widget.controller.filterDown),
],
)
],
),
),
Container(
padding: EdgeInsets.only(left:10.w,right:10.w,top:30.w,bottom:10.w),
color: Colors.white,
// margin: const EdgeInsets.symmetric(horizontal: 15),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Expanded(
child: GestureDetector(
onTap: (){
widget.controller.resetFilter();
},
child: Container(
alignment: Alignment.center,
height: 35.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17.5.w),
border:Border.all(
width: 0.5.w,
color: Colours.c9
),
Container(
padding: EdgeInsets.only(left:10.w,right:10.w,top:30.w,bottom:10.w),
color: Colors.white,
// margin: const EdgeInsets.symmetric(horizontal: 15),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
Expanded(
child: GestureDetector(
onTap: (){
widget.controller.resetFilter();
},
child: Container(
alignment: Alignment.center,
height: 35.w,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17.5.w),
border:Border.all(
width: 0.5.w,
color: Colours.c9
),
// color: Colours.cE0.withOpacity(0.5),
),
// color: Colours.cE0.withOpacity(0.5),
// padding: EdgeInsets.symmetric(vertical: 8),
child: Text('重置',style: TextStyle(fontSize: 13.w,color: Colours.c9,height: 1.5),),
),
// padding: EdgeInsets.symmetric(vertical: 8),
child: Text('重置',style: TextStyle(fontSize: 13.w,color: Colours.c9,height: 1.5),),
),
),
),
Gaps.hGaps10,
Expanded(
child: GestureDetector(
onTap: widget.sureTap,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17.5.w),
color: AppTheme.primary.withOpacity(0.1)
Gaps.hGaps10,
Expanded(
child: GestureDetector(
onTap: widget.sureTap,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(17.5.w),
color: AppTheme.primary.withOpacity(0.1)
),
height: 35.w,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: 8.w),
child: Text('确定',style: TextStyle(fontSize: 13.w,color: AppTheme.primary,height: 1.5),),
),
height: 35.w,
alignment: Alignment.center,
padding: EdgeInsets.symmetric(vertical: 8.w),
child: Text('确定',style: TextStyle(fontSize: 13.w,color: AppTheme.primary,height: 1.5),),
),
),
)
],
),
)
],
)
],
),
)
],
),
),
);
}
......
lib/pages/user_order_evaluate/view.dart
浏览文件 @ 843d638a
......@@ -194,7 +194,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
),
Gaps.hGaps20,
AbsorbPointer(
absorbing: false,
absorbing: bookListModel.rating!.toDouble()>0,
child: CustomRating(
max: 5,
score:bookListModel.rating !=null ?bookListModel.rating!.toDouble():0,
......@@ -221,18 +221,20 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
focusedBorder: InputBorder.none,
border: InputBorder.none,
enabledBorder: InputBorder.none,
disabledBorder: InputBorder.none,
errorBorder: InputBorder.none,
fillColor: Colors.white,
hintText: '请简要描述',
hintStyle: TextStyle(
fontSize: 14.w, height: 1.5, color: Colours.c6)),
maxLines: 5,
maxLines: 5,
onChanged: (text){
orderEvaluates[index].comments=myController._commentsControllers[index].text;
myController.setCanClick(double:orderEvaluates[index].rating??0);
},
focusNode: myController._focusNode,
controller: myController._commentsControllers[index],
enabled: myController._commentsControllers[index].text.isEmpty,
onTap: () {
// 在文本框获取焦点时，将光标移动到文本末尾
myController._commentsControllers[index].selection = TextSelection.fromPosition(
......@@ -240,27 +242,6 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
);
},
),
// CustomInputCommands(
// decoration: InputDecoration(
// focusedBorder: InputBorder.none,
// border: InputBorder.none,
// enabledBorder: InputBorder.none,
// errorBorder: InputBorder.none,
// fillColor: Colors.white,
// hintStyle: TextStyle(
// fontSize: 14.w, height: 1.5, color: Colours.c6)),
// maxLines: 5,
// controller: myController.commentsInput,
// hintText: '请简要描述',
// onChanged: (text){
// myController.setCanClick();
// print(myController.commentsInput.text);
// orderEvaluates[index].comments=myController.commentsInput.text;
// },
// focusNode: myController._focusNode,
// ),
],
),
),
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论