xt / Flutter-ReserveApp · Commits

Go to a project

Commit 54ffac5e44ff5e63fe92af546702d25f480eac17

Authored by gaiyaguang
2 parents 34c33fbd 207df189
build: skipped

2020-09-18

Inline Side-by-side
Showing 1 changed file with 41 additions and 35 deletions
@@ -88,6 +88,8 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -88,6 +88,8 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
88 isSelect: value['select'], 88 isSelect: value['select'],
89 onTap: () async { 89 onTap: () async {
90 print(value['title']); 90 print(value['title']);
  91 + FocusScope.of(context)
  92 + .requestFocus(FocusNode()); //点击空白处隐藏键盘
91 if (value['title'] == '其他') { 93 if (value['title'] == '其他') {
92 _calendWidget(DateTime.now()); 94 _calendWidget(DateTime.now());
93 } else { 95 } else {
@@ -101,21 +103,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -101,21 +103,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
101 value['title']) { 103 value['title']) {
102 _notebookDetailChangeModel.dateList[j]['select'] = 104 _notebookDetailChangeModel.dateList[j]['select'] =
103 true; 105 true;
104 - //选完今天明天刷新页面  
105 - int ddate = _getDdate(_notebookDetailChangeModel);  
106 - String ddateSolt =  
107 - _getDdateSolt(_notebookDetailChangeModel);  
108 - String pnum = _getPnum(_notebookDetailChangeModel);  
109 - List<t.TableList> list =  
110 - await _notebookDetailChangeModel.getNewTableList(  
111 - context,  
112 - '${ddate}',  
113 - ddateSolt,  
114 - pnum,  
115 - _notebookDetailChangeModel.tableList);  
116 - if (list.length == 0) {  
117 - _notebookDetailChangeModel.isRecommend = true;  
118 - } 106 +
119 if (j == 0 || j == 1) { 107 if (j == 0 || j == 1) {
120 _notebookDetailChangeModel.dateList[2]['title'] = 108 _notebookDetailChangeModel.dateList[2]['title'] =
121 '其他'; 109 '其他';
@@ -133,6 +121,21 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -133,6 +121,21 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
133 } 121 }
134 } 122 }
135 } 123 }
  124 + //选完今天明天刷新页面
  125 + int ddate = _getDdate(_notebookDetailChangeModel);
  126 + String ddateSolt =
  127 + _getDdateSolt(_notebookDetailChangeModel);
  128 + String pnum = _getPnum(_notebookDetailChangeModel);
  129 + List<t.TableList> list =
  130 + await _notebookDetailChangeModel.getNewTableList(
  131 + context,
  132 + '${ddate}',
  133 + ddateSolt,
  134 + pnum,
  135 + _notebookDetailChangeModel.tableList);
  136 + if (list.length == 0) {
  137 + _notebookDetailChangeModel.isRecommend = true;
  138 + }
136 } 139 }
137 _notebookDetailChangeModel.notifyListeners(); 140 _notebookDetailChangeModel.notifyListeners();
138 }, 141 },
@@ -151,6 +154,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -151,6 +154,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
151 : EdgeInsets.only(right: ScreenUtil().setWidth(20)), 154 : EdgeInsets.only(right: ScreenUtil().setWidth(20)),
152 child: CustomButton( 155 child: CustomButton(
153 onTap: () { 156 onTap: () {
  157 + FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
154 for (var item in _notebookDetailChangeModel.sunDateList) { 158 for (var item in _notebookDetailChangeModel.sunDateList) {
155 item['isSelect'] = false; 159 item['isSelect'] = false;
156 if (item['dateText'] == value['dateText']) { 160 if (item['dateText'] == value['dateText']) {
@@ -177,16 +181,17 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -177,16 +181,17 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
177 } 181 }
178 } 182 }
179 _notebookDetailChangeModel.notifyListeners(); 183 _notebookDetailChangeModel.notifyListeners();
180 - int ddate = _getDdate(_notebookDetailChangeModel);  
181 - String pnum = _getPnum(_notebookDetailChangeModel);  
182 - _notebookDetailChangeModel.getNewTableList(  
183 - context,  
184 - '${ddate}',  
185 - '${item['ddateSolt']}',  
186 - pnum,  
187 - _notebookDetailChangeModel.tableList);  
188 } 184 }
189 } 185 }
  186 + int ddate = _getDdate(_notebookDetailChangeModel);
  187 + String pnum = _getPnum(_notebookDetailChangeModel);
  188 + String ddateSolt = _getDdateSolt(_notebookDetailChangeModel);
  189 + _notebookDetailChangeModel.getNewTableList(
  190 + context,
  191 + '${ddate}',
  192 + '${ddateSolt}',
  193 + pnum,
  194 + _notebookDetailChangeModel.tableList);
