用餐人数应为选填，不能默认一个数值，有时老板查看，发现6人占了一个20人间

wdn127929
1 parent f39cb4d3
Showing 3 changed files with 32 additions and 23 deletions
lib/pages/home_enter_order/home_enter_order.dart
lib/provider/home_enter_model.dart
lib/provider/notebook_detail_change_model.dart
--- a/lib/pages/home_enter_order/home_enter_order.dart
View file @bbf1523
+++ b/lib/pages/home_enter_order/home_enter_order.dart
View file @bbf1523
@@ -73,8 +73,8 @@ class _HomeEnterPageState extends State<HomeEnterPage>
   String morning; //早市时间段
   String noon; //午市时间段
   String night; //晚市时间段
-  String pnum = '6'; //人数 默认6
-  int selectPnum = 5; //选中的人数
+  String pnum; //人数
+  int selectPnum; //选中的人数
   @override
   void initState() {
     super.initState();
@@ -207,7 +207,7 @@ class _HomeEnterPageState extends State<HomeEnterPage>
                 Text(
                   title,
                   style: TextStyle(
-                      color: title == '时间（选填）'
+                      color: title == '时间（选填）' || title == '人数（选填）'
                           ? MyColours.color_999999
                           : MyColours.color_199095,
                       fontSize: ScreenUtil().setWidth(28)),
@@ -486,11 +486,7 @@ class _HomeEnterPageState extends State<HomeEnterPage>
                         _showMorningAndNightChooseWidget(context, temp);
                       }),
                       HEmptyView(40),
-                      _buttonChoose(
-                          _homeEnterModel.ddateStr == '' ||
-                                  _homeEnterModel.isSetDate == '0'
-                              ? '时间（选填）'
-                              : _homeEnterModel.ddateStr, (value) {
+                      _buttonChoose(_homeEnterModel.ddateStr, (value) {
                         FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
                         _showDateChooseWidget(context);
                       }),
@@ -504,7 +500,7 @@ class _HomeEnterPageState extends State<HomeEnterPage>
                               color: MyColours.color_199095,
                               fontSize: ScreenUtil().setWidth(28))),
                       HEmptyView(20),
-                      _buttonChoose(pnum, (value) {
+                      _buttonChoose(pnum == null ? '人数（选填）' : pnum, (value) {
                         FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
                         DialogUtil.showSelectCusmanDialog(
                                 context, _homeEnterModel.personNumList,
@@ -1131,7 +1127,7 @@ class _HomeEnterPageState extends State<HomeEnterPage>
                                       tempMndList[index]['title']) {
                                     item['select'] = true;
-                                    _homeEnterModel.isSetDate = "1";
+                                    // _homeEnterModel.isSetDate = "1";
                                     _homeEnterModel.ddateStr = item['title'];
                                   }
                                 }
@@ -1247,8 +1243,8 @@ class _HomeEnterPageState extends State<HomeEnterPage>
     // currTimeIndex = null;
     _homeEnterModel.ddateStr = '';
-    pnum = '6';
-    selectPnum = 5;
+    pnum = null;
+    selectPnum = null;
     dateTimeNow = DateTime.now();
     _homeEnterModel.initDateHourMinuteList(context, currTimeIndex, dateText);
--- a/lib/provider/home_enter_model.dart
View file @bbf1523
+++ b/lib/provider/home_enter_model.dart
View file @bbf1523
@@ -167,6 +167,16 @@ class HomeEnterModel with ChangeNotifier {
   /// 早市、午市、晚市对应的半个小时间隔时间段
   initDateHourMinuteList(
       BuildContext context, int index, String dateText) async {
+    if (ddateStr == '' || ddateStr == null) {
+      if (index == 1) {
+        ddateStr = '08:00';
+      } else if (index == 2) {
+        ddateStr = '12:00';
+      } else if (index == 3) {
+        ddateStr = '18:00';
+      }
+    }
+
     UserModel userModel = Provider.of<UserModel>(context, listen: false);
     userModel.user.morning == ''
         ? dailyMap.putIfAbsent('morning', () => '')
@@ -473,19 +483,19 @@ class HomeEnterModel with ChangeNotifier {
     DateTime createTime = DateTime.fromMillisecondsSinceEpoch(int.parse(ddate));
     Map<String, Notebook> tableMap = await getReserveList(context,
         dateTime: createTime, currTimeIndex: ddate_solt);
-    if (pnum == '') {
-      pnum = '6';
-    }
     String rdate = DateUtil.formatDate(createTime, format: "yyyyMMdd");
     UserModel userModel = Provider.of<UserModel>(context, listen: false);
     Map<String, String> params = {
       "sid": userModel.user.sellerid,
       "rdate": rdate,
-      'ddate_solt': ddate_solt,
-      'pnum': pnum
+      'ddate_solt': ddate_solt
     };
+    if (pnum != '' && pnum != null) {
+      params['pnum'] = pnum;
+    }
+
     BaseResp<dynamic> baseResp = await DioUtil()
         .request<dynamic>(context, Method.get, HttpUrl.get_table_list,
             data: params)
@@ -640,7 +650,7 @@ class HomeEnterModel with ChangeNotifier {
     Map<String, String> params = {
       "sid": userModel.user.sellerid, //商家ID
       "tid": tableSelectInfo, //桌子ID: 格式 2,3,4
-      "pnum": pnum, //预定用餐人数
+
       "rname": nameController.text, //预订人姓名
       "sex": sex, //预订人姓名：1：男 2：女
       "phone": phoneController.text, //预订人电话
@@ -653,6 +663,9 @@ class HomeEnterModel with ChangeNotifier {
       "channel": '5',
       "uid": userModel.user.openid
     };
+    if (pnum != null && pnum != '') {
+      params["pnum"] = pnum; //预定用餐人数
+    }
     print(params);
     BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
--- a/lib/provider/notebook_detail_change_model.dart
View file @bbf1523
+++ b/lib/provider/notebook_detail_change_model.dart
View file @bbf1523
@@ -695,15 +695,13 @@ class NotebookDetailChangeModel with ChangeNotifier {
   Future<SunReserveInfoModel> updateOnlineReserveInfo(
       BuildContext context) async {
     UserModel userModel = Provider.of<UserModel>(context, listen: false);
-    String pnum = '6';
+    String pnum = '';
     for (var item in personNumList) {
       if (item['isSelect']) {
         pnum = item['dateText'];
       }
     }
-    if (pnum == '') {
-      pnum = '6';
-    }
+
     String sex = '1';
     for (var item in sexList) {
       if (item['select']) {
@@ -768,7 +766,6 @@ class NotebookDetailChangeModel with ChangeNotifier {
       'is_set_ddate': isSetDate,
       "sid": userModel.user.sellerid, //商家ID
       "tid": tableSelectInfo, //桌子ID: 格式 2,3,4
-      "pnum": pnum, //预定用餐人数
       "rname": nameController.text, //预订人姓名
       "sex": sex, //预订人姓名：1：男 2：女
       "phone": phoneController.text, //预订人电话
@@ -778,6 +775,9 @@ class NotebookDetailChangeModel with ChangeNotifier {
       "ddate": '${ddate}'.substring(0, 10), //到店时间
       "ddate_solt": ddateSolt
     };
+    if (pnum != '' && pnum != null) {
+      params['pnum'] = pnum;
+    }
     print(params);
     BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
         .request<Map<String, dynamic>>(