部分店内消息

@@ -165,6 +165,20 @@ class NewUnmessage extends Object {
     }
   }
 
+  /// 餐段
+  String get dsoltStr {
+    switch (ddate_solt) {
+      case "1": //早餐
+        return " 早餐";
+      case "2": //午餐
+        return " 午餐";
+      case "3": //晚餐
+        return " 晚餐";
+      default:
+        return '';
+    }
+  }
+
   String get cdateStr {
     String temp_date = '${cdate}';
     switch (message_type) {

@@ -247,6 +247,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
               Provider.of<MessageDialogModel>(context, listen: false);
           await messageDialogModel.setMessageStatus(context, params);
           break;
+        case "15":
+          //店内消息
+          NavigatorUtil.goHomePage(context, initialIndex: 1);
+          break;
+
         case "1":
           NavigatorUtil.goHasOrderFoodPage(context,
               rid: notifyParam["rid"], fromNotify: true);
@@ -402,6 +407,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
                   Provider.of<MessageDialogModel>(context, listen: false);
               await messageDialogModel.setMessageStatus(context, params);
               break;
+            case "15":
+              //店内消息
+              NavigatorUtil.goHomePage(context, initialIndex: 1);
+              break;
+
             case "1":
               NavigatorUtil.goHasOrderFoodPage(context,
                   rid: custom["rid"], fromNotify: true);

+import 'package:common_utils/common_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:one_key/models/message.dart';
@@ -57,7 +58,7 @@ class MessageItemF extends StatelessWidget {
       titleText = "发票\n申请";
       subTitleTextFir = '桌位信息';
       subTitleTextSec = '申请时间';
-    } else if (message.message_type == "店内消息") {
+    } else if (message.message_type == "15") {
       titleText = "店内\n消息";
       bgcolor = MyColours.color_5F7292;
       btnname = 'store_info_go';
@@ -66,6 +67,12 @@ class MessageItemF extends StatelessWidget {
       bgcolor = MyColours.color_BFC4D4;
     }
 
+// final formatter = DateFormats(DateFormats.y_mo_d_h_m);
+// final dateTimeFromStr = formatter.parse(timeStr.toUpperCase());
+// final DateTime now = new DateTime.now();
+// final DateTime date = new DateTime(now.year, now.month, now.day, now.hour, dateTimeFromStr.minute, dateTimeFromStr.second);
+// print(date);
+
     MessageDialogModel messageDialogModel =
         Provider.of<MessageDialogModel>(context, listen: false);
     return GestureDetector(
@@ -401,19 +408,19 @@ class MessageItemF extends StatelessWidget {
                           ],
                         )
                       : SizedBox(),
-                  message.message_type == "店内消息"
+                  message.message_type == "15"
                       ? Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             Text(
-                              "请确认 2022-04-02 午餐 客人是否会如约到店！",
+                              "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n客人是否会如约到店！",
                               style: TextStyle(
                                   color: isTreated
                                       ? MyColours.color_BFC4D4
                                       : MyColours.color_515151,
                                   fontSize: ScreenUtil().setSp(28)),
                             ),
-                            VEmptyView(8),
+                            VEmptyView(15),
                             Text(
                               "发起人：系统自动",
                               style: TextStyle(