xt / Flutter-ReserveApp · Commits

Go to a project

Commit ee335a7b7bde02edbd64be621c7f6e42ba4419d0

Authored by wdn127929
1 parent d11ee546
build: skipped

bug修复

Inline Side-by-side
Showing 8 changed files with 587 additions and 553 deletions
... ... @@ -548,7 +548,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 52693;
CURRENT_PROJECT_VERSION = 52695;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -696,7 +696,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 52693;
CURRENT_PROJECT_VERSION = 52695;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -732,7 +732,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 52693;
CURRENT_PROJECT_VERSION = 52695;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -23,13 +23,24 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) {
String servename;
String serveuid;
if (json['serve_name'] != null) {
servename = json['serve_name'];
}
if (json['serve_uid'] != null) {
serveuid = json['serve_uid'];
if (json['serve_name'] is Map) {
servename = json['serve_name']['nick_name'];
serveuid = json['serve_name']['id'];
} else if (json['serve_name'] is String) {
servename = json['serve_name'];
if (json['serve_uid'] != null) {
serveuid = json['serve_uid'];
}
}
}
// if (json['serve_name'] != null) {
// servename = json['serve_name'];
// }
// if (json['serve_uid'] != null) {
// serveuid = json['serve_uid'];
// }
return NotebookDetail()
..id = json['id'] as String
..uid = json['uid'] as String
... ...
This diff could not be displayed because it is too large.
... ... @@ -111,7 +111,7 @@ class TableManagerPageState extends State<TableManagerPage> {
String ddateHm = '选填';
int actualPnumIndex;
int ddateIndex;
List<String> couponsCan = []; //优惠券弹框数据
// List<String> couponsCan = []; //优惠券弹框数据
String youhui = '选择优惠';
int couponSelectIndex = 0;
CouponProvider couponProvider;
... ... @@ -121,6 +121,7 @@ class TableManagerPageState extends State<TableManagerPage> {
String smsErro = '';
String showErro = '';
// int
ScrollController _scrollCrl = ScrollController();
final ItemPositionsListener itemPositionsListener =
... ... @@ -148,45 +149,47 @@ class TableManagerPageState extends State<TableManagerPage> {
String smsContent = '';
PersonnelProvider personnelProvider;
DateTime dateTime = DateTime.now();
String dateText = ""; //当前显示日期时间
int currTimeIndex = 1; //当前选中时间段
String morning; //早市时间段
String noon; //午市时间段
String night; //晚市时间段
// UserModel userModel;
// Map dailyMap = {}; // 早市对应半点钟，午市对应半点钟、晚市对应半点钟
bool swichState = false; //仅看空座
String selectDateStr = '';
String selectWeekAndLunarCalendar = '';
String doltStr = '';
DateTime dateTimeSelect;
int selectNumber = 0;
@override
void initState() {
// TODO: implement initState
super.initState();
LogUtil.v("table_manager_page initState");
// for (int i = 1; i < 31; i++) {
// personNumList.add(i.toString());
// }
personNumList = Utils.getPersonNumList();
// personNumList.add('30以上');
if (App.sp.containsKey('user')) {
String s = App.sp.getString('user');
User _user = User.fromJson(json.decode(s));
morning = _user.morning.isEmpty ? "00:00-00:00" : _user.morning;
noon = _user.noon.isEmpty ? "00:00-00:00" : _user.noon;
night = _user.night.isEmpty ? "00:00-00:00" : _user.night;
}
initTimeTable();
personNumList = Utils.getPersonNumList();
WidgetsBinding.instance.addPostFrameCallback((_) {
// tableManagerModel.pageStateOrReserve = PageState.Loading;
// tableManagerModel.initTimeTable(context);
if (App.sp.containsKey('table_list')) {
// //退出清空桌位数据
App.sp.remove('table_list');
}
// getSpTableList();
UserModel userModel = Provider.of<UserModel>(context, listen: false);
tableManagerModel.dateTime = DateTime.now();
tableManagerModel.dateText =
tableManagerModel.returnDate(tableManagerModel.dateTime);
setState(() {});
tableManagerModel.dateTimeSelect = tableManagerModel.dateTime;
// tableManagerModel.notifyListeners;
getUserAccountTypeById(showLoading: false);
// couponProvider.sendSMS = false;
// String tableSp = App.sp.getString('table_list_or_reserve');
// if (tableSp != null) {
// //有缓存数据
// // tableManagerModel.showLoading = true;
// // Loading.showLoading(context);
// }
_myExtendedMaterialTextSelectionControls =
MyTextSelectionControls(callback: (value) {
_baseIndoProvider.phoneController.value = TextEditingValue(
... ... @@ -196,17 +199,10 @@ class TableManagerPageState extends State<TableManagerPage> {
offset: value.toString().length)));
});
_getSellerById();
// _couponNetworkData(selfDismiss: true);
// getDzSellerConf();
// _getRemark();
EventBus().on("refresh_tablemanager", (arg) {
//订座-完成预订 刷新管理桌位
tableManagerModel.getTableListOrReserve(
context,
);
context, currTimeIndex, dateTime, selectNumber);
print(tableManagerModel);
});
EventBus().on("refresh_tablePhoto", (arg) {
... ... @@ -234,6 +230,155 @@ class TableManagerPageState extends State<TableManagerPage> {
});
}
//初始化时间
initTimeTable() {
dateTime = DateTime.now();
dateText = returnDate(dateTime);
dateTimeSelect = dateTime;
if (dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
morning.split("-")[1] +
":00"))) {
//未过早市
currTimeIndex = 1;
} else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
morning.split("-")[1] +
":00")) &&
dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
noon.split("-")[1] +
":00"))) {
//过了早市，未过午市
currTimeIndex = 2;
} else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
noon.split("-")[1] +
":00")) &&
dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
night.split("-")[1] +
":00"))) {
//过了午市，未过晚市
currTimeIndex = 3;
} else {
//过了晚市
currTimeIndex = 3;
}
selectDateStr = returnDayDateStr(dateTime);
selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(dateTime, context);
}
String returnWeekAndLunarCalendar(DateTime day, BuildContext context) {
String date = "星期${Utils.formatWeekDayNum(day.weekday)} ";
date += Utils.lunarCalendarHolidays(day);
_getDoltStr(context);
return date;
}
String returnDayDateStr(DateTime day) {
String date = '';
DateTime dateNow = DateTime.now();
String ymd = "${day.year}年" +
Utils.addZeroNumber(day.month) +
"月" +
Utils.addZeroNumber(day.day) +
"日";
if (Utils.isOneDay(day, dateNow)) {
date += "今天 ";
} else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
date += "明天 ";
} else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
date += "后天 ";
}
date += ymd;
// date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
return date;
}
//生成日期文本
createDateText(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);
}
//生成日期文本
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);
}
String _returnDayDateWeek(DateTime day) {
String date = '';
DateTime dateNow = DateTime.now();
String ymd = "${day.year}-" +
Utils.addZeroNumber(day.month) +
"-" +
Utils.addZeroNumber(day.day);
if (Utils.isOneDay(day, dateNow)) {
date += "今天 ";
} else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
date += "明天 ";
} else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
date += "后天 ";
}
date += ymd;
date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
return date;
}
returnDate(DateTime day) {
// String time = Utils.lunarCalendarHolidays(day);
String date = _returnDayDateWeek(day);
// date += ' ${time}';
return date;
}
_getDoltStr(BuildContext context) {
if (currTimeIndex == 1) {
doltStr = '早餐';
} else if (currTimeIndex == 2) {
doltStr = '午餐';
} else if (currTimeIndex == 3) {
doltStr = '晚餐';
}
// _initTimeDdate(currTimeIndex, context);
}
List<TableListReseveSunModel> getSpTableList() {
String tableList = App.sp.getString('table_list_or_reserve');
if (tableList == null) {
... ... @@ -272,8 +417,8 @@ class TableManagerPageState extends State<TableManagerPage> {
_getSellerById() async {
StoreBaseIndoProvider storeBaseIndoProvider =
Provider.of<StoreBaseIndoProvider>(context, listen: false);
GetSellerInfoSunModel sellerInfoSunModel =
await storeBaseIndoProvider.getSellerById(context, showLoading: false);
GetSellerInfoSunModel sellerInfoSunModel = await storeBaseIndoProvider
.getSellerById(context, showLoading: false, selfDismiss: true);
if (sellerInfoSunModel != null) {
if (App.sp.containsKey('user')) {
String s = App.sp.getString('user');
... ... @@ -289,8 +434,22 @@ class TableManagerPageState extends State<TableManagerPage> {
'${sellerInfoSunModel.data.mapAddress}${sellerInfoSunModel.data.realAddress ?? ''}';
await UserModel().saveUserInfo(_user);
}
UserModel userModel = Provider.of<UserModel>(context, listen: false);
morning = userModel.user.morning.isEmpty
? "00:00-00:00"
: userModel.user.morning;
noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon;
night =
userModel.user.night.isEmpty ? "00:00-00:00" : userModel.user.night;
setState(() {});
bool showLoading = true;
if (tableManagerModel.pageStateOrReserve == PageState.Loading) {
showLoading = false;
}
tableManagerModel.getTableListOrReserve(
context, currTimeIndex, dateTime, selectNumber,
showLoading: showLoading);
}
tableManagerModel.initTimeTable(context);
}
// ///获取备注信息
... ... @@ -421,65 +580,64 @@ class TableManagerPageState extends State<TableManagerPage> {
}
///消费券
_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, selfDismiss: selfDismiss);
//此人已经新建好券
if (couponProvider.couponListSelect.length > 0) {
// couponProvider.initCouponSelect(context);
couponsCan = [];
List<CouponSunModel> temp = [];
for (int i = 0; i < couponProvider.couponListSelect.length; i++) {
if (couponProvider.couponListSelect[i].isOpenBool) {
// 店铺优惠券
if (couponProvider.couponListSelect[i].isType == '1') {
if (couponProvider.couponListSelect[i].uidList != null) {
List<String> listuids =
couponProvider.couponListSelect[i].uidList.split(',');
if (listuids.contains(
Provider.of<UserModel>(context, listen: false).user.openid))
couponsCan.add(couponProvider.couponListSelect[i].aname);
temp.add(couponProvider.couponListSelect[i]);
}
} else {
//我的优惠券
couponsCan.add(couponProvider.couponListSelect[i].aname);
temp.add(couponProvider.couponListSelect[i]);
}
}
}
couponProvider.couponListSelect = temp;
//获取绑定的优惠券
// _getActivityByRid();
// if (couponProvider.coupons.length == 0) {
// setState(() {
// couponHeight = 0.0;
// });
// } else {
// setState(() {
// couponHeight = 140.0;
// });
// }
} else {
//没有新建的优惠券
// setState(() {
// couponHeight = 0.0;
// });
}
}
// _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, selfDismiss: selfDismiss);
// //此人已经新建好券
// if (couponProvider.couponListSelect.length > 0) {
// // couponProvider.initCouponSelect(context);
// couponsCan = [];
// List<CouponSunModel> temp = [];
// for (int i = 0; i < couponProvider.couponListSelect.length; i++) {
// if (couponProvider.couponListSelect[i].isOpenBool) {
// // 店铺优惠券
// if (couponProvider.couponListSelect[i].isType == '1') {
// if (couponProvider.couponListSelect[i].uidList != null) {
// List<String> listuids =
// couponProvider.couponListSelect[i].uidList.split(',');
// if (listuids.contains(
// Provider.of<UserModel>(context, listen: false).user.openid))
// couponsCan.add(couponProvider.couponListSelect[i].aname);
// temp.add(couponProvider.couponListSelect[i]);
// }
// } else {
// //我的优惠券
// couponsCan.add(couponProvider.couponListSelect[i].aname);
// temp.add(couponProvider.couponListSelect[i]);
// }
// }
// }
// couponProvider.couponListSelect = temp;
// //获取绑定的优惠券
// // _getActivityByRid();
// // if (couponProvider.coupons.length == 0) {
// // setState(() {
// // couponHeight = 0.0;
// // });
// // } else {
// // setState(() {
// // couponHeight = 140.0;
// // });
// // }
// } else {
// //没有新建的优惠券
// // setState(() {
// // couponHeight = 0.0;
// // });
// }
// }
///刷新图片显示
_refreshTablePhoto() async {
await tableManagerModel.getTableListOrReserve(
context,
);
context, currTimeIndex, dateTime, selectNumber);
tableManagerModel.notifyListeners();
}
... ... @@ -2043,14 +2201,15 @@ class TableManagerPageState extends State<TableManagerPage> {
_onlyReserve() async {
bool isShow = true; //是否需要弹窗 “预订失败!”
SunReserveInfoModel _model =
await tableManagerModel.setReserveInfoOrReseve(context, (v) {
SunReserveInfoModel _model = await tableManagerModel
.setReserveInfoOrReseve(context, (v) {
if (v) {
isShow = true;
} else {
isShow = false;
}
}, needKeep: true, guest: widget.guest);
}, dateTime, currTimeIndex, morning, noon, night,
needKeep: true, guest: widget.guest);
if (_model != null &&
ObjectUtil.isNotEmpty(_model.row) &&
ObjectUtil.isNotEmpty(_model.row.id)) {
... ... @@ -2185,9 +2344,7 @@ class TableManagerPageState extends State<TableManagerPage> {
child: Column(
children: [
Text(
tableManagerModel.selectDateStr +
' ' +
tableManagerModel.doltStr,
selectDateStr + ' ' + doltStr,
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(28),
... ... @@ -2195,7 +2352,7 @@ class TableManagerPageState extends State<TableManagerPage> {
),
VEmptyView(8),
Text(
tableManagerModel.selectWeekAndLunarCalendar,
selectWeekAndLunarCalendar,
style: TextStyle(
color: MyColours.color_999999,
fontSize: ScreenUtil().setSp(20)),
... ... @@ -2400,14 +2557,15 @@ class TableManagerPageState extends State<TableManagerPage> {
_wechatReserve(bool isWechat) async {
bool isShow = true; //是否需要弹窗 “预订失败!”
SunReserveInfoModel _model =
await tableManagerModel.setReserveInfoOrReseve(context, (v) {
SunReserveInfoModel _model = await tableManagerModel
.setReserveInfoOrReseve(context, (v) {
if (v) {
isShow = true;
} else {
isShow = false;
}
}, needKeep: true, guest: widget.guest);
}, dateTime, currTimeIndex, morning, noon, night,
needKeep: true, guest: widget.guest);
if (_model != null &&
ObjectUtil.isNotEmpty(_model.row) &&
ObjectUtil.isNotEmpty(_model.row.id)) {
... ... @@ -3210,7 +3368,7 @@ class TableManagerPageState extends State<TableManagerPage> {
} else {
isShow = false;
}
},
}, dateTime, currTimeIndex, morning, noon, night,
needKeep: true,
pnum: pnum,
cusdem: cusdem,
... ... @@ -3463,11 +3621,11 @@ class TableManagerPageState extends State<TableManagerPage> {
_clickMorAndNoonAndNig(BuildContext context) async {
ddateIndex = null;
ddateHm = '选填';
tableManagerModel.selectDateStr =
tableManagerModel.returnDayDateStr(tableManagerModel.dateTimeSelect);
tableManagerModel.selectWeekAndLunarCalendar = tableManagerModel
.returnWeekAndLunarCalendar(tableManagerModel.dateTimeSelect, context);
bool success = await tableManagerModel.getTableListOrReserve(context,
selectDateStr = returnDayDateStr(dateTimeSelect);
selectWeekAndLunarCalendar =
returnWeekAndLunarCalendar(dateTimeSelect, context);
bool success = await tableManagerModel.getTableListOrReserve(
context, currTimeIndex, dateTime, selectNumber,
showLoading: true, selfDismiss: false);
}
... ... @@ -3497,13 +3655,13 @@ class TableManagerPageState extends State<TableManagerPage> {
int sum = 3;
int hide = 0;
int btnNum = 0;
if (tableManagerModel.morning == "00:00-00:00") {
if (morning == "00:00-00:00") {
hide++;
}
if (tableManagerModel.noon == "00:00-00:00") {
if (noon == "00:00-00:00") {
hide++;
}
if (tableManagerModel.night == "00:00-00:00") {
if (night == "00:00-00:00") {
hide++;
}
btnNum = sum - hide;
... ... @@ -3519,14 +3677,16 @@ class TableManagerPageState extends State<TableManagerPage> {
Expanded(
child: GestureDetector(
onTap: () {
DialogUtil.showCalendarDialog(
context, tableManagerModel.dateTime)
DialogUtil.showCalendarDialog(context, dateTime)
.then((day) async {
if (day != null) {
tableManagerModel.createDateText1(context, day);
createDateText1(context, day);
bool success =
await tableManagerModel.getTableListOrReserve(
context,
currTimeIndex,
dateTime,
selectNumber,
showLoading: true,
);
}
... ... @@ -3546,7 +3706,7 @@ class TableManagerPageState extends State<TableManagerPage> {
children: [
Expanded(
child: Text(
tableManagerModel.dateText,
dateText,
textAlign: TextAlign.center,
style: TextStyle(
color: MyColours.color_ffffff,
... ... @@ -3570,8 +3730,7 @@ class TableManagerPageState extends State<TableManagerPage> {
HEmptyView(20),
Container(
width: btnNum == 3 &&
(tableManagerModel.currTimeIndex == 3 ||
tableManagerModel.currTimeIndex == 1)
(currTimeIndex == 3 || currTimeIndex == 1)
? ScreenUtil().setWidth(300) +
ScreenUtil().setWidth(4)
: ScreenUtil().setWidth(300),
... ... @@ -3587,33 +3746,26 @@ class TableManagerPageState extends State<TableManagerPage> {
children: <Widget>[
Offstage(
offstage:
tableManagerModel.morning == "00:00-00:00"
? true
: false,
morning == "00:00-00:00" ? true : false,
child: CommonButtonFlat(
content: "早餐",
state: tableManagerModel.currTimeIndex == 1
? 1
: 0,
state: currTimeIndex == 1 ? 1 : 0,
fontSize: 28,
right:
tableManagerModel.noon == "00:00-00:00" &&
tableManagerModel.night ==
"00:00-00:00"
? true
: false,
right: noon == "00:00-00:00" &&
night == "00:00-00:00"
? true
: false,
width: ScreenUtil().setWidth(300) / btnNum,
onPress: () {
if (tableManagerModel.currTimeIndex == 1)
return;
if (currTimeIndex == 1) return;
setState(() {
tableManagerModel.currTimeIndex = 1;
currTimeIndex = 1;
});
_clickMorAndNoonAndNig(context);
},
)),
btnNum == 3 && tableManagerModel.currTimeIndex == 3
btnNum == 3 && currTimeIndex == 3
? MyDivider(
ScreenUtil().setWidth(4),
ScreenUtil().setWidth(46),
... ... @@ -3621,35 +3773,23 @@ class TableManagerPageState extends State<TableManagerPage> {
)
: SizedBox(),
Offstage(
offstage:
tableManagerModel.noon == "00:00-00:00"
? true
: false,
offstage: noon == "00:00-00:00" ? true : false,
child: CommonButtonFlat(
content: "午餐",
state: tableManagerModel.currTimeIndex == 2
? 1
: 0,
state: currTimeIndex == 2 ? 1 : 0,
fontSize: 28,
width: ScreenUtil().setWidth(300) / btnNum,
left:
tableManagerModel.morning == "00:00-00:00"
? true
: false,
right:
tableManagerModel.night == "00:00-00:00"
? true
: false,
left: morning == "00:00-00:00" ? true : false,
right: night == "00:00-00:00" ? true : false,
onPress: () {
if (tableManagerModel.currTimeIndex == 2)
return;
if (currTimeIndex == 2) return;
setState(() {
tableManagerModel.currTimeIndex = 2;
currTimeIndex = 2;
});
_clickMorAndNoonAndNig(context);
},
)),
btnNum == 3 && tableManagerModel.currTimeIndex == 1
btnNum == 3 && currTimeIndex == 1
? MyDivider(
ScreenUtil().setWidth(4),
ScreenUtil().setWidth(46),
... ... @@ -3657,27 +3797,21 @@ class TableManagerPageState extends State<TableManagerPage> {
)
: SizedBox(),
Offstage(
offstage: tableManagerModel.night == "00:00-00:00"
? true
: false,
offstage: night == "00:00-00:00" ? true : false,
child: Container(
child: CommonButtonFlat(
content: "晚餐",
left: tableManagerModel.morning ==
"00:00-00:00" &&
tableManagerModel.noon == "00:00-00:00"
left: morning == "00:00-00:00" &&
noon == "00:00-00:00"
? true
: false,
state: tableManagerModel.currTimeIndex == 3
? 1
: 0,
state: currTimeIndex == 3 ? 1 : 0,
fontSize: 28,
width: ScreenUtil().setWidth(300) / btnNum,
onPress: () {
if (tableManagerModel.currTimeIndex == 3)
return;
if (currTimeIndex == 3) return;
setState(() {
tableManagerModel.currTimeIndex = 3;
currTimeIndex = 3;
});
_clickMorAndNoonAndNig(context);
... ... @@ -3697,7 +3831,8 @@ class TableManagerPageState extends State<TableManagerPage> {
child: ExceptionPage(
pageState: model.pageStateOrReserve,
callback: () {
tableManagerModel.getTableListOrReserve(context,
tableManagerModel.getTableListOrReserve(
context, currTimeIndex, dateTime, selectNumber,
showLoading: true);
},
emptyMsg: "暂时没有桌位哦",
... ... @@ -3736,8 +3871,7 @@ class TableManagerPageState extends State<TableManagerPage> {
setState(() {
// isSelected = false;
area.select = true;
tableManagerModel.selectNumber =
index;
selectNumber = index;
// tableManagerModel.currentArea =
// tableManagerModel
// .areas[index - 1].name;
... ... @@ -3756,9 +3890,9 @@ class TableManagerPageState extends State<TableManagerPage> {
InkWell(
onTap: () {
setState(() {
model.swichState = !model.swichState;
swichState = !swichState;
});
if (model.swichState) {
if (swichState) {
//把没有预订和宴会的桌子筛选出来显示
model.tablesOrReserveData
... ... @@ -3823,7 +3957,7 @@ class TableManagerPageState extends State<TableManagerPage> {
// color: MyColours.color_9C9C9C),
HEmptyView(30),
Image.asset(
model.swichState
swichState
? Utils.getImgPath(
'f_swich_on')
: Utils.getImgPath(
... ... @@ -3847,7 +3981,12 @@ class TableManagerPageState extends State<TableManagerPage> {
],
),
),
if (tableManagerModel.selectNumber != null)
if (tableManagerModel.tablesOrReserveDataShow !=
null &&
tableManagerModel
.tablesOrReserveDataShow.length >
0 &&
selectNumber != null)
Expanded(
// flex: 2,
child: Container(
... ... @@ -3855,8 +3994,7 @@ class TableManagerPageState extends State<TableManagerPage> {
minHeight:
ScreenUtil().setWidth(100)),
color: Color.fromRGBO(249, 249, 249, 1),
child: item(
tableManagerModel.selectNumber))),
child: item(selectNumber))),
tableManagerModel.selectTablesOrReserve.length > 0
?
// wechatNotification
... ...
... ... @@ -30,14 +30,14 @@ class StoreBaseIndoProvider with ChangeNotifier {
String _dataKey = "data";
///根据商家ID获取商家信息
Future<GetSellerInfoSunModel> getSellerById(BuildContext context,{bool showLoading = true}) async {
Future<GetSellerInfoSunModel> getSellerById(BuildContext context,{bool showLoading = true, bool selfDismiss = false,}) async {
Map<String, String> params = {
"sellerid": Provider.of<UserModel>(context, listen: false).user.sellerid,
};
BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
.request<Map<String, dynamic>>(
context, Method.post, HttpUrl.get_seller_info,
data: params,showLoading:showLoading )
data: params,showLoading:showLoading,selfDismiss:selfDismiss )
.catchError((error) {
print(error.toString());
});
... ...
... ... @@ -56,22 +56,22 @@ class TableManagerModelOrReserve with ChangeNotifier {
// List<t.Table> tablesCanNote = []; //全部桌子(空桌子)
// List<t.Table> tablesShow = []; //页面展示
DateTime dateTime = DateTime.now();
String dateText = ""; //当前显示日期时间
int currTimeIndex = 1; //当前选中时间段
String morning; //早市时间段
String noon; //午市时间段
String night; //晚市时间段
// UserModel userModel;
// Map dailyMap = {}; // 早市对应半点钟，午市对应半点钟、晚市对应半点钟
bool swichState = false; //仅看空座
String selectDateStr = '';
String selectWeekAndLunarCalendar = '';
String doltStr = '';
DateTime dateTimeSelect;
int selectNumber;
// DateTime dateTime = DateTime.now();
// String dateText = ""; //当前显示日期时间
// int currTimeIndex = 1; //当前选中时间段
// String morning; //早市时间段
// String noon; //午市时间段
// String night; //晚市时间段
// // UserModel userModel;
// // Map dailyMap = {}; // 早市对应半点钟，午市对应半点钟、晚市对应半点钟
// bool swichState = false; //仅看空座
// String selectDateStr = '';
// String selectWeekAndLunarCalendar = '';
// String doltStr = '';
// DateTime dateTimeSelect;
// int selectNumber;
// List dailyList = []; // 早市对应半点钟，午市对应半点钟、晚市对应半点钟
// List<FeastBoardModel> banquetByDateData = []; //宴会看板数据/宴会预订的数据
... ... @@ -88,6 +88,7 @@ class TableManagerModelOrReserve with ChangeNotifier {
TableManagerModelOrReserve() {
// print('fdsfs');
String tableSp = App.sp.getString('table_list_or_reserve');
if (tableSp == null) {
... ... @@ -113,7 +114,7 @@ class TableManagerModelOrReserve with ChangeNotifier {
tempShow.add(TableListReseveSunModel.fromJson2(element));
});
}
selectNumber = 0;
tablesOrReserveData = temp;
tablesOrReserveDataShow = tempShow;
pageStateOrReserve = PageState.Success;
... ... @@ -147,13 +148,25 @@ class TableManagerModelOrReserve with ChangeNotifier {
// 获取商家桌位列表及对应预订数据
Future<bool> getTableListOrReserve(BuildContext context,
{showLoading = false, bool selfDismiss = false, bool needInitIndex = false}) async {
Future<bool> getTableListOrReserve(
BuildContext context,
int currTimeIndex,
DateTime datetime,
int selectNumber, {
showLoading = true,
bool selfDismiss = false,
}) async {
// if (pageStateOrReserve == PageState.Loading) {
// showLoading = false;
// } else {
// showLoading = true;
// }
Map<String, String> params = {
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'x': '1',
'y': '200',
"rdate": _getRdate(),
"rdate": _getRdate(datetime),
"ddate_solt": currTimeIndex.toString(),
"keywords": "",
"sort": "1"
... ... @@ -180,21 +193,26 @@ class TableManagerModelOrReserve with ChangeNotifier {
List<TableListReserve> tableListOrReserveDataAll = []; //桌位页面数据接口重组 --全部
tablesOrReserveData.forEach((element) {
element.select = false;
tableListOrReserveDataAll.addAll(element.tableList);
});
tablesOrReserveDataShow.forEach((element) {
element.select = false;
});
TableListReseveSunModel data0 = TableListReseveSunModel();
data0.name = '全部';
data0.select = true;
data0.select = false;
data0.tableList = tableListOrReserveDataAll;
tablesOrReserveData.insert(0, data0);
tablesOrReserveDataShow.insert(0, data0);
if(needInitIndex){
selectNumber = 0;
}
tablesOrReserveData[selectNumber].select = true;
tablesOrReserveDataShow[selectNumber].select = true;
App.sp.setString(
'table_list_or_reserve', json.encode(tablesOrReserveDataShow));
... ... @@ -286,122 +304,6 @@ class TableManagerModelOrReserve with ChangeNotifier {
// }
//初始化时间
initTimeTable(BuildContext context) async {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
dateTime = DateTime.now();
dateText = returnDate(dateTime);
dateTimeSelect = dateTime;
// morning = '07:00-10:00';
// noon = '11:00-14:30';
// night = '16:00-21:00';
morning =
userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning;
noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon;
night = userModel.user.night.isEmpty ? "00:00-00:00" : userModel.user.night;
// userModel.user.morning.isEmpty
// ? dailyMap.putIfAbsent("morning", () => "")
// : dailyMap.putIfAbsent("morning", () => _getHourAndMinute(morning, 1));
// userModel.user.noon.isEmpty
// ? dailyMap.putIfAbsent("noon", () => "")
// : dailyMap.putIfAbsent("noon", () => _getHourAndMinute(noon, 2));
// userModel.user.night.isEmpty
// ? dailyMap.putIfAbsent("night", () => "")
// : dailyMap.putIfAbsent("night", () => _getHourAndMinute(night, 3));
if (dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
morning.split("-")[1] +
":00"))) {
//未过早市
currTimeIndex = 1;
} else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
morning.split("-")[1] +
":00")) &&
dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
noon.split("-")[1] +
":00"))) {
//过了早市，未过午市
currTimeIndex = 2;
} else if (dateTime.isAfter(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
noon.split("-")[1] +
":00")) &&
dateTime.isBefore(DateTime.parse(dateTime.year.toString() +
"-" +
Utils.addZeroNumber(dateTime.month) +
"-" +
Utils.addZeroNumber(dateTime.day) +
" " +
night.split("-")[1] +
":00"))) {
//过了午市，未过晚市
currTimeIndex = 3;
} else {
//过了晚市
currTimeIndex = 3;
}
selectDateStr = returnDayDateStr(dateTime);
selectWeekAndLunarCalendar = returnWeekAndLunarCalendar(dateTime, context);
getTableListOrReserve(context,needInitIndex: true);
// userModel.user.morning.isEmpty
// ? dailyMap.putIfAbsent("morning", () => "")
// : dailyMap.putIfAbsent("morning", () => _getHourAndMinute(morning, 1));
// userModel.user.noon.isEmpty
// ? dailyMap.putIfAbsent("noon", () => "")
// : dailyMap.putIfAbsent("noon", () => _getHourAndMinute(noon, 2));
// userModel.user.night.isEmpty
// ? dailyMap.putIfAbsent("night", () => "")
// : dailyMap.putIfAbsent("night", () => _getHourAndMinute(night, 3));
// 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) {
// 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;
// notifyListeners();
// }
}
//初始化时间
// initTime(BuildContext context) async {
// UserModel userModel = Provider.of<UserModel>(context, listen: false);
// dateTime = DateTime.now();
... ... @@ -650,12 +552,13 @@ class TableManagerModelOrReserve with ChangeNotifier {
// }
Future<bool> getTableItExistOrder(
BuildContext context, String rdate, String tableids,
BuildContext context, String rdate, String tableids, String ddateSolt,
{showLoading = false, bool selfDismiss = false}) async {
Map<String, String> params = {
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'tableid': tableids,
'rdate': rdate,
'ddate_solt': ddateSolt
};
BaseResp<dynamic> baseResp = await DioUtil()
.request<dynamic>(context, Method.get, HttpUrl.get_table_it_exist_order,
... ... @@ -714,7 +617,13 @@ class TableManagerModelOrReserve with ChangeNotifier {
///录入更改内部预订
Future<SunReserveInfoModel> setReserveInfoOrReseve(
BuildContext context, CustomCallBack callback,
BuildContext context,
CustomCallBack callback,
DateTime dateTime,
int currTimeIndex,
String morning,
String noon,
String night,
{needKeep = false,
Guest guest,
String pnum,
... ... @@ -729,7 +638,8 @@ class TableManagerModelOrReserve with ChangeNotifier {
//判断是否可以输入自己的手机号
CustomerProvider customerProvider =
Provider.of<CustomerProvider>(context, listen: false);
await customerProvider.getSellerGuest(context,showLoading: true,selfDismiss: true);
await customerProvider.getSellerGuest(context,
showLoading: true, selfDismiss: true);
if (customerProvider.isselfphone) {
//录入客户电话时不能用自己手机号（管店）
... ... @@ -783,7 +693,8 @@ class TableManagerModelOrReserve with ChangeNotifier {
}
print(tableSelectInfo);
bool sucess = await getTableItExistOrder(context, rdate, tableSelectInfo);
bool sucess = await getTableItExistOrder(
context, rdate, tableSelectInfo, currTimeIndex.toString());
if (sucess) {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
... ... @@ -1508,7 +1419,7 @@ class TableManagerModelOrReserve with ChangeNotifier {
// }
//获取一天开始-结束时间字符串
String _getRdate() {
String _getRdate(DateTime dateTime) {
//一天开始时间
double startDay;
//一天结束时间
... ... @@ -1652,45 +1563,45 @@ class TableManagerModelOrReserve with ChangeNotifier {
// notifyListeners();
// }
//生成日期文本
createDateText(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);
}
// //生成日期文本
// createDateText(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);
// }
//生成日期文本
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);
}
// //生成日期文本
// 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) {
// String time = Utils.lunarCalendarHolidays(day);
String date = _returnDayDateWeek(day);
// date += ' ${time}';
return date;
}
// returnDate(DateTime day) {
// // String time = Utils.lunarCalendarHolidays(day);
// String date = _returnDayDateWeek(day);
// // date += ' ${time}';
// return date;
// }
_getDoltStr(BuildContext context) {
if (currTimeIndex == 1) {
doltStr = '早餐';
} else if (currTimeIndex == 2) {
doltStr = '午餐';
} else if (currTimeIndex == 3) {
doltStr = '晚餐';
}
// _initTimeDdate(currTimeIndex, context);
}
// _getDoltStr(BuildContext context) {
// if (currTimeIndex == 1) {
// doltStr = '早餐';
// } else if (currTimeIndex == 2) {
// doltStr = '午餐';
// } else if (currTimeIndex == 3) {
// doltStr = '晚餐';
// }
// // _initTimeDdate(currTimeIndex, context);
// }
// String returnDayDateWeekStr(DateTime day, int index) {
// String date = _returnDayDate(day);
... ... @@ -1705,53 +1616,53 @@ class TableManagerModelOrReserve with ChangeNotifier {
// return date;
// }
String returnDayDateStr(DateTime day) {
String date = '';
DateTime dateNow = DateTime.now();
String ymd = "${day.year}年" +
Utils.addZeroNumber(day.month) +
"月" +
Utils.addZeroNumber(day.day) +
"日";
if (Utils.isOneDay(day, dateNow)) {
date += "今天 ";
} else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
date += "明天 ";
} else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
date += "后天 ";
}
date += ymd;
// date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
return date;
}
// String returnDayDateStr(DateTime day) {
// String date = '';
// DateTime dateNow = DateTime.now();
// String ymd = "${day.year}年" +
// Utils.addZeroNumber(day.month) +
// "月" +
// Utils.addZeroNumber(day.day) +
// "日";
// if (Utils.isOneDay(day, dateNow)) {
// date += "今天 ";
// } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
// date += "明天 ";
// } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
// date += "后天 ";
// }
// date += ymd;
// // date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
// return date;
// }
String _returnDayDateWeek(DateTime day) {
String date = '';
DateTime dateNow = DateTime.now();
String ymd = "${day.year}-" +
Utils.addZeroNumber(day.month) +
"-" +
Utils.addZeroNumber(day.day);
if (Utils.isOneDay(day, dateNow)) {
date += "今天 ";
} else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
date += "明天 ";
} else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
date += "后天 ";
}
date += ymd;
date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
return date;
}
// String _returnDayDateWeek(DateTime day) {
// String date = '';
// DateTime dateNow = DateTime.now();
// String ymd = "${day.year}-" +
// Utils.addZeroNumber(day.month) +
// "-" +
// Utils.addZeroNumber(day.day);
// if (Utils.isOneDay(day, dateNow)) {
// date += "今天 ";
// } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
// date += "明天 ";
// } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 2)))) {
// date += "后天 ";
// }
// date += ymd;
// date += " 星期${Utils.formatWeekDayNum(day.weekday)}";
// return date;
// }
String returnWeekAndLunarCalendar(DateTime day, BuildContext context) {
String date = "星期${Utils.formatWeekDayNum(day.weekday)} ";
date += Utils.lunarCalendarHolidays(day);
_getDoltStr(context);
return date;
}
// String returnWeekAndLunarCalendar(DateTime day, BuildContext context) {
// String date = "星期${Utils.formatWeekDayNum(day.weekday)} ";
// date += Utils.lunarCalendarHolidays(day);
// _getDoltStr(context);
// return date;
// }
//获取桌位数据
Future<dynamic> setSwitchStatus(
... ...
... ... @@ -537,46 +537,46 @@ var handleSelectTableFHandler = new Handler(
// 跳转到选择桌位_方硕新修改的页面
var handleSelectTableFOrReserveHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
String rid = params['rid'].first;
String tid = params['tid'].first;
DateTime dateTime =
DateTime.fromMillisecondsSinceEpoch(int.parse(params["dateTime"].first));
String ddateSlot = params["ddate_slot"].first;
String source = params["source"].first;
String fromPage = params["fromPage"].first;
bool canChoose = params["canChoose"].first == "true" ? true : false;
String hmS = params["hmS"].first;
String hmE = params["hmE"].first;
List<TableList> res = [];
if (params.keys.contains('object')) {
Map object = FluroConvertUtils.string2map(params["object"].first);
List temp = object['object'];
for (var item in temp) {
res.add(TableList.fromJson(item));
}
}
String ridFeast = params["ridFeast"].first;
// return SelectTablePage(rid, dateTime, ddate_slot,canChoose: canChoose);
return ChangeNotifierProvider<ChooseTableModel>(
create: (_) => ChooseTableModel(),
child: ChangeNotifierProvider<TableManagerModelOrReserve>(
create: (_) => TableManagerModelOrReserve(),
child: SelectTableFPageOrReserve(rid, dateTime, ddateSlot,
canChoose: canChoose,
tableList: res,
fromPage: fromPage,
tid: tid,
hmS: hmS,
hmE: hmE,
source: source,
ridFeast: ridFeast)));
});
// var handleSelectTableFOrReserveHandler = new Handler(
// handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
// String rid = params['rid'].first;
// String tid = params['tid'].first;
// DateTime dateTime =
// DateTime.fromMillisecondsSinceEpoch(int.parse(params["dateTime"].first));
// String ddateSlot = params["ddate_slot"].first;
// String source = params["source"].first;
// String fromPage = params["fromPage"].first;
// bool canChoose = params["canChoose"].first == "true" ? true : false;
// String hmS = params["hmS"].first;
// String hmE = params["hmE"].first;
// List<TableList> res = [];
// if (params.keys.contains('object')) {
// Map object = FluroConvertUtils.string2map(params["object"].first);
// List temp = object['object'];
// for (var item in temp) {
// res.add(TableList.fromJson(item));
// }
// }
// String ridFeast = params["ridFeast"].first;
// // return SelectTablePage(rid, dateTime, ddate_slot,canChoose: canChoose);
// return ChangeNotifierProvider<ChooseTableModel>(
// create: (_) => ChooseTableModel(),
// child: ChangeNotifierProvider<TableManagerModelOrReserve>(
// create: (_) => TableManagerModelOrReserve(),
// child: SelectTableFPageOrReserve(rid, dateTime, ddateSlot,
// canChoose: canChoose,
// tableList: res,
// fromPage: fromPage,
// tid: tid,
// hmS: hmS,
// hmE: hmE,
// source: source,
// ridFeast: ridFeast)));
// });
// 跳转到照片管理的选择桌位_方硕新修改的页面
var photoManagerPageHandle = new Handler(
... ...
... ... @@ -8,19 +8,18 @@ import 'route_handles.dart';
class Routes {
static String login = "/"; //登录页
static String home = "/home"; //主页
static String home_sim = "/home_sim"; //主页_极速版
static String home_sim = "/home_sim"; //主页_极速版
static String handle_online_page = "/handle_online_page"; //处理在线预订
static String handle_online_page_sim = "/handle_online_page_sim"; //处理在线预订
static String handle_online_page_sim = "/handle_online_page_sim"; //处理在线预订
static String reserve_detail = "/reserve_detail"; //预订详情
static String reserve_detail_sim = "/reserve_detail_sim"; //预订详情
static String reserve_detail_sim = "/reserve_detail_sim"; //预订详情
static String select_table = "/select_table"; //选择桌位
static String select_table_f = "/select_table_f"; //选择桌位_方硕新修改的页面
static String invication = "/invication"; //邀请函
static String invication_sim = "/invication_sim"; //邀请函
static String sms = "/sms"; //发短信
static String webview = "/webview"; //网页
... ... @@ -39,9 +38,8 @@ static String home_sim = "/home_sim"; //銝駁△_
static String coupon_select = "/coupon_select"; //优惠券选择
static String coupon_detail = "/coupon_detail"; //优惠券详情页
static String base_info = "/base_info"; //个人资料页面
static String base_info_sim = "/base_info_sim"; //个人资料页面
static String base_info_sim = "/base_info_sim"; //个人资料页面
static String binding_phone = "/binding_phone"; //绑定手机号码页面
static String if_need_create_store = "/if_need_create_store"; //是否选择新建店铺页面
static String create_store = "/create_store"; //新建店铺
... ... @@ -65,8 +63,8 @@ static String home_sim = "/home_sim"; //銝駁△_
static String sms_manager_page = "/sms_manager_page"; //短信充值
static String sms_recharge_page = "/sms_recharge_page"; //短信充值
static String store_base_info_page = "/store_base_info_page"; //店铺信息
static String store_base_info_page_sim = "/store_base_info_page_sim"; //店铺信息
static String store_base_info_page_sim = "/store_base_info_page_sim"; //店铺信息
static String room_type_manage_page = "/room_type_manage_page"; //包间类型管理
static String room_type_create_page = "/room_type_create_page"; //包间类型创建
static String room_type_select_table_page =
... ... @@ -76,12 +74,12 @@ static String home_sim = "/home_sim"; //銝駁△_
static String menu_add_dishes_page = "/menu_add_dishes_page"; //添加菜品页面
static String personnel_manage_page = "/personnel_manage_page"; //店员管理页面
static String personnel_manage_page_sim = "/personnel_manage_page_sim"; //店员管理页面
static String personnel_manage_page_sim =
"/personnel_manage_page_sim"; //店员管理页面
static String personnel_detail_page = "/personnel_detail_page"; //店员详情页面
static String personnel_detail_page_sim = "/personnel_detail_page_sim"; //店员详情页面
static String personnel_detail_page_sim =
"/personnel_detail_page_sim"; //店员详情页面
static String personnel_password_page = "/personnel_password_page"; //密码展示页
static String personnel_password_edit_page =
"/personnel_password_edit_page"; //密码修改页
... ... @@ -91,22 +89,20 @@ static String home_sim = "/home_sim"; //銝駁△_
static String store_customer_page = "/store_customer_page"; //全店客情
static String my_customer_page = "/my_customer_page"; //我的客情
static String customer_list_page = "/customer_list_page"; //客情列表
static String customer_list_page_sim = "/customer_list_page_sim"; //客情列表
static String customer_list_page_sim = "/customer_list_page_sim"; //客情列表
static String customer_set_page = "/customer_set_page"; //客情设置
static String marketing_records_page = "/marketing_records_page"; //全店营销记录
static String marketing_records_detail_page =
"/marketing_records_detail_page"; //全店营销记录详情
static String make_marketing_page = "/make_marketing_page"; //创建营销
static String customer_detail_page = "/customer_detail_page"; //客户详情
static String customer_detail_page_sim = "/customer_detail_page_sim"; //客户详情
static String customer_detail_page_sim = "/customer_detail_page_sim"; //客户详情
static String customer_edit_detail_page =
"/customer_edit_detail_page"; //编辑客户详情
static String customer_edit_detail_page_sim =
static String customer_edit_detail_page_sim =
"/customer_edit_detail_page_sim"; //编辑客户详情
static String festival_edit_page = "/festival_edit_page"; //编辑纪念日
... ... @@ -114,23 +110,22 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
static String my_customer_list_page = "/my_customer_list_page"; //客情列表
static String my_customer_list_page_sim = "/my_customer_list_page_sim"; //客情列表
static String my_marketing_records_page =
"/my_marketing_records_page"; //全店营销记录
static String my_marketing_records_detail_page =
"/my_marketing_records_detail_page"; //全店营销记录详情
static String my_make_marketing_page = "/my_make_marketing_page"; //创建营销
static String my_customer_detail_page = "/my_customer_detail_page"; //客户详情
static String my_customer_detail_page_sim = "/my_customer_detail_page_sim"; //客户详情
static String my_customer_detail_page_sim =
"/my_customer_detail_page_sim"; //客户详情
static String my_customer_edit_detail_page =
"/my_customer_edit_detail_page"; //编辑客户详情
static String my_customer_edit_detail_page_sim =
static String my_customer_edit_detail_page_sim =
"/my_customer_edit_detail_page_sim"; //编辑客户详情
static String my_festival_edit_page = "/my_festival_edit_page"; //编辑纪念日
static String my_customer_order_page = "/my_customer_order_page"; //客户订单
static String show_customer_list_page =
... ... @@ -143,8 +138,9 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
static String my_show_customer_list_page =
"/my_show_customer_list_page"; //仅展示的客户列表----我的
static String table_manager_page = "/table_manager_page"; //客情再次预订跳转的桌位预订页面
static String table_manager_page_sim = "/table_manager_page_sim"; //客情再次预订跳转的桌位预订页面
static String table_manager_page_sim =
"/table_manager_page_sim"; //客情再次预订跳转的桌位预订页面
static String account_login_page = "/account_login_page"; //账号登录页面
static String my_table_manager_home_page =
"/my_table_manager_home_page"; //我的---桌位管理
... ... @@ -234,9 +230,9 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
"/marketing_center_home_page"; //我的---营销中心
static String first_image_page = "/first_image_page"; //预订安排通知定制------首图形象展示
static String book_info_page = "/book_info_page"; //预订安排通知定制------预订信息展示
static String book_info_page_sim = "/book_info_page_sim"; //预订安排通知定制------预订信息展示
static String book_info_page_sim =
"/book_info_page_sim"; //预订安排通知定制------预订信息展示
static String store_introduce_page =
"/store_introduce_page"; //预订安排通知定制------店铺介绍
static String chef_introduce_page =
... ... @@ -248,7 +244,6 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
static String marking_interaction_page_sim =
"/marking_interaction_page_sim"; //预订安排通知定制------客户互动及店铺推广
static String marking_coupon_select_page =
"/marking_coupon_select_page"; //预订安排通知定制------优惠券选择
... ... @@ -329,8 +324,7 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
static String customer_notice_setting_page =
"/customer_notice_setting_page"; // 客户通知配置页
static String customer_notice_setting_page_sim =
static String customer_notice_setting_page_sim =
"/customer_notice_setting_page_sim"; // 客户通知配置页
static String order_setting_manager_page =
... ... @@ -346,13 +340,12 @@ static String customer_detail_page_sim = "/customer_detail_page_sim"; //摰Ｘ霂
static String invitation_theme_home_page =
"/invitation_theme_home_page"; //邀请函主题选择
static String invitation_theme_home_page_sim =
static String invitation_theme_home_page_sim =
"/invitation_theme_home_page_sim"; //邀请函主题选择
static String invitation_theme_home_preview_page =
"/invitation_theme_home_preview_page"; //邀请函主题选择预览页
static String invitation_theme_home_preview_page_sim =
static String invitation_theme_home_preview_page_sim =
"/invitation_theme_home_preview_page_sim"; //邀请函主题选择预览页
static String book_deposit_page = "/book_deposit_page"; //预订订金
... ... @@ -365,11 +358,9 @@ static String invitation_theme_home_preview_page_sim =
static String sms_template_setting_page =
"/sms_template_setting_page"; //短信模版设置
static String sms_template_setting_page_sim =
static String sms_template_setting_page_sim =
"/sms_template_setting_page_sim"; //短信模版设置
static String coupon_poster_page = "/coupon_poster_page"; //优惠券海报
static String input_name_phone_setting_page =
... ... @@ -378,22 +369,13 @@ static String invitation_theme_home_preview_page_sim =
static String month_order_home_page =
"/month_order_home_page"; //月度订单 全店和分经理显示
static String invication_addition_page =
static String invication_addition_page =
"/invication_addition_page"; //预订信息模块设置-自定义图文默认
static String payment_setting_page =
static String payment_setting_page =
"/payment_setting_page"; //在客户预订通知中，增加支付订金功能
static String select_table_f_or_reserve =
static String select_table_f_or_reserve =
"/select_table_f_or_reserve"; //在客户预订通知中，增加支付订金功能
static void configureRoutes(FluroRouter router) {
router.notFoundHandler = new Handler(
... ... @@ -403,19 +385,19 @@ static String select_table_f_or_reserve =
});
router.define(login, handler: loginHandler);
router.define(home, handler: homeHandler);
router.define(home_sim, handler: homeSimHandler);
router.define(home_sim, handler: homeSimHandler);
router.define(handle_online_page, handler: handleOnlineHandler);
router.define(handle_online_page_sim, handler: handleOnlineSimHandler);
router.define(handle_online_page_sim, handler: handleOnlineSimHandler);
router.define(reserve_detail, handler: reserveDetailHandler);
router.define(reserve_detail_sim, handler: reserveDetailSimHandler);
router.define(select_table, handler: handleSelectTableHandler);
router.define(select_table_f, handler: handleSelectTableFHandler);
router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHandler);
// router.define(select_table_f_or_reserve, handler: handleSelectTableFOrReserveHandler);
router.define(invication, handler: handleInvicationHandler);
router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(sms, handler: handleSmsHandler);
router.define(webview, handler: handleWebviewHandler);
router.define(web_page, handler: webPageHandler);
... ... @@ -436,8 +418,8 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(coupon_detail, handler: handleCouponDetailPageHandler);
router.define(base_info, handler: baseInfoPageHandler);
router.define(base_info_sim, handler: baseInfoPageSimHandler);
router.define(base_info_sim, handler: baseInfoPageSimHandler);
router.define(binding_phone, handler: bindingPhonePageHandler);
router.define(if_need_create_store, handler: ifNeedCreateStorePageHandler);
router.define(create_store, handler: createStorePageHandler);
... ... @@ -465,8 +447,8 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(sms_recharge_page, handler: smsRechargePageHandler);
router.define(store_base_info_page, handler: storeBaseInfoPageHandler);
router.define(store_base_info_page_sim, handler: storeBaseInfoPageSimHandler);
router.define(store_base_info_page_sim,
handler: storeBaseInfoPageSimHandler);
router.define(room_type_manage_page, handler: roomTypeManagePageHandler);
router.define(room_type_create_page, handler: roomTypeCreatePageHandler);
router.define(room_type_select_table_page,
... ... @@ -475,11 +457,13 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(menu_category_page, handler: menuCategoryPageHandle);
router.define(menu_add_dishes_page, handler: menuAddDishesPageHandle);
router.define(personnel_manage_page, handler: personnelManagePageHandle);
router.define(personnel_manage_page_sim, handler: personnelManagePageSimHandle);
router.define(personnel_manage_page_sim,
handler: personnelManagePageSimHandle);
router.define(personnel_detail_page, handler: personnelDetailPageHandle);
router.define(personnel_detail_page_sim, handler: personnelDetailPageSimHandle);
router.define(personnel_detail_page_sim,
handler: personnelDetailPageSimHandle);
router.define(personnel_password_page,
handler: personnelPasswordPageHandle);
router.define(personnel_password_edit_page,
... ... @@ -490,7 +474,6 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(store_customer_page, handler: storeCustomerPageHandle);
router.define(customer_list_page, handler: customerListPageHandle);
router.define(customer_list_page_sim, handler: customerListPageSimHandle);
router.define(customer_set_page, handler: customerSettingPageHandle);
router.define(marketing_records_page, handler: marketingRecordsPageHandle);
... ... @@ -498,33 +481,35 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
handler: marketingRecordsDetailPageHandle);
router.define(make_marketing_page, handler: makeMarkingPageHandle);
router.define(customer_detail_page, handler: customerDetailPageHandle);
router.define(customer_detail_page_sim, handler: customerDetailPageSimHandle);
router.define(customer_detail_page_sim,
handler: customerDetailPageSimHandle);
router.define(customer_edit_detail_page,
handler: customerDetailEditPageHandle);
router.define(customer_edit_detail_page_sim,
router.define(customer_edit_detail_page_sim,
handler: customerDetailEditPageSimHandle);
router.define(festival_edit_page, handler: festivalEditPageHandle);
router.define(customer_order_page, handler: customerOrderPageHandle);
router.define(my_customer_page, handler: myCustomerPageHandle);
router.define(my_customer_list_page, handler: myCustomerListPageHandle);
router.define(my_customer_list_page_sim, handler: myCustomerListPageSimHandle);
router.define(my_customer_list_page_sim,
handler: myCustomerListPageSimHandle);
router.define(my_marketing_records_page,
handler: myMarketingRecordsPageHandle);
router.define(my_marketing_records_detail_page,
handler: myMarketingRecordsDetailPageHandle);
router.define(my_make_marketing_page, handler: myMakeMarkingPageHandle);
router.define(my_customer_detail_page, handler: myCustomerDetailPageHandle);
router.define(my_customer_detail_page_sim, handler: myCustomerDetailPageSimHandle);
router.define(my_customer_detail_page_sim,
handler: myCustomerDetailPageSimHandle);
router.define(my_customer_edit_detail_page,
handler: myCustomerDetailEditPageHandle);
router.define(my_customer_edit_detail_page_sim,
router.define(my_customer_edit_detail_page_sim,
handler: myCustomerDetailEditPagSimHandle);
router.define(my_festival_edit_page, handler: myFestivalEditPageHandle);
router.define(my_customer_order_page, handler: myCustomerOrderPageHandle);
... ... @@ -537,7 +522,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
handler: myShowCustomerListPageHandle);
router.define(table_manager_page, handler: tableManagerPageHandle);
router.define(table_manager_page_sim, handler: tableManagerPageSimHandle);
router.define(account_login_page, handler: accountLoginPageHandle);
router.define(my_table_manager_home_page,
handler: myTableManagerHomePageHandle);
... ... @@ -619,9 +604,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(book_info_page, handler: bookInfoPageHandle);
router.define(book_info_page_sim, handler: bookInfoPageSimHandle);
router.define(book_info_page_sim, handler: bookInfoPageSimHandle);
router.define(store_introduce_page, handler: storeIntroducePageHandle);
router.define(chef_introduce_page, handler: chefIntroducePageHandle);
... ... @@ -629,8 +612,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(marking_interaction_page,
handler: markingInteractionPageHandle);
router.define(marking_interaction_page_sim,
router.define(marking_interaction_page_sim,
handler: markingInteractionPageSimHandle);
router.define(marking_coupon_select_page,
handler: markingCouponSelectPageHandle);
... ... @@ -680,9 +662,7 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(customer_notice_setting_page,
handler: customerNoticeSettingPageHandle);
router.define( customer_notice_setting_page_sim,
router.define(customer_notice_setting_page_sim,
handler: customerNoticeSettingPageSimHandle);
router.define(order_setting_manager_page,
... ... @@ -700,11 +680,11 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(invitation_theme_home_page,
handler: invitationThemeHomePageHandle);
router.define(invitation_theme_home_page_sim,
router.define(invitation_theme_home_page_sim,
handler: invitationThemeHomePageSimHandle);
router.define(invitation_theme_home_preview_page,
handler: invitationThemeHomePreviewPageHandle);
router.define(invitation_theme_home_preview_page_sim,
router.define(invitation_theme_home_preview_page_sim,
handler: invitationThemeHomePreviewPageSimHandle);
router.define(book_deposit_page, handler: bookDepositPageHandle);
router.define(verify_food_page, handler: verifyFoodPageHandle);
... ... @@ -716,24 +696,18 @@ router.define(invication_sim, handler: handleInvicationSimHandler);
router.define(sms_template_setting_page,
handler: smsTemplateSettingPageHandle);
router.define(sms_template_setting_page_sim,
router.define(sms_template_setting_page_sim,
handler: smsTemplateSettingPageSimHandle);
router.define(coupon_poster_page, handler: couponPosterPageHandle);
router.define(input_name_phone_setting_page,
handler: inputNamePhoneSettingPageHandle);
router.define(input_name_phone_setting_page, handler: inputNamePhoneSettingPageHandle);
router.define(month_order_home_page, handler: monthOrderHomePageHandle);
router.define(invication_addition_page, handler: invicationAdditionPageHandle);
router.define(payment_setting_page, handler: paymentSettingPageHandle);
router.define(invication_addition_page,
handler: invicationAdditionPageHandle);
router.define(payment_setting_page, handler: paymentSettingPageHandle);
}
}
... ...