xt / Flutter-ReserveApp · Commits

Go to a project

Commit e2d32959924fed78123b499fc3b2d33e94972c1d

Authored by wdn127929
1 parent 1dc976d1
build: skipped

选中餐段问题

Inline Side-by-side
Showing 3 changed files with 41 additions and 25 deletions
... ... @@ -164,7 +164,13 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
if (needInit) {
bool has = storeBaseIndoProvider.dayDateData!
.any((element) => element.ddateSolt == ddateSoltSelect);
currTimeIndex = has ? int.parse(ddateSoltSelect) : 1;
if (has) {
currTimeIndex = int.parse(ddateSoltSelect);
} else {
currTimeIndex =
int.parse(storeBaseIndoProvider.dayDateData!.last.ddateSolt!);
}
}
}
... ...
... ... @@ -98,8 +98,7 @@ class NoteBookPageState extends State<NoteBookPage> {
String? solt;
late StateSetter _cancelState;
late NotebookDetailModel detailModel
;
late NotebookDetailModel detailModel;
// String? roleName =
// Provider.of<UserModel>(context, listen: false).user!.role_name;
... ... @@ -161,7 +160,7 @@ class NoteBookPageState extends State<NoteBookPage> {
}
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context,showLoading: false);
await collectStoreProvider.getSellerVersion(context, showLoading: false);
}
/// 第一个显示今天
... ... @@ -199,6 +198,11 @@ class NoteBookPageState extends State<NoteBookPage> {
if (first && date != null) {
_refreshPageCalendar(dateTimeNow);
}
morning = "00:00-00:00"; //早市时间段
noon = "00:00-00:00"; //午市时间段
night = "00:00-00:00"; //晚市时间段
meal1 = "00:00-00:00";
meal2 = "00:00-00:00";
storeBaseIndoProvider.dayDateData!.forEach((element) {
if (element.ddateSolt == '1') {
morning = element.mdate;
... ... @@ -227,7 +231,11 @@ class NoteBookPageState extends State<NoteBookPage> {
} else {
bool has = storeBaseIndoProvider.dayDateData!
.any((element) => element.ddateSolt == ddateSoltSelect);
currTimeIndex = has ? int.parse(ddateSoltSelect) : 1;
if (has) {
currTimeIndex = int.parse(ddateSoltSelect);
} else {
initCurruntIndex();
}
}
}
_getReserveList(needLoading: true);
... ... @@ -291,15 +299,18 @@ class NoteBookPageState extends State<NoteBookPage> {
//过了午市，未过晚市
currTimeIndex = 5;
} else {
//过了晚市
currTimeIndex = 1;
//过了晚市
currTimeIndex =
int.parse(storeBaseIndoProvider.dayDateData!.last.ddateSolt!);
}
}
getDzSellerConfTemp() async {
MarketingCenterProvider marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: false);
bool success = await marketingCenterProvider.getDzSellerConf(context,showLoading: false);
bool success = await marketingCenterProvider.getDzSellerConf(context,
showLoading: false);
if (success && marketingCenterProvider.dzSellerConfModel != null) {
cancelDay = marketingCenterProvider.dzSellerConfModel!.cancelDay;
cancelShopowner =
... ... @@ -691,13 +702,12 @@ class NoteBookPageState extends State<NoteBookPage> {
"uid": userModel.user!.openid,
"uname": userModel.user!.nickName,
"desc": desc,
"account":userModel.user!.account,
"account": userModel.user!.account,
};
params["cause"] = json.encode(causeMap);
}
params['note_name'] = userModel.user!.account;
bool success = await detailModel.setReserveStatusOnly(context, params,
ifPush: false, notebook: notebook);
if (success) {
... ... @@ -730,7 +740,7 @@ class NoteBookPageState extends State<NoteBookPage> {
'rid': rid,
'sid': Provider.of<UserModel>(context, listen: false).user!.sellerid,
};
detailModel.wxSendCancelSms(context, pramas);
}
}
... ... @@ -1162,7 +1172,7 @@ class NoteBookPageState extends State<NoteBookPage> {
? _depositController.text
: desc2
};
await detailModel.setReserveDeposit(
context, pramas);
}
... ... @@ -1573,7 +1583,6 @@ class NoteBookPageState extends State<NoteBookPage> {
/// 通过预订ID查收订金详情
_getReserveDepositByRid(String rid) async {
Map<String, String> params = {
'rid': rid,
};
... ... @@ -1680,7 +1689,7 @@ class NoteBookPageState extends State<NoteBookPage> {
collectStoreProvider =
Provider.of<CollectStoreProvider>(context, listen: true);
detailModel = Provider.of<NotebookDetailModel>(context, listen: true);
detailModel = Provider.of<NotebookDetailModel>(context, listen: true);
// int sum = 3;
// int hide = 0;
// int btnNum = 0;
... ...
... ... @@ -332,6 +332,11 @@ class TableManagerPageState extends State<TableManagerPage> {
//初始化时间
initTimeTable({bool needInit = true}) {
morning = "00:00-00:00"; //早市时间段
noon = "00:00-00:00"; //午市时间段
night = "00:00-00:00"; //晚市时间段
meal1 = "00:00-00:00";
meal2 = "00:00-00:00";
storeBaseIndoProvider.dayDateData!.forEach((element) {
if (element.ddateSolt == '1') {
morning = element.mdate;
... ... @@ -594,7 +599,10 @@ class TableManagerPageState extends State<TableManagerPage> {
getDzSellerConf() async {
MarketingCenterProvider marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: false);
bool success = await marketingCenterProvider.getDzSellerConf(context,showLoading: tableManagerModel?.pageStateOrReserve == PageState.Loading ?false:true );
bool success = await marketingCenterProvider.getDzSellerConf(context,
showLoading: tableManagerModel?.pageStateOrReserve == PageState.Loading
? false
: true);
if (success && marketingCenterProvider.dzSellerConfModel != null) {
isAddOver = marketingCenterProvider.dzSellerConfModel!.isAddOver == '1'
? true
... ... @@ -4025,15 +4033,8 @@ class TableManagerPageState extends State<TableManagerPage> {
}
createDateText1(context, day);
getMealSectionByDay(needInit: true);
bool success =
await tableManagerModel!.getTableListOrReserve(
context,
currTimeIndex,
dateTime,
selectNumber,
showLoading: true,
);
await getMealSectionByDay(needInit: true);
}
});
// // 切换之前的餐段
... ...