xt / Flutter-ReserveApp · Commits

Go to a project

Commit f77dea6a1f3ad1fc3fba4c5e9328546417731849

Authored by wdn127929
1 parent 642e14f5
build: skipped

部分店内消息

Inline Side-by-side
Showing 3 changed files with 35 additions and 4 deletions
@@ -165,6 +165,20 @@ class NewUnmessage extends Object { @@ -165,6 +165,20 @@ class NewUnmessage extends Object {
165 } 165 }
166 } 166 }
167 167
  168 + /// 餐段
  169 + String get dsoltStr {
  170 + switch (ddate_solt) {
  171 + case "1": //早餐
  172 + return " 早餐";
  173 + case "2": //午餐
  174 + return " 午餐";
  175 + case "3": //晚餐
  176 + return " 晚餐";
  177 + default:
  178 + return '';
  179 + }
  180 + }
  181 +
168 String get cdateStr { 182 String get cdateStr {
169 String temp_date = '${cdate}'; 183 String temp_date = '${cdate}';
170 switch (message_type) { 184 switch (message_type) {
@@ -247,6 +247,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -247,6 +247,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
247 Provider.of<MessageDialogModel>(context, listen: false); 247 Provider.of<MessageDialogModel>(context, listen: false);
248 await messageDialogModel.setMessageStatus(context, params); 248 await messageDialogModel.setMessageStatus(context, params);
249 break; 249 break;
  250 + case "15":
  251 + //店内消息
  252 + NavigatorUtil.goHomePage(context, initialIndex: 1);
  253 + break;
  254 +
250 case "1": 255 case "1":
251 NavigatorUtil.goHasOrderFoodPage(context, 256 NavigatorUtil.goHasOrderFoodPage(context,
252 rid: notifyParam["rid"], fromNotify: true); 257 rid: notifyParam["rid"], fromNotify: true);
@@ -402,6 +407,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -402,6 +407,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
402 Provider.of<MessageDialogModel>(context, listen: false); 407 Provider.of<MessageDialogModel>(context, listen: false);
403 await messageDialogModel.setMessageStatus(context, params); 408 await messageDialogModel.setMessageStatus(context, params);
404 break; 409 break;
  410 + case "15":
  411 + //店内消息
  412 + NavigatorUtil.goHomePage(context, initialIndex: 1);
  413 + break;
  414 +
405 case "1": 415 case "1":
406 NavigatorUtil.goHasOrderFoodPage(context, 416 NavigatorUtil.goHasOrderFoodPage(context,
407 rid: custom["rid"], fromNotify: true); 417 rid: custom["rid"], fromNotify: true);
  1 +import 'package:common_utils/common_utils.dart';
1 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
2 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
3 import 'package:one_key/models/message.dart'; 4 import 'package:one_key/models/message.dart';
@@ -57,7 +58,7 @@ class MessageItemF extends StatelessWidget { @@ -57,7 +58,7 @@ class MessageItemF extends StatelessWidget {
57 titleText = "发票\n申请"; 58 titleText = "发票\n申请";
58 subTitleTextFir = '桌位信息'; 59 subTitleTextFir = '桌位信息';
59 subTitleTextSec = '申请时间'; 60 subTitleTextSec = '申请时间';
60 - } else if (message.message_type == "店内消息") { 61 + } else if (message.message_type == "15") {
61 titleText = "店内\n消息"; 62 titleText = "店内\n消息";
62 bgcolor = MyColours.color_5F7292; 63 bgcolor = MyColours.color_5F7292;
63 btnname = 'store_info_go'; 64 btnname = 'store_info_go';
@@ -66,6 +67,12 @@ class MessageItemF extends StatelessWidget { @@ -66,6 +67,12 @@ class MessageItemF extends StatelessWidget {
66 bgcolor = MyColours.color_BFC4D4; 67 bgcolor = MyColours.color_BFC4D4;
67 } 68 }
68 69
  70 +// final formatter = DateFormats(DateFormats.y_mo_d_h_m);
  71 +// final dateTimeFromStr = formatter.parse(timeStr.toUpperCase());
  72 +// final DateTime now = new DateTime.now();
  73 +// final DateTime date = new DateTime(now.year, now.month, now.day, now.hour, dateTimeFromStr.minute, dateTimeFromStr.second);
  74 +// print(date);
  75 +
69 MessageDialogModel messageDialogModel = 76 MessageDialogModel messageDialogModel =
70 Provider.of<MessageDialogModel>(context, listen: false); 77 Provider.of<MessageDialogModel>(context, listen: false);
71 return GestureDetector( 78 return GestureDetector(
@@ -401,19 +408,19 @@ class MessageItemF extends StatelessWidget { @@ -401,19 +408,19 @@ class MessageItemF extends StatelessWidget {
401 ], 408 ],
402 ) 409 )
403 : SizedBox(), 410 : SizedBox(),
404 - message.message_type == "店内消息" 411 + message.message_type == "15"
405 ? Column( 412 ? Column(
406 crossAxisAlignment: CrossAxisAlignment.start, 413 crossAxisAlignment: CrossAxisAlignment.start,
407 children: [ 414 children: [
408 Text( 415 Text(
409 - "请确认 2022-04-02 午餐 客人是否会如约到店！", 416 + "请确认 ${DateUtil.formatDate(DateTime.parse(message.ddate.replaceAll('/', '-')), format: DateFormats.y_mo_d)} ${message.dsoltStr} \n客人是否会如约到店！",
410 style: TextStyle( 417 style: TextStyle(
411 color: isTreated 418 color: isTreated
412 ? MyColours.color_BFC4D4 419 ? MyColours.color_BFC4D4
413 : MyColours.color_515151, 420 : MyColours.color_515151,
414 fontSize: ScreenUtil().setSp(28)), 421 fontSize: ScreenUtil().setSp(28)),
415 ), 422 ),
416 - VEmptyView(8), 423 + VEmptyView(15),
417 Text( 424 Text(
418 "发起人：系统自动", 425 "发起人：系统自动",
419 style: TextStyle( 426 style: TextStyle(