diff --git a/lib/pages/goods_deto_page/goods_deto_page.dart b/lib/pages/goods_deto_page/goods_deto_page.dart index f3cd34bc..a7bbca85 100644 --- a/lib/pages/goods_deto_page/goods_deto_page.dart +++ b/lib/pages/goods_deto_page/goods_deto_page.dart @@ -50,8 +50,9 @@ class _GoodsDetoPageState extends State { return AnimatedPositioned( bottom: 0, top: 0, - left: (_canSkew(4) && _isEdit) ? 80.w : 0.w, + left: (_canSkew(model.status) && _isEdit) ? 80.w : 0.w, duration: Duration(milliseconds: 300), + curve: Curves.easeInOutCubic, width: 750.w, child: GoodsInfoCard( model: model, diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart index 064a5fa0..677e8e10 100644 --- a/lib/pages/things_page/fixed_submit_page.dart +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -1,4 +1,5 @@ // Flutter imports: +import 'package:akuCommunity/widget/buttons/radio_button.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -84,7 +85,7 @@ class _FixedSubmitPageState extends State { Widget _buildCard(FixedSubmitModel model) { return AnimatedPositioned( top: 0, - left: (_canSkew(model.status) && _isEdit) ? 55.w : 0, + left: (_canSkew(4) && _isEdit) ? 55.w : 0, bottom: 0, duration: Duration(milliseconds: 300), curve: Curves.easeInOutCubic, @@ -158,19 +159,31 @@ class _FixedSubmitPageState extends State { } Widget _buildCheckBox(FixedSubmitModel model) { - return 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: FixedCheckBox( + // onChanged: (isSelect) { + // if (isSelect) { + // _selected.add(model.id); + // } else { + // _selected.remove(model.id); + // } + // setState(() {}); + // }, + // ), + child: BeeRadio(value: model.id, groupValues: _selected), + ), + ); } Widget _showDeletDialog() {