Commit cd6d31b4a7eb0fd52fb5fd466898b26d5c9efe01
1 parent
65f99c97
https://www.tapd.cn/57419716/sparrow/test_plan/view/1157419716001000077?action_t…
…imestamp=43815944&left_tree=1&cur_test_pla:wq
Showing
5 changed files
with
20 additions
and
6 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 = "275" | 14 | +def flutterVersionCode = "276" |
| 15 | if (flutterVersionCode == null) { | 15 | if (flutterVersionCode == null) { |
| 16 | - flutterVersionCode = '275' | 16 | + flutterVersionCode = '276' |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | -def flutterVersionName = "2.7.5" | 19 | +def flutterVersionName = "2.7.6" |
| 20 | if (flutterVersionName == null) { | 20 | if (flutterVersionName == null) { |
| 21 | - flutterVersionName = '2.7.5' | 21 | + flutterVersionName = '2.7.6' |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | apply plugin: 'com.android.application' | 24 | apply plugin: 'com.android.application' |
| @@ -32,6 +32,8 @@ class CreatedOrderSunModel extends Object { | @@ -32,6 +32,8 @@ class CreatedOrderSunModel extends Object { | ||
| 32 | 32 | ||
| 33 | @JsonKey(name: 'rid') | 33 | @JsonKey(name: 'rid') |
| 34 | String rid; | 34 | String rid; |
| 35 | + @JsonKey(name: 'ddate') | ||
| 36 | + String ddate; | ||
| 35 | 37 | ||
| 36 | @JsonKey(name: 'no') | 38 | @JsonKey(name: 'no') |
| 37 | String no; | 39 | String no; |
| @@ -72,6 +74,7 @@ class CreatedOrderSunModel extends Object { | @@ -72,6 +74,7 @@ class CreatedOrderSunModel extends Object { | ||
| 72 | CreatedOrderSunModel( | 74 | CreatedOrderSunModel( |
| 73 | this.id, | 75 | this.id, |
| 74 | this.rid, | 76 | this.rid, |
| 77 | + this.ddate, | ||
| 75 | this.no, | 78 | this.no, |
| 76 | this.rowNum, | 79 | this.rowNum, |
| 77 | this.pnum, | 80 | this.pnum, |
| @@ -26,6 +26,7 @@ CreatedOrderSunModel _$CreatedOrderSunModelFromJson(Map<String, dynamic> json) { | @@ -26,6 +26,7 @@ CreatedOrderSunModel _$CreatedOrderSunModelFromJson(Map<String, dynamic> json) { | ||
| 26 | return CreatedOrderSunModel( | 26 | return CreatedOrderSunModel( |
| 27 | json['id'] as String, | 27 | json['id'] as String, |
| 28 | json['rid'] as String, | 28 | json['rid'] as String, |
| 29 | + json['ddate'] as String, | ||
| 29 | json['no'] as String, | 30 | json['no'] as String, |
| 30 | json['row_num'] as String, | 31 | json['row_num'] as String, |
| 31 | json['pnum'] as String, | 32 | json['pnum'] as String, |
| @@ -51,6 +52,7 @@ Map<String, dynamic> _$CreatedOrderSunModelToJson( | @@ -51,6 +52,7 @@ Map<String, dynamic> _$CreatedOrderSunModelToJson( | ||
| 51 | <String, dynamic>{ | 52 | <String, dynamic>{ |
| 52 | 'id': instance.id, | 53 | 'id': instance.id, |
| 53 | 'rid': instance.rid, | 54 | 'rid': instance.rid, |
| 55 | + 'ddate': instance.ddate, | ||
| 54 | 'no': instance.no, | 56 | 'no': instance.no, |
| 55 | 'row_num': instance.rowNum, | 57 | 'row_num': instance.rowNum, |
| 56 | 'pnum': instance.pnum, | 58 | 'pnum': instance.pnum, |
| @@ -1001,7 +1001,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | @@ -1001,7 +1001,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { | ||
| 1001 | .length == | 1001 | .length == |
| 1002 | 0 | 1002 | 0 |
| 1003 | ? ScreenUtil.screenWidthDp - | 1003 | ? ScreenUtil.screenWidthDp - |
| 1004 | - ScreenUtil().setWidth(91) | 1004 | + ScreenUtil().setWidth(100) |
| 1005 | : (ScreenUtil.screenWidthDp - | 1005 | : (ScreenUtil.screenWidthDp - |
| 1006 | ScreenUtil() | 1006 | ScreenUtil() |
| 1007 | .setWidth(91)) / | 1007 | .setWidth(91)) / |
| @@ -112,6 +112,12 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> { | @@ -112,6 +112,12 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> { | ||
| 112 | itemCount: data.length + 1, | 112 | itemCount: data.length + 1, |
| 113 | itemBuilder: (context, index) { | 113 | itemBuilder: (context, index) { |
| 114 | if (index == data.length) { | 114 | if (index == data.length) { |
| 115 | + DateTime dateTime = DateTime.fromMillisecondsSinceEpoch( | ||
| 116 | + int.parse(_orderFoodProvider.createdOrderSunModel.ddate) * | ||
| 117 | + 1000); | ||
| 118 | + String hm = Utils.addZeroNumber(dateTime.hour) + | ||
| 119 | + ":" + | ||
| 120 | + Utils.addZeroNumber(dateTime.minute); | ||
| 115 | return Column( | 121 | return Column( |
| 116 | crossAxisAlignment: CrossAxisAlignment.end, | 122 | crossAxisAlignment: CrossAxisAlignment.end, |
| 117 | children: [ | 123 | children: [ |
| @@ -192,7 +198,10 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> { | @@ -192,7 +198,10 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> { | ||
| 192 | _orderFoodProvider | 198 | _orderFoodProvider |
| 193 | .createdOrderSunModel.cdate) * | 199 | .createdOrderSunModel.cdate) * |
| 194 | 1000), | 200 | 1000), |
| 195 | - format: DateFormats.y_mo_d)) | 201 | + format: DateFormats.y_mo_d)), |
| 202 | + VEmptyView(30), | ||
| 203 | + _getRow('用餐时间', | ||
| 204 | + "${dateTime.year}-${Utils.addZeroNumber(dateTime.month)}-${Utils.addZeroNumber(dateTime.day)} 星期${Utils.formatWeekDayNum(dateTime.weekday)} ${hm}"), | ||
| 196 | ], | 205 | ], |
| 197 | ), | 206 | ), |
| 198 | ), | 207 | ), |
-
Please register or login to post a comment