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 { @@ -336,7 +336,9 @@ class Cancel {
336 " " + 336 " " +
337 Utils.addZeroNumber(dateTime.hour) + 337 Utils.addZeroNumber(dateTime.hour) +
338 ":" + 338 ":" +
339 - Utils.addZeroNumber(dateTime.minute); 339 + Utils.addZeroNumber(dateTime.minute) +
  340 + ":" +
  341 + Utils.addZeroNumber(dateTime.second);
340 } 342 }
341 343
342 factory Cancel.fromJson(Map<String, dynamic> json) => _$CancelFromJson(json); 344 factory Cancel.fromJson(Map<String, dynamic> json) => _$CancelFromJson(json);
@@ -184,7 +184,7 @@ class MessageDialogItemF extends StatelessWidget { @@ -184,7 +184,7 @@ class MessageDialogItemF extends StatelessWidget {
184 NavigatorUtil.goHomePage(context, 184 NavigatorUtil.goHomePage(context,
185 initialIndex: 1, 185 initialIndex: 1,
186 needRefresh: false, 186 needRefresh: false,
187 - mine: true, 187 + mine: false,
188 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-')) 188 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
189 .millisecondsSinceEpoch, 189 .millisecondsSinceEpoch,
190 solt: message.ddate_solt); 190 solt: message.ddate_solt);
@@ -701,7 +701,7 @@ class MessageDialogItemF extends StatelessWidget { @@ -701,7 +701,7 @@ class MessageDialogItemF extends StatelessWidget {
701 NavigatorUtil.goHomePage(context, 701 NavigatorUtil.goHomePage(context,
702 initialIndex: 1, 702 initialIndex: 1,
703 needRefresh: false, 703 needRefresh: false,
704 - mine: true, 704 + mine: false,
705 dateTime: 705 dateTime:
706 DateTime.parse(message.ddate.replaceAll('/', '-')) 706 DateTime.parse(message.ddate.replaceAll('/', '-'))
707 .millisecondsSinceEpoch, 707 .millisecondsSinceEpoch,
@@ -133,7 +133,7 @@ class MessageItemF extends StatelessWidget { @@ -133,7 +133,7 @@ class MessageItemF extends StatelessWidget {
133 NavigatorUtil.goHomePage(context, 133 NavigatorUtil.goHomePage(context,
134 initialIndex: 1, 134 initialIndex: 1,
135 needRefresh: false, 135 needRefresh: false,
136 - mine: true, 136 + mine: false,
137 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-')) 137 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
138 .millisecondsSinceEpoch, 138 .millisecondsSinceEpoch,
139 solt: message.ddate_solt); 139 solt: message.ddate_solt);
@@ -295,7 +295,7 @@ class MessageItemF extends StatelessWidget { @@ -295,7 +295,7 @@ class MessageItemF extends StatelessWidget {
295 NavigatorUtil.goHomePage(context, 295 NavigatorUtil.goHomePage(context,
296 initialIndex: 1, 296 initialIndex: 1,
297 needRefresh: false, 297 needRefresh: false,
298 - mine: true, 298 + mine: false,
299 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-')) 299 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
300 .millisecondsSinceEpoch, 300 .millisecondsSinceEpoch,
301 solt: message.ddate_solt); 301 solt: message.ddate_solt);
@@ -817,7 +817,7 @@ class MessageItemF extends StatelessWidget { @@ -817,7 +817,7 @@ class MessageItemF extends StatelessWidget {
817 NavigatorUtil.goHomePage(context, 817 NavigatorUtil.goHomePage(context,
818 initialIndex: 1, 818 initialIndex: 1,
819 needRefresh: false, 819 needRefresh: false,
820 - mine: true, 820 + mine: false,
821 dateTime: 821 dateTime:
822 DateTime.parse(message.ddate.replaceAll('/', '-')) 822 DateTime.parse(message.ddate.replaceAll('/', '-'))
823 .millisecondsSinceEpoch, 823 .millisecondsSinceEpoch,
@@ -398,13 +398,13 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -398,13 +398,13 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
398 return; 398 return;
399 } 399 }
400 400
401 - if (!Utils.isNumericReq(_phoneController.text.trim())) {  
402 - Utils.showToast('电话1请输入纯数字！'); 401 + if (!Utils.isNumeric1Req(_phoneController.text.trim())) {
  402 + Utils.showToast('电话1请输入正确的格式！');
403 return; 403 return;
404 } 404 }
405 if (_phoneController2.text.trim().length > 0 && 405 if (_phoneController2.text.trim().length > 0 &&
406 - !Utils.isNumericReq(_phoneController2.text.trim())) {  
407 - Utils.showToast('电话2请输入纯数字！'); 406 + !Utils.isNumeric1Req(_phoneController2.text.trim())) {
  407 + Utils.showToast('电话2请输入正确的格式！');
408 return; 408 return;
409 } 409 }
410 410
@@ -59,7 +59,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -59,7 +59,7 @@ class NoteBookPageState extends State<NoteBookPage> {
59 59
60 UserModel userModel; 60 UserModel userModel;
61 61
62 - int tabIndex = 0; //当前选中的tab 标签 62 + // int tabIndex = 0; //当前选中的tab 标签
63 CalendarController _calendarController = CalendarController(); 63 CalendarController _calendarController = CalendarController();
64 StartingDayOfWeek startingDayOfWeek; 64 StartingDayOfWeek startingDayOfWeek;
65 bool clearSel = false; 65 bool clearSel = false;
@@ -72,7 +72,10 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -72,7 +72,10 @@ class NoteBookPageState extends State<NoteBookPage> {
72 // TODO: implement initState 72 // TODO: implement initState
73 super.initState(); 73 super.initState();
74 74
75 - tabIndex = widget.tabIndex; 75 + // tabIndex = widget.tabIndex;
  76 + if( widget.tabIndex == 1){
  77 + isall = false;
  78 + }
76 LogUtil.v("notebook_page initState"); 79 LogUtil.v("notebook_page initState");
77 80
78 _controller = EasyRefreshController(); 81 _controller = EasyRefreshController();
@@ -81,7 +84,8 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -81,7 +84,8 @@ class NoteBookPageState extends State<NoteBookPage> {
81 _getReserveList(); 84 _getReserveList();
82 }); 85 });
83 startingDayOfWeek = _initStartingDayOfWeek(); 86 startingDayOfWeek = _initStartingDayOfWeek();
84 - dateTimeNow = DateTime.now(); 87 + // dateTimeNow = DateTime.now();
  88 + dateTimeNow = widget.date != null ? widget.date : DateTime.now();
85 WidgetsBinding.instance.addPostFrameCallback((_) { 89 WidgetsBinding.instance.addPostFrameCallback((_) {
86 noteBookModel.isSimple = App.sp.getBool("isSimple") ?? true; 90 noteBookModel.isSimple = App.sp.getBool("isSimple") ?? true;
87 _initTime(); 91 _initTime();
@@ -124,7 +128,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -124,7 +128,7 @@ class NoteBookPageState extends State<NoteBookPage> {
124 128
125 //初始化时间 129 //初始化时间
126 _initTime() { 130 _initTime() {
127 - dateTimeNow = widget.date != null ? widget.date : DateTime.now(); 131 + // dateTimeNow = widget.date != null ? widget.date : DateTime.now();
128 if (widget.date != null) { 132 if (widget.date != null) {
129 _refreshPageCalendar(dateTimeNow); 133 _refreshPageCalendar(dateTimeNow);
130 } 134 }
@@ -284,7 +288,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -284,7 +288,7 @@ class NoteBookPageState extends State<NoteBookPage> {
284 ? "0" + dateTimeNow.day.toString() 288 ? "0" + dateTimeNow.day.toString()
285 : dateTimeNow.day.toString()) 289 : dateTimeNow.day.toString())
286 }; 290 };
287 - if (tabIndex == 1) { 291 + if (!isall) {
288 params["account"] = userModel.user.account; 292 params["account"] = userModel.user.account;
289 } 293 }
290 await model.getReserveCountDay(context, params); 294 await model.getReserveCountDay(context, params);
@@ -1036,6 +1040,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -1036,6 +1040,7 @@ class NoteBookPageState extends State<NoteBookPage> {
1036 isall = !isall; 1040 isall = !isall;
1037 }); 1041 });
1038 _getReserveList(); 1042 _getReserveList();
  1043 + _reserveCountDay();
1039 }, 1044 },
1040 child: Column( 1045 child: Column(
1041 children: [ 1046 children: [
@@ -184,7 +184,7 @@ class MessageDialogItemFSim extends StatelessWidget { @@ -184,7 +184,7 @@ class MessageDialogItemFSim extends StatelessWidget {
184 NavigatorUtil.goHomePageSim(context, 184 NavigatorUtil.goHomePageSim(context,
185 initialIndex: 1, 185 initialIndex: 1,
186 needRefresh: false, 186 needRefresh: false,
187 - mine: true, 187 + mine: false,
188 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-')) 188 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
189 .millisecondsSinceEpoch, 189 .millisecondsSinceEpoch,
190 solt: message.ddate_solt); 190 solt: message.ddate_solt);
@@ -701,7 +701,7 @@ class MessageDialogItemFSim extends StatelessWidget { @@ -701,7 +701,7 @@ class MessageDialogItemFSim extends StatelessWidget {
701 NavigatorUtil.goHomePageSim(context, 701 NavigatorUtil.goHomePageSim(context,
702 initialIndex: 1, 702 initialIndex: 1,
703 needRefresh: false, 703 needRefresh: false,
704 - mine: true, 704 + mine: false,
705 dateTime: 705 dateTime:
706 DateTime.parse(message.ddate.replaceAll('/', '-')) 706 DateTime.parse(message.ddate.replaceAll('/', '-'))
707 .millisecondsSinceEpoch, 707 .millisecondsSinceEpoch,
@@ -133,7 +133,7 @@ class MessageItemFSim extends StatelessWidget { @@ -133,7 +133,7 @@ class MessageItemFSim extends StatelessWidget {
133 NavigatorUtil.goHomePageSim(context, 133 NavigatorUtil.goHomePageSim(context,
134 initialIndex: 1, 134 initialIndex: 1,
135 needRefresh: false, 135 needRefresh: false,
136 - mine: true, 136 + mine: false,
137 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-')) 137 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
138 .millisecondsSinceEpoch, 138 .millisecondsSinceEpoch,
139 solt: message.ddate_solt); 139 solt: message.ddate_solt);
@@ -295,7 +295,7 @@ class MessageItemFSim extends StatelessWidget { @@ -295,7 +295,7 @@ class MessageItemFSim extends StatelessWidget {
295 NavigatorUtil.goHomePageSim(context, 295 NavigatorUtil.goHomePageSim(context,
296 initialIndex: 1, 296 initialIndex: 1,
297 needRefresh: false, 297 needRefresh: false,
298 - mine: true, 298 + mine: false,
299 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-')) 299 dateTime: DateTime.parse(message.ddate.replaceAll('/', '-'))
300 .millisecondsSinceEpoch, 300 .millisecondsSinceEpoch,
301 solt: message.ddate_solt); 301 solt: message.ddate_solt);
@@ -817,7 +817,7 @@ class MessageItemFSim extends StatelessWidget { @@ -817,7 +817,7 @@ class MessageItemFSim extends StatelessWidget {
817 NavigatorUtil.goHomePageSim(context, 817 NavigatorUtil.goHomePageSim(context,
818 initialIndex: 1, 818 initialIndex: 1,
819 needRefresh: false, 819 needRefresh: false,
820 - mine: true, 820 + mine: false,
821 dateTime: 821 dateTime:
822 DateTime.parse(message.ddate.replaceAll('/', '-')) 822 DateTime.parse(message.ddate.replaceAll('/', '-'))
823 .millisecondsSinceEpoch, 823 .millisecondsSinceEpoch,
@@ -398,13 +398,13 @@ class _StoreBaseInfoPageSimState extends State<StoreBaseInfoPageSim> { @@ -398,13 +398,13 @@ class _StoreBaseInfoPageSimState extends State<StoreBaseInfoPageSim> {
398 return; 398 return;
399 } 399 }
400 400
401 - if (!Utils.isNumericReq(_phoneController.text.trim())) {  
402 - Utils.showToast('电话1请输入纯数字！'); 401 + if (!Utils.isNumeric1Req(_phoneController.text.trim())) {
  402 + Utils.showToast('电话1请输入正确的格式！');
403 return; 403 return;
404 } 404 }
405 if (_phoneController2.text.trim().length > 0 && 405 if (_phoneController2.text.trim().length > 0 &&
406 - !Utils.isNumericReq(_phoneController2.text.trim())) {  
407 - Utils.showToast('电话2请输入纯数字！'); 406 + !Utils.isNumeric1Req(_phoneController2.text.trim())) {
  407 + Utils.showToast('电话2请输入正确的格式！');
408 return; 408 return;
409 } 409 }
410 410
@@ -59,7 +59,7 @@ class NoteBookPageSimState extends State<NoteBookPageSim> { @@ -59,7 +59,7 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
59 59
60 UserModel userModel; 60 UserModel userModel;
61 61
62 - int tabIndex = 0; //当前选中的tab 标签 62 + // int tabIndex = 0; //当前选中的tab 标签
63 CalendarController _calendarController = CalendarController(); 63 CalendarController _calendarController = CalendarController();
64 StartingDayOfWeek startingDayOfWeek; 64 StartingDayOfWeek startingDayOfWeek;
65 bool clearSel = false; 65 bool clearSel = false;
@@ -72,7 +72,9 @@ class NoteBookPageSimState extends State<NoteBookPageSim> { @@ -72,7 +72,9 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
72 // TODO: implement initState 72 // TODO: implement initState
73 super.initState(); 73 super.initState();
74 74
75 - tabIndex = widget.tabIndex; 75 + if( widget.tabIndex == 1){
  76 + isall = false;
  77 + }
76 LogUtil.v("notebook_page initState"); 78 LogUtil.v("notebook_page initState");
77 79
78 _controller = EasyRefreshController(); 80 _controller = EasyRefreshController();
@@ -81,7 +83,8 @@ class NoteBookPageSimState extends State<NoteBookPageSim> { @@ -81,7 +83,8 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
81 _getReserveList(); 83 _getReserveList();
82 }); 84 });
83 startingDayOfWeek = _initStartingDayOfWeek(); 85 startingDayOfWeek = _initStartingDayOfWeek();
84 - dateTimeNow = DateTime.now(); 86 + // dateTimeNow = DateTime.now();
  87 + dateTimeNow = widget.date != null ? widget.date : DateTime.now();
85 WidgetsBinding.instance.addPostFrameCallback((_) { 88 WidgetsBinding.instance.addPostFrameCallback((_) {
86 noteBookModel.isSimple = App.sp.getBool("isSimple") ?? true; 89 noteBookModel.isSimple = App.sp.getBool("isSimple") ?? true;
87 _initTime(); 90 _initTime();
@@ -124,7 +127,7 @@ class NoteBookPageSimState extends State<NoteBookPageSim> { @@ -124,7 +127,7 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
124 127
125 //初始化时间 128 //初始化时间
126 _initTime() { 129 _initTime() {
127 - dateTimeNow = widget.date != null ? widget.date : DateTime.now(); 130 + // dateTimeNow = widget.date != null ? widget.date : DateTime.now();
128 if (widget.date != null) { 131 if (widget.date != null) {
129 _refreshPageCalendar(dateTimeNow); 132 _refreshPageCalendar(dateTimeNow);
130 } 133 }
@@ -284,7 +287,7 @@ class NoteBookPageSimState extends State<NoteBookPageSim> { @@ -284,7 +287,7 @@ class NoteBookPageSimState extends State<NoteBookPageSim> {
284 ? "0" + dateTimeNow.day.toString() 287 ? "0" + dateTimeNow.day.toString()
285 : dateTimeNow.day.toString()) 288 : dateTimeNow.day.toString())
286 }; 289 };
287 - if (tabIndex == 1) { 290 + if (!isall) {
288 params["account"] = userModel.user.account; 291 params["account"] = userModel.user.account;
289 } 292 }
290 await model.getReserveCountDay(context, params); 293 await model.getReserveCountDay(context, params);
@@ -158,6 +158,13 @@ class Utils { @@ -158,6 +158,13 @@ class Utils {
158 return reg.hasMatch(str); 158 return reg.hasMatch(str);
159 } 159 }
160 160
  161 + static bool isNumeric1Req(String str) {
  162 + 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}))$)');
  163 + print('$str 是否数字:${reg.hasMatch(str)}');
  164 + return reg.hasMatch(str);
  165 + }
  166 +
  167 +
161 // ^(([^0][0-9]+|0)$)|^(([1-9]+)$) 168 // ^(([^0][0-9]+|0)$)|^(([1-9]+)$)
162 169
163 // 验证是否为数字 170 // 验证是否为数字