宴会首页数据全部

@@ -12,14 +12,14 @@ if (flutterRoot == null) {
 }
 }
 
 
 
 
-def flutterVersionCode = "421"
+def flutterVersionCode = "422"
 if (flutterVersionCode == null) {
 if (flutterVersionCode == null) {
-    flutterVersionCode = '421'
+    flutterVersionCode = '422'
 }
 }
 
 
-def flutterVersionName = "4.2.1"
+def flutterVersionName = "4.2.2"
 if (flutterVersionName == null) {
 if (flutterVersionName == null) {
-    flutterVersionName = '4.2.1'
+    flutterVersionName = '4.2.2'
 }
 }
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android'

@@ -606,6 +606,9 @@ class CostInfoModel {
       return serviceprice;
       return serviceprice;
     } else {
     } else {
       //选中百分比
       //选中百分比
+      if (serviceper == null) {
+        return '0';
+      }
 
 
       // 使除数为0
       // 使除数为0
       double input = double.parse(serviceper);
       double input = double.parse(serviceper);
@@ -628,6 +631,9 @@ class CostInfoModel {
       return '-${discountprice} 元';
       return '-${discountprice} 元';
     } else {
     } else {
       //选中百分比
       //选中百分比
+      if (discountper == null) {
+        return '0 元';
+      }
 
 
       // 使除数为0
       // 使除数为0
       double input = double.parse(discountper);
       double input = double.parse(discountper);

@@ -317,6 +317,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
   @override
   @override
   void dispose() {
   void dispose() {
     super.dispose();
     super.dispose();
+    bus.emit('feast_home_page'); //编辑之后刷新宴会首页
     bus.off('feast_deposit_list');
     bus.off('feast_deposit_list');
     bus.off('feast_qy_list');
     bus.off('feast_qy_list');
 
 
@@ -637,7 +638,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
                       text: TextSpan(
                       text: TextSpan(
                         children: [
                         children: [
                           TextSpan(
                           TextSpan(
-                              text: title,
+                              text: title ?? "",
                               style: TextStyle(
                               style: TextStyle(
                                   color: MyColours.color_515151,
                                   color: MyColours.color_515151,
                                   fontSize: ScreenUtil().setSp(28)),
                                   fontSize: ScreenUtil().setSp(28)),
@@ -655,7 +656,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
                       ))),
                       ))),
               Expanded(
               Expanded(
                   child: Text(
                   child: Text(
-                labelShow,
+                labelShow ?? "",
                 overflow: TextOverflow.ellipsis,
                 overflow: TextOverflow.ellipsis,
                 style: TextStyle(
                 style: TextStyle(
                   color: labelShow == '请选择' || labelShow == '暂未选择'
                   color: labelShow == '请选择' || labelShow == '暂未选择'

@@ -692,7 +692,7 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
                               ),
                               ),
                               Spacer(),
                               Spacer(),
                               Text(
                               Text(
-                                '${costInfoModel.totalprice} 元',
+                                '${costInfoModel.totalprice??''} 元',
                                 style: TextStyle(
                                 style: TextStyle(
                                     color: MyColours.color_515151,
                                     color: MyColours.color_515151,
                                     fontSize: font(14)),
                                     fontSize: font(14)),

@@ -400,23 +400,41 @@ class FeastModel extends ChangeNotifier {
       return false;
       return false;
     });
     });
     if (baseResp.code == Constant.status_success) {
     if (baseResp.code == Constant.status_success) {
-      // if (baseResp.data == 1) {
-      rid = baseResp.data['id'];
-      reserve = baseResp.data['rname'];
-      dynamic sex = baseResp.data['sex'];
-      if (sex.toString() == '1') {
-        reserve += '先生';
-      } else if (sex.toString() == '2') {
-        reserve += '女士';
-      } else if (sex.toString() == '3') {
-        reserve += '公司';
-      }
+      if (baseResp.data == 1) {
+        reserve = params['rname'];
+        dynamic sex = params['sex'];
+        if (sex.toString() == '1') {
+          reserve += '先生';
+        } else if (sex.toString() == '2') {
+          reserve += '女士';
+        } else if (sex.toString() == '3') {
+          reserve += '公司';
+        }
 
 
-      classifyData.forEach((element) {
-        if (element.id == baseResp.data['classify_id'].toString()) {
-          type = element.className;
+        classifyData.forEach((element) {
+          if (element.id == params['classify_id'].toString()) {
+            type = element.className;
+          }
+        });
+        return true;
+      } else {
+        rid = baseResp.data['id'];
+        reserve = baseResp.data['rname'];
+        dynamic sex = baseResp.data['sex'];
+        if (sex.toString() == '1') {
+          reserve += '先生';
+        } else if (sex.toString() == '2') {
+          reserve += '女士';
+        } else if (sex.toString() == '3') {
+          reserve += '公司';
         }
         }
-      });
+
+        classifyData.forEach((element) {
+          if (element.id == baseResp.data['classify_id'].toString()) {
+            type = element.className;
+          }
+        });
+      }
 
 
       return true;
       return true;
       // } else {
       // } else {