xt / Flutter-ReserveApp · Commits

Go to a project

Commit 2337cf4ff4a9aef07eb5f9ee54a0ab0494d3e36d

Authored by wdn127929
1 parent 03ab100f
build: skipped

临餐取消s级别判断

Inline Side-by-side
Showing 6 changed files with 69 additions and 40 deletions
... ... @@ -548,7 +548,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5325;
CURRENT_PROJECT_VERSION = 5326;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -696,7 +696,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5325;
CURRENT_PROJECT_VERSION = 5326;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -732,7 +732,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5325;
CURRENT_PROJECT_VERSION = 5326;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -10,10 +10,10 @@ class Constant {
*
* 测试账号变更，已经删除0001 账户 代替为 0019！！！！！！！注意！！！！！！！！！！！！！！
* */
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.RELEASE; //正式版
static const WXMiniProgramType wxMiniProgramType =
WXMiniProgramType.PREVIEW; //体验版
WXMiniProgramType.RELEASE; //正式版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.PREVIEW; //体验版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.TEST; //开发版
... ...
... ... @@ -416,9 +416,13 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
//临餐不可以取消
//比较相差的天数
int difference =
detailEntity.ddateFhms.difference(DateTime.now()).inDays;
if (difference <= int.parse(cancelDay) && difference >= 0) {
int differenceSeconds = detailEntity.ddateFhms
.difference(DateTime.now())
.inSeconds;
if (int.parse(cancelDay) != 0 &&
differenceSeconds < int.parse(cancelDay) * 24 * 60 * 60) {
// 临餐时间内
cancelCan = false;
} else {
... ... @@ -432,9 +436,12 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
//临餐不可以取消
//比较相差的天数
int difference =
detailEntity.ddateFhms.difference(DateTime.now()).inDays;
if (difference <= int.parse(cancelDay) && difference >= 0) {
int differenceSeconds = detailEntity.ddateFhms
.difference(DateTime.now())
.inSeconds;
if (int.parse(cancelDay) != 0 &&
differenceSeconds < int.parse(cancelDay) * 24 * 60 * 60) {
// 临餐时间内
cancelCan = false;
} else {
... ... @@ -448,9 +455,12 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
//临餐不可以取消
//比较相差的天数
int difference =
detailEntity.ddateFhms.difference(DateTime.now()).inDays;
if (difference <= int.parse(cancelDay) && difference >= 0) {
int differenceSeconds = detailEntity.ddateFhms
.difference(DateTime.now())
.inSeconds;
if (int.parse(cancelDay) != 0 &&
differenceSeconds < int.parse(cancelDay) * 24 * 60 * 60) {
// 临餐时间内
cancelCan = false;
} else {
... ...
... ... @@ -788,10 +788,13 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
//临餐不可以取消
//比较相差的天数
int difference = detailModel.detailModelAllSunModel.ddateFhms
int differenceSeconds = detailModel.detailModelAllSunModel.ddateFhms
.difference(DateTime.now())
.inDays;
if (difference <= int.parse(cancelDay) && difference >= 0) {
.inSeconds;
if (int.parse(cancelDay) != 0 &&
differenceSeconds < int.parse(cancelDay) * 24 * 60 * 60) {
// 临餐时间内
cancelCan = false;
} else {
... ... @@ -805,10 +808,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
//临餐不可以取消
//比较相差的天数
int difference = detailModel.detailModelAllSunModel.ddateFhms
int differenceSeconds = detailModel.detailModelAllSunModel.ddateFhms
.difference(DateTime.now())
.inDays;
if (difference <= int.parse(cancelDay) && difference >= 0) {
.inSeconds;
if (int.parse(cancelDay) != 0 &&
differenceSeconds < int.parse(cancelDay) * 24 * 60 * 60) {
// 临餐时间内
cancelCan = false;
} else {
... ... @@ -822,10 +827,13 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
//临餐不可以取消
//比较相差的天数
int difference = detailModel.detailModelAllSunModel.ddateFhms
int differenceSeconds = detailModel.detailModelAllSunModel.ddateFhms
.difference(DateTime.now())
.inDays;
if (difference <= int.parse(cancelDay) && difference >= 0) {
.inSeconds;
if (int.parse(cancelDay) != 0 &&
differenceSeconds < int.parse(cancelDay) * 24 * 60 * 60) {
// 临餐时间内
cancelCan = false;
} else {
... ...
... ... @@ -367,10 +367,13 @@ class InvicationPageState extends State<InvicationPage>
//临餐不可以取消
//比较相差的天数
int difference = detailModel.detailModelAllSunModel.ddateFhms
int differenceSeconds = detailModel.detailModelAllSunModel.ddateFhms
.difference(DateTime.now())
.inDays;
if (difference <= int.parse(cancelDay) && difference >= 0) {
.inSeconds;
if (int.parse(cancelDay) != 0 &&
differenceSeconds < int.parse(cancelDay) * 24 * 60 * 60) {
// 临餐时间内
cancelCan = false;
} else {
... ... @@ -384,10 +387,12 @@ class InvicationPageState extends State<InvicationPage>
//临餐不可以取消
//比较相差的天数
int difference = detailModel.detailModelAllSunModel.ddateFhms
int differenceSeconds = detailModel.detailModelAllSunModel.ddateFhms
.difference(DateTime.now())
.inDays;
if (difference <= int.parse(cancelDay) && difference >= 0) {
.inSeconds;
if (int.parse(cancelDay) != 0 &&
differenceSeconds < int.parse(cancelDay) * 24 * 60 * 60) {
// 临餐时间内
cancelCan = false;
} else {
... ... @@ -401,10 +406,12 @@ class InvicationPageState extends State<InvicationPage>
//临餐不可以取消
//比较相差的天数
int difference = detailModel.detailModelAllSunModel.ddateFhms
int differenceSeconds = detailModel.detailModelAllSunModel.ddateFhms
.difference(DateTime.now())
.inDays;
if (difference <= int.parse(cancelDay) && difference >= 0) {
.inSeconds;
if (int.parse(cancelDay) != 0 &&
differenceSeconds < int.parse(cancelDay) * 24 * 60 * 60) {
// 临餐时间内
cancelCan = false;
} else {
... ...
... ... @@ -577,14 +577,18 @@ class _CustomerSettingPageState extends State<CustomerSettingPage> {
VEmptyView(48),
Row(
children: [
Container(
padding: EdgeInsets.symmetric(vertical: w(8)),
child: Text('临餐取消预订限制（前台及管理员除外）',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32)))),
HEmptyView(10),
Expanded(
child: Container(
padding: EdgeInsets.symmetric(vertical: w(8)),
child: Text('临餐取消预订限制（前台及管理员除外）',
overflow: TextOverflow.ellipsis,
maxLines: 10,
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(32))))),
HEmptyView(2),
Container(
width: w(40),
child: TextField(
controller: controllerDay,
textAlign: TextAlign.right,
... ...