xt / Flutter-ReserveApp · Commits

Go to a project

Commit 93533c269708f13daa5c1137dc04be0f035e5039

Authored by wdn127929
1 parent ee5628a0
build: skipped

通知

Inline Side-by-side
Showing 10 changed files with 118 additions and 57 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "394" 15 +def flutterVersionCode = "397"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '394' 17 + flutterVersionCode = '397'
18 } 18 }
19 19
20 -def flutterVersionName = "3.9.4" 20 +def flutterVersionName = "3.9.7"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '3.9.4' 22 + flutterVersionName = '3.9.7'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -107,6 +107,9 @@ class NewUnmessage extends Object { @@ -107,6 +107,9 @@ class NewUnmessage extends Object {
107 @JsonKey(name: 'nick_name') 107 @JsonKey(name: 'nick_name')
108 String nickName; 108 String nickName;
109 109
  110 + @JsonKey(name: 'table_class_name')
  111 + String tableClassName;
  112 +
110 NewUnmessage( 113 NewUnmessage(
111 this.id, 114 this.id,
112 this.uid, 115 this.uid,
@@ -127,7 +130,8 @@ class NewUnmessage extends Object { @@ -127,7 +130,8 @@ class NewUnmessage extends Object {
127 this.status, 130 this.status,
128 this.room_info, 131 this.room_info,
129 this.uname, 132 this.uname,
130 - this.nickName); 133 + this.nickName,
  134 + this.tableClassName);
131 135
132 String get rnameStr { 136 String get rnameStr {
133 if (rname == null || rname == '') return ""; 137 if (rname == null || rname == '') return "";
@@ -62,6 +62,7 @@ NewUnmessage _$NewUnmessageFromJson(Map<String, dynamic> json) { @@ -62,6 +62,7 @@ NewUnmessage _$NewUnmessageFromJson(Map<String, dynamic> json) {
62 json['room_info'] as dynamic, 62 json['room_info'] as dynamic,
63 json['uname'] as String, 63 json['uname'] as String,
64 json['nick_name'] as String, 64 json['nick_name'] as String,
  65 + json['table_class_name'] as String,
65 ); 66 );
66 } 67 }
67 68
@@ -86,5 +87,6 @@ Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) => @@ -86,5 +87,6 @@ Map<String, dynamic> _$NewUnmessageToJson(NewUnmessage instance) =>
86 'status': instance.status, 87 'status': instance.status,
87 'room_info': instance.room_info, 88 'room_info': instance.room_info,
88 'uname': instance.uname, 89 'uname': instance.uname,
89 - 'nick_name':instance.nickName 90 + 'nick_name': instance.nickName,
  91 + 'table_class_name':instance.tableClassName
90 }; 92 };
@@ -319,11 +319,12 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> { @@ -319,11 +319,12 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
319 319
320 // print(await reGeocodeList.toFutureString()); 320 // print(await reGeocodeList.toFutureString());
321 address = reGeocodeList.formatAddress; 321 address = reGeocodeList.formatAddress;
  322 +
322 await AmapLocation.instance.updatePrivacyShow(true); 323 await AmapLocation.instance.updatePrivacyShow(true);
323 await AmapLocation.instance.updatePrivacyAgree(true); 324 await AmapLocation.instance.updatePrivacyAgree(true);
324 - final poiList = await AmapSearch.instance.searchKeyword(  
325 - address.toString(),  
326 - city: "西安", 325 + final poiList = await AmapSearch.instance.searchAround(
  326 + latLng,
  327 + city: "",
327 ); 328 );
328 329
329 poiModel = new PoiModel("当前位置", address, latLng); 330 poiModel = new PoiModel("当前位置", address, latLng);
@@ -335,10 +336,14 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> { @@ -335,10 +336,14 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
335 String provinceName = await poi.provinceName; 336 String provinceName = await poi.provinceName;
336 String address = await poi.address; 337 String address = await poi.address;
337 LatLng latLng = await poi.latLng; 338 LatLng latLng = await poi.latLng;
  339 + String bussniss = poi.businessArea;
338 340
339 list.add(new PoiModel( 341 list.add(new PoiModel(
340 title.toString(), 342 title.toString(),
341 - provinceName.toString() + cityName.toString() + address.toString(), 343 + provinceName.toString() +
  344 + cityName.toString() +
  345 + address.toString() +
  346 + bussniss.toString(),
342 latLng)); 347 latLng));
343 } 348 }
344 349
@@ -352,7 +357,7 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> { @@ -352,7 +357,7 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
352 await AmapLocation.instance.updatePrivacyAgree(true); 357 await AmapLocation.instance.updatePrivacyAgree(true);
353 final poiList = await AmapSearch.instance.searchKeyword( 358 final poiList = await AmapSearch.instance.searchKeyword(
354 text, 359 text,
355 - city: "西安", 360 + city: "",
356 ); 361 );
357 362
358 list.clear(); 363 list.clear();
@@ -62,7 +62,7 @@ class MessageDialogItemF extends StatelessWidget { @@ -62,7 +62,7 @@ class MessageDialogItemF extends StatelessWidget {
62 titleText = "发票\n申请"; 62 titleText = "发票\n申请";
63 subTitleTextFir = '桌位信息'; 63 subTitleTextFir = '桌位信息';
64 subTitleTextSec = '申请时间'; 64 subTitleTextSec = '申请时间';
65 - } else if (message.message_type == "店内消息") { 65 + } else if (message.message_type == "15") {
66 titleText = "店内\n消息"; 66 titleText = "店内\n消息";
67 bgcolor = MyColours.color_5F7292; 67 bgcolor = MyColours.color_5F7292;
68 btnname = 'store_info_go'; 68 btnname = 'store_info_go';
@@ -435,7 +435,9 @@ class MessageDialogItemF extends StatelessWidget { @@ -435,7 +435,9 @@ class MessageDialogItemF extends StatelessWidget {
435 crossAxisAlignment: CrossAxisAlignment.start, 435 crossAxisAlignment: CrossAxisAlignment.start,
436 children: [ 436 children: [
437 Text( 437 Text(
438 - "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n客人是否会如约到店！", 438 + "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}客人是否如约到店",
  439 + maxLines: 3,
  440 + overflow: TextOverflow.ellipsis,
439 style: TextStyle( 441 style: TextStyle(
440 color: isTreated 442 color: isTreated
441 ? MyColours.color_BFC4D4 443 ? MyColours.color_BFC4D4
@@ -472,11 +472,14 @@ class MessageItemF extends StatelessWidget { @@ -472,11 +472,14 @@ class MessageItemF extends StatelessWidget {
472 )) 472 ))
473 : SizedBox(), 473 : SizedBox(),
474 message.message_type == "15" 474 message.message_type == "15"
475 - ? Column( 475 + ? Expanded(
  476 + child: Column(
476 crossAxisAlignment: CrossAxisAlignment.start, 477 crossAxisAlignment: CrossAxisAlignment.start,
477 children: [ 478 children: [
478 Text( 479 Text(
479 - "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n客人是否会如约到店！", 480 + "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n${message.tableClassName ?? ''}${message.tableClassName == null ? '' : ' '}客人是否如约到店",
  481 + maxLines: 3,
  482 + overflow: TextOverflow.ellipsis,
480 style: TextStyle( 483 style: TextStyle(
481 color: isTreated 484 color: isTreated
482 ? MyColours.color_BFC4D4 485 ? MyColours.color_BFC4D4
@@ -493,8 +496,9 @@ class MessageItemF extends StatelessWidget { @@ -493,8 +496,9 @@ class MessageItemF extends StatelessWidget {
493 fontSize: ScreenUtil().setSp(24)), 496 fontSize: ScreenUtil().setSp(24)),
494 ), 497 ),
495 ], 498 ],
496 - )  
497 - : SizedBox() 499 + ))
  500 + : SizedBox(),
  501 + HEmptyView(32)
498 ], 502 ],
499 ), 503 ),
500 ), 504 ),
@@ -42,7 +42,7 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> { @@ -42,7 +42,7 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> {
42 bool swichState = true; 42 bool swichState = true;
43 StoreDetailModel detailModel; 43 StoreDetailModel detailModel;
44 int selectIndex = 0; 44 int selectIndex = 0;
45 - String selectNum = '0'; 45 + String selectNum = '不通知';
46 String tableListStr = ''; 46 String tableListStr = '';
47 47
48 @override 48 @override
@@ -71,8 +71,10 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> { @@ -71,8 +71,10 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> {
71 71
72 sunModel.status == '1' ? swichState = true : swichState = false; 72 sunModel.status == '1' ? swichState = true : swichState = false;
73 tableListSel = sunModel.tableid != null ? sunModel.tableid : ''; 73 tableListSel = sunModel.tableid != null ? sunModel.tableid : '';
74 - selectNum = sunModel.surplus ?? '0';  
75 - List<String> numList = []; 74 + selectNum = sunModel.surplus == null || sunModel.surplus == ''
  75 + ? '不通知'
  76 + : sunModel.surplus;
  77 + List<String> numList = ['不通知'];
76 tableListStr = tableListSel; 78 tableListStr = tableListSel;
77 for (int i = 0; i < tableListSel.split(',').length; i++) { 79 for (int i = 0; i < tableListSel.split(',').length; i++) {
78 numList.add('$i'); 80 numList.add('$i');
@@ -108,7 +110,11 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> { @@ -108,7 +110,11 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> {
108 if ((userModel.user.role_name == '管理员' || 110 if ((userModel.user.role_name == '管理员' ||
109 userModel.user.role_name == '店长') && 111 userModel.user.role_name == '店长') &&
110 tableListSel.split(',').length > 0) { 112 tableListSel.split(',').length > 0) {
111 - params['surplus'] = selectNum; 113 + if (selectNum == '不通知') {
  114 + params['surplus'] = null;
  115 + } else {
  116 + params['surplus'] = selectNum;
  117 + }
112 } 118 }
113 119
114 bool success = 120 bool success =
@@ -460,10 +466,13 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> { @@ -460,10 +466,13 @@ class _RoomTypeCreatePageState extends State<RoomTypeCreatePage> {
460 vertical: ScreenUtil().setWidth(40), 466 vertical: ScreenUtil().setWidth(40),
461 ), 467 ),
462 child: _select( 468 child: _select(
463 - '核实通知', '当剩余 $selectNum 间时', 469 + '核实通知',
  470 + selectNum == '不通知'
  471 + ? '不通知'
  472 + : '当剩余 $selectNum 间时',
464 textColor: MyColours.color_000000, 473 textColor: MyColours.color_000000,
465 ontap: () async { 474 ontap: () async {
466 - List<String> numList = []; 475 + List<String> numList = ['不通知'];
467 for (int i = 0; 476 for (int i = 0;
468 i < 477 i <
469 tableListSel 478 tableListSel
@@ -91,9 +91,13 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -91,9 +91,13 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
91 String _getMinuteStrFromPicker(List value) { 91 String _getMinuteStrFromPicker(List value) {
92 if (value[1] == 0) { 92 if (value[1] == 0) {
93 return '00'; 93 return '00';
94 - } else { 94 + } else if (value[1] == 1) {
  95 + return '15';
  96 + }
  97 + if (value[1] == 2) {
95 return '30'; 98 return '30';
96 } 99 }
  100 + return '45';
97 } 101 }
98 102
99 @override 103 @override
@@ -792,15 +796,19 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -792,15 +796,19 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
792 796
793 ///从时间选择器中获取分钟数字符串 00 or 30 797 ///从时间选择器中获取分钟数字符串 00 or 30
794 String _getMinuteStrFromPickerBookTime(List data, List value) { 798 String _getMinuteStrFromPickerBookTime(List data, List value) {
795 - if (data.length == 1) { 799 + // if (data.length == 1) {
  800 + // return '30';
  801 + // } else {
  802 + if (value[1] == 0) {
  803 + return '00';
  804 + } else if (value[1] == 1) {
  805 + return '15';
  806 + } else if (value[1] == 2) {
796 return '30'; 807 return '30';
797 } else { 808 } else {
798 - if (value[1] == 0) {  
799 - return '00';  
800 - } else {  
801 - return '30';  
802 - } 809 + return '45';
803 } 810 }
  811 + // }
804 } 812 }
805 813
806 Widget _itemBookTime(String start, String end, int tag) { 814 Widget _itemBookTime(String start, String end, int tag) {
@@ -976,13 +984,21 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -976,13 +984,21 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
976 if (tag == 0) { 984 if (tag == 0) {
977 //早市 985 //早市
978 morning.end = time; 986 morning.end = time;
  987 +
979 setState(() { 988 setState(() {
  989 + Utils.compareDateTime(time, morning.start,
  990 + (needChange) {
  991 + if (needChange) {
  992 + morning.start = time;
  993 + }
  994 + });
980 Utils.compareDateTime(noon.start, time, 995 Utils.compareDateTime(noon.start, time,
981 (needChange) { 996 (needChange) {
982 if (needChange) { 997 if (needChange) {
983 noon.start = time; 998 noon.start = time;
984 } 999 }
985 }); 1000 });
  1001 +
986 Utils.compareDateTime(noon.end, time, (needChange) { 1002 Utils.compareDateTime(noon.end, time, (needChange) {
987 if (needChange) { 1003 if (needChange) {
988 noon.end = time; 1004 noon.end = time;
@@ -994,6 +1010,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -994,6 +1010,7 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
994 night.start = time; 1010 night.start = time;
995 } 1011 }
996 }); 1012 });
  1013 +
997 Utils.compareDateTime(night.end, time, 1014 Utils.compareDateTime(night.end, time,
998 (needChange) { 1015 (needChange) {
999 if (needChange) { 1016 if (needChange) {
@@ -1005,6 +1022,12 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -1005,6 +1022,12 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
1005 //午市 1022 //午市
1006 noon.end = time; 1023 noon.end = time;
1007 setState(() { 1024 setState(() {
  1025 + Utils.compareDateTime(noon.end, noon.start,
  1026 + (needChange) {
  1027 + if (needChange) {
  1028 + noon.start = noon.end;
  1029 + }
  1030 + });
1008 Utils.compareDateTime(night.start, time, 1031 Utils.compareDateTime(night.start, time,
1009 (needChange) { 1032 (needChange) {
1010 if (needChange) { 1033 if (needChange) {
@@ -1021,6 +1044,14 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -1021,6 +1044,14 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
1021 } else if (tag == 2) { 1044 } else if (tag == 2) {
1022 //晚市 1045 //晚市
1023 night.end = time; 1046 night.end = time;
  1047 + setState(() {
  1048 + Utils.compareDateTime(night.end, night.start,
  1049 + (needChange) {
  1050 + if (needChange) {
  1051 + night.start = night.end;
  1052 + }
  1053 + });
  1054 + });
1024 } 1055 }
1025 }); 1056 });
1026 print(value); 1057 print(value);
@@ -1382,7 +1382,7 @@ class Utils { @@ -1382,7 +1382,7 @@ class Utils {
1382 static getPickerData(String lastTime, List dateData) { 1382 static getPickerData(String lastTime, List dateData) {
1383 String hour = Utils.getHourFromhourAndMinute(lastTime); 1383 String hour = Utils.getHourFromhourAndMinute(lastTime);
1384 String minute = Utils.getMinuteFromhourAndMinute(lastTime); 1384 String minute = Utils.getMinuteFromhourAndMinute(lastTime);
1385 - if (minute == '30') { 1385 + if (minute == '45') {
1386 hour = '${int.parse(hour) + 1}'; 1386 hour = '${int.parse(hour) + 1}';
1387 } 1387 }
1388 List tempList = List(); 1388 List tempList = List();
@@ -1391,7 +1391,7 @@ class Utils { @@ -1391,7 +1391,7 @@ class Utils {
1391 if (tempList.length == 0) { 1391 if (tempList.length == 0) {
1392 tempList = [ 1392 tempList = [
1393 { 1393 {
1394 - '晚上23时': [30] 1394 + '晚上23时': [45]
1395 } 1395 }
1396 ]; 1396 ];
1397 } 1397 }
@@ -7,76 +7,76 @@ typedef SetTimeCallback = void Function(List value); @@ -7,76 +7,76 @@ typedef SetTimeCallback = void Function(List value);
7 class SetTimeWidget { 7 class SetTimeWidget {
8 static List dateData = [ 8 static List dateData = [
9 { 9 {
10 - '深夜00时': [00, 30] 10 + '深夜00时': [00, 15, 30, 45]
11 }, 11 },
12 { 12 {
13 - '深夜01时': [00, 30] 13 + '深夜01时': [00, 15, 30, 45]
14 }, 14 },
15 { 15 {
16 - '深夜02时': [00, 30] 16 + '深夜02时': [00, 15, 30, 45]
17 }, 17 },
18 { 18 {
19 - '深夜03时': [00, 30] 19 + '深夜03时': [00, 15, 30, 45]
20 }, 20 },
21 { 21 {
22 - '深夜04时': [00, 30] 22 + '深夜04时': [00, 15, 30, 45]
23 }, 23 },
24 { 24 {
25 - '深夜05时': [00, 30] 25 + '深夜05时': [00, 15, 30, 45]
26 }, 26 },
27 { 27 {
28 - '早上06时': [00, 30] 28 + '早上06时': [00, 15, 30, 45]
29 }, 29 },
30 { 30 {
31 - '早上07时': [00, 30] 31 + '早上07时': [00, 15, 30, 45]
32 }, 32 },
33 { 33 {
34 - '早上08时': [00, 30] 34 + '早上08时': [00, 15, 30, 45]
35 }, 35 },
36 { 36 {
37 - '早上09时': [00, 30] 37 + '早上09时': [00, 15, 30, 45]
38 }, 38 },
39 { 39 {
40 - '中午10时': [00, 30] 40 + '中午10时': [00, 15, 30, 45]
41 }, 41 },
42 { 42 {
43 - '中午11时': [00, 30] 43 + '中午11时': [00, 15, 30, 45]
44 }, 44 },
45 { 45 {
46 - '中午12时': [00, 30] 46 + '中午12时': [00, 15, 30, 45]
47 }, 47 },
48 { 48 {
49 - '中午13时': [00, 30] 49 + '中午13时': [00, 15, 30, 45]
50 }, 50 },
51 { 51 {
52 - '中午14时': [00, 30] 52 + '中午14时': [00, 15, 30, 45]
53 }, 53 },
54 { 54 {
55 - '下午15时': [00, 30] 55 + '下午15时': [00, 15, 30, 45]
56 }, 56 },
57 { 57 {
58 - '下午16时': [00, 30] 58 + '下午16时': [00, 15, 30, 45]
59 }, 59 },
60 { 60 {
61 - '下午17时': [00, 30] 61 + '下午17时': [00, 15, 30, 45]
62 }, 62 },
63 { 63 {
64 - '下午18时': [00, 30] 64 + '下午18时': [00, 15, 30, 45]
65 }, 65 },
66 { 66 {
67 - '晚上19时': [00, 30] 67 + '晚上19时': [00, 15, 30, 45]
68 }, 68 },
69 { 69 {
70 - '晚上20时': [00, 30] 70 + '晚上20时': [00, 15, 30, 45]
71 }, 71 },
72 { 72 {
73 - '晚上21时': [00, 30] 73 + '晚上21时': [00, 15, 30, 45]
74 }, 74 },
75 { 75 {
76 - '晚上22时': [00, 30] 76 + '晚上22时': [00, 15, 30, 45]
77 }, 77 },
78 { 78 {
79 - '晚上23时': [00, 30] 79 + '晚上23时': [00, 15, 30, 45]
80 } 80 }
81 ]; 81 ];
82 showTimeSelector( 82 showTimeSelector(
@@ -109,7 +109,11 @@ class SetTimeWidget { @@ -109,7 +109,11 @@ class SetTimeWidget {
109 String minute = Utils.getMinuteFromhourAndMinute(hourAndMinute); 109 String minute = Utils.getMinuteFromhourAndMinute(hourAndMinute);
110 if (minute == '00') { 110 if (minute == '00') {
111 return 0; 111 return 0;
  112 + } else if (minute == '15') {
  113 + return 1;
  114 + } else if (minute == '30') {
  115 + return 2;
112 } 116 }
113 - return 1; 117 + return 3;
114 } 118 }
115 } 119 }