xt / Flutter-ReserveApp · Commits

Go to a project

Commit 803677d1c2f67f3d64bcaeb88b4ead949143ae83

Authored by wdn127929
1 parent 32ab29c8
build: skipped

桌位管理页面缓存修改遗留bug

Inline Side-by-side
Showing 6 changed files with 131 additions and 117 deletions
@@ -760,7 +760,6 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -760,7 +760,6 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
760 "sid": userModel.user.sellerid, 760 "sid": userModel.user.sellerid,
761 // "type_id": "10", //1提前点餐2内部预订10在线预订 761 // "type_id": "10", //1提前点餐2内部预订10在线预订
762 // "status": '0', 762 // "status": '0',
763 -  
764 "offset": "0", 763 "offset": "0",
765 "limit": "100", 764 "limit": "100",
766 }; 765 };
@@ -778,9 +777,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -778,9 +777,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
778 case AppLifecycleState.resumed: //应用前台可见 777 case AppLifecycleState.resumed: //应用前台可见
779 // if (widget.initialIndex == 1 && needRefreshTemp == false) { 778 // if (widget.initialIndex == 1 && needRefreshTemp == false) {
780 // } else { 779 // } else {
781 - // _clearBadge(() { 780 + _clearBadge(() {
782 // _getAllUnMessages(); 781 // _getAllUnMessages();
783 - // }); 782 + });
784 // } 783 // }
785 784
786 break; 785 break;
@@ -135,6 +135,15 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore> @@ -135,6 +135,15 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
135 _loginStore(context, CheckSellerAccSunModel sunModel) { 135 _loginStore(context, CheckSellerAccSunModel sunModel) {
136 UserModel userModel = Provider.of<UserModel>(context, listen: false); 136 UserModel userModel = Provider.of<UserModel>(context, listen: false);
137 App.sp.setBool("accountLogin", false); 137 App.sp.setBool("accountLogin", false);
  138 + if (App.sp.containsKey('table_list')) {
  139 + //退出清空桌位数据
  140 + App.sp.remove('table_list');
  141 + }
  142 + if (App.sp.containsKey('specid')) {
  143 + //退出清空销售计价
  144 + App.sp.remove('specid');
  145 + App.sp.remove('specs');
  146 + }
138 Map<String, dynamic> seller = sunModel.toJson(); 147 Map<String, dynamic> seller = sunModel.toJson();
139 Map<String, dynamic> userMap = { 148 Map<String, dynamic> userMap = {
140 "openid": seller['uid'], 149 "openid": seller['uid'],
@@ -119,14 +119,14 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> { @@ -119,14 +119,14 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> {
119 Utils.showToast('修改成功！'); 119 Utils.showToast('修改成功！');
120 tableManagerModel.currentArea = value; 120 tableManagerModel.currentArea = value;
121 121
122 - TableManagerModel tableManagerModel1 =  
123 - Provider.of<TableManagerModel>(  
124 - context,  
125 - listen: false);  
126 - tableManagerModel1.getTableList(  
127 - context,  
128 - needLoading: false,  
129 - ); 122 + // TableManagerModel tableManagerModel1 =
  123 + // Provider.of<TableManagerModel>(
  124 + // context,
  125 + // listen: false);
  126 + // tableManagerModel1.getTableList(
  127 + // context,
  128 + // needLoading: false,
  129 + // );
130 130
131 await tableManagerModel 131 await tableManagerModel
132 .refreshTable(context); 132 .refreshTable(context);
@@ -186,13 +186,13 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> { @@ -186,13 +186,13 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> {
186 // .getTableList(context); 186 // .getTableList(context);
187 // await tableManagerModel 187 // await tableManagerModel
188 // .initData(); 188 // .initData();
189 - TableManagerModel tableManagerModel =  
190 - Provider.of<TableManagerModel>(context,  
191 - listen: false);  
192 - tableManagerModel.getTableList(  
193 - context,  
194 - needLoading: false,  
195 - ); 189 + // TableManagerModel tableManagerModel =
  190 + // Provider.of<TableManagerModel>(context,
  191 + // listen: false);
  192 + // tableManagerModel.getTableList(
  193 + // context,
  194 + // needLoading: false,
  195 + // );
196 196
197 await tableManagerModel 197 await tableManagerModel
198 .refreshTable(context); 198 .refreshTable(context);
@@ -165,34 +165,35 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -165,34 +165,35 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
165 .then((results) async { 165 .then((results) async {
166 print(results[0]); 166 print(results[0]);
167 if (results[0] && results[1]) { 167 if (results[0] && results[1]) {
168 - TableManagerModel tableManagerModel1 =  
169 - Provider.of<TableManagerModel>(context, listen: false);  
170 - tableManagerModel1.getTableList(  
171 - context,  
172 - needLoading: false,  
173 - ); 168 + // TableManagerModel tableManagerModel1 =
  169 + // Provider.of<TableManagerModel>(context, listen: false);
  170 + // tableManagerModel1.getTableList(
  171 + // context,
  172 + // needLoading: false,
  173 + // );
174 await tableManagerModel.refreshTable(context); 174 await tableManagerModel.refreshTable(context);
175 } else { 175 } else {
176 if (results[0]) { 176 if (results[0]) {
177 //修改桌位信息成功 177 //修改桌位信息成功
178 - TableManagerModel tableManagerModel1 =  
179 - Provider.of<TableManagerModel>(context, listen: false);  
180 - tableManagerModel1.getTableList(  
181 - context,  
182 - needLoading: false,  
183 - ); 178 + // TableManagerModel tableManagerModel1 =
  179 + // Provider.of<TableManagerModel>(context, listen: false);
  180 + // tableManagerModel1.getTableList(
  181 + // context,
  182 + // needLoading: false,
  183 + // );
184 await tableManagerModel.refreshTable(context, needLoading: true); 184 await tableManagerModel.refreshTable(context, needLoading: true);
185 } else { 185 } else {
186 //修改桌位信息失败 186 //修改桌位信息失败
187 } 187 }
188 if (results[1]) { 188 if (results[1]) {
189 //合并桌位成功 189 //合并桌位成功
190 - TableManagerModel tableManagerModel =  
191 - Provider.of<TableManagerModel>(context, listen: false);  
192 - tableManagerModel.getTableList(  
193 - context,  
194 - needLoading: false,  
195 - ); 190 + // TableManagerModel tableManagerModel =
  191 + // Provider.of<TableManagerModel>(context, listen: false);
  192 + // tableManagerModel.getTableList(
  193 + // context,
  194 + // needLoading: false,
  195 + // );
  196 + await tableManagerModel.refreshTable(context, needLoading: true);
196 } else { 197 } else {
197 //合并桌位失败 198 //合并桌位失败
198 } 199 }
@@ -336,13 +337,13 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -336,13 +337,13 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
336 // .getTableList(context); 337 // .getTableList(context);
337 // await tableManagerModel 338 // await tableManagerModel
338 // .initData(); 339 // .initData();
339 - TableManagerModel tableManagerModel =  
340 - Provider.of<TableManagerModel>(context,  
341 - listen: false);  
342 - tableManagerModel.getTableList(  
343 - context,  
344 - needLoading: false,  
345 - ); 340 + // TableManagerModel tableManagerModel1 =
  341 + // Provider.of<TableManagerModel>(context,
  342 + // listen: false);
  343 + // tableManagerModel1.getTableList(
  344 + // context,
  345 + // needLoading: false,
  346 + // );
346 await tableManagerModel.refreshTable(context); 347 await tableManagerModel.refreshTable(context);
347 } 348 }
348 }); 349 });
@@ -467,13 +468,13 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -467,13 +468,13 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
467 // .getTableList(context); 468 // .getTableList(context);
468 // await tableManagerModel 469 // await tableManagerModel
469 // .initData(); 470 // .initData();
470 - TableManagerModel tableManagerModel =  
471 - Provider.of<TableManagerModel>(context,  
472 - listen: false);  
473 - tableManagerModel.getTableList(  
474 - context,  
475 - needLoading: false,  
476 - ); 471 + // TableManagerModel tableManagerModel =
  472 + // Provider.of<TableManagerModel>(context,
  473 + // listen: false);
  474 + // tableManagerModel.getTableList(
  475 + // context,
  476 + // needLoading: false,
  477 + // );
477 await tableManagerModel.refreshTable(context); 478 await tableManagerModel.refreshTable(context);
478 } 479 }
479 }, onTap: (Map<String, String> value) async { 480 }, onTap: (Map<String, String> value) async {
@@ -624,18 +625,18 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -624,18 +625,18 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
624 .currentArea = 625 .currentArea =
625 value; 626 value;
626 627
627 - TableManagerModel  
628 - tableManagerModel1 =  
629 - Provider.of<  
630 - TableManagerModel>(  
631 - context,  
632 - listen:  
633 - false);  
634 - tableManagerModel1  
635 - .getTableList(  
636 - context,  
637 - needLoading: false,  
638 - ); 628 + // TableManagerModel
  629 + // tableManagerModel1 =
  630 + // Provider.of<
  631 + // TableManagerModel>(
  632 + // context,
  633 + // listen:
  634 + // false);
  635 + // tableManagerModel1
  636 + // .getTableList(
  637 + // context,
  638 + // needLoading: false,
  639 + // );
639 640
640 await tableManagerModel 641 await tableManagerModel
641 .refreshTable( 642 .refreshTable(
@@ -834,17 +835,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -834,17 +835,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
834 .currentArea = 835 .currentArea =
835 value; 836 value;
836 837
837 - TableManagerModel  
838 - tableManagerModel1 =  
839 - Provider.of<  
840 - TableManagerModel>(  
841 - context,  
842 - listen: false);  
843 - tableManagerModel1  
844 - .getTableList(  
845 - context,  
846 - needLoading: false,  
847 - ); 838 + // TableManagerModel
  839 + // tableManagerModel1 =
  840 + // Provider.of<
  841 + // TableManagerModel>(
  842 + // context,
  843 + // listen: false);
  844 + // tableManagerModel1
  845 + // .getTableList(
  846 + // context,
  847 + // needLoading: false,
  848 + // );
848 849
849 await tableManagerModel 850 await tableManagerModel
850 .refreshTable( 851 .refreshTable(
@@ -1227,17 +1228,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -1227,17 +1228,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
1227 print(success); 1228 print(success);
1228 if (success) { 1229 if (success) {
1229 Utils.showToast('修改成功！'); 1230 Utils.showToast('修改成功！');
1230 - TableManagerModel  
1231 - tableManagerModel1 =  
1232 - Provider.of<  
1233 - TableManagerModel>(  
1234 - context,  
1235 - listen: false);  
1236 - tableManagerModel1  
1237 - .getTableList(  
1238 - context,  
1239 - needLoading: false,  
1240 - ); 1231 + // TableManagerModel
  1232 + // tableManagerModel1 =
  1233 + // Provider.of<
  1234 + // TableManagerModel>(
  1235 + // context,
  1236 + // listen: false);
  1237 + // tableManagerModel1
  1238 + // .getTableList(
  1239 + // context,
  1240 + // needLoading: false,
  1241 + // );
1241 1242
1242 await tableManagerModel 1243 await tableManagerModel
1243 .refreshTable(context); 1244 .refreshTable(context);
@@ -1301,17 +1302,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -1301,17 +1302,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
1301 print(success); 1302 print(success);
1302 if (success) { 1303 if (success) {
1303 Utils.showToast('修改成功！'); 1304 Utils.showToast('修改成功！');
1304 - TableManagerModel  
1305 - tableManagerModel =  
1306 - Provider.of<  
1307 - TableManagerModel>(  
1308 - context,  
1309 - listen: false);  
1310 - tableManagerModel  
1311 - .getTableList(  
1312 - context,  
1313 - needLoading: false,  
1314 - ); 1305 + // TableManagerModel
  1306 + // tableManagerModel =
  1307 + // Provider.of<
  1308 + // TableManagerModel>(
  1309 + // context,
  1310 + // listen: false);
  1311 + // tableManagerModel
  1312 + // .getTableList(
  1313 + // context,
  1314 + // needLoading: false,
  1315 + // );
1315 1316
1316 await tableManagerModel 1317 await tableManagerModel
1317 .refreshTable(context); 1318 .refreshTable(context);
@@ -1390,17 +1391,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -1390,17 +1391,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
1390 print(success); 1391 print(success);
1391 if (success) { 1392 if (success) {
1392 Utils.showToast('修改成功！'); 1393 Utils.showToast('修改成功！');
1393 - TableManagerModel  
1394 - tableManagerModel =  
1395 - Provider.of<  
1396 - TableManagerModel>(  
1397 - context,  
1398 - listen: false);  
1399 - tableManagerModel  
1400 - .getTableList(  
1401 - context,  
1402 - needLoading: false,  
1403 - ); 1394 + // TableManagerModel
  1395 + // tableManagerModel =
  1396 + // Provider.of<
  1397 + // TableManagerModel>(
  1398 + // context,
  1399 + // listen: false);
  1400 + // tableManagerModel
  1401 + // .getTableList(
  1402 + // context,
  1403 + // needLoading: false,
  1404 + // );
1404 1405
1405 await tableManagerModel 1406 await tableManagerModel
1406 .refreshTable(context); 1407 .refreshTable(context);
@@ -1484,15 +1485,15 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -1484,15 +1485,15 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
1484 // await tableManagerModel 1485 // await tableManagerModel
1485 // .initData(); 1486 // .initData();
1486 1487
1487 - TableManagerModel  
1488 - tableManagerModel =  
1489 - Provider.of<TableManagerModel>(  
1490 - context,  
1491 - listen: false);  
1492 - tableManagerModel.getTableList(  
1493 - context,  
1494 - needLoading: false,  
1495 - ); 1488 + // TableManagerModel
  1489 + // tableManagerModel =
  1490 + // Provider.of<TableManagerModel>(
  1491 + // context,
  1492 + // listen: false);
  1493 + // tableManagerModel.getTableList(
  1494 + // context,
  1495 + // needLoading: false,
  1496 + // );
1496 1497
1497 await tableManagerModel 1498 await tableManagerModel
1498 .refreshTable(context); 1499 .refreshTable(context);
  1 +import 'dart:convert';
  2 +
1 import 'package:common_utils/common_utils.dart'; 3 import 'package:common_utils/common_utils.dart';
2 import 'package:flutter/material.dart'; 4 import 'package:flutter/material.dart';
3 import 'package:one_key/constant/constant.dart'; 5 import 'package:one_key/constant/constant.dart';
@@ -21,6 +23,7 @@ import 'package:one_key/utils/lunar_calendar.dart'; @@ -21,6 +23,7 @@ import 'package:one_key/utils/lunar_calendar.dart';
21 import 'package:one_key/utils/utils.dart'; 23 import 'package:one_key/utils/utils.dart';
22 import 'package:provider/provider.dart'; 24 import 'package:provider/provider.dart';
23 25
  26 +import '../app.dart';
24 import 'notebook_model.dart'; 27 import 'notebook_model.dart';
25 28
26 class MyTableManageHomeModel with ChangeNotifier { 29 class MyTableManageHomeModel with ChangeNotifier {
@@ -151,6 +154,8 @@ class MyTableManageHomeModel with ChangeNotifier { @@ -151,6 +154,8 @@ class MyTableManageHomeModel with ChangeNotifier {
151 pageState = PageState.Success; 154 pageState = PageState.Success;
152 } 155 }
153 156
  157 + App.sp.setString('table_list', json.encode(tableOuterList));
  158 +
154 return tableOuterList; 159 return tableOuterList;
155 } 160 }
156 161
@@ -471,7 +471,7 @@ class TableManagerModel with ChangeNotifier { @@ -471,7 +471,7 @@ class TableManagerModel with ChangeNotifier {
471 keys = 'night'; 471 keys = 'night';
472 } 472 }
473 473
474 - if (keys != '' && dailyMap.length > 0 && dailyMap[keys] != '') { 474 + if (keys != '') {
475 List temp = dailyMap[keys]; 475 List temp = dailyMap[keys];
476 String timeStrStart = ymd + ' ' + temp.first + ':00'; 476 String timeStrStart = ymd + ' ' + temp.first + ':00';
477 String timeStrEnd = ymd + ' ' + temp.last + ':00'; 477 String timeStrEnd = ymd + ' ' + temp.last + ':00';
@@ -863,7 +863,7 @@ class TableManagerModel with ChangeNotifier { @@ -863,7 +863,7 @@ class TableManagerModel with ChangeNotifier {
863 double startDay; 863 double startDay;
864 //一天结束时间 864 //一天结束时间
865 double endDay; 865 double endDay;
866 - if (keys != '' && dailyMap.length > 0 && dailyMap[keys] != '') { 866 + if (keys != '') {
867 List temp = dailyMap[keys]; 867 List temp = dailyMap[keys];
868 timeStrStart = ymd + ' ' + temp.first + ':00'; 868 timeStrStart = ymd + ' ' + temp.first + ':00';
869 timeStrEnd = ymd + ' ' + temp.last + ':00'; 869 timeStrEnd = ymd + ' ' + temp.last + ':00';