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> { @@ -164,7 +164,13 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
164 if (needInit) { 164 if (needInit) {
165 bool has = storeBaseIndoProvider.dayDateData! 165 bool has = storeBaseIndoProvider.dayDateData!
166 .any((element) => element.ddateSolt == ddateSoltSelect); 166 .any((element) => element.ddateSolt == ddateSoltSelect);
167 - currTimeIndex = has ? int.parse(ddateSoltSelect) : 1; 167 +
  168 + if (has) {
  169 + currTimeIndex = int.parse(ddateSoltSelect);
  170 + } else {
  171 + currTimeIndex =
  172 + int.parse(storeBaseIndoProvider.dayDateData!.last.ddateSolt!);
  173 + }
168 } 174 }
169 } 175 }
170 176
@@ -98,8 +98,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -98,8 +98,7 @@ class NoteBookPageState extends State<NoteBookPage> {
98 98
99 String? solt; 99 String? solt;
100 late StateSetter _cancelState; 100 late StateSetter _cancelState;
101 - late NotebookDetailModel detailModel  
102 - ; 101 + late NotebookDetailModel detailModel;
103 102
104 // String? roleName = 103 // String? roleName =
105 // Provider.of<UserModel>(context, listen: false).user!.role_name; 104 // Provider.of<UserModel>(context, listen: false).user!.role_name;
@@ -161,7 +160,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -161,7 +160,7 @@ class NoteBookPageState extends State<NoteBookPage> {
161 } 160 }
162 161
163 getSellerVersion() async { 162 getSellerVersion() async {
164 - await collectStoreProvider.getSellerVersion(context,showLoading: false); 163 + await collectStoreProvider.getSellerVersion(context, showLoading: false);
165 } 164 }
166 165
167 /// 第一个显示今天 166 /// 第一个显示今天
@@ -199,6 +198,11 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -199,6 +198,11 @@ class NoteBookPageState extends State<NoteBookPage> {
199 if (first && date != null) { 198 if (first && date != null) {
200 _refreshPageCalendar(dateTimeNow); 199 _refreshPageCalendar(dateTimeNow);
201 } 200 }
  201 + morning = "00:00-00:00"; //早市时间段
  202 + noon = "00:00-00:00"; //午市时间段
  203 + night = "00:00-00:00"; //晚市时间段
  204 + meal1 = "00:00-00:00";
  205 + meal2 = "00:00-00:00";
202 storeBaseIndoProvider.dayDateData!.forEach((element) { 206 storeBaseIndoProvider.dayDateData!.forEach((element) {
203 if (element.ddateSolt == '1') { 207 if (element.ddateSolt == '1') {
204 morning = element.mdate; 208 morning = element.mdate;
@@ -227,7 +231,11 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -227,7 +231,11 @@ class NoteBookPageState extends State<NoteBookPage> {
227 } else { 231 } else {
228 bool has = storeBaseIndoProvider.dayDateData! 232 bool has = storeBaseIndoProvider.dayDateData!
229 .any((element) => element.ddateSolt == ddateSoltSelect); 233 .any((element) => element.ddateSolt == ddateSoltSelect);
230 - currTimeIndex = has ? int.parse(ddateSoltSelect) : 1; 234 + if (has) {
  235 + currTimeIndex = int.parse(ddateSoltSelect);
  236 + } else {
  237 + initCurruntIndex();
  238 + }
231 } 239 }
232 } 240 }
233 _getReserveList(needLoading: true); 241 _getReserveList(needLoading: true);
@@ -291,15 +299,18 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -291,15 +299,18 @@ class NoteBookPageState extends State<NoteBookPage> {
291 //过了午市，未过晚市 299 //过了午市，未过晚市
292 currTimeIndex = 5; 300 currTimeIndex = 5;
293 } else { 301 } else {
294 - //过了晚市  
295 - currTimeIndex = 1; 302 +
  303 + //过了晚市
  304 + currTimeIndex =
  305 + int.parse(storeBaseIndoProvider.dayDateData!.last.ddateSolt!);
296 } 306 }
297 } 307 }
298 308
299 getDzSellerConfTemp() async { 309 getDzSellerConfTemp() async {
300 MarketingCenterProvider marketingCenterProvider = 310 MarketingCenterProvider marketingCenterProvider =
301 Provider.of<MarketingCenterProvider>(context, listen: false); 311 Provider.of<MarketingCenterProvider>(context, listen: false);
302 - bool success = await marketingCenterProvider.getDzSellerConf(context,showLoading: false); 312 + bool success = await marketingCenterProvider.getDzSellerConf(context,
  313 + showLoading: false);
303 if (success && marketingCenterProvider.dzSellerConfModel != null) { 314 if (success && marketingCenterProvider.dzSellerConfModel != null) {
304 cancelDay = marketingCenterProvider.dzSellerConfModel!.cancelDay; 315 cancelDay = marketingCenterProvider.dzSellerConfModel!.cancelDay;
305 cancelShopowner = 316 cancelShopowner =
@@ -691,13 +702,12 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -691,13 +702,12 @@ class NoteBookPageState extends State<NoteBookPage> {
691 "uid": userModel.user!.openid, 702 "uid": userModel.user!.openid,
692 "uname": userModel.user!.nickName, 703 "uname": userModel.user!.nickName,
693 "desc": desc, 704 "desc": desc,
694 - "account":userModel.user!.account,  
695 - 705 + "account": userModel.user!.account,
696 }; 706 };
697 params["cause"] = json.encode(causeMap); 707 params["cause"] = json.encode(causeMap);
698 } 708 }
699 params['note_name'] = userModel.user!.account; 709 params['note_name'] = userModel.user!.account;
700 - 710 +
701 bool success = await detailModel.setReserveStatusOnly(context, params, 711 bool success = await detailModel.setReserveStatusOnly(context, params,
702 ifPush: false, notebook: notebook); 712 ifPush: false, notebook: notebook);
703 if (success) { 713 if (success) {
@@ -730,7 +740,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -730,7 +740,7 @@ class NoteBookPageState extends State<NoteBookPage> {
730 'rid': rid, 740 'rid': rid,
731 'sid': Provider.of<UserModel>(context, listen: false).user!.sellerid, 741 'sid': Provider.of<UserModel>(context, listen: false).user!.sellerid,
732 }; 742 };
733 - 743 +
734 detailModel.wxSendCancelSms(context, pramas); 744 detailModel.wxSendCancelSms(context, pramas);
735 } 745 }
736 } 746 }
@@ -1162,7 +1172,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -1162,7 +1172,7 @@ class NoteBookPageState extends State<NoteBookPage> {
1162 ? _depositController.text 1172 ? _depositController.text
1163 : desc2 1173 : desc2
1164 }; 1174 };
1165 - 1175 +
1166 await detailModel.setReserveDeposit( 1176 await detailModel.setReserveDeposit(
1167 context, pramas); 1177 context, pramas);
1168 } 1178 }
@@ -1573,7 +1583,6 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -1573,7 +1583,6 @@ class NoteBookPageState extends State<NoteBookPage> {
1573 1583
1574 /// 通过预订ID查收订金详情 1584 /// 通过预订ID查收订金详情
1575 _getReserveDepositByRid(String rid) async { 1585 _getReserveDepositByRid(String rid) async {
1576 -  
1577 Map<String, String> params = { 1586 Map<String, String> params = {
1578 'rid': rid, 1587 'rid': rid,
1579 }; 1588 };
@@ -1680,7 +1689,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -1680,7 +1689,7 @@ class NoteBookPageState extends State<NoteBookPage> {
1680 collectStoreProvider = 1689 collectStoreProvider =
1681 Provider.of<CollectStoreProvider>(context, listen: true); 1690 Provider.of<CollectStoreProvider>(context, listen: true);
1682 1691
1683 - detailModel = Provider.of<NotebookDetailModel>(context, listen: true); 1692 + detailModel = Provider.of<NotebookDetailModel>(context, listen: true);
1684 // int sum = 3; 1693 // int sum = 3;
1685 // int hide = 0; 1694 // int hide = 0;
1686 // int btnNum = 0; 1695 // int btnNum = 0;
@@ -332,6 +332,11 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -332,6 +332,11 @@ class TableManagerPageState extends State<TableManagerPage> {
332 332
333 //初始化时间 333 //初始化时间
334 initTimeTable({bool needInit = true}) { 334 initTimeTable({bool needInit = true}) {
  335 + morning = "00:00-00:00"; //早市时间段
  336 + noon = "00:00-00:00"; //午市时间段
  337 + night = "00:00-00:00"; //晚市时间段
  338 + meal1 = "00:00-00:00";
  339 + meal2 = "00:00-00:00";
335 storeBaseIndoProvider.dayDateData!.forEach((element) { 340 storeBaseIndoProvider.dayDateData!.forEach((element) {
336 if (element.ddateSolt == '1') { 341 if (element.ddateSolt == '1') {
337 morning = element.mdate; 342 morning = element.mdate;
@@ -594,7 +599,10 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -594,7 +599,10 @@ class TableManagerPageState extends State<TableManagerPage> {
594 getDzSellerConf() async { 599 getDzSellerConf() async {
595 MarketingCenterProvider marketingCenterProvider = 600 MarketingCenterProvider marketingCenterProvider =
596 Provider.of<MarketingCenterProvider>(context, listen: false); 601 Provider.of<MarketingCenterProvider>(context, listen: false);
597 - bool success = await marketingCenterProvider.getDzSellerConf(context,showLoading: tableManagerModel?.pageStateOrReserve == PageState.Loading ?false:true ); 602 + bool success = await marketingCenterProvider.getDzSellerConf(context,
  603 + showLoading: tableManagerModel?.pageStateOrReserve == PageState.Loading
  604 + ? false
  605 + : true);
598 if (success && marketingCenterProvider.dzSellerConfModel != null) { 606 if (success && marketingCenterProvider.dzSellerConfModel != null) {
599 isAddOver = marketingCenterProvider.dzSellerConfModel!.isAddOver == '1' 607 isAddOver = marketingCenterProvider.dzSellerConfModel!.isAddOver == '1'
600 ? true 608 ? true
@@ -4025,15 +4033,8 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -4025,15 +4033,8 @@ class TableManagerPageState extends State<TableManagerPage> {
4025 } 4033 }
4026 4034
4027 createDateText1(context, day); 4035 createDateText1(context, day);
4028 - getMealSectionByDay(needInit: true);  
4029 - bool success =  
4030 - await tableManagerModel!.getTableListOrReserve(  
4031 - context,  
4032 - currTimeIndex,  
4033 - dateTime,  
4034 - selectNumber,  
4035 - showLoading: true,  
4036 - ); 4036 + await getMealSectionByDay(needInit: true);
  4037 +
4037 } 4038 }
4038 }); 4039 });
4039 // // 切换之前的餐段 4040 // // 切换之前的餐段