xt / Flutter-ReserveApp · Commits

Go to a project

Commit f90aa0ef08b45a7de287b2f137f6f783b049a6c8

Authored by wdn127929
1 parent 72165a5e
build: skipped

预订安排和录入预订ok

Inline Side-by-side
Showing 15 changed files with 894 additions and 855 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "230" 14 +def flutterVersionCode = "231"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '230' 16 + flutterVersionCode = '231'
17 } 17 }
18 18
19 -def flutterVersionName = "2.3.0" 19 +def flutterVersionName = "2.3.1"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.3.0' 21 + flutterVersionName = '2.3.1'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'

459 Bytes | W: | H:

623 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.16 KB | W: | H:

1.23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

67.2 KB | W: | H:

56.5 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -472,7 +472,7 @@ @@ -472,7 +472,7 @@
472 CODE_SIGN_IDENTITY = "iPhone Developer"; 472 CODE_SIGN_IDENTITY = "iPhone Developer";
473 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 473 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
474 CODE_SIGN_STYLE = Automatic; 474 CODE_SIGN_STYLE = Automatic;
475 - CURRENT_PROJECT_VERSION = 220; 475 + CURRENT_PROJECT_VERSION = 230;
476 DEVELOPMENT_TEAM = 8J59HM8B82; 476 DEVELOPMENT_TEAM = 8J59HM8B82;
477 ENABLE_BITCODE = NO; 477 ENABLE_BITCODE = NO;
478 FLUTTER_BUILD_MODE = release; 478 FLUTTER_BUILD_MODE = release;
@@ -487,7 +487,7 @@ @@ -487,7 +487,7 @@
487 "$(inherited)", 487 "$(inherited)",
488 "$(PROJECT_DIR)/Flutter", 488 "$(PROJECT_DIR)/Flutter",
489 ); 489 );
490 - MARKETING_VERSION = 2.2.6; 490 + MARKETING_VERSION = 2.3.1;
491 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 491 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
492 PRODUCT_NAME = Runner; 492 PRODUCT_NAME = Runner;
493 PROVISIONING_PROFILE_SPECIFIER = ""; 493 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -616,7 +616,7 @@ @@ -616,7 +616,7 @@
616 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 616 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
617 CODE_SIGN_IDENTITY = "iPhone Developer"; 617 CODE_SIGN_IDENTITY = "iPhone Developer";
618 CODE_SIGN_STYLE = Automatic; 618 CODE_SIGN_STYLE = Automatic;
619 - CURRENT_PROJECT_VERSION = 220; 619 + CURRENT_PROJECT_VERSION = 230;
620 DEVELOPMENT_TEAM = 8J59HM8B82; 620 DEVELOPMENT_TEAM = 8J59HM8B82;
621 ENABLE_BITCODE = NO; 621 ENABLE_BITCODE = NO;
622 FLUTTER_BUILD_MODE = release; 622 FLUTTER_BUILD_MODE = release;
@@ -631,7 +631,7 @@ @@ -631,7 +631,7 @@
631 "$(inherited)", 631 "$(inherited)",
632 "$(PROJECT_DIR)/Flutter", 632 "$(PROJECT_DIR)/Flutter",
633 ); 633 );
634 - MARKETING_VERSION = 2.2.6; 634 + MARKETING_VERSION = 2.3.1;
635 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 635 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
636 PRODUCT_NAME = Runner; 636 PRODUCT_NAME = Runner;
637 PROVISIONING_PROFILE_SPECIFIER = ""; 637 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -651,7 +651,7 @@ @@ -651,7 +651,7 @@
651 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 651 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
652 CODE_SIGN_IDENTITY = "iPhone Developer"; 652 CODE_SIGN_IDENTITY = "iPhone Developer";
653 CODE_SIGN_STYLE = Automatic; 653 CODE_SIGN_STYLE = Automatic;
654 - CURRENT_PROJECT_VERSION = 220; 654 + CURRENT_PROJECT_VERSION = 230;
655 DEVELOPMENT_TEAM = 8J59HM8B82; 655 DEVELOPMENT_TEAM = 8J59HM8B82;
656 ENABLE_BITCODE = NO; 656 ENABLE_BITCODE = NO;
657 FLUTTER_BUILD_MODE = release; 657 FLUTTER_BUILD_MODE = release;
@@ -666,7 +666,7 @@ @@ -666,7 +666,7 @@
666 "$(inherited)", 666 "$(inherited)",
667 "$(PROJECT_DIR)/Flutter", 667 "$(PROJECT_DIR)/Flutter",
668 ); 668 );
669 - MARKETING_VERSION = 2.2.6; 669 + MARKETING_VERSION = 2.3.1;
670 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 670 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
671 PRODUCT_NAME = Runner; 671 PRODUCT_NAME = Runner;
672 PROVISIONING_PROFILE_SPECIFIER = ""; 672 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -586,8 +586,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -586,8 +586,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
586 setState(() { 586 setState(() {
587 _currIndex = index; 587 _currIndex = index;
588 }); 588 });
589 - if (_currIndex == 3) {  
590 - Utils.changeStatusColor(color: Colors.transparent); 589 + if (_currIndex == 5) {
  590 + Utils.changeStatusColor(color: MyColours.color_199095);
591 } else { 591 } else {
592 Utils.changeStatusColor(color: Colors.white); 592 Utils.changeStatusColor(color: Colors.white);
593 } 593 }
@@ -80,10 +80,10 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -80,10 +80,10 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
80 _initTime(); 80 _initTime();
81 setState(() {}); 81 setState(() {});
82 sid = Provider.of<UserModel>(context, listen: false).user.sellerid; 82 sid = Provider.of<UserModel>(context, listen: false).user.sellerid;
83 - _homeEnterModel.initDateHourMinuteList(context, currTimeIndex);  
84 - String ddate = DateTime.now().millisecondsSinceEpoch.toString() + '000';  
85 - _homeEnterModel  
86 - .getNewTableList(context, ddate, currTimeIndex.toString(), pnum, []); 83 + _homeEnterModel.initDateHourMinuteList(context, currTimeIndex, dateText);
  84 + String ddate = DateTime.now().millisecondsSinceEpoch.toString();
  85 + _homeEnterModel.getNewTableList(
  86 + context, ddate, currTimeIndex.toString(), pnum);
87 87
88 Map<String, String> params = { 88 Map<String, String> params = {
89 "uid": Provider.of<UserModel>(context, listen: false).user.openid 89 "uid": Provider.of<UserModel>(context, listen: false).user.openid
@@ -471,11 +471,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -471,11 +471,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
471 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳 471 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
472 // String pnum = Utils.getPnum(_homeEnterModel.personNumList); 472 // String pnum = Utils.getPnum(_homeEnterModel.personNumList);
473 _homeEnterModel.getNewTableList( 473 _homeEnterModel.getNewTableList(
474 - context,  
475 - '${ddate}',  
476 - currTimeIndex.toString(),  
477 - pnum,  
478 - _homeEnterModel.tableList); 474 + context, '${ddate}', currTimeIndex.toString(), pnum);
479 _homeEnterModel.notifyListeners(); 475 _homeEnterModel.notifyListeners();
480 } 476 }
481 }, selecteds: selectPnum == null ? [] : [selectPnum]) 477 }, selecteds: selectPnum == null ? [] : [selectPnum])
@@ -681,12 +677,13 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -681,12 +677,13 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
681 // } else { 677 // } else {
682 // _homeEnterModel.dateList[2]['title'] = '其他'; 678 // _homeEnterModel.dateList[2]['title'] = '其他';
683 // } 679 // }
684 - _homeEnterModel.initHourAndMinuteSelect(); 680 + _homeEnterModel.getNewTableList(
  681 + context, '${dateTimeMill}', currTimeIndex.toString(), pnum);
  682 + _homeEnterModel.initHourAndMinuteSelect(dateText);
685 // 选完日历刷新页面 683 // 选完日历刷新页面
686 684
687 // String pnum = Utils.getPnum(_homeEnterModel.personNumList); 685 // String pnum = Utils.getPnum(_homeEnterModel.personNumList);
688 - _homeEnterModel.getNewTableList(context, '${dateTimeMill}',  
689 - currTimeIndex.toString(), pnum, _homeEnterModel.tableList); 686 +
690 } 687 }
691 _homeEnterModel.notifyListeners(); 688 _homeEnterModel.notifyListeners();
692 }); 689 });
@@ -807,6 +804,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -807,6 +804,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
807 } 804 }
808 805
809 _refreshRemark(List<Remark> remark, int index) { 806 _refreshRemark(List<Remark> remark, int index) {
  807 + print(currentRemark);
810 if (remark[index].selected) { 808 if (remark[index].selected) {
811 if (currentRemark.length == 0) { 809 if (currentRemark.length == 0) {
812 currentRemark += '${remark[index].custom}'; 810 currentRemark += '${remark[index].custom}';
@@ -878,7 +876,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -878,7 +876,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
878 // } 876 // }
879 // }); 877 // });
880 if (currTimeIndex == 1) { 878 if (currTimeIndex == 1) {
881 - _homeEnterModel.ddateStr = '8:00'; 879 + _homeEnterModel.ddateStr = '08:00';
882 } else if (currTimeIndex == 2) { 880 } else if (currTimeIndex == 2) {
883 _homeEnterModel.ddateStr = '12:00'; 881 _homeEnterModel.ddateStr = '12:00';
884 } else if (currTimeIndex == 3) { 882 } else if (currTimeIndex == 3) {
@@ -890,8 +888,8 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -890,8 +888,8 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
890 String timeStr = ymyStr + ' ' + "00:00:00"; 888 String timeStr = ymyStr + ' ' + "00:00:00";
891 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳 889 int ddate = DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
892 // String pnum = Utils.getPnum(_homeEnterModel.personNumList); 890 // String pnum = Utils.getPnum(_homeEnterModel.personNumList);
893 - _homeEnterModel.getNewTableList(context, '${ddate}',  
894 - currTimeIndex.toString(), pnum, _homeEnterModel.tableList); 891 + _homeEnterModel.getNewTableList(
  892 + context, '${ddate}', currTimeIndex.toString(), pnum);
895 _homeEnterModel.notifyListeners(); 893 _homeEnterModel.notifyListeners();
896 Navigator.pop(context); 894 Navigator.pop(context);
897 }, 895 },
@@ -902,7 +900,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -902,7 +900,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
902 isSelect: _getCurruntIndex(list[i]) == currTimeIndex, 900 isSelect: _getCurruntIndex(list[i]) == currTimeIndex,
903 )); 901 ));
904 if (i < list.length - 1) { 902 if (i < list.length - 1) {
905 - temp.add(HEmptyView(80)); 903 + temp.add(HEmptyView(70));
906 } 904 }
907 } 905 }
908 return temp; 906 return temp;
@@ -1043,6 +1041,13 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1043,6 +1041,13 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1043 key = item['key']; 1041 key = item['key'];
1044 tempMndList = _homeEnterModel.dailyMap[key]; 1042 tempMndList = _homeEnterModel.dailyMap[key];
1045 } 1043 }
  1044 + print(_homeEnterModel.ddateStr);
  1045 + for (var itemSun in tempMndList) {
  1046 + itemSun['select'] = false;
  1047 + if (itemSun['title'] == _homeEnterModel.ddateStr) {
  1048 + itemSun['select'] = true;
  1049 + }
  1050 + }
