ee

wdn127929
2 parents 2d9195b9 3e3fb1d0
Showing 9 changed files with 81 additions and 35 deletions
android/app/build.gradle
android/app/src/main/AndroidManifest.xml
lib/models/get_banquet_by_id_new_model.dart
lib/pages/feast/feast_board.dart
lib/pages/feast/feast_create_page.dart
lib/pages/feast/feast_deposit_data_page.dart
lib/pages/feast/feast_detail_page.dart
lib/pages/feast/feast_followup_page.dart
lib/provider/feast_model.dart
--- a/android/app/build.gradle
View file @c8f4d1b
+++ b/android/app/build.gradle
View file @c8f4d1b
@@ -12,14 +12,14 @@ if (flutterRoot == null) {
 }
-def flutterVersionCode = "421"
+def flutterVersionCode = "422"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '421'
+    flutterVersionCode = '422'
 }
-def flutterVersionName = "4.2.1"
+def flutterVersionName = "4.2.2"
 if (flutterVersionName == null) {
-    flutterVersionName = '4.2.1'
+    flutterVersionName = '4.2.2'
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
--- a/android/app/src/main/AndroidManifest.xml
View file @c8f4d1b
+++ b/android/app/src/main/AndroidManifest.xml
View file @c8f4d1b
@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.per酒精，kmission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.CAMERA"/>
      <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
       <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -22,7 +22,7 @@
     <application
-        android:label="一键订"
+        android:label="周到安排商家"
         tools:replace="android:label"
         android:icon="@mipmap/ic_launcher">
         <activity
--- a/lib/models/get_banquet_by_id_new_model.dart
View file @c8f4d1b
+++ b/lib/models/get_banquet_by_id_new_model.dart
View file @c8f4d1b
@@ -606,6 +606,9 @@ class CostInfoModel {
       return serviceprice;
     } else {
       //选中百分比
+      if (serviceper == null) {
+        return '0';
+      }
       // 使除数为0
       double input = double.parse(serviceper);
@@ -628,6 +631,9 @@ class CostInfoModel {
       return '-${discountprice} 元';
     } else {
       //选中百分比
+      if (discountper == null) {
+        return '0 元';
+      }
       // 使除数为0
       double input = double.parse(discountper);
--- a/lib/pages/feast/feast_board.dart
View file @c8f4d1b
+++ b/lib/pages/feast/feast_board.dart
View file @c8f4d1b
@@ -46,6 +46,12 @@ class _FeastBoardPageState extends State<FeastBoardPage> {
     });
   }
+  @override
+  void dispose() {
+    super.dispose();
+    Utils.changeStatusColor(color: MyColours.color_ffffff);
+  }
+
   ///指定日期、时段宴会预定
   _getBanquetByDate() async {
     UserModel userModel = Provider.of<UserModel>(context, listen: false);
@@ -598,7 +604,8 @@ class _FeastBoardPageState extends State<FeastBoardPage> {
               Expanded(
                   child: _callButton(
                       onPress: () async {
-                        NavigatorUtil.goFeastCreatePage(context,isCreate: true);
+                        NavigatorUtil.goFeastCreatePage(context,
+                            isCreate: true);
                       },
                       content: '创建宴会',
                       hasLeftBorder: true,
--- a/lib/pages/feast/feast_create_page.dart
View file @c8f4d1b
+++ b/lib/pages/feast/feast_create_page.dart
View file @c8f4d1b
@@ -126,10 +126,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
       _getData();
     });
     bus.on("feast_deposit_list", (arg) {
-      if (widget.banquetDetail != null) {
+      // if (widget.banquetDetail != null) {
         bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
         bus.emit('feast_home_page'); //编辑之后刷新宴会首页
-      }
+      // }
       _getBanquetDeposit();
     });
     bus.on("feast_qy_list", (arg) {
@@ -319,6 +319,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
     super.dispose();
     bus.off('feast_deposit_list');
     bus.off('feast_qy_list');
+    if (widget.isCreate) {
+      Utils.changeStatusColor(color: MyColours.color_ffffff);
+    }
     feastModel.rid = null;
     feastModel.type = null;
@@ -637,7 +640,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
                       text: TextSpan(
                         children: [
                           TextSpan(
-                              text: title,
+                              text: title ?? "",
                               style: TextStyle(
                                   color: MyColours.color_515151,
                                   fontSize: ScreenUtil().setSp(28)),
@@ -655,7 +658,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
                       ))),
               Expanded(
                   child: Text(
-                labelShow,
+                labelShow ?? "",
                 overflow: TextOverflow.ellipsis,
                 style: TextStyle(
                   color: labelShow == '请选择' || labelShow == '暂未选择'
@@ -984,10 +987,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
     bool success = await feastModel.createBanquet(context, pramas);
     if (success) {
       Utils.showToast('保存成功');
-      if (widget.banquetDetail != null) {
+      // if (widget.banquetDetail != null) {
         bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
         bus.emit('feast_home_page'); //编辑之后刷新宴会首页
-      }
+      // }
       return true;
     } else {
@@ -1437,10 +1440,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
         });
         print(xuantaiData);
         Utils.showToast('保存成功');
-        if (widget.banquetDetail != null) {
+        // if (widget.banquetDetail != null) {
           bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
           bus.emit('feast_home_page'); //编辑之后刷新宴会首页
-        }
+        // }
         return true;
       } else {
         return false;
@@ -2588,10 +2591,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
     };
     bool success = await feastModel.setWarrant(context, pramas);
     if (success) {
-      if (widget.banquetDetail != null) {
+      // if (widget.banquetDetail != null) {
         bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
         bus.emit('feast_home_page'); //编辑之后刷新宴会首页
-      }
+      // }
       return true;
     } else {
       return false;
@@ -4488,9 +4491,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
       if (results[0] && results[1] && results[2]) {
         //成功
         Utils.showToast('保存成功');
-        if (widget.banquetDetail != null) {
+        // if (widget.banquetDetail != null) {
           bus.emit('feast_detail_page'); //编辑之后刷新宴会详情页面
-        }
+        // }
         bus.emit('feast_home_page'); //编辑之后刷新宴会首页
       } else {
         if (!results[0]) {
--- a/lib/pages/feast/feast_deposit_data_page.dart
View file @c8f4d1b
+++ b/lib/pages/feast/feast_deposit_data_page.dart
View file @c8f4d1b
@@ -49,6 +49,12 @@ class _FeastDepositDataPageState extends State<FeastDepositDataPage> {
     });
   }
+    @override
+  void dispose() {
+    super.dispose();
+    Utils.changeStatusColor(color: MyColours.color_ffffff);
+  }
+
   ///获取经理数据  ---- 接单人---全部员工
   Future<bool> _getSellerUserBySellerid() async {
--- a/lib/pages/feast/feast_detail_page.dart
View file @c8f4d1b
+++ b/lib/pages/feast/feast_detail_page.dart
View file @c8f4d1b
@@ -692,7 +692,7 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
                               ),
                               Spacer(),
                               Text(
-                                '${costInfoModel.totalprice} 元',
+                                '${costInfoModel.totalprice??''} 元',
                                 style: TextStyle(
                                     color: MyColours.color_515151,
                                     fontSize: font(14)),
--- a/lib/pages/feast/feast_followup_page.dart
View file @c8f4d1b
+++ b/lib/pages/feast/feast_followup_page.dart
View file @c8f4d1b
@@ -49,6 +49,12 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
     });
   }
+    @override
+  void dispose() {
+    super.dispose();
+    Utils.changeStatusColor(color: MyColours.color_ffffff);
+  }
+
   /// 根据时间范围查询待跟进订单
   _getBanquetBeFollow() async {
     Map<String, String> pramas = {
--- a/lib/provider/feast_model.dart
View file @c8f4d1b
+++ b/lib/provider/feast_model.dart
View file @c8f4d1b
@@ -400,23 +400,41 @@ class FeastModel extends ChangeNotifier {
       return false;
     });
     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;
       // } else {