diff --git a/lib/pages/goods_deto_page/goods_deto_page.dart b/lib/pages/goods_deto_page/goods_deto_page.dart index a7bbca85..d8ad6199 100644 --- a/lib/pages/goods_deto_page/goods_deto_page.dart +++ b/lib/pages/goods_deto_page/goods_deto_page.dart @@ -1,12 +1,15 @@ // Flutter imports: import 'package:akuCommunity/pages/manager_func.dart'; +import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/widget/buttons/bottom_button.dart'; import 'package:akuCommunity/widget/buttons/radio_button.dart'; +import 'package:bot_toast/bot_toast.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; // Package imports: import 'package:flutter_easyrefresh/easy_refresh.dart'; +import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; // Project imports: @@ -62,6 +65,7 @@ class _GoodsDetoPageState extends State { @override Widget build(BuildContext context) { + UserProvider userProvider = Provider.of(context); return BeeScaffold( title: '物品出户', actions: [ @@ -124,7 +128,9 @@ class _GoodsDetoPageState extends State { _refreshController.callRefresh(); } : () { - DetoCreatePage().to(); + userProvider.isLogin + ? DetoCreatePage().to() + : BotToast.showText(text: '请先登录!'); }, child: _isEdit ? '删除'.text.size(32.sp).bold.make() diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart index 677e8e10..a3bfd174 100644 --- a/lib/pages/things_page/fixed_submit_page.dart +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -85,7 +85,7 @@ class _FixedSubmitPageState extends State { Widget _buildCard(FixedSubmitModel model) { return AnimatedPositioned( top: 0, - left: (_canSkew(4) && _isEdit) ? 55.w : 0, + left: (_canSkew(model.status) && _isEdit) ? 55.w : 0, bottom: 0, duration: Duration(milliseconds: 300), curve: Curves.easeInOutCubic, @@ -159,30 +159,33 @@ class _FixedSubmitPageState extends State { } Widget _buildCheckBox(FixedSubmitModel model) { - return GestureDetector( - onTap: () { - if (_selected.contains(model.id)) { - _selected.remove(model.id); - } else { - _selected.add(model.id); - } - setState(() {}); - }, - child: Container( + return + // GestureDetector( + // onTap: () { + // if (_selected.contains(model.id)) { + // _selected.remove(model.id); + // } else { + // _selected.add(model.id); + // } + // setState(() {}); + // }, + // child: + Container( alignment: Alignment.centerLeft, constraints: BoxConstraints(minHeight: 384.w, minWidth: 686.w), - // child: FixedCheckBox( - // onChanged: (isSelect) { - // if (isSelect) { - // _selected.add(model.id); - // } else { - // _selected.remove(model.id); - // } - // setState(() {}); - // }, - // ), - child: BeeRadio(value: model.id, groupValues: _selected), - ), + child: FixedCheckBox( + key:ValueKey(model.id), + onChanged: (isSelect) { + if (isSelect) { + _selected.add(model.id); + } else { + _selected.remove(model.id); + } + setState(() {}); + }, + ), + // child: BeeRadio(value: model.id, groupValues: _selected), + // ), ); } @@ -259,8 +262,8 @@ class _FixedSubmitPageState extends State { }, ).expand(), MaterialButton( - disabledColor: kDarkSubColor, - disabledTextColor: ktextSubColor, + disabledColor: Colors.white.withOpacity(0.5), + disabledTextColor: ktextSubColor.withOpacity(0.8), textColor: ktextPrimary, onPressed: _isEdit ? _selected.isEmpty diff --git a/lib/pages/things_page/widget/fixed_check_box.dart b/lib/pages/things_page/widget/fixed_check_box.dart index 3972a270..582a5403 100644 --- a/lib/pages/things_page/widget/fixed_check_box.dart +++ b/lib/pages/things_page/widget/fixed_check_box.dart @@ -17,6 +17,8 @@ class FixedCheckBox extends StatefulWidget { class _FixedCheckBoxState extends State { bool _isSelected = false; + + @override Widget build(BuildContext context) { return GestureDetector( @@ -28,6 +30,7 @@ class _FixedCheckBoxState extends State { }, child: AnimatedContainer( duration: Duration(milliseconds: 300), + curve: Curves.easeInOutCubic, alignment: Alignment.center, width: 40.w, height: 40.w, @@ -39,11 +42,12 @@ class _FixedCheckBoxState extends State { ), child: AnimatedContainer( duration: Duration(milliseconds: 300), + curve: Curves.easeInOutCubic, width: 24.w, height: 24.w, decoration: BoxDecoration( borderRadius: BorderRadius.circular(24.w), - color: _isSelected ? kPrimaryColor : Colors.transparent, + color: kPrimaryColor.withOpacity(_isSelected?1:0) ), ), ),