190 }, 195 },
191 dateText: value['dateText'], 196 dateText: value['dateText'],
192 dayText: '', 197 dayText: '',
@@ -219,18 +224,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -219,18 +224,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
219 value['dateText']; 224 value['dateText'];
220 FocusScope.of(context) 225 FocusScope.of(context)
221 .requestFocus(FocusNode()); //点击空白处隐藏键盘 226 .requestFocus(FocusNode()); //点击空白处隐藏键盘
222 - //人数选择页面刷新  
223 - String pnum = value['dateText'];  
224 - int ddate = _getDdate(_notebookDetailChangeModel);  
225 - String ddateSolt =  
226 - _getDdateSolt(_notebookDetailChangeModel);  
227 227
228 - _notebookDetailChangeModel.getNewTableList(  
229 - context,  
230 - '${ddate}',  
231 - ddateSolt,  
232 - pnum,  
233 - _notebookDetailChangeModel.tableList);  
234 } 228 }
235 229
236 // if (j < 5) { 230 // if (j < 5) {
@@ -240,6 +234,17 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -240,6 +234,17 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
240 } 234 }
241 } 235 }
242 _notebookDetailChangeModel.notifyListeners(); 236 _notebookDetailChangeModel.notifyListeners();
  237 + //人数选择页面刷新
  238 + String pnum = _getPnum(_notebookDetailChangeModel);
  239 + int ddate = _getDdate(_notebookDetailChangeModel);
  240 + String ddateSolt = _getDdateSolt(_notebookDetailChangeModel);
  241 +
  242 + _notebookDetailChangeModel.getNewTableList(
  243 + context,
  244 + '${ddate}',
  245 + ddateSolt,
  246 + pnum,
  247 + _notebookDetailChangeModel.tableList);
243 }, 248 },
244 dateText: value['dateText'], 249 dateText: value['dateText'],
245 fontSize: value['fontSize'], 250 fontSize: value['fontSize'],
@@ -308,6 +313,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -308,6 +313,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
308 children: [ 313 children: [
309 InkWell( 314 InkWell(
310 onTap: () async { 315 onTap: () async {
  316 + FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
311 //当前选中 月 日string 317 //当前选中 月 日string
312 String mdStr = ''; 318 String mdStr = '';
313 //今天 明天 其他天 319 //今天 明天 其他天
@@ -988,7 +994,7 @@ class _ButtonState extends State<CustomButton> { @@ -988,7 +994,7 @@ class _ButtonState extends State<CustomButton> {
988 int ddate = _getDdate(widget.model); 994 int ddate = _getDdate(widget.model);
989 String ddateSolt = _getDdateSolt(widget.model); 995 String ddateSolt = _getDdateSolt(widget.model);
990 String pnum = _getPnum(widget.model); 996 String pnum = _getPnum(widget.model);
991 - 997 +
992 widget.model.getNewTableList(context, '${ddate}', 998 widget.model.getNewTableList(context, '${ddate}',
993 ddateSolt, pnum, widget.model.tableList); 999 ddateSolt, pnum, widget.model.tableList);
994 }, 1000 },