店内常点

@@ -12,14 +12,14 @@ if (flutterRoot == null) {
 }
 
 
-def flutterVersionCode = "431"
+def flutterVersionCode = "432"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '431'
+    flutterVersionCode = '432'
 }
 
-def flutterVersionName = "4.3.1"
+def flutterVersionName = "4.3.2"
 if (flutterVersionName == null) {
-    flutterVersionName = '4.3.1'
+    flutterVersionName = '4.3.2'
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'

@@ -809,7 +809,8 @@ class _OrderAdvanceHomePageState extends State<OrderAdvanceHomePage> {
                           // if (oid != null) {
                           //获取成功
                           Utils.goShareOrderPageToWeChat(context,
-                              title: '张红经理邀请您点餐了',
+                              title:
+                                  '${Provider.of<UserModel>(context, listen: false).user.nickName ?? Provider.of<UserModel>(context, listen: false).user.sellername}经理邀请您点餐了',
                               img:
                                   'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',
                               rid: widget.rid,

@@ -325,105 +325,109 @@ class PlanDishProvider extends ChangeNotifier {
       List<MenuSunModel> data = [];
       List<MenuSunModel> datatemp = [];
       sellerOftenSunModel.forEach((element) {
-        // SellerOftenSunModel
-        MenuSunModel menuSunModel = MenuSunModel();
-        menuSunModel.id = element.id;
-        menuSunModel.name = '${element.pnum}人';
-        // menuSunModel.price = element.menuPrice;
-        menuSunModel.price = element.price;
-        menuSunModel.member_price = element.memberPrice ?? element.price;
-        menuSunModel.unit = '份';
-        //
-
-        List<MenuModel> cookF = [];
-        element.cooklist.forEach((value) {
-          MenuModel menuModel = MenuModel();
-          menuModel.id = value.classid;
-          menuModel.sellerid = element.sellerid;
-          menuModel.className = value.className;
-          menuModel.classLabel = null;
-          menuModel.order = null;
-          menuModel.status = '1';
-          menuModel.classType = null;
-          menuModel.cookbooklist = [];
-          value.cooklist.forEach((cook) {
-            MenuSunModel cookData = MenuSunModel();
-            cookData.id = cook.cookbookid;
-            cookData.sellerid = cook.sid;
-            cookData.cid = cook.classid;
-            cookData.price = cook.price;
-            cookData.member_price = cook.memberPrice ?? cook.price;
-            cookData.name = cook.name;
-            cookData.unit = cook.unit;
-            cookData.image = cook.image;
-            cookData.amount = cook.amount;
-
-            //  "specid": null,
-            //  "practiceid": null,
-            // "class_name": "炒菜12",
-            // "class_order": "2"
-            menuModel.cookbooklist.add(cookData);
+        if (element.cooklist != null) {
+          // SellerOftenSunModel
+          MenuSunModel menuSunModel = MenuSunModel();
+          menuSunModel.id = element.id;
+          menuSunModel.name = '${element.pnum}人';
+          // menuSunModel.price = element.menuPrice;
+          menuSunModel.price = element.price;
+          menuSunModel.member_price = element.memberPrice ?? element.price;
+          menuSunModel.unit = '份';
+          //
+
+          List<MenuModel> cookF = [];
+          element.cooklist.forEach((value) {
+            MenuModel menuModel = MenuModel();
+            menuModel.id = value.classid;
+            menuModel.sellerid = element.sellerid;
+            menuModel.className = value.className;
+            menuModel.classLabel = null;
+            menuModel.order = null;
+            menuModel.status = '1';
+            menuModel.classType = null;
+            menuModel.cookbooklist = [];
+            value.cooklist.forEach((cook) {
+              MenuSunModel cookData = MenuSunModel();
+              cookData.id = cook.cookbookid;
+              cookData.sellerid = cook.sid;
+              cookData.cid = cook.classid;
+              cookData.price = cook.price;
+              cookData.member_price = cook.memberPrice ?? cook.price;
+              cookData.name = cook.name;
+              cookData.unit = cook.unit;
+              cookData.image = cook.image;
+              cookData.amount = cook.amount;
+
+              //  "specid": null,
+              //  "practiceid": null,
+              // "class_name": "炒菜12",
+              // "class_order": "2"
+              menuModel.cookbooklist.add(cookData);
+            });
+
+            cookF.add(menuModel);
           });
 
-          cookF.add(menuModel);
-        });
+          menuSunModel.cookList = cookF;
 
-        menuSunModel.cookList = cookF;
-
-        data.add(menuSunModel);
-        // datatemp.add(menuSunModel);
+          data.add(menuSunModel);
+          // datatemp.add(menuSunModel);
+        }
       });
       print(data);
 
       sellerOftendata = data;
 
       sellerOftenSunModel.forEach((element) {
-        // SellerOftenSunModel
-        MenuSunModel menuSunModel = MenuSunModel();
-        menuSunModel.id = element.id;
-        menuSunModel.name = '${element.pnum}人';
-        // menuSunModel.price = element.menuPrice;
-        menuSunModel.price = element.price;
-        menuSunModel.member_price = element.memberPrice ?? element.price;
-        menuSunModel.unit = '份';
-        //
-
-        List<MenuModel> cookF = [];
-        element.cooklist.forEach((value) {
-          MenuModel menuModel = MenuModel();
-          menuModel.id = value.classid;
-          menuModel.sellerid = element.sellerid;
-          menuModel.className = value.className;
-          menuModel.classLabel = null;
-          menuModel.order = null;
-          menuModel.status = '1';
-          menuModel.classType = null;
-          menuModel.cookbooklist = [];
-          value.cooklist.forEach((cook) {
-            MenuSunModel cookData = MenuSunModel();
-            cookData.id = cook.cookbookid;
-            cookData.sellerid = cook.sid;
-            cookData.cid = cook.classid;
-            cookData.price = cook.price;
-            cookData.member_price = cook.memberPrice ?? cook.price;
-            cookData.name = cook.name;
-            cookData.unit = cook.unit;
-            cookData.image = cook.image;
-            cookData.amount = cook.amount;
-
-            //  "specid": null,
-            //  "practiceid": null,
-            // "class_name": "炒菜12",
-            // "class_order": "2"
-            menuModel.cookbooklist.add(cookData);
+        if (element.cooklist != null) {
+          // SellerOftenSunModel
+          MenuSunModel menuSunModel = MenuSunModel();
+          menuSunModel.id = element.id;
+          menuSunModel.name = '${element.pnum}人';
+          // menuSunModel.price = element.menuPrice;
+          menuSunModel.price = element.price;
+          menuSunModel.member_price = element.memberPrice ?? element.price;
+          menuSunModel.unit = '份';
+          //
+
+          List<MenuModel> cookF = [];
+          element.cooklist.forEach((value) {
+            MenuModel menuModel = MenuModel();
+            menuModel.id = value.classid;
+            menuModel.sellerid = element.sellerid;
+            menuModel.className = value.className;
+            menuModel.classLabel = null;
+            menuModel.order = null;
+            menuModel.status = '1';
+            menuModel.classType = null;
+            menuModel.cookbooklist = [];
+            value.cooklist.forEach((cook) {
+              MenuSunModel cookData = MenuSunModel();
+              cookData.id = cook.cookbookid;
+              cookData.sellerid = cook.sid;
+              cookData.cid = cook.classid;
+              cookData.price = cook.price;
+              cookData.member_price = cook.memberPrice ?? cook.price;
+              cookData.name = cook.name;
+              cookData.unit = cook.unit;
+              cookData.image = cook.image;
+              cookData.amount = cook.amount;
+
+              //  "specid": null,
+              //  "practiceid": null,
+              // "class_name": "炒菜12",
+              // "class_order": "2"
+              menuModel.cookbooklist.add(cookData);
+            });
+
+            cookF.add(menuModel);
           });
 
-          cookF.add(menuModel);
-        });
+          menuSunModel.cookList = cookF;
 
-        menuSunModel.cookList = cookF;
-
-        datatemp.add(menuSunModel);
+          datatemp.add(menuSunModel);
+        }
       });
 
       sellerOftendataTemp = datatemp;