Commit 2d299df45959e2b4f36491af8c051314584dccb4

Authored by wdn127929
2 parents 73ea28d8 bc2ce13e

合并桌位缓存

... ... @@ -14,6 +14,7 @@ if (flutterRoot == null) {
def flutterVersionCode = "480"
if (flutterVersionCode == null) {
flutterVersionCode = '480'
... ... @@ -21,6 +22,7 @@ if (flutterVersionCode == null) {
def flutterVersionName = "4.8.0"
if (flutterVersionName == null) {
flutterVersionName = '4.8.0'
... ...
... ... @@ -21,6 +21,54 @@ class TableOuter {
Map<String, dynamic> toJson() => {"name": name, "list": list};
// Setmeal.fromJson(Map<String, dynamic> json) {
// setmealId = json['setmeal_id'];
// price = json['price'];
// finalPrice = json['final_price'];
// pnum = json['pnum'];
// min = json['min'];
// spare = json['spare'];
// name = json['name'];
// select = json['select'];
// bargaining = json['bargaining'];
// // if (json['cooklist'] != null) {
// // cooklist = <Cooklist>[];
// // json['cooklist'].forEach((v) {
// // cooklist.add(new Cooklist.fromJson(v));
// // });
// // }
// if (json['cooklist'] != null && json['cooklist'].length > 0) {
// cooklist = <Cooklist>[];
// dataMenu = {};
// Map map = json['cooklist'];
// map.forEach((key, v) {
// List<Cook> cooktemp = [];
// v.forEach((v1) {
// cooklist.add(new Cooklist.fromJson(v1));
// cooktemp.add(new Cook.fromJson(v1));
// });
// dataMenu[key] = cooktemp;
// });
// print(dataMenu);
// }
// // finalPriceC = json['finalPriceC'];
// // pnumC = json['pnumC'];
// // minC = json['minC'];
// // spareC = json['spareC'];
// }
TableOuter.fromJson2(Map<String, dynamic> json) {
name = json["name"];
if (json['list'] != null && json['list'].length > 0) {
list = <Table>[];
json['list'].forEach((element) {
list.add(Table.fromJson(element));
});
}
}
@override
String toString() {
return 'TableOuter{name: $name, list: $list}';
... ...
... ... @@ -178,13 +178,17 @@ class DioUtil {
Options options,
CancelToken cancelToken,
bool showLoading = true,
bool needHeader = true}) async {
bool needHeader = true,
bool selfDismiss = false}) async {
bool connectivity = await Utils.checkConnectiviy();
if (!connectivity) {
Utils.showToast("网络错误,请稍后重试");
throw MyError(type: 1);
}
if (showLoading) Loading.showLoading(context);
if (showLoading)
Loading.showLoading(
context,
);
try {
print('--------' + path + '---------');
Response response = await _dio.request(path,
... ... @@ -223,7 +227,10 @@ class DioUtil {
_responseData = _dataMap;
}
Loading.hideLoading(context);
if (!selfDismiss) {
Loading.hideLoading(context);
}
return new BaseResp(_status, _code, _msg, _data, _responseData);
} catch (e) {
Loading.hideLoading(context);
... ...
... ... @@ -128,7 +128,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
Map<String, String> params = {
"uid": Provider.of<UserModel>(context, listen: false).user.openid
};
await remarkManagerModel.getRemarks(context, params);
await remarkManagerModel.getRemarks(context, params,
showPageLoading: true);
managers = await detailModel.getManagers(context);
//添加listener监听
//对应的TextField失去或者获取焦点都会回调此监听
... ... @@ -336,7 +337,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {"rid": widget.rid};
//remark信息获取
await _onlineCheckEditProvider.getOrderInfo(context, params);
await _onlineCheckEditProvider.getOrderInfo(context, params,
isShowLoading: false);
}
///订座详情
... ...
... ... @@ -28,6 +28,7 @@ import 'package:one_key/provider/tools.dart';
import 'package:one_key/provider/update_model.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/route/route_handles.dart';
import 'package:one_key/utils/dialog_util.dart';
import 'package:one_key/route/navigator_util.dart';
... ... @@ -65,7 +66,7 @@ class HomePage extends StatefulWidget {
class HomePageState extends State<HomePage> with WidgetsBindingObserver {
List<Widget> pages = List<Widget>();
int _currIndex = 1;
int _currIndex = 2;
Color _activeColor = MyColours.color_199095;
Color _defaultColor = MyColours.color_999999;
int numPush = 0; //推送消息个数
... ... @@ -154,6 +155,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
));
WidgetsBinding.instance.addPostFrameCallback((_) {
initPlatformState();
_getTableList();
List<PullMarketingByUidSunModel> data =
Provider.of<UserModel>(context, listen: false)
... ... @@ -204,6 +206,15 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
});
}
_getTableList() async {
TableManagerModel tableManagerModel =
Provider.of<TableManagerModel>(context, listen: false);
await tableManagerModel.getTableList(
context,
needLoading: false,
);
}
_initNotification() async {
Map param = await Tools().getIntent();
_getIntent(param);
... ... @@ -345,7 +356,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
break;
}
} else {
_getAllUnMessages();
// _getAllUnMessages();
}
}
... ... @@ -467,13 +478,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
fromNotify: true);
break;
case "10":
//处理客户在线预订
//处理客户在线预订
NavigatorUtil.goHandleOnlinePage(
context, custom["rid"].toString(), custom['mid'].toString(),
fromNotify: true);
break;
case "11":
//订单详情
//订单详情
NavigatorUtil.goNotebookDetailPage(
context, custom['rid'].toString(), custom["uid"].toString(),
mid: custom['mid'].toString(), fromNotify: true);
... ... @@ -542,7 +553,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
mid: custom['mid'].toString(), fromNotify: true);
break;
case "1":
//提前点餐消息
//提前点餐消息
NavigatorUtil.goHasOrderFoodPage(context,
rid: custom["rid"], fromNotify: true);
// bus.emit("remove_untreated_message_order", notifyParam["rid"]);
... ... @@ -660,12 +671,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
super.didChangeAppLifecycleState(state);
switch (state) {
case AppLifecycleState.resumed: //应用前台可见
if (widget.initialIndex == 1 && needRefreshTemp == false) {
} else {
_clearBadge(() {
_getAllUnMessages();
});
}
// if (widget.initialIndex == 1 && needRefreshTemp == false) {
// } else {
// _clearBadge(() {
// _getAllUnMessages();
// });
// }
break;
case AppLifecycleState.inactive:
... ... @@ -801,6 +812,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// ),
BottomNavigationBarItem(
icon: Stack(
clipBehavior: Clip.none,
children: [
Image(
image: AssetImage("assets/message_default.png"),
... ... @@ -808,22 +820,42 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
height: ScreenUtil().setWidth(48),
),
Positioned(
top: 0,
right: 0,
child: Container(
width: ScreenUtil().setWidth(16),
height: ScreenUtil().setWidth(16),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(16)),
color: _getUnMsgNumUI()
? MyColours.color_fa5151
: Colors.transparent),
),
top: -8,
right: -8,
child: _getUnMsgNumUI()
? Container(
width: ScreenUtil().setWidth(36),
height: ScreenUtil().setWidth(36),
margin: EdgeInsets.only(
left: ScreenUtil().setWidth(20)),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(36)),
color: MyColours.color_E34D59),
alignment: Alignment.center,
child: Text(
"${Provider.of<MessageModel>(context, listen: true).allUnNum}",
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(28),
)),
)
: SizedBox(),
// child: Container(
// width: ScreenUtil().setWidth(16),
// height: ScreenUtil().setWidth(16),
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(
// ScreenUtil().setWidth(16)),
// color: _getUnMsgNumUI()
// ? MyColours.color_fa5151
// : Colors.transparent),
// ),
)
],
),
activeIcon: Stack(
clipBehavior: Clip.none,
children: [
Image(
image: AssetImage("assets/message_selected.png"),
... ... @@ -831,18 +863,37 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
height: ScreenUtil().setWidth(48),
),
Positioned(
top: 0,
right: 0,
child: Container(
width: ScreenUtil().setWidth(16),
height: ScreenUtil().setWidth(16),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(16)),
color: _getUnMsgNumUI()
? MyColours.color_fa5151
: Colors.transparent),
),
top: -8,
right: -8,
child: _getUnMsgNumUI()
? Container(
width: ScreenUtil().setWidth(36),
height: ScreenUtil().setWidth(36),
margin: EdgeInsets.only(
left: ScreenUtil().setWidth(20)),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(
ScreenUtil().setWidth(36)),
color: MyColours.color_E34D59),
alignment: Alignment.center,
child: Text(
"${Provider.of<MessageModel>(context, listen: true).allUnNum}",
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(28),
)),
)
: SizedBox(),
// child: Container(
// width: ScreenUtil().setWidth(16),
// height: ScreenUtil().setWidth(16),
// decoration: BoxDecoration(
// borderRadius: BorderRadius.circular(
// ScreenUtil().setWidth(16)),
// color: _getUnMsgNumUI()
// ? MyColours.color_fa5151
// : Colors.transparent),
// ),
)
],
),
... ...
... ... @@ -19,6 +19,8 @@ import 'package:one_key/widgets/system_app_bar.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../../provider/table_manager_model.dart';
class TablePhotoManagerPage extends StatefulWidget {
final String tid;
final String tname;
... ... @@ -81,6 +83,12 @@ class _TablePhotoManagerPageState extends State<TablePhotoManagerPage> {
}
bus.emit("refresh_photo_manager");
bus.emit("refresh_photo_invication");
TableManagerModel tableManagerModel1 =
Provider.of<TableManagerModel>(context, listen: false);
tableManagerModel1.getTableList(
context,
needLoading: false,
);
}
print(_uploadImageProvider.tableImageList);
... ...
... ... @@ -11,6 +11,8 @@ import 'package:one_key/widgets/page_exception.dart';
import 'package:one_key/widgets/system_app_bar.dart';
import 'package:provider/provider.dart';
import '../../../provider/table_manager_model.dart';
/*
**** 区域管理
*/
... ... @@ -117,6 +119,15 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> {
Utils.showToast('修改成功!');
tableManagerModel.currentArea = value;
TableManagerModel tableManagerModel1 =
Provider.of<TableManagerModel>(
context,
listen: false);
tableManagerModel1.getTableList(
context,
needLoading: false,
);
await tableManagerModel
.refreshTable(context);
EventBus().emit("refresh_table_area");
... ... @@ -175,6 +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,
);
await tableManagerModel
.refreshTable(context);
... ...
... ... @@ -38,6 +38,8 @@ import 'dart:convert' as convert;
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
import 'package:one_key/models/table_list.dart' as table;
import '../../../provider/table_manager_model.dart';
const scrollDuration = Duration(microseconds: 500);
class MyTableManagerHomePage extends StatefulWidget {
... ... @@ -163,16 +165,34 @@ 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,
);
await tableManagerModel.refreshTable(context);
} else {
if (results[0]) {
//修改桌位信息成功
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,
);
} else {
//合并桌位失败
}
... ... @@ -316,6 +336,13 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
// .getTableList(context);
// await tableManagerModel
// .initData();
TableManagerModel tableManagerModel =
Provider.of<TableManagerModel>(context,
listen: false);
tableManagerModel.getTableList(
context,
needLoading: false,
);
await tableManagerModel.refreshTable(context);
}
});
... ... @@ -440,6 +467,13 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
// .getTableList(context);
// await tableManagerModel
// .initData();
TableManagerModel tableManagerModel =
Provider.of<TableManagerModel>(context,
listen: false);
tableManagerModel.getTableList(
context,
needLoading: false,
);
await tableManagerModel.refreshTable(context);
}
}, onTap: (Map<String, String> value) async {
... ... @@ -590,6 +624,19 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
.currentArea =
value;
TableManagerModel
tableManagerModel1 =
Provider.of<
TableManagerModel>(
context,
listen:
false);
tableManagerModel1
.getTableList(
context,
needLoading: false,
);
await tableManagerModel
.refreshTable(
context);
... ... @@ -787,6 +834,18 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
.currentArea =
value;
TableManagerModel
tableManagerModel1 =
Provider.of<
TableManagerModel>(
context,
listen: false);
tableManagerModel1
.getTableList(
context,
needLoading: false,
);
await tableManagerModel
.refreshTable(
context);
... ... @@ -1168,6 +1227,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,
);
await tableManagerModel
.refreshTable(context);
... ... @@ -1231,6 +1301,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,
);
await tableManagerModel
.refreshTable(context);
... ... @@ -1309,6 +1390,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,
);
await tableManagerModel
.refreshTable(context);
... ... @@ -1391,6 +1483,17 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
// .getTableList(context);
// await tableManagerModel
// .initData();
TableManagerModel
tableManagerModel =
Provider.of<TableManagerModel>(
context,
listen: false);
tableManagerModel.getTableList(
context,
needLoading: false,
);
await tableManagerModel
.refreshTable(context);
}
... ...
... ... @@ -83,11 +83,13 @@ class NoteBookPageState extends State<NoteBookPage> {
WidgetsBinding.instance.addPostFrameCallback((_) {
_initTime();
setState(() {});
_getReserveList();
_getReserveList(needLoading: true, showLoading: false);
_reserveCountDay();
});
}
/// 第一个显示今天
_initStartingDayOfWeek() {
switch (DateTime.now().weekday.toString()) {
... ... @@ -204,7 +206,7 @@ class NoteBookPageState extends State<NoteBookPage> {
}
//获取已预订列表
_getReserveList() async {
_getReserveList({bool needLoading = false, bool showLoading = true}) async {
Map<String, String> params = {
"sid": userModel.user.sellerid,
"rdate": _getRdate(),
... ... @@ -218,7 +220,8 @@ class NoteBookPageState extends State<NoteBookPage> {
params["account"] = userModel.user.account;
}
await noteBookModel.getReserveList(context, params);
await noteBookModel.getReserveList(context, params,
needLoading: needLoading, showLoading: showLoading);
_simpleState();
}
... ...
... ... @@ -533,86 +533,120 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> {
: '',
fontsize: 20),
Offstage(
offstage: _onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.taxnumber ??
'' == ''
: true,
offstage:
_onlineCheckEditProvider.orderInfoSunModel != null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.taxnumber !=
null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.taxnumber !=
''
? false
: true,
child: Padding(
padding: EdgeInsets.only(top: ScreenUtil().setWidth(24)),
child: _customInfoItemWidget(
'税号',
_onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.taxnumber ??''
_onlineCheckEditProvider.orderInfoSunModel != null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.taxnumber !=
null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.taxnumber !=
''
? false
: '',
fontsize: 20),
),
),
Offstage(
offstage: _onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.companyaddress ??'' ==
''
: true,
offstage:
_onlineCheckEditProvider.orderInfoSunModel != null &&
_onlineCheckEditProvider.orderInfoSunModel.invoice
?.companyaddress !=
null &&
_onlineCheckEditProvider.orderInfoSunModel.invoice
?.companyaddress !=
''
? false
: true,
child: Padding(
padding: EdgeInsets.only(top: ScreenUtil().setWidth(24)),
child: _customInfoItemWidget(
'地址',
_onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.companyaddress ??''
? _onlineCheckEditProvider.orderInfoSunModel.invoice
?.companyaddress ??
''
: '',
fontsize: 20),
),
),
Offstage(
offstage: _onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.telephone ??'' ==
''
: true,
offstage:
_onlineCheckEditProvider.orderInfoSunModel != null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.telephone !=
null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.telephone !=
''
? false
: true,
child: Padding(
padding: EdgeInsets.only(top: ScreenUtil().setWidth(24)),
child: _customInfoItemWidget(
'电话',
_onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.telephone ??''
.orderInfoSunModel.invoice?.telephone ??
''
: '',
fontsize: 20),
),
),
Offstage(
offstage: _onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.bankname ??'' ==
''
: true,
offstage:
_onlineCheckEditProvider.orderInfoSunModel != null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.bankname !=
null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.bankname !=
''
? false
: true,
child: Padding(
padding: EdgeInsets.only(top: ScreenUtil().setWidth(24)),
child: _customInfoItemWidget(
'开户行',
_onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.bankname ??''
.orderInfoSunModel.invoice?.bankname ??
''
: '',
fontsize: 20),
),
),
Offstage(
offstage: _onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.bankaccount ??'' ==
''
: true,
offstage:
_onlineCheckEditProvider.orderInfoSunModel != null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.bankaccount !=
null &&
_onlineCheckEditProvider
.orderInfoSunModel.invoice?.bankaccount !=
''
? false
: true,
child: Padding(
padding: EdgeInsets.only(top: ScreenUtil().setWidth(24)),
child: _customInfoItemWidget(
'账号',
_onlineCheckEditProvider.orderInfoSunModel != null
? _onlineCheckEditProvider
.orderInfoSunModel.invoice?.bankaccount ??''
.orderInfoSunModel.invoice?.bankaccount ??
''
: '',
fontsize: 20),
),
... ...
... ... @@ -45,6 +45,8 @@ import 'dart:convert' as convert;
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
import 'package:one_key/models/table_list.dart' as table;
import '../../app.dart';
import '../../widgets/loading.dart';
import '../../widgets/special_text/my_extended_text_selection_controls.dart';
const scrollDuration = Duration(microseconds: 500);
... ... @@ -126,6 +128,14 @@ class TableManagerPageState extends State<TableManagerPage> {
WidgetsBinding.instance.addPostFrameCallback((_) {
// couponProvider.sendSMS = false;
String tableSp = App.sp.getString('table_list');
if (tableSp != null) {
//有缓存数据
tableManagerModel.showLoading = true;
Loading.showLoading(context);
} else {
tableManagerModel.showLoading = false;
}
_myExtendedMaterialTextSelectionControls =
MyTextSelectionControls(callback: (value) {
... ... @@ -137,7 +147,7 @@ class TableManagerPageState extends State<TableManagerPage> {
});
tableManagerModel.initTime(context);
_couponNetworkData();
_couponNetworkData(selfDismiss: true);
_getSmsInfo(context);
EventBus().on("refresh_tablemanager", (arg) {
... ... @@ -168,7 +178,7 @@ class TableManagerPageState extends State<TableManagerPage> {
///获取短信余量
_getSmsInfo(context) async {
smsInfoData = await myModel.getSmsInfo(context);
smsInfoData = await myModel.getSmsInfo(context,selfDismiss: true);
if (myModel.smsInfo == '0') {
if (!mounted) {
return;
... ... @@ -195,14 +205,15 @@ class TableManagerPageState extends State<TableManagerPage> {
}
///消费券
_couponNetworkData({bool isShowLoading = true}) async {
_couponNetworkData(
{bool isShowLoading = true, bool selfDismiss = false}) async {
couponSelectIndex = 0;
Map<String, String> params = {
"uid": Provider.of<UserModel>(context, listen: false).user.openid,
'status': '1'
};
await couponProvider.getCustomerSelectActivityNew(context, params,
isShowLoading: isShowLoading);
isShowLoading: isShowLoading, selfDismiss: selfDismiss);
//此人已经新建好券
if (couponProvider.couponListSelect.length > 0) {
// couponProvider.initCouponSelect(context);
... ... @@ -2720,8 +2731,13 @@ class TableManagerPageState extends State<TableManagerPage> {
tableManagerModel.returnDayDateStr(tableManagerModel.dateTimeSelect);
tableManagerModel.selectWeekAndLunarCalendar = tableManagerModel
.returnWeekAndLunarCalendar(tableManagerModel.dateTimeSelect, context);
await tableManagerModel.getReserveList(context,
needLoading: true, showMsg: true);
bool success = await tableManagerModel.getReserveList(context,
needLoading: false,
showMsg: true,
showloading: true,
selfDismiss: true);
Loading.hideLoading(context);
}
@override
... ... @@ -2773,9 +2789,15 @@ class TableManagerPageState extends State<TableManagerPage> {
context, tableManagerModel.dateTime)
.then((day) async {
if (day != null) {
tableManagerModel.createDateText(context, day);
await tableManagerModel.getReserveList(context,
needLoading: true, showMsg: true);
tableManagerModel.createDateText1(context, day);
bool success = await tableManagerModel
.getReserveList(context,
needLoading: false,
showMsg: true,
showloading: true,
selfDismiss: true);
Loading.hideLoading(context);
}
});
},
... ... @@ -3189,14 +3211,16 @@ class TableManagerPageState extends State<TableManagerPage> {
],
),
),
Expanded(
// flex: 2,
child: Container(
constraints: BoxConstraints(
minHeight: ScreenUtil().setWidth(100)),
color: Color.fromRGBO(249, 249, 249, 1),
child:
item(tableManagerModel.selectNumber))),
if (tableManagerModel.currentArea != null)
Expanded(
// flex: 2,
child: Container(
constraints: BoxConstraints(
minHeight:
ScreenUtil().setWidth(100)),
color: Color.fromRGBO(249, 249, 249, 1),
child: item(
tableManagerModel.selectNumber))),
tableManagerModel.selectTables.length > 0
? wechatNotification
? _selectTableWidgetWechat()
... ...
... ... @@ -277,14 +277,14 @@ class CouponProvider with ChangeNotifier {
///客户经理获取所创建活动列表(选择优惠券)
Future<List<CouponSunModel>> getCustomerSelectActivityNew(
BuildContext context, Map<String, String> params,
{isShowLoading = true}) async {
{isShowLoading = true, bool selfDismiss = false}) async {
if (isShowLoading) {
pageStateSelect = PageState.Loading;
notifyListeners();
}
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_customer_activity,
data: params, showLoading: false)
data: params, showLoading: false, selfDismiss: selfDismiss)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ...
... ... @@ -1770,7 +1770,10 @@ class CustomerProvider extends ChangeNotifier {
{bool showLoading = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_marketing_by_seller,
data: params, showLoading: showLoading)
data: params,
showLoading: pageStateMarketingRecord == PageState.Loading
? false
: showLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -1812,7 +1815,10 @@ class CustomerProvider extends ChangeNotifier {
{bool showLoading = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_marketing_by_id,
data: params, showLoading: showLoading)
data: params,
showLoading: pageStateMarketingRecordDetail == PageState.Loading
? false
: showLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ...
... ... @@ -281,7 +281,9 @@ class FeastModel extends ChangeNotifier {
{isShowLoading = true}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_banquet_be_follow,
data: params, showLoading: isShowLoading)
data: params,
showLoading:
pageStateFollowUp == PageState.Loading ? false : isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -337,7 +339,8 @@ class FeastModel extends ChangeNotifier {
{isShowLoading = true}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_banquet_by_time,
data: params, showLoading: isShowLoading)
data: params,
showLoading: pageState == PageState.Loading ? false : isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -655,7 +658,9 @@ class FeastModel extends ChangeNotifier {
{isShowLoading = true}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_banquet_by_id,
data: params, showLoading: isShowLoading)
data: params,
showLoading:
pageStateBanquet == PageState.Loading ? false : isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -860,7 +865,10 @@ class FeastModel extends ChangeNotifier {
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_auth_user_lists,
data: params, showLoading: showLoading)
data: params,
showLoading: pageStatePersonnalHome == PageState.Loading
? false
: showLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -1021,7 +1029,9 @@ class FeastModel extends ChangeNotifier {
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_classify,
data: params, showLoading: isShowLoading)
data: params,
showLoading:
pageStateType == PageState.Loading ? false : isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -1121,7 +1131,9 @@ class FeastModel extends ChangeNotifier {
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_wine,
data: params, showLoading: isShowLoading)
data: params,
showLoading:
pageStateWine == PageState.Loading ? false : isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -1223,7 +1235,9 @@ class FeastModel extends ChangeNotifier {
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_other,
data: params, showLoading: isShowLoading)
data: params,
showLoading:
pageStateOther == PageState.Loading ? false : isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -1324,7 +1338,7 @@ class FeastModel extends ChangeNotifier {
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_setmeal,
data: params, showLoading: isShowLoading)
data: params, showLoading:pageStateSetmeal == PageState.Loading ? false: isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -1393,7 +1407,7 @@ class FeastModel extends ChangeNotifier {
{isShowLoading = true}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_setmeal_by_id,
data: params, showLoading: isShowLoading)
data: params, showLoading:pageStateMenu == PageState.Loading ? false: isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -1681,7 +1695,7 @@ class FeastModel extends ChangeNotifier {
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_deposit,
data: params, showLoading: isShowLoading)
data: params, showLoading:pageStateDeposit == PageState.Loading ? false: isShowLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ...
... ... @@ -90,7 +90,7 @@ class MarketingCenterProvider extends ChangeNotifier {
Map<String, String> params = {"sid": userModel.user.sellerid};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_seller_template_conf,
data: params, showLoading: showLoading)
data: params, showLoading:pageState == PageState.Loading? false: showLoading)
.catchError((error) {
pageState = PageState.ConnectivityError;
print(error.toString());
... ... @@ -162,7 +162,7 @@ class MarketingCenterProvider extends ChangeNotifier {
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_new_recharge_list,
data: params, showLoading: showLoading)
data: params, showLoading:pageStateRechargeHome == PageState.Loading ? false: showLoading)
.catchError((error) {
pageStateRechargeHome = PageState.ConnectivityError;
print(error.toString());
... ... @@ -195,7 +195,7 @@ class MarketingCenterProvider extends ChangeNotifier {
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_new_recharge_detail,
data: params, showLoading: showLoading)
data: params, showLoading:pageStateDetail == PageState.Loading?false: showLoading)
.catchError((error) {
pageStateDetail = PageState.ConnectivityError;
print(error.toString());
... ...
... ... @@ -65,7 +65,7 @@ class MenuManageProvider extends ChangeNotifier {
{showLoading = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_cookbook_by_class,
data: params, showLoading: showLoading)
data: params, showLoading:pageState == PageState.Loading? false: showLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -109,7 +109,7 @@ class MenuManageProvider extends ChangeNotifier {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(
context, Method.get, HttpUrl.get_cookbook_by_seller_id,
data: params, showLoading: showLoading)
data: params, showLoading:pageStateCategory == PageState.Loading?false: showLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ...
... ... @@ -18,13 +18,13 @@ class MyModel extends ChangeNotifier {
String reserveTotal = '';
/// 短信余量查询及套餐查询接口
Future<SmsInfoData> getSmsInfo(BuildContext context) async {
Future<SmsInfoData> getSmsInfo(BuildContext context,{bool selfDismiss = false}) async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
Map<String, String> params = {"seller_id": userModel.user.sellerid};
try {
BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
.request<Map<String, dynamic>>(context, Method.get, HttpUrl.sms_info,
data: params, showLoading: false)
data: params, showLoading: false,selfDismiss:selfDismiss)
.catchError((error) {
print(error.toString());
});
... ...
... ... @@ -81,7 +81,7 @@ class NotebookDetailModel extends ChangeNotifier {
BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
.request<Map<String, dynamic>>(
context, Method.get, HttpUrl.reserve_detail,
data: params, showLoading: showCircle)
data: params, showLoading:isShowLoading ? false: showCircle)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ...
... ... @@ -20,21 +20,20 @@ class NoteBookModel extends ChangeNotifier {
String totalnight = ""; //一天统计
PageState pageState = PageState.Loading;
//获取已预订订单
Future<List<Notebook>> getReserveList(
BuildContext context, Map<String, String> params,
{needLoading = true}) async {
{bool needLoading = false, bool showLoading = true}) async {
if (needLoading) {
pageState = PageState.Loading;
notifyListeners();
}
pageState = PageState.Loading;
notifyListeners();
// pageState = PageState.Loading;
// notifyListeners();
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_reserve_list,
data: params, showLoading: false)
data: params, showLoading:needLoading ? false: showLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ...
... ... @@ -48,7 +48,7 @@ class OtherLoginProvider extends ChangeNotifier {
{isShowLoading = true, showLoading = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.check_seller_acc,
data: params, showLoading: showLoading)
data: params, showLoading:pageState == PageState.Loading ? false:showLoading)
.catchError((error) {
print(error);
});
... ...
... ... @@ -50,7 +50,7 @@ class PlanDishProvider extends ChangeNotifier {
{showLoading = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_cookbook_by_class,
data: params, showLoading: showLoading)
data: params, showLoading:pageState == PageState.Loading? false: showLoading)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -268,7 +268,7 @@ class PlanDishProvider extends ChangeNotifier {
{showLoading = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_plan_cook_list,
data: params, showLoading: showLoading)
data: params, showLoading: false)
.catchError((error) {
print(error.toString());
if (error is MyError) {}
... ...
... ... @@ -126,7 +126,9 @@ class StoreWineProvider with ChangeNotifier {
{bool showLoading = true}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_store_wine_by_seller,
data: params, showLoading: showLoading)
data: params,
showLoading:
pageStateAll == PageState.Loading ? false : showLoading)
.catchError((error) {
pageStateAll = PageState.ConnectivityError;
print(error.toString());
... ... @@ -186,7 +188,9 @@ class StoreWineProvider with ChangeNotifier {
{bool showLoading = true}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_store_wine_by_id,
data: params, showLoading: showLoading)
data: params,
showLoading:
pageStateDetail == PageState.Loading ? false : showLoading)
.catchError((error) {
pageStateDetail = PageState.ConnectivityError;
print(error.toString());
... ... @@ -218,7 +222,9 @@ class StoreWineProvider with ChangeNotifier {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(
context, Method.get, HttpUrl.get_store_wine_check_by_wid,
data: params, showLoading: showLoading)
data: params,
showLoading:
pageStateRecord == PageState.Loading ? false : showLoading)
.catchError((error) {
pageStateRecord = PageState.ConnectivityError;
print(error.toString());
... ... @@ -252,7 +258,9 @@ class StoreWineProvider with ChangeNotifier {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(
context, Method.get, HttpUrl.get_store_wine_check_list,
data: params, showLoading: showLoading)
data: params,
showLoading:
pageStateRecordHome == PageState.Loading ? false : showLoading)
.catchError((error) {
pageStateRecordHome = PageState.ConnectivityError;
print(error.toString());
... ...
import 'dart:convert';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:one_key/app.dart';
import 'package:one_key/constant/constant.dart';
import 'package:one_key/constant/error.dart';
import 'package:one_key/constant/state.dart';
... ... @@ -21,6 +24,7 @@ import 'package:one_key/utils/utils.dart';
import 'package:provider/provider.dart';
import '../models/get_board_model.dart';
import '../widgets/loading.dart';
import 'notebook_model.dart';
class TableManagerModel with ChangeNotifier {
... ... @@ -55,8 +59,6 @@ class TableManagerModel with ChangeNotifier {
String night; //晚市时间段
UserModel userModel;
PageState pageState = PageState.Loading;
Map dailyMap = {}; // 早市对应半点钟,午市对应半点钟、晚市对应半点钟
bool swichState = false; //仅看空座
String selectDateStr = '';
... ... @@ -67,15 +69,67 @@ class TableManagerModel with ChangeNotifier {
List dailyList = []; // 早市对应半点钟,午市对应半点钟、晚市对应半点钟
List<FeastBoardModel> banquetByDateData = []; //宴会看板数据/宴会预订的数据
List<Notebook> noteBooks;
PageState pageState;
bool showLoading = false;
TableManagerModel() {
print('fdsfs');
String tableSp = App.sp.getString('table_list');
if (tableSp == null) {
pageState = PageState.Loading;
} else {
tableOuterList = getSpTableList();
tablesAll = getSpTableAll();
pageState = PageState.Success;
initData(needKeep: false);
}
}
List<TableOuter> getSpTableList() {
String tableList = App.sp.getString('table_list');
if (tableList == null) {
return [];
}
List<TableOuter> temp = [];
List list = json.decode(tableList);
list.forEach((element) {
temp.add(TableOuter.fromJson2(element));
});
return temp;
}
List<t.Table> getSpTableAll() {
String tableList = App.sp.getString('table_list');
if (tableList == null) {
return [];
} else {
List<t.Table> temp = [];
// // List list = json.decode(tableAll);
// // list.forEach((element) {
// // temp.add(t.Table.fromJson(element));
// // });
// // return temp;
// // List<TableOuter> temp = [];
// List list = json.decode(tableList);
// list.forEach((element) {
// temp.addAll(TableOuter.fromJson2(element).list);
// });
tableOuterList.forEach((element) {
temp.addAll(element.list);
});
return temp;
}
}
//指定日期、时段宴会预定
Future<bool> getBanquetByDate(
BuildContext context, Map<String, String> params,
{showLoading = false}) async {
{showLoading = false, bool selfDismiss = false}) async {
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_banquet_by_date,
data: params, showLoading: showLoading)
data: params, showLoading: showLoading, selfDismiss: selfDismiss)
.catchError((error) {
print(error.toString());
if (error is MyError) {}
... ... @@ -174,9 +228,29 @@ class TableManagerModel with ChangeNotifier {
}
selectDateStr = returnDayDateStr(dateTime);
selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(dateTime, context);
List temp = await getTableList(context);
List temp = [];
String tableSp = App.sp.getString('table_list');
if (tableSp == null) {
temp = await getTableList(context);
} else {
// List list = json.decode(tableSp);
// list.forEach((element) {
// temp.add(TableOuter.fromJson2(element));
// });
temp = getSpTableList();
}
if (temp.length > 0) {
getReserveList(context);
await getReserveList(context, selfDismiss: true);
// await getReserveList(context,
// needLoading: false,
// showMsg: true,
// showloading: true,
// selfDismiss: true);
if (showLoading) {
Loading.hideLoading(context);
}
} else {
// pageState = PageState.Empty;
pageState = PageState.Success;
... ... @@ -289,7 +363,6 @@ class TableManagerModel with ChangeNotifier {
/*获取结束分钟*/
int endMinute = int.parse(endTemp[1]);
if (endMinute == 15) {
endDate = '${endHour}:00';
} else if (endMinute == 45) {
endDate = '${endHour}:30';
... ... @@ -339,8 +412,13 @@ class TableManagerModel with ChangeNotifier {
Utils.showToast('请选择桌位');
return null;
}
bool sucess = await getReserveList(context,
showMsg: true, needLoading: false, needKeep: true, showloading: true);
bool sucess = await getReserveList(
context,
showMsg: true,
needLoading: false,
needKeep: true,
showloading: true,
);
if (sucess) {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
//
... ... @@ -456,16 +534,22 @@ class TableManagerModel with ChangeNotifier {
//获取桌位数据
Future<List<TableOuter>> getTableList(BuildContext context,
{bool needLoading = true}) async {
{bool needLoading = true,
bool selfDismiss = false,
String sellerid}) async {
if (needLoading) {
pageState = PageState.Loading;
notifyListeners();
}
Map<String, String> params = {"sellerid": userModel.user.sellerid};
Map<String, String> params = {
"sellerid": sellerid == null
? Provider.of<UserModel>(context, listen: false).user.sellerid
: sellerid
};
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.table_list,
data: params, showLoading: false)
data: params, showLoading: false, selfDismiss: selfDismiss)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -541,11 +625,15 @@ class TableManagerModel with ChangeNotifier {
}
}
App.sp.setString('table_list', json.encode(tableOuterList));
// App.sp.setString('table_all', json.encode(tablesAll));
return tableOuterList;
}
//获取预订(原来普通预订和宴会预订)
_getReserveListAndFeastData(context, params, showloading) async {
_getReserveListAndFeastData(context, params, showloading,
{bool selfDismiss = false}) async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
String timeStrStart = dateTime.year.toString() +
"-" +
... ... @@ -571,8 +659,9 @@ class TableManagerModel with ChangeNotifier {
'ddate_interval': currTimeIndex.toString()
};
return await Future.wait<bool>([
_getOldReserve(context, params, showloading),
getBanquetByDate(context, banquetmap, showLoading: showloading)
_getOldReserve(context, params, showloading, selfDismiss: selfDismiss),
getBanquetByDate(context, banquetmap,
showLoading: showloading, selfDismiss: selfDismiss)
]).then((results) {
if (results[0] && results[1]) {
//成功
... ... @@ -591,9 +680,10 @@ class TableManagerModel with ChangeNotifier {
});
}
Future<bool> _getOldReserve(context, params, showloading) async {
List<Notebook> noteBooks =
await newGetReserveList(context, params, showLoading: showloading);
Future<bool> _getOldReserve(context, params, showloading,
{bool selfDismiss = false}) async {
List<Notebook> noteBooks = await newGetReserveList(context, params,
showLoading: showloading, selfDismiss: selfDismiss);
return true;
}
... ... @@ -602,7 +692,8 @@ class TableManagerModel with ChangeNotifier {
{bool needLoading = true,
bool needKeep = false,
bool showMsg = false,
bool showloading = false}) async {
bool showloading = false,
bool selfDismiss = false}) async {
tableMap.clear();
NoteBookModel model = new NoteBookModel();
Map<String, String> params = {
... ... @@ -614,13 +705,15 @@ class TableManagerModel with ChangeNotifier {
"keywords": "",
"sort": "1"
};
if (needLoading) {
String tableSp = App.sp.getString('table_list');
if (needLoading && tableSp == null) {
pageState = PageState.Loading;
notifyListeners();
}
bool success =
await _getReserveListAndFeastData(context, params, showloading);
bool success = await _getReserveListAndFeastData(
context, params, (needLoading && tableSp == null) ? false : showloading,
selfDismiss: selfDismiss);
if (success) {
List<FeastBoardModel> banquetByDateDataTemp = []; //转换为桌子id为key,data为value
banquetByDateData.forEach((element) {
... ... @@ -693,25 +786,28 @@ class TableManagerModel with ChangeNotifier {
Utils.showToast('${msg}已被预订,请选择其他桌位!');
print(tableMap);
initData(needKeep: needKeep);
// notifyListeners();
return false;
}
print(tableMap);
initData(needKeep: needKeep);
return true;
}
return false;
}
//获取已预订订单
Future<List<Notebook>> newGetReserveList(
BuildContext context, Map<String, String> params,
{showLoading = false}) async {
{showLoading = false, bool selfDismiss = false}) async {
noteBooks = [];
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_reserve_list,
data: params, showLoading: false)
data: params, showLoading: false, selfDismiss: selfDismiss)
.catchError((error) {
print(error.toString());
if (error is MyError) {
... ... @@ -901,7 +997,18 @@ class TableManagerModel with ChangeNotifier {
selectDateStr = returnDayDateStr(day);
selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(day, context);
dateTime = day;
getReserveList(context, needLoading: true);
getReserveList(context, needLoading: false, showloading: true);
}
//生成日期文本
createDateText1(BuildContext context, DateTime day) {
if (Utils.isOneDay(day, dateTime)) return; //日期没变
dateTimeSelect = day;
dateText = _returnDate(day);
selectDateStr = returnDayDateStr(day);
selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(day, context);
dateTime = day;
// getReserveList(context, needLoading: false, showloading: true);
}
_returnDate(DateTime day) {
... ... @@ -1043,7 +1150,9 @@ class TableManagerModel with ChangeNotifier {
//获取区域数据
Future<List<AreaSunModel>> getRegionBySellerid(BuildContext context) async {
Map<String, String> params = {"sellerid": userModel.user.sellerid};
Map<String, String> params = {
"sellerid": Provider.of<UserModel>(context, listen: false).user.sellerid
};
BaseResp<List> baseResp = await DioUtil()
.request<List>(context, Method.get, HttpUrl.get_area_by_sellerid,
data: params, showLoading: false)
... ...
... ... @@ -9,6 +9,7 @@ import 'package:one_key/models/user.dart';
import 'package:one_key/net/base_resp.dart';
import 'package:one_key/net/dio_util.dart';
import 'package:one_key/net/http_url.dart';
import 'package:one_key/provider/table_manager_model.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/route/navigator_util.dart';
import 'package:one_key/utils/utils.dart';
... ... @@ -93,6 +94,7 @@ class UserModel with ChangeNotifier {
'nickname': user['nick_name'],
};
await saveUserInfo(User.fromJson(userMap));
return getSellerInfo(
context,
{"seller_id": seller['id'], "seller_openid": seller['openid']},
... ... @@ -334,6 +336,11 @@ class UserModel with ChangeNotifier {
App.sp.remove('openid');
App.sp.remove("unionid");
}
if (App.sp.containsKey('table_list')) {
//退出清空桌位数据
App.sp.remove('table_list');
}
App.sp.setBool("isLogin", false);
// XgFlutterPlugin().stopXg();
NavigatorUtil.goLoginPage(context);
... ...
... ... @@ -65,7 +65,7 @@ class NavigatorUtil {
/// 首页
static void goHomePage(BuildContext context,
{int initialIndex = 1,
{int initialIndex = 2,
needRefresh = true,
mine = false,
int dateTime,
... ...
... ... @@ -246,12 +246,14 @@ var homeHandler = new Handler(
? null
: DateTime.fromMillisecondsSinceEpoch(
int.parse(params["dateTime"].first));
return HomePage(
initialIndex: int.parse(initialIndex),
needReresh: needRefresh,
mine: mine,
date: dateTime,
solt: solt);
return ChangeNotifierProvider<TableManagerModel>(
create: (_) => TableManagerModel(),
child: HomePage(
initialIndex: int.parse(initialIndex),
needReresh: needRefresh,
mine: mine,
date: dateTime,
solt: solt));
});
// 跳转预订详情页
... ... @@ -800,7 +802,10 @@ var tablePhotoManagerHandler = new Handler(
FromPage.values, params["fromPage"].first);
return ChangeNotifierProvider<TablePhotoManagerModel>(
create: (_) => TablePhotoManagerModel(),
child: TablePhotoManagerPage(tid: tid, tname: tname, fromPage: fromPage));
child: ChangeNotifierProvider<TableManagerModel>(
create: (_) => TableManagerModel(),
child: TablePhotoManagerPage(
tid: tid, tname: tname, fromPage: fromPage)));
// return ChangeNotifierProvider<UploadImageProvider>(
// create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
});
... ... @@ -1375,9 +1380,11 @@ var myTableManagerHomePageHandle = new Handler(
// FluroConvertUtils.fluroCnParamsDecode(
// params["userHistoryEntity"].first)));
return ChangeNotifierProvider<MyTableManageHomeModel>(
create: (_) => MyTableManageHomeModel(),
child: MyTableManagerHomePage(),
);
create: (_) => MyTableManageHomeModel(),
child: ChangeNotifierProvider<TableManagerModel>(
create: (_) => TableManagerModel(),
child: MyTableManagerHomePage(),
));
});
///我的---区域管理
... ... @@ -1389,9 +1396,11 @@ var myAreaManagePageHandle = new Handler(
// FluroConvertUtils.fluroCnParamsDecode(
// params["userHistoryEntity"].first)));
return ChangeNotifierProvider<MyTableManageHomeModel>(
create: (_) => MyTableManageHomeModel(),
child: MyAreaManagePage(),
);
create: (_) => MyTableManageHomeModel(),
child: ChangeNotifierProvider<TableManagerModel>(
create: (_) => TableManagerModel(),
child: MyAreaManagePage(),
));
});
///选择优惠券类型
... ...
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:one_key/res/colors.dart';
class Loading {
static bool isLoading = false;
... ... @@ -10,6 +11,7 @@ class Loading {
showGeneralDialog(
context: context,
barrierDismissible: false,
barrierColor: Colors.transparent,
barrierLabel:
MaterialLocalizations.of(context).modalBarrierDismissLabel,
transitionDuration: const Duration(milliseconds: 150),
... ... @@ -17,14 +19,16 @@ class Loading {
Animation secondaryAnimation) {
return Align(
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Container(
width: 100,
height: 100,
color: Colors.black54,
child: CupertinoActivityIndicator(),
),
),
borderRadius: BorderRadius.circular(10),
child: Container(
width: 200,
height: 200,
color: Colors.transparent,
child: CupertinoActivityIndicator(
color: MyColours.color_000000,
radius: 30,
),
)),
);
}).then((v) {
isLoading = false;
... ...