xt / Flutter-ReserveApp · Commits

Go to a project

Commit e8361d208c473c0f1594d9c91a1c64268459d177

Authored by wdn127929
1 parent f4b4a699
build: skipped

微调

Inline Side-by-side
Showing 7 changed files with 124 additions and 61 deletions
... ... @@ -2,6 +2,7 @@ import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_picker/flutter_picker.dart';
import 'package:flutter_screenutil/screenutil.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/utils/dialog_util.dart';
import 'package:one_key/utils/navigator_util.dart';
... ... @@ -32,8 +33,6 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
final GlobalKey<ScaffoldState> scaffoldKey = GlobalKey<ScaffoldState>();
String fromDate = '点击选择'; //有效期开始时间
String endDate = '点击选择'; //有效期结束时间
List<int> fromDateSelect;
List<int> endDateSelect;
FocusNode _nameFocusNode = FocusNode();
FocusNode _requireFocusNode = FocusNode();
bool showDateSelWidget = false;
... ... @@ -323,6 +322,32 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
ScreenUtil().setWidth(40), ScreenUtil().setWidth(40)),
child: RoundButton(
onPressed: () {
if (_couponNameEditControl.text.trim().length == 0) {
Utils.showToast('请填写券名称');
return;
}
if (_couponRequireEditControl.text.trim().length == 0) {
Utils.showToast('请填写券要求');
return;
}
if (fromDate == '点击选择') {
Utils.showToast('请选择有效期起始时间');
return;
}
if (endDate == '点击选择') {
Utils.showToast('请选择有效期结束时间');
return;
}
if (_couponExplainEditControl.text.trim().length == 0) {
Utils.showToast('请填写券说明');
return;
}
if (DateUtil.getDateTime(endDate)
.compareTo(DateUtil.getDateTime(fromDate)) <
0) {
Utils.showToast('有效期结束时间不能早于起始时间');
return;
}
// ***参数***
// _couponNameEditControl.text
// _couponRequireEditControl.text
... ...
... ... @@ -23,8 +23,10 @@ class _CouponHistoryPageState extends State<CouponHistoryPage> {
///获取优惠券列表数据
_couponNetworkData() {
return Future.delayed(Duration(seconds: 1),
() => couponProvider.pageStateHistory = PageState.Success);
return Future.delayed(Duration(seconds: 1), () {
couponProvider.pageStateHistory = PageState.Success;
couponProvider.notifyListeners();
});
}
@override
... ... @@ -50,7 +52,7 @@ class _CouponHistoryPageState extends State<CouponHistoryPage> {
builder: (context, model, _) {
if (model.pageStateHistory != PageState.Success) {
return ExceptionPage(
pageState: model.pageState,
pageState: model.pageStateHistory,
callback: () {
// offset = 0;
// getMessage(showLoading: true);
... ...
... ... @@ -29,8 +29,10 @@ class _CouponPageState extends State<CouponPage> {
///获取优惠券列表数据
_couponNetworkData() {
return Future.delayed(Duration(seconds: 1),
() => couponProvider.pageState = PageState.Success);
return Future.delayed(Duration(seconds: 1), () {
couponProvider.pageState = PageState.Success;
couponProvider.notifyListeners();
});
}
@override
... ...
... ... @@ -4,6 +4,7 @@ import 'package:flutter_screenutil/screenutil.dart';
import 'package:one_key/constant/state.dart';
import 'package:one_key/pages/coupon/coupon_item.dart';
import 'package:one_key/provider/coupon_provider.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/utils/navigator_util.dart';
import 'package:one_key/widgets/h_empty_view.dart';
import 'package:one_key/widgets/page_exception.dart';
... ... @@ -25,8 +26,10 @@ class _CouponSelectPageState extends State<CouponSelectPage> {
///获取优惠券列表数据
_couponNetworkData() {
return Future.delayed(Duration(seconds: 1),
() => couponProvider.pageStateSelect = PageState.Success);
return Future.delayed(Duration(seconds: 1), () {
couponProvider.pageStateSelect = PageState.Success;
couponProvider.notifyListeners();
});
}
@override
... ... @@ -93,11 +96,29 @@ class _CouponSelectPageState extends State<CouponSelectPage> {
child: Row(
children: [
HEmptyView(30),
Image.asset(
couponProvider.listData[index]['checked']
? 'assets/select.png'
: 'assets/unselect.png',
width: ScreenUtil().setWidth(44)),
Checkbox(
value: couponProvider.listData[index]
['checked'],
checkColor: MyColours.color_ffffff,
activeColor: MyColours.app_main,
onChanged: (bool value) {
couponProvider.listData[index]['checked'] =
!couponProvider.listData[index]
['checked'];
if (couponProvider.listData[index]
['checked']) {
couponProvider.addData(index);
} else {
couponProvider.cancelData(index);
}
couponProvider.getCheckValue();
},
),
// Image.asset(
// couponProvider.listData[index]['checked']
// ? 'assets/select.png'
// : 'assets/unselect.png',
// width: ScreenUtil().setWidth(44)),
Expanded(
child: CouponItem(
index: index,
... ...
... ... @@ -253,15 +253,22 @@ class InvicationPageState extends State<InvicationPage> {
)
])),
Positioned(
left: ScreenUtil().setWidth(40),
top: ScreenUtil().setWidth(65),
left: ScreenUtil().setWidth(0),
top: ScreenUtil().setWidth(0),
child: GestureDetector(
onTap: () {
Navigator.of(context).pop();
},
behavior: HitTestBehavior.opaque,
child: Container(
padding: EdgeInsets.fromLTRB(
ScreenUtil().setWidth(40),
ScreenUtil().setWidth(95),
ScreenUtil().setWidth(200),
ScreenUtil().setWidth(100),
),
alignment: Alignment.centerLeft,
// color: Colors.red,
child: Image.asset(
"assets/invication_back.png",
width: ScreenUtil().setWidth(20),
... ...
... ... @@ -86,6 +86,7 @@ class NotebookItemState extends State<NoteBookItem> {
alignment: Alignment.center,
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(
notebook.rnameStr,
... ... @@ -97,16 +98,20 @@ class NotebookItemState extends State<NoteBookItem> {
// fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(30)),
),
VEmptyView(10),
Text(
notebook.phoneStr,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: textColor,
// fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(26)),
)
notebook.phoneStr.isNotEmpty
? Padding(
padding: EdgeInsets.only(
top: ScreenUtil().setWidth(10)),
child: Text(
notebook.phoneStr,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: textColor,
// fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(26)),
))
: Container()
],
),
),
... ... @@ -136,8 +141,12 @@ class NotebookItemState extends State<NoteBookItem> {
),
GestureDetector(
onTap: _onOperateClick,
behavior: HitTestBehavior.opaque,
child: Container(
padding:
EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(20)),
width: ScreenUtil().setWidth(184),
// color: Colors.red,
alignment: Alignment.center,
child: Text(
notebook.operationText,
... ...
... ... @@ -69,7 +69,8 @@ class NoteBookPageState extends State<NoteBookPage> {
//初始化时间
_initTime() {
dateTime = DateTime.now();
dateText = "${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
dateText = "${dateTime.year}年 " +
Utils.addZeroNumber(dateTime.month) +
"月" +
Utils.addZeroNumber(dateTime.day) +
"日" +
... ... @@ -142,8 +143,8 @@ class NoteBookPageState extends State<NoteBookPage> {
"keywords": "",
"sort": "1"
};
if(tabIndex==1){
params["account"]=userModel.user.account;
if (tabIndex == 1) {
params["account"] = userModel.user.account;
}
model.getReserveList(context, params);
}
... ... @@ -184,8 +185,8 @@ class NoteBookPageState extends State<NoteBookPage> {
? "0" + dateTime.day.toString()
: dateTime.day.toString())
};
if(tabIndex==1){
params["account"]=userModel.user.account;
if (tabIndex == 1) {
params["account"] = userModel.user.account;
}
model.getReserveCountDay(context, params);
}
... ... @@ -263,7 +264,8 @@ class NoteBookPageState extends State<NoteBookPage> {
if (Utils.isOneDay(day, dateTime)) return; //日期没变
setState(() {
DateTime dateNow = DateTime.now();
dateText = "${day.year}年 "+Utils.addZeroNumber(day.month) +
dateText = "${day.year}年 " +
Utils.addZeroNumber(day.month) +
"月" +
Utils.addZeroNumber(day.day) +
"日";
... ... @@ -286,15 +288,17 @@ class NoteBookPageState extends State<NoteBookPage> {
Container container = Container(
color: MyColours.color_ffffff,
width: double.infinity,
padding: EdgeInsets.only(left: ScreenUtil().setWidth(20),top: ScreenUtil().setWidth(20)),
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(20), top: ScreenUtil().setWidth(20)),
child: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
child: GestureDetector(
onTap: () {
if(tabIndex==0)return;
if (tabIndex == 0) return;
setState(() {
tabIndex = 0;
_getReserveList();
... ... @@ -322,30 +326,27 @@ class NoteBookPageState extends State<NoteBookPage> {
child: Container(
height: ScreenUtil().setWidth(6),
width: ScreenUtil().setWidth(60),
margin:
EdgeInsets.only(top: ScreenUtil().setWidth(8)),
margin: EdgeInsets.only(top: ScreenUtil().setWidth(8)),
decoration: tabIndex == 0
? BoxDecoration(color: MyColours.color_199095,borderRadius: BorderRadius.circular(
ScreenUtil()
.setWidth(
6)))
? BoxDecoration(
color: MyColours.color_199095,
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(6)))
: BoxDecoration(
color: MyColours.color_ffffff,
borderRadius: BorderRadius.circular(
ScreenUtil()
.setWidth(
6))
),
color: MyColours.color_ffffff,
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(6))),
),
),
],
)),
),
Container(
padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
child: GestureDetector(
onTap: () {
if(tabIndex==1)return;
if (tabIndex == 1) return;
setState(() {
tabIndex = 1;
_getReserveList();
... ... @@ -373,20 +374,16 @@ class NoteBookPageState extends State<NoteBookPage> {
child: Container(
height: ScreenUtil().setWidth(6),
width: ScreenUtil().setWidth(60),
margin:
EdgeInsets.only(top: ScreenUtil().setWidth(8)),
margin: EdgeInsets.only(top: ScreenUtil().setWidth(8)),
decoration: tabIndex == 1
? BoxDecoration(color: MyColours.color_199095,borderRadius: BorderRadius.circular(
ScreenUtil()
.setWidth(
6)))
? BoxDecoration(
color: MyColours.color_199095,
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(6)))
: BoxDecoration(
color: MyColours.color_ffffff,
borderRadius: BorderRadius.circular(
ScreenUtil()
.setWidth(
6))
),
color: MyColours.color_ffffff,
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(6))),
),
),
],
... ...