xt / Flutter-ReserveApp · Commits

Go to a project

Commit 3d84968ff6c932c1bcf9dfdd5949d56601cff784

Authored by wdn127929
1 parent 8818fab1
build: skipped

我录入的变量不统一&店铺电话号码格式

Inline Side-by-side
Showing 10 changed files with 46 additions and 29 deletions
... ... @@ -336,7 +336,9 @@ class Cancel {
" " +
Utils.addZeroNumber(dateTime.hour) +
":" +
Utils.addZeroNumber(dateTime.minute);
Utils.addZeroNumber(dateTime.minute) +
":" +
Utils.addZeroNumber(dateTime.second);
}
factory Cancel.fromJson(Map<String, dynamic> json) => _$CancelFromJson(json);
... ...
... ... @@ -184,7 +184,7 @@ class MessageDialogItemF extends StatelessWidget {
NavigatorUtil.goHomePage(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
solt: message.ddate_solt);
... ... @@ -701,7 +701,7 @@ class MessageDialogItemF extends StatelessWidget {
NavigatorUtil.goHomePage(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime:
DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
... ...
... ... @@ -133,7 +133,7 @@ class MessageItemF extends StatelessWidget {
NavigatorUtil.goHomePage(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
solt: message.ddate_solt);
... ... @@ -295,7 +295,7 @@ class MessageItemF extends StatelessWidget {
NavigatorUtil.goHomePage(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
solt: message.ddate_solt);
... ... @@ -817,7 +817,7 @@ class MessageItemF extends StatelessWidget {
NavigatorUtil.goHomePage(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime:
DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
... ...
... ... @@ -398,13 +398,13 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
return;
}
if (!Utils.isNumericReq(_phoneController.text.trim())) {
Utils.showToast('电话1请输入纯数字！');
if (!Utils.isNumeric1Req(_phoneController.text.trim())) {
Utils.showToast('电话1请输入正确的格式！');
return;
}
if (_phoneController2.text.trim().length > 0 &&
!Utils.isNumericReq(_phoneController2.text.trim())) {
Utils.showToast('电话2请输入纯数字！');
!Utils.isNumeric1Req(_phoneController2.text.trim())) {
Utils.showToast('电话2请输入正确的格式！');
return;
}
... ...
... ... @@ -59,7 +59,7 @@ class NoteBookPageState extends State<NoteBookPage> {
UserModel userModel;
int tabIndex = 0; //当前选中的tab 标签
// int tabIndex = 0; //当前选中的tab 标签
CalendarController _calendarController = CalendarController();
StartingDayOfWeek startingDayOfWeek;
bool clearSel = false;
... ... @@ -72,7 +72,10 @@ class NoteBookPageState extends State<NoteBookPage> {
// TODO: implement initState
super.initState();
tabIndex = widget.tabIndex;
// tabIndex = widget.tabIndex;
if( widget.tabIndex == 1){
isall = false;
}
LogUtil.v("notebook_page initState");
_controller = EasyRefreshController();
... ... @@ -81,7 +84,8 @@ class NoteBookPageState extends State<NoteBookPage> {
_getReserveList();
});
startingDayOfWeek = _initStartingDayOfWeek();
dateTimeNow = DateTime.now();
// dateTimeNow = DateTime.now();
dateTimeNow = widget.date != null ? widget.date : DateTime.now();
WidgetsBinding.instance.addPostFrameCallback((_) {
noteBookModel.isSimple = App.sp.getBool("isSimple") ?? true;
_initTime();
... ... @@ -124,7 +128,7 @@ class NoteBookPageState extends State<NoteBookPage> {
//初始化时间
_initTime() {
dateTimeNow = widget.date != null ? widget.date : DateTime.now();
// dateTimeNow = widget.date != null ? widget.date : DateTime.now();
if (widget.date != null) {
_refreshPageCalendar(dateTimeNow);
}
... ... @@ -284,7 +288,7 @@ class NoteBookPageState extends State<NoteBookPage> {
? "0" + dateTimeNow.day.toString()
: dateTimeNow.day.toString())
};
if (tabIndex == 1) {
if (!isall) {
params["account"] = userModel.user.account;
}
await model.getReserveCountDay(context, params);
... ... @@ -1036,6 +1040,7 @@ class NoteBookPageState extends State<NoteBookPage> {
isall = !isall;
});
_getReserveList();
_reserveCountDay();
},
child: Column(
children: [
... ...
... ... @@ -184,7 +184,7 @@ class MessageDialogItemFSim extends StatelessWidget {
NavigatorUtil.goHomePageSim(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
solt: message.ddate_solt);
... ... @@ -701,7 +701,7 @@ class MessageDialogItemFSim extends StatelessWidget {
NavigatorUtil.goHomePageSim(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime:
DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
... ...
... ... @@ -133,7 +133,7 @@ class MessageItemFSim extends StatelessWidget {
NavigatorUtil.goHomePageSim(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
solt: message.ddate_solt);
... ... @@ -295,7 +295,7 @@ class MessageItemFSim extends StatelessWidget {
NavigatorUtil.goHomePageSim(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
solt: message.ddate_solt);
... ... @@ -817,7 +817,7 @@ class MessageItemFSim extends StatelessWidget {
NavigatorUtil.goHomePageSim(context,
initialIndex: 1,
needRefresh: false,
mine: true,
mine: false,
dateTime:
DateTime.parse(message.ddate.replaceAll('/', '-'))
.millisecondsSinceEpoch,
... ...
... ... @@ -398,13 +398,13 @@ class _StoreBaseInfoPageSimState extends State<StoreBaseInfoPageSim> {
return;
}
if (!Utils.isNumericReq(_phoneController.text.trim())) {
Utils.showToast('电话1请输入纯数字！');
if (!Utils.isNumeric1Req(_phoneController.text.trim())) {
Utils.showToast('电话1请输入正确的格式！');
return;
}
if (_phoneController2.text.trim().length > 0 &&
!Utils.isNumericReq(_phoneController2.text.trim())) {
Utils.showToast('电话2请输入纯数字！');
!Utils.isNumeric1Req(_phoneController2.text.trim())) {
Utils.showToast('电话2请输入正确的格式！');
return;
}
... ...
... ... @@ -59,7 +59,7 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
UserModel userModel;
int tabIndex = 0; //当前选中的tab 标签
// int tabIndex = 0; //当前选中的tab 标签
CalendarController _calendarController = CalendarController();
StartingDayOfWeek startingDayOfWeek;
bool clearSel = false;
... ... @@ -72,7 +72,9 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
// TODO: implement initState
super.initState();
tabIndex = widget.tabIndex;
if( widget.tabIndex == 1){
isall = false;
}
LogUtil.v("notebook_page initState");
_controller = EasyRefreshController();
... ... @@ -81,7 +83,8 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
_getReserveList();
});
startingDayOfWeek = _initStartingDayOfWeek();
dateTimeNow = DateTime.now();
// dateTimeNow = DateTime.now();
dateTimeNow = widget.date != null ? widget.date : DateTime.now();
WidgetsBinding.instance.addPostFrameCallback((_) {
noteBookModel.isSimple = App.sp.getBool("isSimple") ?? true;
_initTime();
... ... @@ -124,7 +127,7 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
//初始化时间
_initTime() {
dateTimeNow = widget.date != null ? widget.date : DateTime.now();
// dateTimeNow = widget.date != null ? widget.date : DateTime.now();
if (widget.date != null) {
_refreshPageCalendar(dateTimeNow);
}
... ... @@ -284,7 +287,7 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
? "0" + dateTimeNow.day.toString()
: dateTimeNow.day.toString())
};
if (tabIndex == 1) {
if (!isall) {
params["account"] = userModel.user.account;
}
await model.getReserveCountDay(context, params);
... ...
... ... @@ -158,6 +158,13 @@ class Utils {
return reg.hasMatch(str);
}
static bool isNumeric1Req(String str) {
final reg = RegExp(r'((\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$)');
print('$str 是否数字:${reg.hasMatch(str)}');
return reg.hasMatch(str);
}
// ^(([^0][0-9]+|0)$)|^(([1-9]+)$)
// 验证是否为数字
... ...