1046 // if (item['isSelect'] == true) { 1051 // if (item['isSelect'] == true) {
1047 1052
1048 // } 1053 // }
@@ -1109,7 +1114,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1109,7 +1114,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1109 itemBuilder: (BuildContext context, int index) { 1114 itemBuilder: (BuildContext context, int index) {
1110 // locationState = state; 1115 // locationState = state;
1111 return CustomButton( 1116 return CustomButton(
1112 - onTap: () { 1117 + onTap: () async {
1113 // state(() { 1118 // state(() {
1114 for (var item in tempMndList) { 1119 for (var item in tempMndList) {
1115 item['select'] = false; 1120 item['select'] = false;
@@ -1121,21 +1126,17 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1121,21 +1126,17 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1121 _homeEnterModel.ddateStr = item['title']; 1126 _homeEnterModel.ddateStr = item['title'];
1122 } 1127 }
1123 } 1128 }
  1129 +
1124 // }); 1130 // });
1125 String ymyStr = dateText; //年月日 1131 String ymyStr = dateText; //年月日
1126 String timeStr = ymyStr + ' ' + "00:00:00"; 1132 String timeStr = ymyStr + ' ' + "00:00:00";
1127 int ddate = DateUtil.getDateMsByTimeStr( 1133 int ddate = DateUtil.getDateMsByTimeStr(
1128 timeStr); //筛选日期时间戳 1134 timeStr); //筛选日期时间戳
1129 // String pnum = Utils.getPnum(_homeEnterModel.personNumList); 1135 // String pnum = Utils.getPnum(_homeEnterModel.personNumList);
1130 - _homeEnterModel.getNewTableList(  
1131 - context,  
1132 - '${ddate}',  
1133 - currTimeIndex.toString(),  
1134 - pnum,  
1135 - _homeEnterModel.tableList);  
1136 -  
1137 - _homeEnterModel.notifyListeners(); 1136 + await _homeEnterModel.getNewTableList(context,
  1137 + '${ddate}', currTimeIndex.toString(), pnum);
1138 Navigator.pop(context); 1138 Navigator.pop(context);
  1139 + _homeEnterModel.notifyListeners();
1139 }, 1140 },
1140 width: 80, 1141 width: 80,
1141 height: 36, 1142 height: 36,
@@ -1223,6 +1224,34 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1223,6 +1224,34 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1223 } 1224 }
1224 } 1225 }
1225 1226
  1227 + _clearData() async {
  1228 + _initTime();
  1229 + for (Remark item in remarkManagerModel.ofenRemarks) {
  1230 + item.selected = false;
  1231 + }
  1232 + currentRemark = '';
  1233 + _homeEnterModel.initSexList();
  1234 + _homeEnterModel.nameController.text = '';
  1235 + _homeEnterModel.phoneController.text = '';
  1236 + _homeEnterModel.customController.text = '';
  1237 + dateText = ""; //当前显示日期时间
  1238 + // currTimeIndex = null;
  1239 + _homeEnterModel.ddateStr = '';
  1240 + pnum = '6';
  1241 + selectPnum = 5;
  1242 + dateTimeNow = DateTime.now();
  1243 + dateText = "${dateTimeNow.year}" +
  1244 + "-" +
  1245 + Utils.addZeroNumber(dateTimeNow.month) +
  1246 + "-" +
  1247 + Utils.addZeroNumber(dateTimeNow.day);
  1248 + String ddate = DateTime.now().millisecondsSinceEpoch.toString() + '000';
  1249 + await _homeEnterModel.getNewTableList(
  1250 + context, ddate, currTimeIndex.toString(), pnum);
  1251 + FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
  1252 + _homeEnterModel.notifyListeners();
  1253 + }
  1254 +
