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 {
"sid": userModel.user.sellerid,
// "type_id": "10", //1提前点餐2内部预订10在线预订
// "status": '0',
"offset": "0",
"limit": "100",
};
... ... @@ -778,9 +777,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
case AppLifecycleState.resumed: //应用前台可见
// if (widget.initialIndex == 1 && needRefreshTemp == false) {
// } else {
// _clearBadge(() {
_clearBadge(() {
// _getAllUnMessages();
// });
});
// }
break;
... ...
... ... @@ -135,6 +135,15 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
_loginStore(context, CheckSellerAccSunModel sunModel) {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
App.sp.setBool("accountLogin", false);
if (App.sp.containsKey('table_list')) {
//退出清空桌位数据
App.sp.remove('table_list');
}
if (App.sp.containsKey('specid')) {
//退出清空销售计价
App.sp.remove('specid');
App.sp.remove('specs');
}
Map<String, dynamic> seller = sunModel.toJson();
Map<String, dynamic> userMap = {
"openid": seller['uid'],
... ...
... ... @@ -119,14 +119,14 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> {
Utils.showToast('修改成功！');
tableManagerModel.currentArea = value;
TableManagerModel tableManagerModel1 =
Provider.of<TableManagerModel>(
context,
listen: false);
tableManagerModel1.getTableList(
context,
needLoading: false,
);
// TableManagerModel tableManagerModel1 =
// Provider.of<TableManagerModel>(
// context,
// listen: false);
// tableManagerModel1.getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel
.refreshTable(context);
... ... @@ -186,13 +186,13 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> {
// .getTableList(context);
// await tableManagerModel
// .initData();
TableManagerModel tableManagerModel =
Provider.of<TableManagerModel>(context,
listen: false);
tableManagerModel.getTableList(
context,
needLoading: false,
);
// TableManagerModel tableManagerModel =
// Provider.of<TableManagerModel>(context,
// listen: false);
// tableManagerModel.getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel
.refreshTable(context);
... ...
... ... @@ -165,34 +165,35 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
.then((results) async {
print(results[0]);
if (results[0] && results[1]) {
TableManagerModel tableManagerModel1 =
Provider.of<TableManagerModel>(context, listen: false);
tableManagerModel1.getTableList(
context,
needLoading: false,
);
// TableManagerModel tableManagerModel1 =
// Provider.of<TableManagerModel>(context, listen: false);
// tableManagerModel1.getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel.refreshTable(context);
} else {
if (results[0]) {
//修改桌位信息成功
TableManagerModel tableManagerModel1 =
Provider.of<TableManagerModel>(context, listen: false);
tableManagerModel1.getTableList(
context,
needLoading: false,
);
// TableManagerModel tableManagerModel1 =
// Provider.of<TableManagerModel>(context, listen: false);
// tableManagerModel1.getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel.refreshTable(context, needLoading: true);
} else {
//修改桌位信息失败
}
if (results[1]) {
//合并桌位成功
TableManagerModel tableManagerModel =
Provider.of<TableManagerModel>(context, listen: false);
tableManagerModel.getTableList(
context,
needLoading: false,
);
// TableManagerModel tableManagerModel =
// Provider.of<TableManagerModel>(context, listen: false);
// tableManagerModel.getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel.refreshTable(context, needLoading: true);
} else {
//合并桌位失败
}
... ... @@ -336,13 +337,13 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
// .getTableList(context);
// await tableManagerModel
// .initData();
TableManagerModel tableManagerModel =
Provider.of<TableManagerModel>(context,
listen: false);
tableManagerModel.getTableList(
context,
needLoading: false,
);
// TableManagerModel tableManagerModel1 =
// Provider.of<TableManagerModel>(context,
// listen: false);
// tableManagerModel1.getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel.refreshTable(context);
}
});
... ... @@ -467,13 +468,13 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
// .getTableList(context);
// await tableManagerModel
// .initData();
TableManagerModel tableManagerModel =
Provider.of<TableManagerModel>(context,
listen: false);
tableManagerModel.getTableList(
context,
needLoading: false,
);
// TableManagerModel tableManagerModel =
// Provider.of<TableManagerModel>(context,
// listen: false);
// tableManagerModel.getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel.refreshTable(context);
}
}, onTap: (Map<String, String> value) async {
... ... @@ -624,18 +625,18 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
.currentArea =
value;
TableManagerModel
tableManagerModel1 =
Provider.of<
TableManagerModel>(
context,
listen:
false);
tableManagerModel1
.getTableList(
context,
needLoading: false,
);
// TableManagerModel
// tableManagerModel1 =
// Provider.of<
// TableManagerModel>(
// context,
// listen:
// false);
// tableManagerModel1
// .getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel
.refreshTable(
... ... @@ -834,17 +835,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
.currentArea =
value;
TableManagerModel
tableManagerModel1 =
Provider.of<
TableManagerModel>(
context,
listen: false);
tableManagerModel1
.getTableList(
context,
needLoading: false,
);
// TableManagerModel
// tableManagerModel1 =
// Provider.of<
// TableManagerModel>(
// context,
// listen: false);
// tableManagerModel1
// .getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel
.refreshTable(
... ... @@ -1227,17 +1228,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
print(success);
if (success) {
Utils.showToast('修改成功！');
TableManagerModel
tableManagerModel1 =
Provider.of<
TableManagerModel>(
context,
listen: false);
tableManagerModel1
.getTableList(
context,
needLoading: false,
);
// TableManagerModel
// tableManagerModel1 =
// Provider.of<
// TableManagerModel>(
// context,
// listen: false);
// tableManagerModel1
// .getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel
.refreshTable(context);
... ... @@ -1301,17 +1302,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
print(success);
if (success) {
Utils.showToast('修改成功！');
TableManagerModel
tableManagerModel =
Provider.of<
TableManagerModel>(
context,
listen: false);
tableManagerModel
.getTableList(
context,
needLoading: false,
);
// TableManagerModel
// tableManagerModel =
// Provider.of<
// TableManagerModel>(
// context,
// listen: false);
// tableManagerModel
// .getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel
.refreshTable(context);
... ... @@ -1390,17 +1391,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
print(success);
if (success) {
Utils.showToast('修改成功！');
TableManagerModel
tableManagerModel =
Provider.of<
TableManagerModel>(
context,
listen: false);
tableManagerModel
.getTableList(
context,
needLoading: false,
);
// TableManagerModel
// tableManagerModel =
// Provider.of<
// TableManagerModel>(
// context,
// listen: false);
// tableManagerModel
// .getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel
.refreshTable(context);
... ... @@ -1484,15 +1485,15 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
// await tableManagerModel
// .initData();
TableManagerModel
tableManagerModel =
Provider.of<TableManagerModel>(
context,
listen: false);
tableManagerModel.getTableList(
context,
needLoading: false,
);
// TableManagerModel
// tableManagerModel =
// Provider.of<TableManagerModel>(
// context,
// listen: false);
// tableManagerModel.getTableList(
// context,
// needLoading: false,
// );
await tableManagerModel
.refreshTable(context);
... ...
import 'dart:convert';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:one_key/constant/constant.dart';
... ... @@ -21,6 +23,7 @@ import 'package:one_key/utils/lunar_calendar.dart';
import 'package:one_key/utils/utils.dart';
import 'package:provider/provider.dart';
import '../app.dart';
import 'notebook_model.dart';
class MyTableManageHomeModel with ChangeNotifier {
... ... @@ -151,6 +154,8 @@ class MyTableManageHomeModel with ChangeNotifier {
pageState = PageState.Success;
}
App.sp.setString('table_list', json.encode(tableOuterList));
return tableOuterList;
}
... ...
... ... @@ -471,7 +471,7 @@ class TableManagerModel with ChangeNotifier {
keys = 'night';
}
if (keys != '' && dailyMap.length > 0 && dailyMap[keys] != '') {
if (keys != '') {
List temp = dailyMap[keys];
String timeStrStart = ymd + ' ' + temp.first + ':00';
String timeStrEnd = ymd + ' ' + temp.last + ':00';
... ... @@ -863,7 +863,7 @@ class TableManagerModel with ChangeNotifier {
double startDay;
//一天结束时间
double endDay;
if (keys != '' && dailyMap.length > 0 && dailyMap[keys] != '') {
if (keys != '') {
List temp = dailyMap[keys];
timeStrStart = ymd + ' ' + temp.first + ':00';
timeStrEnd = ymd + ' ' + temp.last + ':00';
... ...