Showing
6 changed files
with
23 additions
and
15 deletions
| @@ -15,17 +15,17 @@ if (flutterRoot == null) { | @@ -15,17 +15,17 @@ if (flutterRoot == null) { | ||
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | -def flutterVersionCode = "482" | 18 | +def flutterVersionCode = "483" |
| 19 | if (flutterVersionCode == null) { | 19 | if (flutterVersionCode == null) { |
| 20 | - flutterVersionCode = '482' | 20 | + flutterVersionCode = '483' |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | 25 | ||
| 26 | -def flutterVersionName = "4.8.2" | 26 | +def flutterVersionName = "4.8.3" |
| 27 | if (flutterVersionName == null) { | 27 | if (flutterVersionName == null) { |
| 28 | - flutterVersionName = '4.8.2' | 28 | + flutterVersionName = '4.8.3' |
| 29 | } | 29 | } |
| 30 | 30 | ||
| 31 | 31 |
| @@ -61,8 +61,8 @@ class TableOuter { | @@ -61,8 +61,8 @@ class TableOuter { | ||
| 61 | 61 | ||
| 62 | TableOuter.fromJson2(Map<String, dynamic> json) { | 62 | TableOuter.fromJson2(Map<String, dynamic> json) { |
| 63 | name = json["name"]; | 63 | name = json["name"]; |
| 64 | + list = <Table>[]; | ||
| 64 | if (json['list'] != null && json['list'].length > 0) { | 65 | if (json['list'] != null && json['list'].length > 0) { |
| 65 | - list = <Table>[]; | ||
| 66 | json['list'].forEach((element) { | 66 | json['list'].forEach((element) { |
| 67 | list.add(Table.fromJson(element)); | 67 | list.add(Table.fromJson(element)); |
| 68 | }); | 68 | }); |
| @@ -178,7 +178,7 @@ class TableManagerPageState extends State<TableManagerPage> { | @@ -178,7 +178,7 @@ class TableManagerPageState extends State<TableManagerPage> { | ||
| 178 | 178 | ||
| 179 | ///获取短信余量 | 179 | ///获取短信余量 |
| 180 | _getSmsInfo(context) async { | 180 | _getSmsInfo(context) async { |
| 181 | - smsInfoData = await myModel.getSmsInfo(context,selfDismiss: true); | 181 | + smsInfoData = await myModel.getSmsInfo(context, selfDismiss: true); |
| 182 | if (myModel.smsInfo == '0') { | 182 | if (myModel.smsInfo == '0') { |
| 183 | if (!mounted) { | 183 | if (!mounted) { |
| 184 | return; | 184 | return; |
| @@ -93,9 +93,12 @@ class TableManagerModel with ChangeNotifier { | @@ -93,9 +93,12 @@ class TableManagerModel with ChangeNotifier { | ||
| 93 | } | 93 | } |
| 94 | List<TableOuter> temp = []; | 94 | List<TableOuter> temp = []; |
| 95 | List list = json.decode(tableList); | 95 | List list = json.decode(tableList); |
| 96 | - list.forEach((element) { | ||
| 97 | - temp.add(TableOuter.fromJson2(element)); | ||
| 98 | - }); | 96 | + if (list.length > 0) { |
| 97 | + list.forEach((element) { | ||
| 98 | + temp.add(TableOuter.fromJson2(element)); | ||
| 99 | + }); | ||
| 100 | + } | ||
| 101 | + | ||
| 99 | return temp; | 102 | return temp; |
| 100 | } | 103 | } |
| 101 | 104 | ||
| @@ -115,9 +118,12 @@ class TableManagerModel with ChangeNotifier { | @@ -115,9 +118,12 @@ class TableManagerModel with ChangeNotifier { | ||
| 115 | // list.forEach((element) { | 118 | // list.forEach((element) { |
| 116 | // temp.addAll(TableOuter.fromJson2(element).list); | 119 | // temp.addAll(TableOuter.fromJson2(element).list); |
| 117 | // }); | 120 | // }); |
| 118 | - tableOuterList.forEach((element) { | ||
| 119 | - temp.addAll(element.list); | ||
| 120 | - }); | 121 | + if (tableOuterList.length > 0) { |
| 122 | + tableOuterList.forEach((element) { | ||
| 123 | + temp.addAll(element.list??[]); | ||
| 124 | + }); | ||
| 125 | + } | ||
| 126 | + | ||
| 121 | return temp; | 127 | return temp; |
| 122 | } | 128 | } |
| 123 | } | 129 | } |
| @@ -96,9 +96,9 @@ import 'package:one_key/pages/my/personnel_type/personnel_password_show_page.dar | @@ -96,9 +96,9 @@ import 'package:one_key/pages/my/personnel_type/personnel_password_show_page.dar | ||
| 96 | import 'package:one_key/pages/my/base_info.dart'; | 96 | import 'package:one_key/pages/my/base_info.dart'; |
| 97 | import 'package:one_key/pages/my/book_time_set.dart'; | 97 | import 'package:one_key/pages/my/book_time_set.dart'; |
| 98 | import 'package:one_key/pages/my/contant_page.dart'; | 98 | import 'package:one_key/pages/my/contant_page.dart'; |
| 99 | -import 'package:one_key/pages/my/menu_type/menu_add_dishes_page_old.dart'; | 99 | +// import 'package:one_key/pages/my/menu_type/menu_add_dishes_page_old.dart'; |
| 100 | import 'package:one_key/pages/my/menu_type/menu_category_page.dart'; | 100 | import 'package:one_key/pages/my/menu_type/menu_category_page.dart'; |
| 101 | -import 'package:one_key/pages/my/menu_type/menu_manage_page_old.dart'; | 101 | +// import 'package:one_key/pages/my/menu_type/menu_manage_page_old.dart'; |
| 102 | import 'package:one_key/pages/my/my_integral_page.dart'; | 102 | import 'package:one_key/pages/my/my_integral_page.dart'; |
| 103 | import 'package:one_key/pages/my/photo_type/photo_manager_page.dart'; | 103 | import 'package:one_key/pages/my/photo_type/photo_manager_page.dart'; |
| 104 | import 'package:one_key/pages/my/receive_orders_time_set.dart'; | 104 | import 'package:one_key/pages/my/receive_orders_time_set.dart'; |
| @@ -200,8 +200,10 @@ import '../pages/my/marketing_center/recharge/recharge_history_page.dart'; | @@ -200,8 +200,10 @@ import '../pages/my/marketing_center/recharge/recharge_history_page.dart'; | ||
| 200 | import '../pages/my/marketing_center/recharge/recharge_home_page.dart'; | 200 | import '../pages/my/marketing_center/recharge/recharge_home_page.dart'; |
| 201 | import '../pages/my/marketing_center/recharge/recharge_select_store_coupon_page.dart'; | 201 | import '../pages/my/marketing_center/recharge/recharge_select_store_coupon_page.dart'; |
| 202 | import '../pages/my/menu_type/menu_add_dishes_page.dart'; | 202 | import '../pages/my/menu_type/menu_add_dishes_page.dart'; |
| 203 | +// import '../pages/my/menu_type/menu_add_dishes_page_new.dart'; | ||
| 203 | import '../pages/my/menu_type/menu_dish_method_page.dart'; | 204 | import '../pages/my/menu_type/menu_dish_method_page.dart'; |
| 204 | import '../pages/my/menu_type/menu_manage_page.dart'; | 205 | import '../pages/my/menu_type/menu_manage_page.dart'; |
| 206 | +// import '../pages/my/menu_type/menu_manage_page_new.dart'; | ||
| 205 | import '../pages/my/menu_type/menu_theme_color_set_page.dart'; | 207 | import '../pages/my/menu_type/menu_theme_color_set_page.dart'; |
| 206 | import '../pages/my/menu_type/menu_unit_page.dart'; | 208 | import '../pages/my/menu_type/menu_unit_page.dart'; |
| 207 | import '../pages/my/plan_dish/final_plan_dish_page.dart'; | 209 | import '../pages/my/plan_dish/final_plan_dish_page.dart'; |
| @@ -1587,7 +1587,7 @@ class Utils { | @@ -1587,7 +1587,7 @@ class Utils { | ||
| 1587 | path: _path, | 1587 | path: _path, |
| 1588 | description: _description, | 1588 | description: _description, |
| 1589 | miniProgramType: WXMiniProgramType.PREVIEW, //体验版 | 1589 | miniProgramType: WXMiniProgramType.PREVIEW, //体验版 |
| 1590 | - // miniProgramType: WXMiniProgramType.RELEASE //正式版 | 1590 | + // miniProgramType: WXMiniProgramType.RELEASE, //正式版 |
| 1591 | // miniProgramType: WXMiniProgramType.TEST //开发版 | 1591 | // miniProgramType: WXMiniProgramType.TEST //开发版 |
| 1592 | // thumbnail: WeChatImage.binary(source) | 1592 | // thumbnail: WeChatImage.binary(source) |
| 1593 | thumbnail: WeChatImage.network(_thumbnail) | 1593 | thumbnail: WeChatImage.network(_thumbnail) |
-
Please register or login to post a comment