1226 _getContactData() async { 1255 _getContactData() async {
1227 Contact contact = await _contactPicker.selectContactWithNative(); 1256 Contact contact = await _contactPicker.selectContactWithNative();
1228 setState(() { 1257 setState(() {
@@ -1257,29 +1286,8 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1257,29 +1286,8 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1257 '录入预订', 1286 '录入预订',
1258 showLeading: false, 1287 showLeading: false,
1259 rightImgName: '清空', 1288 rightImgName: '清空',
1260 - onTapRight: () async {  
1261 - _initTime();  
1262 - _homeEnterModel.initSexList();  
1263 - _homeEnterModel.nameController.text = '';  
1264 - _homeEnterModel.phoneController.text = '';  
1265 - _homeEnterModel.customController.text = '';  
1266 - dateText = ""; //当前显示日期时间  
1267 - // currTimeIndex = null;  
1268 - _homeEnterModel.ddateStr = '';  
1269 - pnum = '6';  
1270 - selectPnum = 5;  
1271 - dateTimeNow = DateTime.now();  
1272 - dateText = "${dateTimeNow.year}" +  
1273 - "-" +  
1274 - Utils.addZeroNumber(dateTimeNow.month) +  
1275 - "-" +  
1276 - Utils.addZeroNumber(dateTimeNow.day);  
1277 - String ddate =  
1278 - DateTime.now().millisecondsSinceEpoch.toString() + '000';  
1279 - await _homeEnterModel.getNewTableList(  
1280 - context, ddate, currTimeIndex.toString(), pnum, []);  
1281 - FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘  
1282 - _homeEnterModel.notifyListeners(); 1289 + onTapRight: () {
  1290 + _clearData();
1283 }, 1291 },
1284 ), 1292 ),
1285 Expanded( 1293 Expanded(
@@ -1314,7 +1322,10 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1314,7 +1322,10 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1314 return; 1322 return;
1315 } 1323 }
1316 SunReserveInfoModel _model = 1324 SunReserveInfoModel _model =
1317 - await _homeEnterModel.setReserveInfo(context); 1325 + await _homeEnterModel.setReserveInfo(context,
  1326 + pnum: pnum,
  1327 + dateText: dateText,
  1328 + currTimeIndex: currTimeIndex);
1318 if (ObjectUtil.isNotEmpty(_model.row) || 1329 if (ObjectUtil.isNotEmpty(_model.row) ||
1319 ObjectUtil.isNotEmpty(_model.row.id)) { 1330 ObjectUtil.isNotEmpty(_model.row.id)) {
1320 print('成功'); 1331 print('成功');
@@ -1354,8 +1365,29 @@ class _HomeEnterPageState extends State<HomeEnterPage> { @@ -1354,8 +1365,29 @@ class _HomeEnterPageState extends State<HomeEnterPage> {
1354 _model.row.ddate, 1365 _model.row.ddate,
1355 ddate_solt, 1366 ddate_solt,
1356 _model.row.phone, 1367 _model.row.phone,
1357 - replace: true);  
1358 - EventBus().emit("refresh_tablemanager"); //刷新桌位 1368 + replace: false);
  1369 + //今天 明天 其他天
  1370 + String tempTime = _homeEnterModel.ddateStr;
  1371 + if (_homeEnterModel.ddateStr == '') {
  1372 + if (currTimeIndex == 1) {
  1373 + tempTime = '08:00';
  1374 + } else if (currTimeIndex == 2) {
  1375 + tempTime = '12:00';
  1376 + } else if (currTimeIndex == 3) {
  1377 + tempTime = '18:30';
  1378 + }
  1379 + }
  1380 + print(_model.row.tableinfo);
  1381 + _clearData();
  1382 + String timeStr = dateText + ' ' + tempTime + ':00';
  1383 +
  1384 + LogUtil.v(timeStr);
  1385 + int ddate = DateUtil.getDateMsByTimeStr(timeStr);
  1386 +
  1387 + _homeEnterModel.getNewTableList(
  1388 + context, '${ddate}', currTimeIndex.toString(), pnum);
  1389 +
  1390 + // EventBus().emit("refresh_tablemanager"); //刷新桌位
1359 } else { 1391 } else {
1360 Utils.showToast("录入预订订单失败，请重试！"); 1392 Utils.showToast("录入预订订单失败，请重试！");
1361 } 1393 }
@@ -1489,13 +1521,16 @@ class _ButtonState extends State<CustomButton> { @@ -1489,13 +1521,16 @@ class _ButtonState extends State<CustomButton> {
1489 }, 1521 },
1490 onEditingComplete: () { 1522 onEditingComplete: () {
1491 _cancelNode.unfocus(); 1523 _cancelNode.unfocus();
1492 - int ddate = Utils.getDdate(widget.model.dateList); 1524 + String ymyStr = widget.dateText; //年月日
  1525 + String timeStr = ymyStr + ' ' + "00:00:00";
  1526 + int ddate =
  1527 + DateUtil.getDateMsByTimeStr(timeStr); //筛选日期时间戳
1493 String ddateSolt = 1528 String ddateSolt =
1494 Utils.getDdateSolt(widget.model.sunDateList); 1529 Utils.getDdateSolt(widget.model.sunDateList);
1495 // String pnum = Utils.getPnum(widget.model.personNumList); 1530 // String pnum = Utils.getPnum(widget.model.personNumList);
1496 1531
1497 - widget.model.getNewTableList(context, '${ddate}',  
1498 - ddateSolt, widget.pnum, widget.model.tableList); 1532 + widget.model.getNewTableList(
  1533 + context, '${ddate}', ddateSolt, widget.pnum);
1499 }, 1534 },
1500 keyboardType: TextInputType.number, 1535 keyboardType: TextInputType.number,
1501 ), 1536 ),
@@ -19,6 +19,7 @@ import 'package:one_key/route/navigator_util.dart'; @@ -19,6 +19,7 @@ import 'package:one_key/route/navigator_util.dart';
19 import 'package:one_key/utils/utils.dart'; 19 import 'package:one_key/utils/utils.dart';
20 import 'package:one_key/widgets/h_empty_view.dart'; 20 import 'package:one_key/widgets/h_empty_view.dart';
21 import 'package:one_key/widgets/round_button.dart'; 21 import 'package:one_key/widgets/round_button.dart';
  22 +import 'package:one_key/widgets/system_app_bar.dart';
22 import 'package:one_key/widgets/v_empty_view.dart'; 23 import 'package:one_key/widgets/v_empty_view.dart';
23 import 'package:permission_handler/permission_handler.dart'; 24 import 'package:permission_handler/permission_handler.dart';
24 import 'package:provider/provider.dart'; 25 import 'package:provider/provider.dart';
@@ -46,7 +47,7 @@ class InvicationPageState extends State<InvicationPage> { @@ -46,7 +47,7 @@ class InvicationPageState extends State<InvicationPage> {
46 DateTime dateTime; 47 DateTime dateTime;
47 String dateTimeStr = ""; 48 String dateTimeStr = "";
48 ScrollController controller = ScrollController(); 49 ScrollController controller = ScrollController();
49 - double couponHeight = 180.0; 50 + double couponHeight = 140.0;
50 CouponProvider couponProvider; 51 CouponProvider couponProvider;
51 BaseIndoProvider _baseIndoProvider; 52 BaseIndoProvider _baseIndoProvider;
52 String name = '填写姓名'; 53 String name = '填写姓名';
@@ -135,7 +136,7 @@ class InvicationPageState extends State<InvicationPage> { @@ -135,7 +136,7 @@ class InvicationPageState extends State<InvicationPage> {
135 }); 136 });
136 } else { 137 } else {
137 setState(() { 138 setState(() {
138 - couponHeight = 180.0; 139 + couponHeight = 140.0;
139 }); 140 });
140 } 141 }
141 } else { 142 } else {
@@ -278,640 +279,572 @@ class InvicationPageState extends State<InvicationPage> { @@ -278,640 +279,572 @@ class InvicationPageState extends State<InvicationPage> {
278 // TODO: implement build 279 // TODO: implement build
279 _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true); 280 _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true);
280 couponProvider = Provider.of<CouponProvider>(context, listen: true); 281 couponProvider = Provider.of<CouponProvider>(context, listen: true);
281 - return Container(  
282 - width: double.infinity,  
283 - // height: double.infinity,  
284 - decoration: BoxDecoration(  
285 - image: DecorationImage(  
286 - image: AssetImage("assets/yd_bg_new.png"), fit: BoxFit.fill),  
287 - ), 282 + return SafeArea(
288 child: Scaffold( 283 child: Scaffold(
289 - backgroundColor: Colors.transparent, 284 + backgroundColor: Colors.white,
  285 + appBar: SystemAppBar('', onTap: () {
  286 + Navigator.pop(context);
  287 + }),
290 body: Stack( 288 body: Stack(
291 children: [ 289 children: [
292 - Container(  
293 - margin: EdgeInsets.only(top: ScreenUtil().setWidth(13 * 2)),  
294 - padding:  
295 - EdgeInsets.only(top: ScreenUtil().setWidth(35 * 2)),  
296 - child: Column(children: [  
297 - Expanded(  
298 - child: ListView(  
299 - controller: controller,  
300 - physics: BouncingScrollPhysics(),  
301 - children: <Widget>[  
302 - Center(  
303 - child: Column(  
304 - children: <Widget>[  
305 - Image.asset(  
306 - "assets/yd_logo.png",  
307 - width: ScreenUtil().setWidth(233 * 2),  
308 - height: ScreenUtil().setHeight(51 * 2),  
309 - ),  
310 - VEmptyView(26),  
311 - Container(  
312 - margin: EdgeInsets.symmetric(  
313 - horizontal: ScreenUtil().setWidth(40)),  
314 - // padding: EdgeInsets.all(  
315 - // ScreenUtil().setWidth(60)),  
316 - // decoration: BoxDecoration(  
317 - // gradient: LinearGradient(  
318 - // begin: Alignment.topCenter,  
319 - // end: Alignment.bottomCenter,  
320 - // colors: [  
321 - // MyColours.color_F7F1E8,  
322 - // MyColours.color_E3D6C7,  
323 - // ],  
324 - // ),  
325 - // borderRadius: BorderRadius.circular(  
326 - // ScreenUtil().setWidth(10))),  
327 - child: Column(  
328 - crossAxisAlignment:  
329 - CrossAxisAlignment.center,  
330 - children: [  
331 - Container(  
332 - // color: Colors.red,  
333 - width:  
334 - ScreenUtil().setWidth(335 * 2),  
335 - height:  
336 - ScreenUtil().setWidth(200 * 2),  
337 - // decoration: BoxDecoration(  
338 - // image: DecorationImage(  
339 - // alignment:  
340 - // Alignment.topCenter,  
341 - // image: AssetImage(  
342 - // "assets/yd_baiinfo_bg.png"),  
343 - // fit: BoxFit.cover),  
344 - // ),  
345 - child: Row(  
346 - crossAxisAlignment:  
347 - CrossAxisAlignment.start,  
348 - children: [  
349 - Padding(  
350 - padding: EdgeInsets.only(  
351 - left: ScreenUtil()  
352 - .setWidth(70)),  
353 - child: qiniuUrl == ''  
354 - ? Image.asset(  
355 - Utils.getImgPath(  
356 - 'yd_person'),  
357 - width: ScreenUtil().setWidth(  
358 - 143 * 2),  
359 - height: ScreenUtil()  
360 - .setWidth(  
361 - 190 * 2))  
362 - : Image.network(qiniuUrl, 290 + Column(children: [
  291 + Expanded(
  292 + child: ListView(
  293 + controller: controller,
  294 + physics: BouncingScrollPhysics(),
  295 + children: <Widget>[
  296 + Center(
  297 + child: Column(
  298 + children: <Widget>[
  299 + VEmptyView(20),
  300 + Image.asset(
  301 + "assets/yd_logo.png",
  302 + width: ScreenUtil().setWidth(233 * 2),
  303 + height: ScreenUtil().setHeight(51 * 2),
  304 + ),
  305 + VEmptyView(26),
  306 + Container(
  307 + margin: EdgeInsets.symmetric(
  308 + horizontal: ScreenUtil().setWidth(40)),
  309 + // padding: EdgeInsets.all(
  310 + // ScreenUtil().setWidth(60)),
  311 + // decoration: BoxDecoration(
  312 + // gradient: LinearGradient(
  313 + // begin: Alignment.topCenter,
  314 + // end: Alignment.bottomCenter,
  315 + // colors: [
  316 + // MyColours.color_F7F1E8,
  317 + // MyColours.color_E3D6C7,
  318 + // ],
  319 + // ),
  320 + // borderRadius: BorderRadius.circular(
  321 + // ScreenUtil().setWidth(10))),
  322 + child: Column(
  323 + crossAxisAlignment: CrossAxisAlignment.center,
  324 + children: [
  325 + Container(
  326 + // color: Colors.red,
  327 + width: ScreenUtil().setWidth(335 * 2),
  328 + height: ScreenUtil().setWidth(200 * 2),
  329 + // decoration: BoxDecoration(
  330 + // image: DecorationImage(
  331 + // alignment:
  332 + // Alignment.topCenter,
  333 + // image: AssetImage(
  334 + // "assets/yd_baiinfo_bg.png"),
  335 + // fit: BoxFit.cover),
  336 + // ),
  337 + child: Row(
  338 + crossAxisAlignment:
  339 + CrossAxisAlignment.start,
  340 + children: [
  341 + Padding(
  342 + padding: EdgeInsets.only(
  343 + left: ScreenUtil()
  344 + .setWidth(70)),
  345 + child: qiniuUrl == ''
  346 + ? Image.asset(
  347 + Utils.getImgPath(
  348 + 'yd_person'),
  349 + width: ScreenUtil()
  350 + .setWidth(143 * 2),
  351 + height: ScreenUtil()
  352 + .setWidth(190 * 2))
  353 + : Image.network(qiniuUrl,
  354 + width: ScreenUtil()
  355 + .setWidth(143 * 2),
  356 + height: ScreenUtil()
  357 + .setWidth(190 * 2)),
  358 + ),
  359 + HEmptyView(10),
  360 + Spacer(),
  361 + Container(
  362 + padding: EdgeInsets.only(
  363 + top: ScreenUtil()
  364 + .setWidth(37 * 2)),
  365 + // height: ScreenUtil()
  366 + // .setWidth(200 * 2),
  367 + child: Column(
  368 + mainAxisAlignment:
  369 + MainAxisAlignment.start,
  370 + crossAxisAlignment:
  371 + CrossAxisAlignment.end,
  372 + children: [
  373 + // VEmptyView(60),
  374 + GestureDetector(
  375 + behavior: HitTestBehavior
  376 + .opaque,
  377 + onTap: () {
  378 + _goBaseInfoPage();
  379 + },
  380 + child: Container(
  381 + width: ScreenUtil()
  382 + .setWidth(120 * 2),
  383 + height: ScreenUtil()
  384 + .setWidth(42 * 2),
  385 + child: Text(
  386 + name,
  387 + overflow: TextOverflow
  388 + .ellipsis,
  389 + textAlign:
  390 + TextAlign.right,
  391 + style: TextStyle(
  392 + color: name ==
  393 + '填写姓名'
  394 + ? MyColours
  395 + .color_999999
  396 + : MyColours
  397 + .color_333333,
  398 + fontSize:
  399 + ScreenUtil()
  400 + .setSp(
  401 + 60)),
  402 + ),
  403 + ),
  404 + ),
  405 + // VEmptyView(6),
  406 + InkWell(
  407 + onTap: () {
  408 + _goBaseInfoPage();
  409 + },
  410 + child: Container(
363 width: ScreenUtil() 411 width: ScreenUtil()
364 .setWidth( 412 .setWidth(
365 - 143 * 2), 413 + 120 * 2),
366 height: ScreenUtil() 414 height: ScreenUtil()
367 - .setWidth(190 * 2)),  
368 - ),  
369 - HEmptyView(10),  
370 - Spacer(),  
371 - Container(  
372 - padding: EdgeInsets.only(  
373 - top: ScreenUtil()  
374 - .setWidth(37 * 2)),  
375 - // height: ScreenUtil()  
376 - // .setWidth(200 * 2),  
377 - child: Column(  
378 - mainAxisAlignment:  
379 - MainAxisAlignment  
380 - .start,  
381 - crossAxisAlignment:  
382 - CrossAxisAlignment  
383 - .end,  
384 - children: [  
385 - // VEmptyView(60),  
386 - GestureDetector(  
387 - behavior:  
388 - HitTestBehavior  
389 - .opaque,  
390 - onTap: () {  
391 - _goBaseInfoPage();  
392 - },  
393 - child: Container(  
394 - width: ScreenUtil()  
395 - .setWidth(  
396 - 120 * 2),  
397 - height: ScreenUtil()  
398 - .setWidth(  
399 - 42 * 2),  
400 - child: Text(  
401 - name,  
402 - overflow:  
403 - TextOverflow  
404 - .ellipsis,  
405 - textAlign:  
406 - TextAlign  
407 - .right,  
408 - style: TextStyle(  
409 - color: MyColours  
410 - .color_ffffff,  
411 - fontSize:  
412 - ScreenUtil()  
413 - .setSp(  
414 - 60)),  
415 - ),  
416 - ),  
417 - ),  
418 - // VEmptyView(6),  
419 - InkWell(  
420 - onTap: () {  
421 - _goBaseInfoPage();  
422 - },  
423 - child: Container(  
424 - width: ScreenUtil()  
425 - .setWidth(  
426 - 120 * 2),  
427 - height:  
428 - ScreenUtil()  
429 - .setWidth(  
430 - 22 *  
431 - 2),  
432 - child: Text(  
433 - phone,  
434 - overflow:  
435 - TextOverflow  
436 - .ellipsis,  
437 - textAlign:  
438 - TextAlign  
439 - .right,  
440 - style: TextStyle(  
441 - color: MyColours  
442 - .color_ffffff,  
443 - fontSize: ScreenUtil() 415 + .setWidth(22 * 2),
  416 + child: Text(
  417 + phone,
  418 + overflow:
  419 + TextOverflow
  420 + .ellipsis,
  421 + textAlign:
  422 + TextAlign.right,
  423 + style: TextStyle(
  424 + color: phone ==
  425 + '填写电话'
  426 + ? MyColours
  427 + .color_999999
  428 + : MyColours
  429 + .color_333333,
  430 + fontSize:
  431 + ScreenUtil()
444 .setSp( 432 .setSp(
445 32)), 433 32)),
446 - ),  
447 - )),  
448 - // VEmptyView(6),  
449 - InkWell(  
450 - onTap: () {  
451 - _goBaseInfoPage();  
452 - },  
453 - child: Container(  
454 - width: ScreenUtil()  
455 - .setWidth(  
456 - 120 * 2),  
457 - height:  
458 - ScreenUtil()  
459 - .setWidth(  
460 - 24 *  
461 - 2),  
462 - child: Text(  
463 - position,  
464 - overflow:  
465 - TextOverflow  
466 - .ellipsis,  
467 - textAlign:  
468 - TextAlign  
469 - .right,  
470 - style: TextStyle(  
471 - color: MyColours  
472 - .color_ffffff,  
473 - fontSize: ScreenUtil() 434 + ),
  435 + )),
  436 + // VEmptyView(6),
  437 + InkWell(
  438 + onTap: () {
  439 + _goBaseInfoPage();
  440 + },
  441 + child: Container(
  442 + width: ScreenUtil()
  443 + .setWidth(
  444 + 120 * 2),
  445 + height: ScreenUtil()
  446 + .setWidth(24 * 2),
  447 + child: Text(
  448 + position,
  449 + overflow:
  450 + TextOverflow
  451 + .ellipsis,
  452 + textAlign:
  453 + TextAlign.right,
  454 + style: TextStyle(
  455 + color: position == '填写职位'
  456 + ? MyColours
  457 + .color_999999
  458 + : MyColours
  459 + .color_333333,
  460 + fontSize:
  461 + ScreenUtil()
474 .setSp( 462 .setSp(
475 34)), 463 34)),
476 - ),  
477 - )), 464 + ),
  465 + )),
478 466
479 - RoundButton(  
480 - // width: ScreenUtil().setWidth(95),  
481 - height: ScreenUtil()  
482 - .setWidth(60 * 2),  
483 - image:  
484 - Utils.getImgPath(  
485 - 'yd_edit_new'),  
486 - imgWidth: 24,  
487 - radius: 0,  
488 - space: ScreenUtil()  
489 - .setWidth(20),  
490 - text: '编辑',  
491 - textColor: MyColours  
492 - .color_BA9953,  
493 - isBold: false,  
494 - fontSize: 28,  
495 - gradientStart: Colors  
496 - .transparent,  
497 - gradientEnd: Colors  
498 - .transparent,  
499 - onPressed: () {  
500 - _goBaseInfoPage();  
501 - },  
502 - )  
503 - ],  
504 - )),  
505 - HEmptyView(60),  
506 - ],  
507 - )),  
508 - // Positioned(  
509 - // bottom: 0,  
510 - // child: Container(  
511 - // color: MyColours.color_EEDBC4,  
512 - // width: double.infinity,  
513 - // height:  
514 - // ScreenUtil().setWidth(40),  
515 - // ))  
516 - // ],  
517 - // ),  
518 - // Container(  
519 - // color: MyColours.color_EEDBC4,  
520 - // width: double.infinity,  
521 - // height: ScreenUtil().setWidth(40),  
522 - // ),  
523 - VEmptyView(76),  
524 - // Image.asset(  
525 - // "assets/yd_up.png",  
526 - // width: ScreenUtil().setWidth(195 * 2),  
527 - // height:  
528 - // ScreenUtil().setHeight(33 * 2),  
529 - // ),  
530 - // VEmptyView(50), 467 + RoundButton(
  468 + // width: ScreenUtil().setWidth(95),
  469 + height: ScreenUtil()
  470 + .setWidth(60 * 2),
  471 + image: Utils.getImgPath(
  472 + 'yd_bianji'),
  473 + imgWidth: 24,
  474 + radius: 0,
  475 + space: ScreenUtil()
  476 + .setWidth(20),
  477 + text: '编辑',
  478 + textColor: MyColours
  479 + .color_199095,
  480 + isBold: false,
  481 + fontSize: 28,
  482 + gradientStart:
  483 + Colors.transparent,
  484 + gradientEnd:
  485 + Colors.transparent,
  486 + onPressed: () {
  487 + _goBaseInfoPage();
  488 + },
  489 + )
  490 + ],
  491 + )),
  492 + HEmptyView(60),
  493 + ],
  494 + )),
  495 + // Positioned(
  496 + // bottom: 0,
  497 + // child: Container(
  498 + // color: MyColours.color_EEDBC4,
  499 + // width: double.infinity,
  500 + // height:
  501 + // ScreenUtil().setWidth(40),
  502 + // ))
  503 + // ],
  504 + // ),
  505 + // Container(
  506 + // color: MyColours.color_EEDBC4,
  507 + // width: double.infinity,
  508 + // height: ScreenUtil().setWidth(40),
  509 + // ),
  510 + VEmptyView(76),
  511 + // Image.asset(
  512 + // "assets/yd_up.png",
  513 + // width: ScreenUtil().setWidth(195 * 2),
  514 + // height:
  515 + // ScreenUtil().setHeight(33 * 2),
  516 + // ),
  517 + // VEmptyView(50),
531 518
532 - RepaintBoundary(  
533 - key: globalKey,  
534 - child: Container(  
535 - padding: EdgeInsets.fromLTRB(  
536 - ScreenUtil().setWidth(10),  
537 - ScreenUtil().setWidth(10),  
538 - ScreenUtil().setWidth(10),  
539 - ScreenUtil().setWidth(40)),  
540 - // color: Colors.red,  
541 - child: Column(  
542 - children: [  
543 - Container(  
544 - height:  
545 - ScreenUtil().setWidth(58),  
546 - child: Text(  
547 - user.sellername,  
548 - style: TextStyle(  
549 - // letterSpacing: ScreenUtil()  
550 - // .setWidth(2.13 * 2),  
551 - color: MyColours  
552 - .color_BA9953,  
553 - // fontWeight: FontWeight.bold,  
554 - fontSize: ScreenUtil()  
555 - .setSp(42)),  
556 - ),  
557 - ),  
558 - VEmptyView(14),  
559 - Container(  
560 - height:  
561 - ScreenUtil().setWidth(58),  
562 - child: Text(  
563 - '${dateTimeStr}',  
564 - style: TextStyle(  
565 - letterSpacing:  
566 - ScreenUtil()  
567 - .setWidth(  
568 - 1.8 * 2),  
569 - color: MyColours  
570 - .color_BA9953,  
571 - fontSize: ScreenUtil()  
572 - .setSp(42)),  
573 - ),  
574 - ),  
575 - VEmptyView(26),  
576 - Container(  
577 - height:  
578 - ScreenUtil().setWidth(44),  
579 - child: Text(  
580 - '已为您安排在包间',  
581 - style: TextStyle(  
582 - color: MyColours  
583 - .color_ffffff,  
584 - fontSize: ScreenUtil()  
585 - .setSp(32)),  
586 - ),  
587 - ),  
588 - VEmptyView(28),  
589 - GestureDetector(  
590 - onTapDown: (TapDownDetails  
591 - details) =>  
592 - onTapDown(  
593 - context, details),  
594 - child: Container(  
595 - child: Stack(  
596 - alignment: Alignment  
597 - .bottomCenter,  
598 - overflow:  
599 - Overflow.visible,  
600 - children: [  
601 - Container(  
602 - margin: EdgeInsets.only(  
603 - bottom:  
604 - ScreenUtil()  
605 - .setWidth(  
606 - 24)),  
607 - constraints: BoxConstraints(  
608 - maxWidth:  
609 - ScreenUtil()  
610 - .setWidth(  
611 - 195 *  
612 - 2)),  
613 - padding: EdgeInsets  
614 - .fromLTRB(  
615 - ScreenUtil()  
616 - .setWidth(  
617 - 60),  
618 - ScreenUtil()  
619 - .setWidth(  
620 - 30),  
621 - ScreenUtil()  
622 - .setWidth(  
623 - 60), 519 + RepaintBoundary(
  520 + key: globalKey,
  521 + child: Container(
  522 + padding: EdgeInsets.fromLTRB(
  523 + ScreenUtil().setWidth(10),
  524 + ScreenUtil().setWidth(10),
  525 + ScreenUtil().setWidth(10),
  526 + ScreenUtil().setWidth(40)),
  527 + // color: Colors.red,
  528 + child: Column(
  529 + children: [
  530 + Container(
  531 + height: ScreenUtil().setWidth(58),
  532 + child: Text(
  533 + user.sellername,
  534 + style: TextStyle(
  535 + // letterSpacing: ScreenUtil()
  536 + // .setWidth(2.13 * 2),
  537 + color:
  538 + MyColours.color_333333,
  539 + // fontWeight: FontWeight.bold,
  540 + fontSize:
  541 + ScreenUtil().setSp(42)),
  542 + ),
  543 + ),
  544 + VEmptyView(14),
  545 + Container(
  546 + height: ScreenUtil().setWidth(58),
  547 + child: Text(
  548 + '${dateTimeStr}',
  549 + style: TextStyle(
  550 + letterSpacing: ScreenUtil()
  551 + .setWidth(1.8 * 2),
  552 + color:
  553 + MyColours.color_333333,
  554 + fontSize:
  555 + ScreenUtil().setSp(42)),
  556 + ),
  557 + ),
  558 + VEmptyView(26),
  559 + Container(
  560 + height: ScreenUtil().setWidth(44),
  561 + child: Text(
  562 + '已为您安排在包间',
  563 + style: TextStyle(
  564 + color:
  565 + MyColours.color_666666,
  566 + fontSize:
  567 + ScreenUtil().setSp(32)),
  568 + ),
  569 + ),
  570 + VEmptyView(28),
  571 + GestureDetector(
  572 + onTapDown: (TapDownDetails
  573 + details) =>
  574 + onTapDown(context, details),
  575 + child: Container(
  576 + child: Stack(
  577 + alignment:
  578 + Alignment.bottomCenter,
  579 + overflow: Overflow.visible,
  580 + children: [
  581 + Container(
  582 + margin: EdgeInsets.only(
  583 + bottom: ScreenUtil()
  584 + .setWidth(24)),
  585 + constraints: BoxConstraints(
  586 + maxWidth: ScreenUtil()
  587 + .setWidth(
  588 + 195 * 2)),
  589 + padding:
  590 + EdgeInsets.fromLTRB(
  591 + ScreenUtil()
  592 + .setWidth(60),
  593 + ScreenUtil()
  594 + .setWidth(30),
  595 + ScreenUtil()
  596 + .setWidth(60),
  597 + ScreenUtil()
  598 + .setWidth(
  599 + 24 * 2)),
  600 + decoration: BoxDecoration(
  601 + borderRadius: BorderRadius.all(
  602 + Radius.circular(
624 ScreenUtil() 603 ScreenUtil()
625 .setWidth( 604 .setWidth(
626 - 24 *  
627 - 2)),  
628 - decoration: BoxDecoration(  
629 - borderRadius: BorderRadius.all(  
630 - Radius.circular(  
631 - ScreenUtil()  
632 - .setWidth(13 * 605 + 13 *
633 2))), 606 2))),
634 - border: Border.all(  
635 - color: MyColours  
636 - .color_BA9953,  
637 - width: ScreenUtil() 607 + border: Border.all(
  608 + color: MyColours
  609 + .color_199095,
  610 + width:
  611 + ScreenUtil()
638 .setWidth( 612 .setWidth(
639 4))), 613 4))),
640 - child: Text(  
641 - widget.tableInfo  
642 - .replaceAll(  
643 - "\n", ""),  
644 - style: TextStyle(  
645 - // letterSpacing: ScreenUtil()  
646 - // .setWidth(2.13 * 2),  
647 - color: MyColours  
648 - .color_BA9953,  
649 - fontWeight:  
650 - FontWeight  
651 - .bold,  
652 - fontSize:  
653 - ScreenUtil()  
654 - .setSp(  
655 - 52)),  
656 - ),  
657 - ),  
658 - Positioned(  
659 - key: key,  
660 - bottom: 0,  
661 - child: _baseIndoProvider  
662 - .photoList  
663 - .length >  
664 - 0  
665 - ? RoundButton(  
666 - onPressed:  
667 - () {  
668 - _seePhoto();  
669 - },  
670 - text: '浏览照片',  
671 - width: ScreenUtil()  
672 - .setWidth(  
673 - 68 *  
674 - 2),  
675 - height: ScreenUtil() 614 + child: Text(
  615 + widget.tableInfo
  616 + .replaceAll(
  617 + "\n", ""),
  618 + style: TextStyle(
  619 + // letterSpacing: ScreenUtil()
  620 + // .setWidth(2.13 * 2),
  621 + color: MyColours
  622 + .color_333333,
  623 + fontWeight:
  624 + FontWeight.bold,
  625 + fontSize:
  626 + ScreenUtil()
  627 + .setSp(52)),
  628 + ),
  629 + ),
  630 + Positioned(
  631 + key: key,
  632 + bottom: 0,
  633 + child: _baseIndoProvider
  634 + .photoList
  635 + .length >
  636 + 0
  637 + ? RoundButton(
  638 + onPressed: () {
  639 + _seePhoto();
  640 + },
  641 + text: '浏览照片',
  642 + width: ScreenUtil()
  643 + .setWidth(
  644 + 68 * 2),
  645 + height:
  646 + ScreenUtil()
676 .setWidth( 647 .setWidth(
677 24 * 648 24 *
678 2), 649 2),
679 - fontSize: 26,  
680 - textColor:  
681 - MyColours  
682 - .color_333333,  
683 - isBold: false,  
684 - gradientStart:  
685 - MyColours  
686 - .color_BA9953,  
687 - gradientEnd:  
688 - MyColours  
689 - .color_BA9953,  
690 - )  
691 - : Container(),  
692 - )  
693 - ],  
694 - ))),  
695 - ],  
696 - ),  
697 - ), 650 + fontSize: 26,
  651 + textColor: MyColours
  652 + .color_ffffff,
  653 + isBold: false,
  654 + gradientStart:
  655 + MyColours
  656 + .color_199095,
  657 + gradientEnd: MyColours
  658 + .color_199095,
  659 + )
  660 + : Container(),
  661 + )
  662 + ],
  663 + ))),
  664 + ],
698 ), 665 ),
699 -  
700 - VEmptyView(30),  
701 - Container(  
702 - // height: ScreenUtil().setWidth(40),  
703 - child: Text(  
704 - '${user.sellerAddr}',  
705 - maxLines: 3,  
706 - overflow: TextOverflow.ellipsis,  
707 - textAlign: TextAlign.center,  
708 - style: TextStyle(  
709 - color: MyColours.color_BA9953,  
710 - fontSize:  
711 - ScreenUtil().setSp(28)),  
712 - ),  
713 - ),  
714 - // VEmptyView(20),  
715 - // RoundButton(  
716 - // text: '一键导航',  
717 - // width: ScreenUtil().setWidth(68 * 2),  
718 - // height: ScreenUtil().setWidth(24 * 2),  
719 - // fontSize: 24,  
720 - // textColor: MyColours.color_794F28,  
721 - // isBold: false,  
722 - // gradientStart:  
723 - // Color.fromRGBO(121, 79, 40, 0.1),  
724 - // gradientEnd:  
725 - // Color.fromRGBO(121, 79, 40, 0.1),  
726 - // ),  
727 - // VEmptyView(50),  
728 - // Image.asset(  
729 - // "assets/yd_down.png",  
730 - // width: ScreenUtil().setWidth(195 * 2),  
731 - // height:  
732 - // ScreenUtil().setHeight(33 * 2),  
733 - // ),  
734 - // VEmptyView(60),  
735 - ], 666 + ),
736 ), 667 ),
737 - )  
738 - ],  
739 - ),  
740 - ),  
741 - VEmptyView(couponHeight),  
742 - ])),  
743 - Container(  
744 - width: double.infinity,  
745 - height: ScreenUtil().setHeight(99),  
746 - child: Row(  
747 - children: <Widget>[  
748 - GestureDetector(  
749 - onTap: () async {  
750 - if (widget.phone.isEmpty) {  
751 - Utils.showToast("没有预订人电话信息");  
752 - return;  
753 - }  
754 - if (!couponProvider.sendSMS) {  
755 - Map<String, String> params = {  
756 - "id": widget.rid,  
757 - "uid": Provider.of<UserModel>(context,  
758 - listen: false)  
759 - .user  
760 - .openid,  
761 - "phone": widget.phone,  
762 - "Strtext": user.sellername +  
763 - _baseIndoProvider.baseInfoSunModel.name  
764 - };  
765 - bool success = await couponProvider  
766 - .sendSMSWxSendSms(context, params);  
767 - print(success);  
768 - if (success) {  
769 - Utils.showToast('短信已经发送成功！');  
770 - } else {  
771 - Utils.showToast('发送次数太频繁！');  
772 - }  
773 - } else {  
774 - Utils.showToast('短信已经发送成功！');  
775 - }  
776 668
777 - // NavigatorUtil.goSmsPage(context, widget.rid);  
778 - },  
779 - child: Container(  
780 - width: ScreenUtil().setWidth(135 * 2),  
781 - height: double.infinity,  
782 - alignment: Alignment.center,  
783 - decoration: BoxDecoration(  
784 - color: MyColours.color_262628,  
785 - border: Border(  
786 - top: BorderSide(  
787 - width: ScreenUtil().setWidth(1),  
788 - color: MyColours.color_ECD9B7))),  
789 - child: Text(  
790 - "发短信",  
791 - style: TextStyle(  
792 - color: MyColours.color_ECD9B7,  
793 - fontSize: ScreenUtil().setSp(28)), 669 + VEmptyView(30),
  670 + Container(
  671 + // height: ScreenUtil().setWidth(40),
  672 + child: Text(
  673 + '${user.sellerAddr}',
  674 + maxLines: 3,
  675 + overflow: TextOverflow.ellipsis,
  676 + textAlign: TextAlign.center,
  677 + style: TextStyle(
  678 + color: MyColours.color_333333,
  679 + fontSize: ScreenUtil().setSp(28)),
  680 + ),
  681 + ),
  682 + // VEmptyView(20),
  683 + // RoundButton(
  684 + // text: '一键导航',
  685 + // width: ScreenUtil().setWidth(68 * 2),
  686 + // height: ScreenUtil().setWidth(24 * 2),
  687 + // fontSize: 24,
  688 + // textColor: MyColours.color_794F28,
  689 + // isBold: false,
  690 + // gradientStart:
  691 + // Color.fromRGBO(121, 79, 40, 0.1),
  692 + // gradientEnd:
  693 + // Color.fromRGBO(121, 79, 40, 0.1),
  694 + // ),
  695 + // VEmptyView(50),
  696 + // Image.asset(
  697 + // "assets/yd_down.png",
  698 + // width: ScreenUtil().setWidth(195 * 2),
  699 + // height:
  700 + // ScreenUtil().setHeight(33 * 2),
  701 + // ),
  702 + // VEmptyView(60),
  703 + ],
794 ), 704 ),
795 - ),  
796 - ),  
797 - Expanded(  
798 - child: GestureDetector(  
799 - onTap: () async {  
800 - // Uint8List image = await _getImage(); 705 + )
  706 + ],
  707 + ),
  708 + ),
  709 + VEmptyView(couponHeight),
  710 + ])),
  711 + Padding(
  712 + padding: EdgeInsets.fromLTRB(
  713 + ScreenUtil().setWidth(70),
  714 + ScreenUtil().setWidth(20),
  715 + ScreenUtil().setWidth(70),
  716 + ScreenUtil().setWidth(40)),
  717 + child: Column(children: [
  718 + RoundButton(
  719 + text: '通知客户',
  720 + width: double.infinity,
  721 + height: ScreenUtil().setWidth(84),
  722 + gradientStart: MyColours.color_199095,
  723 + gradientEnd: MyColours.color_199095,
  724 + textColor: MyColours.color_ffffff,
  725 + fontSize: 34,
  726 + radius: ScreenUtil().setWidth(10),
  727 + isBold: false,
  728 + onPressed: () async {
  729 + // Uint8List image = await _getImage();
801 730
802 - if (ObjectUtil.isEmpty(  
803 - _baseIndoProvider.baseInfoSunModel)) {  
804 - Utils.showToast('请输入个人资料');  
805 - return;  
806 - }  
807 - if (ObjectUtil.isEmpty(_baseIndoProvider  
808 - .baseInfoSunModel.name)) {  
809 - Utils.showToast('请填写您的姓名');  
810 - return;  
811 - }  
812 - if (ObjectUtil.isEmpty(_baseIndoProvider  
813 - .baseInfoSunModel.phone)) {  
814 - Utils.showToast('请填写您的联系电话');  
815 - return;  
816 - }  
817 - if (ObjectUtil.isEmpty(_baseIndoProvider  
818 - .baseInfoSunModel.position)) {  
819 - Utils.showToast('请填写您在餐厅中的职位');  
820 - return;  
821 - }  
822 - if (ObjectUtil.isEmpty(_baseIndoProvider  
823 - .baseInfoSunModel.phone)) {  
824 - Utils.showToast('请上传您的头像');  
825 - return;  
826 - }  
827 - if (ObjectUtil.isEmpty(_baseIndoProvider  
828 - .baseInfoSunModel.qrcode)) {  
829 - Utils.showToast('请上传您的微信二维码');  
830 - return;  
831 - }  
832 - if (!couponProvider.hasModify &&  
833 - couponProvider.coupons.length > 0) {  
834 - Map<String, String> params = {  
835 - "rid": widget.rid,  
836 - "aid": Utils.listToStringEnglish(  
837 - couponProvider.coupons)  
838 - };  
839 - bool isSuc = await couponProvider  
840 - .setActivityAsReserve(context, params);  
841 - if (isSuc) {  
842 - couponProvider.hasModify = true; 731 + if (ObjectUtil.isEmpty(
  732 + _baseIndoProvider.baseInfoSunModel)) {
  733 + Utils.showToast('请输入个人资料');
  734 + return;
  735 + }
  736 + if (ObjectUtil.isEmpty(
  737 + _baseIndoProvider.baseInfoSunModel.name)) {
  738 + Utils.showToast('请填写您的姓名');
  739 + return;
  740 + }
  741 + if (ObjectUtil.isEmpty(
  742 + _baseIndoProvider.baseInfoSunModel.phone)) {
  743 + Utils.showToast('请填写您的联系电话');
  744 + return;
  745 + }
  746 + if (ObjectUtil.isEmpty(
  747 + _baseIndoProvider.baseInfoSunModel.position)) {
  748 + Utils.showToast('请填写您在餐厅中的职位');
  749 + return;
  750 + }
  751 + if (ObjectUtil.isEmpty(
  752 + _baseIndoProvider.baseInfoSunModel.phone)) {
  753 + Utils.showToast('请上传您的头像');
  754 + return;
  755 + }
  756 + if (ObjectUtil.isEmpty(
  757 + _baseIndoProvider.baseInfoSunModel.qrcode)) {
  758 + Utils.showToast('请上传您的微信二维码');
  759 + return;
  760 + }
  761 + if (!couponProvider.hasModify &&
  762 + couponProvider.coupons.length > 0) {
  763 + Map<String, String> params = {
  764 + "rid": widget.rid,
  765 + "aid": Utils.listToStringEnglish(
  766 + couponProvider.coupons)
  767 + };
  768 + bool isSuc = await couponProvider
  769 + .setActivityAsReserve(context, params);
  770 + if (isSuc) {
  771 + couponProvider.hasModify = true;
843 772
844 - bool isSuccess =  
845 - await Utils.goShareInvicationToWeChat(  
846 - widget.rid,  
847 - Provider.of<UserModel>(context,  
848 - listen: false)  
849 - .user  
850 - .openid);  
851 - print(isSuccess);  
852 - // couponProvider.couponsShow = [];  
853 - // couponProvider.couponsShow  
854 - // .addAll(couponProvider.coupons);  
855 - // couponProvider.coupons = [];  
856 - // couponProvider.notifyListeners();  
857 - }  
858 - } else {  
859 - bool isSuccess =  
860 - await Utils.goShareInvicationToWeChat(  
861 - widget.rid,  
862 - Provider.of<UserModel>(context,  
863 - listen: false)  
864 - .user  
865 - .openid);  
866 - print(isSuccess);  
867 - }  
868 - },  
869 - child: Container(  
870 - width: double.infinity,  
871 - height: double.infinity,  
872 - color: MyColours.color_ECD9B7,  
873 - alignment: Alignment.center,  
874 - child: Text(  
875 - "通知客户",  
876 - style: TextStyle(  
877 - color: MyColours.color_7B512A,  
878 - fontSize: ScreenUtil().setSp(30)),  
879 - ),  
880 - ),  
881 - ),  
882 - )  
883 - ], 773 + bool isSuccess =
  774 + await Utils.goShareInvicationToWeChat(
  775 + widget.rid,
  776 + Provider.of<UserModel>(context,
  777 + listen: false)
  778 + .user
  779 + .openid);
  780 + print(isSuccess);
  781 + // couponProvider.couponsShow = [];
  782 + // couponProvider.couponsShow
  783 + // .addAll(couponProvider.coupons);
  784 + // couponProvider.coupons = [];
  785 + // couponProvider.notifyListeners();
  786 + }
  787 + } else {
  788 + bool isSuccess =
  789 + await Utils.goShareInvicationToWeChat(
  790 + widget.rid,
  791 + Provider.of<UserModel>(context,
  792 + listen: false)
  793 + .user
  794 + .openid);
  795 + print(isSuccess);
  796 + }
  797 + },
884 ), 798 ),
885 - )  
886 - ])),  
887 - Positioned(  
888 - left: ScreenUtil().setWidth(0),  
889 - top: ScreenUtil().setWidth(0),  
890 - child: SafeArea(  
891 - child: GestureDetector(  
892 - onTap: () {  
893 - Navigator.of(context).pop();  
894 - },  
895 - behavior: HitTestBehavior.opaque,  
896 - child: Container(  
897 - padding: EdgeInsets.fromLTRB(  
898 - ScreenUtil().setWidth(40),  
899 - ScreenUtil().setWidth(28),  
900 - ScreenUtil().setWidth(200),  
901 - ScreenUtil().setWidth(100), 799 + VEmptyView(20),
  800 + RoundButton(
  801 + text: '发短信',
  802 + width: double.infinity,
  803 + height: ScreenUtil().setWidth(84),
  804 + gradientStart: MyColours.color_ffffff,
  805 + gradientEnd: MyColours.color_ffffff,
  806 + textColor: MyColours.color_199095,
  807 + borderColor: MyColours.color_199095,
  808 + fontSize: 34,
  809 + radius: ScreenUtil().setWidth(10),
  810 + isBold: false,
  811 + onPressed: () async {
  812 + if (widget.phone.isEmpty) {
  813 + Utils.showToast("没有预订人电话信息");
  814 + return;
  815 + }
  816 + if (!couponProvider.sendSMS) {
  817 + Map<String, String> params = {
  818 + "id": widget.rid,
  819 + "uid": Provider.of<UserModel>(context,
  820 + listen: false)
  821 + .user
  822 + .openid,
  823 + "phone": widget.phone,
  824 + "Strtext": user.sellername +
  825 + _baseIndoProvider.baseInfoSunModel.name
  826 + };
  827 + bool success = await couponProvider
  828 + .sendSMSWxSendSms(context, params);
  829 + print(success);
  830 + if (success) {
  831 + Utils.showToast('短信已经发送成功！');
  832 + } else {
  833 + Utils.showToast('发送次数太频繁！');
  834 + }
  835 + } else {
  836 + Utils.showToast('短信已经发送成功！');
  837 + }
  838 +
  839 + // NavigatorUtil.goSmsPage(context, widget.rid);
  840 + },
902 ), 841 ),
903 - alignment: Alignment.centerLeft,  
904 - child: Image.asset(  
905 - "assets/back_white.png",  
906 - width: ScreenUtil().setWidth(20),  
907 - height: ScreenUtil().setHeight(31),  
908 - )),  
909 - )),  
910 - ), 842 + ])),
  843 + ]),
911 Positioned( 844 Positioned(
912 // left: ScreenUtil().setWidth(180), 845 // left: ScreenUtil().setWidth(180),
913 - bottom: ScreenUtil().setWidth(110),  
914 - right: ScreenUtil().setWidth(40), 846 + bottom: ScreenUtil().setWidth(124 * 2),
  847 + right: ScreenUtil().setWidth(52 * 2),
915 child: couponProvider.hasModify || 848 child: couponProvider.hasModify ||
916 couponProvider.coupons.length > 0 || 849 couponProvider.coupons.length > 0 ||
917 couponProvider.couponListSelect.length > 0 850 couponProvider.couponListSelect.length > 0
@@ -931,7 +864,7 @@ class InvicationPageState extends State<InvicationPage> { @@ -931,7 +864,7 @@ class InvicationPageState extends State<InvicationPage> {
931 vertical: ScreenUtil().setWidth(16)), 864 vertical: ScreenUtil().setWidth(16)),
932 height: ScreenUtil().setWidth(35 * 2), 865 height: ScreenUtil().setWidth(35 * 2),
933 decoration: BoxDecoration( 866 decoration: BoxDecoration(
934 - color: MyColours.color_000000, 867 + color: Color.fromRGBO(0, 0, 0, 0.5),
935 borderRadius: BorderRadius.circular( 868 borderRadius: BorderRadius.circular(
936 ScreenUtil().setWidth(20))), 869 ScreenUtil().setWidth(20))),
937 child: Row( 870 child: Row(
@@ -40,6 +40,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -40,6 +40,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
40 40
41 controller = ScrollController(initialScrollOffset: 0.0); 41 controller = ScrollController(initialScrollOffset: 0.0);
42 WidgetsBinding.instance.addObserver(this); 42 WidgetsBinding.instance.addObserver(this);
  43 + Utils.changeStatusColor(color: MyColours.color_199095);
43 Utils.getCurrVersion().then((version) { 44 Utils.getCurrVersion().then((version) {
44 setState(() { 45 setState(() {
45 cur_version = "v" + version; 46 cur_version = "v" + version;
@@ -53,7 +54,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -53,7 +54,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
53 ///获取积分 54 ///获取积分
54 }); 55 });
55 EventBus().on('changeStatusColor', (arg) { 56 EventBus().on('changeStatusColor', (arg) {
56 - Utils.changeStatusColor(color: Colors.transparent); 57 + Utils.changeStatusColor(color: MyColours.color_199095);
57 }); 58 });
58 } 59 }
59 60
@@ -36,7 +36,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -36,7 +36,7 @@ class NoteBookPageState extends State<NoteBookPage> {
36 String noon; //午市时间段 36 String noon; //午市时间段
37 String night; //晚市时间段 37 String night; //晚市时间段
38 38
39 - DateTime dateTime; //当前日期 39 + DateTime dateTimeNow; //当前日期
40 40
41 UserModel userModel; 41 UserModel userModel;
42 42
@@ -70,11 +70,11 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -70,11 +70,11 @@ class NoteBookPageState extends State<NoteBookPage> {
70 70
71 //初始化时间 71 //初始化时间
72 _initTime() { 72 _initTime() {
73 - dateTime = DateTime.now();  
74 - dateText = "${dateTime.year}年 " +  
75 - Utils.addZeroNumber(dateTime.month) + 73 + dateTimeNow = DateTime.now();
  74 + dateText = "${dateTimeNow.year}年 " +
  75 + Utils.addZeroNumber(dateTimeNow.month) +
76 "月" + 76 "月" +
77 - Utils.addZeroNumber(dateTime.day) + 77 + Utils.addZeroNumber(dateTimeNow.day) +
78 "日" + 78 "日" +
79 " 今天"; 79 " 今天";
80 morning = 80 morning =
@@ -82,49 +82,49 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -82,49 +82,49 @@ class NoteBookPageState extends State<NoteBookPage> {
82 noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon; 82 noon = userModel.user.noon.isEmpty ? "00:00-00:00" : userModel.user.noon;
83 night = userModel.user.night.isEmpty ? "00:00-00:00" : userModel.user.night; 83 night = userModel.user.night.isEmpty ? "00:00-00:00" : userModel.user.night;
84 if (morning != '' && 84 if (morning != '' &&
85 - dateTime.isBefore(DateTime.parse(dateTime.year.toString() + 85 + dateTimeNow.isBefore(DateTime.parse(dateTimeNow.year.toString() +
86 "-" + 86 "-" +
87 - Utils.addZeroNumber(dateTime.month) + 87 + Utils.addZeroNumber(dateTimeNow.month) +
88 "-" + 88 "-" +
89 - Utils.addZeroNumber(dateTime.day) + 89 + Utils.addZeroNumber(dateTimeNow.day) +
90 " " + 90 " " +
91 morning.split("-")[1] + 91 morning.split("-")[1] +
92 ":00"))) { 92 ":00"))) {
93 //未过早市 93 //未过早市
94 currTimeIndex = 1; 94 currTimeIndex = 1;
95 } else if (noon != '' && 95 } else if (noon != '' &&
96 - dateTime.isAfter(DateTime.parse(dateTime.year.toString() + 96 + dateTimeNow.isAfter(DateTime.parse(dateTimeNow.year.toString() +
97 "-" + 97 "-" +
98 - Utils.addZeroNumber(dateTime.month) + 98 + Utils.addZeroNumber(dateTimeNow.month) +
99 "-" + 99 "-" +
100 - Utils.addZeroNumber(dateTime.day) + 100 + Utils.addZeroNumber(dateTimeNow.day) +
101 " " + 101 " " +
102 morning.split("-")[1] + 102 morning.split("-")[1] +
103 ":00")) && 103 ":00")) &&
104 - dateTime.isBefore(DateTime.parse(dateTime.year.toString() + 104 + dateTimeNow.isBefore(DateTime.parse(dateTimeNow.year.toString() +
105 "-" + 105 "-" +
106 - Utils.addZeroNumber(dateTime.month) + 106 + Utils.addZeroNumber(dateTimeNow.month) +
107 "-" + 107 "-" +
108 - Utils.addZeroNumber(dateTime.day) + 108 + Utils.addZeroNumber(dateTimeNow.day) +
109 " " + 109 " " +
110 noon.split("-")[1] + 110 noon.split("-")[1] +
111 ":00"))) { 111 ":00"))) {
112 //过了早市，未过午市 112 //过了早市，未过午市
113 currTimeIndex = 2; 113 currTimeIndex = 2;
114 } else if (night != '' && 114 } else if (night != '' &&
115 - dateTime.isAfter(DateTime.parse(dateTime.year.toString() + 115 + dateTimeNow.isAfter(DateTime.parse(dateTimeNow.year.toString() +
116 "-" + 116 "-" +
117 - Utils.addZeroNumber(dateTime.month) + 117 + Utils.addZeroNumber(dateTimeNow.month) +
118 "-" + 118 "-" +
119 - Utils.addZeroNumber(dateTime.day) + 119 + Utils.addZeroNumber(dateTimeNow.day) +
120 " " + 120 " " +
121 noon.split("-")[1] + 121 noon.split("-")[1] +
122 ":00")) && 122 ":00")) &&
123 - dateTime.isBefore(DateTime.parse(dateTime.year.toString() + 123 + dateTimeNow.isBefore(DateTime.parse(dateTimeNow.year.toString() +
124 "-" + 124 "-" +
125 - Utils.addZeroNumber(dateTime.month) + 125 + Utils.addZeroNumber(dateTimeNow.month) +
126 "-" + 126 "-" +
127 - Utils.addZeroNumber(dateTime.day) + 127 + Utils.addZeroNumber(dateTimeNow.day) +
128 " " + 128 " " +
129 night.split("-")[1] + 129 night.split("-")[1] +
130 ":00"))) { 130 ":00"))) {
@@ -157,20 +157,20 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -157,20 +157,20 @@ class NoteBookPageState extends State<NoteBookPage> {
157 //获取一天开始-结束时间字符串 157 //获取一天开始-结束时间字符串
158 String _getRdate() { 158 String _getRdate() {
159 //一天开始时间 159 //一天开始时间
160 - double startDay = (DateTime.parse((dateTime.year.toString() + 160 + double startDay = (DateTime.parse((dateTimeNow.year.toString() +
161 "-" + 161 "-" +
162 - Utils.addZeroNumber(dateTime.month) + 162 + Utils.addZeroNumber(dateTimeNow.month) +
163 "-" + 163 "-" +
164 - Utils.addZeroNumber(dateTime.day) + 164 + Utils.addZeroNumber(dateTimeNow.day) +
165 " 00:00:00")) 165 " 00:00:00"))
166 .millisecondsSinceEpoch) / 166 .millisecondsSinceEpoch) /
167 1000; 167 1000;
168 //一天结束时间 168 //一天结束时间
169 - double endDay = (DateTime.parse((dateTime.year.toString() + 169 + double endDay = (DateTime.parse((dateTimeNow.year.toString() +
170 "-" + 170 "-" +
171 - Utils.addZeroNumber(dateTime.month) + 171 + Utils.addZeroNumber(dateTimeNow.month) +
172 "-" + 172 "-" +
173 - Utils.addZeroNumber(dateTime.day) + 173 + Utils.addZeroNumber(dateTimeNow.day) +
174 " 23:59:59")) 174 " 23:59:59"))
175 .millisecondsSinceEpoch) / 175 .millisecondsSinceEpoch) /
176 1000; 176 1000;
@@ -182,13 +182,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -182,13 +182,13 @@ class NoteBookPageState extends State<NoteBookPage> {
182 NoteBookModel model = Provider.of<NoteBookModel>(context, listen: false); 182 NoteBookModel model = Provider.of<NoteBookModel>(context, listen: false);
183 Map<String, String> params = { 183 Map<String, String> params = {
184 "sid": userModel.user.sellerid, 184 "sid": userModel.user.sellerid,
185 - "day": dateTime.year.toString() +  
186 - (dateTime.month < 10  
187 - ? "0" + dateTime.month.toString()  
188 - : dateTime.month.toString()) +  
189 - (dateTime.day < 10  
190 - ? "0" + dateTime.day.toString()  
191 - : dateTime.day.toString()) 185 + "day": dateTimeNow.year.toString() +
  186 + (dateTimeNow.month < 10
  187 + ? "0" + dateTimeNow.month.toString()
  188 + : dateTimeNow.month.toString()) +
  189 + (dateTimeNow.day < 10
  190 + ? "0" + dateTimeNow.day.toString()
  191 + : dateTimeNow.day.toString())
192 }; 192 };
193 if (tabIndex == 1) { 193 if (tabIndex == 1) {
194 params["account"] = userModel.user.account; 194 params["account"] = userModel.user.account;
@@ -266,7 +266,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -266,7 +266,7 @@ class NoteBookPageState extends State<NoteBookPage> {
266 266
267 //生成日期文本 267 //生成日期文本
268 _createDateText(DateTime day) { 268 _createDateText(DateTime day) {
269 - if (Utils.isOneDay(day, dateTime)) return; //日期没变 269 + if (Utils.isOneDay(day, dateTimeNow)) return; //日期没变
270 setState(() { 270 setState(() {
271 DateTime dateNow = DateTime.now(); 271 DateTime dateNow = DateTime.now();
272 dateText = "${day.year}年 " + 272 dateText = "${day.year}年 " +
@@ -283,7 +283,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -283,7 +283,7 @@ class NoteBookPageState extends State<NoteBookPage> {
283 } else { 283 } else {
284 dateText += " 周${Utils.formatWeekDayNum(day.weekday)}"; 284 dateText += " 周${Utils.formatWeekDayNum(day.weekday)}";
285 } 285 }
286 - dateTime = day; 286 + dateTimeNow = day;
287 }); 287 });
288 _getReserveList(); 288 _getReserveList();
289 _reserveCountDay(); 289 _reserveCountDay();
@@ -422,7 +422,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -422,7 +422,7 @@ class NoteBookPageState extends State<NoteBookPage> {
422 child: Center( 422 child: Center(
423 child: GestureDetector( 423 child: GestureDetector(
424 onTap: () { 424 onTap: () {
425 - DialogUtil.showCalendarDialog(context, dateTime) 425 + DialogUtil.showCalendarDialog(context, dateTimeNow)
426 .then((day) { 426 .then((day) {
427 if (day != null) { 427 if (day != null) {
428 _createDateText(day); 428 _createDateText(day);
@@ -85,6 +85,10 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -85,6 +85,10 @@ class SelectTablePageState extends State<SelectTablePage> {
85 } 85 }
86 } 86 }
87 } 87 }
  88 + if (tableOuterList.length == 0) {
  89 + _chooseTableModel.pageState = PageState.Empty;
  90 + _chooseTableModel.notifyListeners();
  91 + }
88 if (_chooseTableModel.pageState == PageState.Success) { 92 if (_chooseTableModel.pageState == PageState.Success) {
89 _getReserveList(userModel.user.sellerid); 93 _getReserveList(userModel.user.sellerid);
90 } 94 }
@@ -195,7 +199,7 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -195,7 +199,7 @@ class SelectTablePageState extends State<SelectTablePage> {
195 callback: () { 199 callback: () {
196 getTableList(); 200 getTableList();
197 }, 201 },
198 - emptyMsg: "暂时没有预订哦", 202 + emptyMsg: "暂时没有桌位哦",
199 emptyImg: "empty_search", 203 emptyImg: "empty_search",
200 showMsg: "加载中，请稍后...", 204 showMsg: "加载中，请稍后...",
201 ); 205 );
@@ -2,6 +2,8 @@ import 'package:common_utils/common_utils.dart'; @@ -2,6 +2,8 @@ import 'package:common_utils/common_utils.dart';
2 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
3 import 'package:one_key/app.dart'; 3 import 'package:one_key/app.dart';
4 import 'package:one_key/constant/constant.dart'; 4 import 'package:one_key/constant/constant.dart';
  5 +import 'package:one_key/constant/error.dart';
  6 +import 'package:one_key/models/notebook.dart';
5 import 'package:one_key/models/notebook_detail.dart'; 7 import 'package:one_key/models/notebook_detail.dart';
6 import 'package:one_key/models/reserve_info_model.dart'; 8 import 'package:one_key/models/reserve_info_model.dart';
7 import 'package:one_key/models/seller_info.dart'; 9 import 'package:one_key/models/seller_info.dart';
@@ -11,12 +13,13 @@ import 'package:one_key/net/base_resp.dart'; @@ -11,12 +13,13 @@ import 'package:one_key/net/base_resp.dart';
11 import 'package:one_key/net/dio_util.dart'; 13 import 'package:one_key/net/dio_util.dart';
12 import 'package:one_key/net/http_url.dart'; 14 import 'package:one_key/net/http_url.dart';
13 import 'package:one_key/provider/notebook_detail_model.dart'; 15 import 'package:one_key/provider/notebook_detail_model.dart';
  16 +import 'package:one_key/provider/notebook_model.dart';
14 import 'package:one_key/provider/user_model.dart'; 17 import 'package:one_key/provider/user_model.dart';
15 import 'package:one_key/utils/utils.dart'; 18 import 'package:one_key/utils/utils.dart';
16 import 'package:provider/provider.dart'; 19 import 'package:provider/provider.dart';
17 20
18 class HomeEnterModel with ChangeNotifier { 21 class HomeEnterModel with ChangeNotifier {
19 - List dateList = []; //日期选择 月-日 某天 22 + // List dateList = []; //日期选择 月-日 某天
20 List sunDateList = []; // 早市、午市、晚市 23 List sunDateList = []; // 早市、午市、晚市
21 List personNumList = []; // 人数 24 List personNumList = []; // 人数
22 TextEditingController numController = TextEditingController(); //人数 25 TextEditingController numController = TextEditingController(); //人数
@@ -34,12 +37,11 @@ class HomeEnterModel with ChangeNotifier { @@ -34,12 +37,11 @@ class HomeEnterModel with ChangeNotifier {
34 String isSetDate = '0'; 37 String isSetDate = '0';
35 List<TableList> recommendList = []; //推荐列表 38 List<TableList> recommendList = []; //推荐列表
36 bool isRecommend = false; //是否展示推荐 39 bool isRecommend = false; //是否展示推荐
37 - List oldTableList = [];  
38 40
39 List<UserHistoryEntity> userHistorys = []; //历史录入 41 List<UserHistoryEntity> userHistorys = []; //历史录入
40 42
41 clearData() { 43 clearData() {
42 - dateList = []; //日期选择 月-日 某天 44 + // dateList = []; //日期选择 月-日 某天
43 sunDateList = []; // 早市、午市、晚市 45 sunDateList = []; // 早市、午市、晚市
44 personNumList = []; // 人数 46 personNumList = []; // 人数
45 numController = TextEditingController(); //人数 47 numController = TextEditingController(); //人数
@@ -55,47 +57,47 @@ class HomeEnterModel with ChangeNotifier { @@ -55,47 +57,47 @@ class HomeEnterModel with ChangeNotifier {
55 57
56 //构造函数,初始化 58 //构造函数,初始化
57 HomeEnterModel() { 59 HomeEnterModel() {
58 - _initDateList(); 60 + // _initDateList();
59 _initPersonNumList(); 61 _initPersonNumList();
60 initSexList(); 62 initSexList();
61 } 63 }
62 64
63 - ///初始化 日期选择 月-日 某天  
64 - _initDateList() {  
65 - //今天  
66 - DateTime dateTime = DateTime.now();  
67 - int dateTimeMill = dateTime.millisecondsSinceEpoch;  
68 - String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'yyyy-MM-dd');  
69 - dateList.add({  
70 - 'title': dateText,  
71 - 'select': false,  
72 - 'fontSize': 34.0,  
73 - 'dayText': ' 今天',  
74 - 'isImage': false  
75 - });  
76 - //明天  
77 - int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000;  
78 - String dateTextTomorrow =  
79 - DateUtil.formatDateMs(tomorrowMill, format: 'yyyy-MM-dd');  
80 - dateList.add({  
81 - 'title': dateTextTomorrow,  
82 - 'select': false,  
83 - 'fontSize': 34.0,  
84 - 'dayText': ' 明天',  
85 - 'isImage': false  
86 - });  
87 - //第三个  
88 - dateList.add({  
89 - 'title': '其他',  
90 - 'select': false,  
91 - 'fontSize': 30.0,  
92 - 'dayText': '',  
93 - 'isImage': true  
94 - });  
95 - } 65 + // ///初始化 日期选择 月-日 某天
  66 + // _initDateList() {
  67 + // //今天
  68 + // DateTime dateTime = DateTime.now();
  69 + // int dateTimeMill = dateTime.millisecondsSinceEpoch;
  70 + // String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'yyyy-MM-dd');
  71 + // dateList.add({
  72 + // 'title': dateText,
  73 + // 'select': false,
  74 + // 'fontSize': 34.0,
  75 + // 'dayText': ' 今天',
  76 + // 'isImage': false
  77 + // });
  78 + // //明天
  79 + // int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000;
  80 + // String dateTextTomorrow =
  81 + // DateUtil.formatDateMs(tomorrowMill, format: 'yyyy-MM-dd');
  82 + // dateList.add({
  83 + // 'title': dateTextTomorrow,
  84 + // 'select': false,
  85 + // 'fontSize': 34.0,
  86 + // 'dayText': ' 明天',
  87 + // 'isImage': false
  88 + // });
  89 + // //第三个
  90 + // dateList.add({
  91 + // 'title': '其他',
  92 + // 'select': false,
  93 + // 'fontSize': 30.0,
  94 + // 'dayText': '',
  95 + // 'isImage': true
  96 + // });
  97 + // }
96 98
97 /// 初始化 早市、午市、晚市 99 /// 初始化 早市、午市、晚市
98 - _initSunDateList(morning, noon, night, ddateSolt) { 100 + _initSunDateList(morning, noon, night, ddateSolt, dateText) {
99 if (morning != '') { 101 if (morning != '') {
100 sunDateList.add({ 102 sunDateList.add({
101 'dateText': '早餐', 103 'dateText': '早餐',
@@ -123,7 +125,7 @@ class HomeEnterModel with ChangeNotifier { @@ -123,7 +125,7 @@ class HomeEnterModel with ChangeNotifier {
123 'isSelect': ddateSolt == 3 ? true : false 125 'isSelect': ddateSolt == 3 ? true : false
124 }); 126 });
125 } 127 }
126 - initHourAndMinuteSelect(); 128 + initHourAndMinuteSelect(dateText);
127 notifyListeners(); 129 notifyListeners();
128 } 130 }
129 131
@@ -162,7 +164,8 @@ class HomeEnterModel with ChangeNotifier { @@ -162,7 +164,8 @@ class HomeEnterModel with ChangeNotifier {
162 } 164 }
163 165
164 /// 早市、午市、晚市对应的半个小时间隔时间段 166 /// 早市、午市、晚市对应的半个小时间隔时间段
165 - initDateHourMinuteList(BuildContext context, int index) async { 167 + initDateHourMinuteList(
  168 + BuildContext context, int index, String dateText) async {
166 UserModel userModel = Provider.of<UserModel>(context, listen: false); 169 UserModel userModel = Provider.of<UserModel>(context, listen: false);
167 userModel.user.morning == '' 170 userModel.user.morning == ''
168 ? dailyMap.putIfAbsent('morning', () => '') 171 ? dailyMap.putIfAbsent('morning', () => '')
@@ -177,7 +180,7 @@ class HomeEnterModel with ChangeNotifier { @@ -177,7 +180,7 @@ class HomeEnterModel with ChangeNotifier {
177 : dailyMap.putIfAbsent( 180 : dailyMap.putIfAbsent(
178 'night', () => _getHourAndMinute(userModel.user.night, 3)); 181 'night', () => _getHourAndMinute(userModel.user.night, 3));
179 _initSunDateList(userModel.user.morning, userModel.user.noon, 182 _initSunDateList(userModel.user.morning, userModel.user.noon,
180 - userModel.user.night, index); 183 + userModel.user.night, index, dateText);
181 } 184 }
182 185
183 //根据获取时间 11:00-12:30 获取30分钟间隔组装的数组 186 //根据获取时间 11:00-12:30 获取30分钟间隔组装的数组
@@ -244,16 +247,16 @@ class HomeEnterModel with ChangeNotifier { @@ -244,16 +247,16 @@ class HomeEnterModel with ChangeNotifier {
244 } 247 }
245 248
246 //初始化早市午市晚市选中时间 249 //初始化早市午市晚市选中时间
247 - initHourAndMinuteSelect() { 250 + initHourAndMinuteSelect(String ymyStr) {
248 int timeMillsNow = DateTime.now().millisecondsSinceEpoch; 251 int timeMillsNow = DateTime.now().millisecondsSinceEpoch;
249 //当前选中 年-月-日 252 //当前选中 年-月-日
250 - String ymyStr = "";  
251 - //今天 明天 其他天  
252 - for (var item in dateList) {  
253 - if (item['select'] == true) {  
254 - ymyStr = item['title'];  
255 - }  
256 - } 253 +
  254 + // //今天 明天 其他天
  255 + // for (var item in dateList) {
  256 + // if (item['select'] == true) {
  257 + // ymyStr = item['title'];
  258 + // }
  259 + // }
257 String timeStr = ymyStr + ' 00:00:00'; 260 String timeStr = ymyStr + ' 00:00:00';
258 LogUtil.v(timeStr); 261 LogUtil.v(timeStr);
259 DateTime dateTime = DateUtil.getDateTime(timeStr); //当前年月日 262 DateTime dateTime = DateUtil.getDateTime(timeStr); //当前年月日
@@ -373,13 +376,106 @@ class HomeEnterModel with ChangeNotifier { @@ -373,13 +376,106 @@ class HomeEnterModel with ChangeNotifier {
373 } 376 }
374 } 377 }
375 378
  379 + //获取已预订订单
  380 + Future<List<Notebook>> newGetReserveList(
  381 + BuildContext context, Map<String, String> params) async {
  382 + List<Notebook> notebooks = [];
  383 + BaseResp<List> baseResp = await DioUtil()
  384 + .request<List>(context, Method.get, HttpUrl.get_reserve_list,
  385 + data: params, showLoading: false)
  386 + .catchError((error) {
  387 + print(error.toString());
  388 + if (error is MyError) {
  389 + // switch (error.type) {
  390 + // case 1:
  391 + // pageState = PageState.ConnectivityError;
  392 + // break;
  393 + // case 2:
  394 + // pageState = PageState.ConnectivityTimeOut;
  395 + // break;
  396 + // default:
  397 + // pageState = PageState.ConnectivityError;
  398 + // break;
  399 + // }
  400 + }
  401 + });
  402 + if (baseResp == null) return [];
  403 + if (baseResp.code == Constant.status_success) {
  404 + notebooks = baseResp.data.map<Notebook>((value) {
  405 + return Notebook.fromJson(value);
  406 + }).toList();
  407 + } else {
  408 + Utils.showToast(baseResp.msg ?? "");
  409 + }
  410 + return notebooks;
  411 + }
  412 +
  413 + //获取一天开始-结束时间字符串
  414 + String _getRdate(DateTime dateTime) {
  415 + //一天开始时间
  416 + double startDay = (DateTime.parse((dateTime.year.toString() +
  417 + "-" +
  418 + Utils.addZeroNumber(dateTime.month) +
  419 + "-" +
  420 + Utils.addZeroNumber(dateTime.day) +
  421 + " 00:00:00"))
  422 + .millisecondsSinceEpoch) /
  423 + 1000;
  424 + //一天结束时间
  425 + double endDay = (DateTime.parse((dateTime.year.toString() +
  426 + "-" +
  427 + Utils.addZeroNumber(dateTime.month) +
  428 + "-" +
  429 + Utils.addZeroNumber(dateTime.day) +
  430 + " 23:59:59"))
  431 + .millisecondsSinceEpoch) /
  432 + 1000;
  433 + return startDay.floor().toString() + "-" + endDay.floor().toString();
  434 + }
  435 +
  436 + //获取已预订列表
  437 + getReserveList(BuildContext context,
  438 + {DateTime dateTime, String currTimeIndex}) async {
  439 + Map<String, Notebook> tableMap = {};
  440 + NoteBookModel model = new NoteBookModel();
  441 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  442 + Map<String, String> params = {
  443 + "sid": userModel.user.sellerid,
  444 + "rdate": _getRdate(dateTime),
  445 + "ddate_solt": currTimeIndex,
  446 + "y": "200",
  447 + "x": "1",
  448 + "keywords": "",
  449 + "sort": "1"
  450 + };
  451 +
  452 + List<Notebook> noteBooks = await newGetReserveList(context, params);
  453 + for (Notebook notebook in noteBooks) {
  454 + if (notebook.tid.isEmpty) continue;
  455 + if (notebook.status == "1" ||
  456 + notebook.status == "2" ||
  457 + notebook.status == "5") {
  458 + //已预订，用餐中，已安排
  459 + List<String> tids = notebook.tid.split(",");
  460 + for (String tid in tids) {
  461 + tableMap['$tid'] = notebook;
  462 + // tableMap.add('$tid');
  463 + }
  464 + }
  465 + }
  466 + return tableMap;
  467 + }
  468 +
376 ///根据商家ID 获取桌位信息列表： 1：散座 2：包间 默认：获取所有数据 469 ///根据商家ID 获取桌位信息列表： 1：散座 2：包间 默认：获取所有数据
377 Future<List<TableList>> getNewTableList(BuildContext context, String ddate, 470 Future<List<TableList>> getNewTableList(BuildContext context, String ddate,
378 - String ddate_solt, String pnum, List oldTableList) async { 471 + String ddate_solt, String pnum) async {
  472 + DateTime createTime = DateTime.fromMillisecondsSinceEpoch(int.parse(ddate));
  473 + Map<String, Notebook> tableMap = await getReserveList(context,
  474 + dateTime: createTime, currTimeIndex: ddate_solt);
379 if (pnum == '') { 475 if (pnum == '') {
380 pnum = '6'; 476 pnum = '6';
381 } 477 }
382 - DateTime createTime = DateTime.fromMillisecondsSinceEpoch(int.parse(ddate)); 478 +
383 String rdate = DateUtil.formatDate(createTime, format: "yyyyMMdd"); 479 String rdate = DateUtil.formatDate(createTime, format: "yyyyMMdd");
384 UserModel userModel = Provider.of<UserModel>(context, listen: false); 480 UserModel userModel = Provider.of<UserModel>(context, listen: false);
385 Map<String, String> params = { 481 Map<String, String> params = {
@@ -408,7 +504,7 @@ class HomeEnterModel with ChangeNotifier { @@ -408,7 +504,7 @@ class HomeEnterModel with ChangeNotifier {
408 Utils.showToast(baseResp.msg ?? ""); 504 Utils.showToast(baseResp.msg ?? "");
409 } 505 }
410 tableList = []; 506 tableList = [];
411 - 507 + recommendList = [];
412 for (int i = 0; i < itemModelList.length; i++) { 508 for (int i = 0; i < itemModelList.length; i++) {
413 if (itemModelList[i].name == "推荐") { 509 if (itemModelList[i].name == "推荐") {
414 recommendList = itemModelList[i].list; 510 recommendList = itemModelList[i].list;
@@ -420,8 +516,8 @@ class HomeEnterModel with ChangeNotifier { @@ -420,8 +516,8 @@ class HomeEnterModel with ChangeNotifier {
420 itemModelList.remove(item); 516 itemModelList.remove(item);
421 } 517 }
422 for (var item in item.list) { 518 for (var item in item.list) {
423 - for (var table in oldTableList) {  
424 - if (item.id == table.id) { 519 + for (var table in tableMap.values) {
  520 + if (item.id == table.tid) {
425 item.selected = true; 521 item.selected = true;
426 if (!tableList.contains(item)) { 522 if (!tableList.contains(item)) {
427 tableList.add(item); 523 tableList.add(item);
@@ -430,48 +526,25 @@ class HomeEnterModel with ChangeNotifier { @@ -430,48 +526,25 @@ class HomeEnterModel with ChangeNotifier {
430 } 526 }
431 } 527 }
432 } 528 }
433 - // List usedTableList = []; //被占用的包间  
434 - // for (var itemOld in oldTableList) {  
435 - // if (tableList.length == 0) {  
436 - // usedTableList = oldTableList;  
437 - // } else {  
438 - // for (var item in tableList) {  
439 - // if (item.id != itemOld.id) {  
440 - // usedTableList.add(item);  
441 - // }  
442 - // }  
443 - // }  
444 - // }  
445 - List idold = [];  
446 - for (var itemOld in oldTableList) {  
447 - idold.add(itemOld.id);  
448 - }  
449 - List idnew = [];  
450 - for (var item in tableList) {  
451 - idnew.add(item.id);  
452 - }  
453 - for (var item in idnew) {  
454 - idold.remove(item);  
455 - }  
456 - print(idold); //被占用的桌子的id  
457 - if (idold.length > 0) {  
458 - String msg = '';  
459 - for (var item in oldTableList) {  
460 - if (idold.contains(item.id)) {  
461 - msg += '${item.name},';  
462 - }  
463 - }  
464 - if (msg.endsWith(',')) {  
465 - msg = msg.substring(0, msg.length - 1);  
466 - }  
467 - Utils.showToast('${msg}已被占用啦');  
468 - }  
469 529
470 - // if (usedTableList.length > 0) {  
471 - // print(usedTableList); 530 + // List idold = [];
  531 + // for (var itemOld in tableMap.values) {
  532 + // idold.add(itemOld.tid);
  533 + // }
  534 + // List idnew = [];
  535 + // for (var item in tableList) {
  536 + // idnew.add(item.id);
  537 + // }
  538 + // for (var item in idnew) {
  539 + // idold.remove(item);
  540 + // }
  541 + // print(idold); //被占用的桌子的id
  542 + // if (idold.length > 0) {
472 // String msg = ''; 543 // String msg = '';
473 - // for (var item in usedTableList) {  
474 - // msg += '${item.name},'; 544 + // for (var item in tableMap.values) {
  545 + // if (idold.contains(item.tid)) {
  546 + // msg += '${item.name},';
  547 + // }
475 // } 548 // }
476 // if (msg.endsWith(',')) { 549 // if (msg.endsWith(',')) {
477 // msg = msg.substring(0, msg.length - 1); 550 // msg = msg.substring(0, msg.length - 1);
@@ -479,51 +552,47 @@ class HomeEnterModel with ChangeNotifier { @@ -479,51 +552,47 @@ class HomeEnterModel with ChangeNotifier {
479 // Utils.showToast('${msg}已被占用啦'); 552 // Utils.showToast('${msg}已被占用啦');
480 // } 553 // }
481 554
482 - // if(usedTableList.length > 0){  
483 - // for (TableList item in usedTableList) {  
484 - // item  
485 - // }  
486 - // }  
487 -  
488 if (tableList.length == 0) { 555 if (tableList.length == 0) {
489 // Utils.showToast('包间已经被预订'); 556 // Utils.showToast('包间已经被预订');
490 isRecommend = true; 557 isRecommend = true;
  558 + for (var item in recommendList) {
  559 + for (var table in tableMap.values) {
  560 + recommendList.removeWhere((element) => item.id == table.tid);
  561 + }
  562 + }
491 } else { 563 } else {
492 isRecommend = false; 564 isRecommend = false;
493 } 565 }
494 - print(tableList); 566 + print(recommendList);
495 notifyListeners(); 567 notifyListeners();
496 return tableList; 568 return tableList;
497 } 569 }
498 } 570 }
499 571
500 ///录入更改内部预订 572 ///录入更改内部预订
501 - Future<SunReserveInfoModel> setReserveInfo(BuildContext context) async { 573 + Future<SunReserveInfoModel> setReserveInfo(BuildContext context,
  574 + {String pnum, String dateText, int currTimeIndex}) async {
502 UserModel userModel = Provider.of<UserModel>(context, listen: false); 575 UserModel userModel = Provider.of<UserModel>(context, listen: false);
503 - String pnum = '6';  
504 - for (var item in personNumList) {  
505 - if (item['isSelect']) {  
506 - pnum = item['dateText'];  
507 - }  
508 - }  
509 - if (pnum == '') {  
510 - pnum = '6';  
511 - } 576 +
512 String sex = '1'; 577 String sex = '1';
513 for (var item in sexList) { 578 for (var item in sexList) {
514 if (item['select']) { 579 if (item['select']) {
515 sex = item['code']; 580 sex = item['code'];
516 } 581 }
517 } 582 }
518 - //当前选中 年-月-日string  
519 - String ymyStr = ""; 583 +
520 //今天 明天 其他天 584 //今天 明天 其他天
521 - for (var item in dateList) {  
522 - if (item['select'] == true) {  
523 - ymyStr = item['title']; 585 + String tempTime = ddateStr;
  586 + if (ddateStr == '') {
  587 + if (currTimeIndex == 1) {
  588 + tempTime = '08:00';
  589 + } else if (currTimeIndex == 2) {
  590 + tempTime = '12:00';
  591 + } else if (currTimeIndex == 3) {
  592 + tempTime = '18:30';
524 } 593 }
525 } 594 }
526 - String timeStr = ymyStr + ' ' + ddateStr + ':00'; 595 + String timeStr = dateText + ' ' + tempTime + ':00';
527 // int start = DateUtil.getDateMsByTimeStr(timeStr); 596 // int start = DateUtil.getDateMsByTimeStr(timeStr);
528 597
529 LogUtil.v(timeStr); 598 LogUtil.v(timeStr);
@@ -543,32 +612,30 @@ class HomeEnterModel with ChangeNotifier { @@ -543,32 +612,30 @@ class HomeEnterModel with ChangeNotifier {
543 String rdate = ''; 612 String rdate = '';
544 String ddateSolt = ''; 613 String ddateSolt = '';
545 print(sunDateList); 614 print(sunDateList);
546 - for (var item in sunDateList) {  
547 - if (item['isSelect'] == true) {  
548 - String keys = '';  
549 - ddateSolt = '${item['ddateSolt']}';  
550 - if (item['ddateSolt'] == 1) {  
551 - //早市  
552 - keys = 'morning';  
553 - } else if (item['ddateSolt'] == 2) {  
554 - //午市  
555 - keys = 'noon';  
556 - } else if (item['ddateSolt'] == 3) {  
557 - //晚市  
558 - keys = 'night';  
559 - }  
560 - if (keys != '') {  
561 - List temp = dailyMap[keys];  
562 - String timeStrStart = ymyStr + ' ' + temp.first['title'] + ':00';  
563 - String timeStrEnd = ymyStr + ' ' + temp.last['title'] + ':00';  
564 - int startM = DateUtil.getDateMsByTimeStr(timeStrStart);  
565 - int endM = DateUtil.getDateMsByTimeStr(timeStrEnd);  
566 - String start = '${startM}'.substring(0, 10);  
567 - String end = '${endM}'.substring(0, 10);  
568 - rdate = start + '-' + end;  
569 - }  
570 - } 615 +
  616 + String keys = '';
  617 + ddateSolt = currTimeIndex.toString();
  618 + if (currTimeIndex == 1) {
  619 + //早市
  620 + keys = 'morning';
  621 + } else if (currTimeIndex == 2) {
  622 + //午市
  623 + keys = 'noon';
  624 + } else if (currTimeIndex == 3) {
  625 + //晚市
  626 + keys = 'night';
571 } 627 }
  628 + if (keys != '') {
  629 + List temp = dailyMap[keys];
  630 + String timeStrStart = dateText + ' ' + temp.first['title'] + ':00';
  631 + String timeStrEnd = dateText + ' ' + temp.last['title'] + ':00';
  632 + int startM = DateUtil.getDateMsByTimeStr(timeStrStart);
  633 + int endM = DateUtil.getDateMsByTimeStr(timeStrEnd);
  634 + String start = '${startM}'.substring(0, 10);
  635 + String end = '${endM}'.substring(0, 10);
  636 + rdate = start + '-' + end;
  637 + }
  638 +
572 Map<String, String> params = { 639 Map<String, String> params = {
573 "sid": userModel.user.sellerid, //商家ID 640 "sid": userModel.user.sellerid, //商家ID
574 "tid": tableSelectInfo, //桌子ID: 格式 2,3,4 641 "tid": tableSelectInfo, //桌子ID: 格式 2,3,4
@@ -581,7 +648,7 @@ class HomeEnterModel with ChangeNotifier { @@ -581,7 +648,7 @@ class HomeEnterModel with ChangeNotifier {
581 'type': "0", //内部预订 648 'type': "0", //内部预订
582 "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time) 649 "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time)
583 "ddate": '${ddate}'.substring(0, 10), //到店时间 650 "ddate": '${ddate}'.substring(0, 10), //到店时间
584 - 'is_set_ddate': "1" 651 + 'is_set_ddate': '1'
585 }; 652 };
586 653
587 print(params); 654 print(params);
@@ -212,7 +212,6 @@ flutter: @@ -212,7 +212,6 @@ flutter:
212 - assets/bg_invication.png 212 - assets/bg_invication.png
213 - assets/invication_line_left.png 213 - assets/invication_line_left.png
214 - assets/invication_line_right.png 214 - assets/invication_line_right.png
215 - - assets/img_ydap.png  
216 - assets/invication_map.png 215 - assets/invication_map.png
217 - assets/invication_arrow_right.png 216 - assets/invication_arrow_right.png
218 - assets/invication_back.png 217 - assets/invication_back.png