xt / Flutter-ReserveApp · Commits

Go to a project

Commit ad0607a033fcd156942ebb1ac1d3c27973112f18

Authored by wdn127929
1 parent 283e4e76
build: skipped

多时段增加时间显示

Inline Side-by-side
Showing 8 changed files with 92 additions and 55 deletions
... ... @@ -449,7 +449,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5545;
CURRENT_PROJECT_VERSION = 5546;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -632,7 +632,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5545;
CURRENT_PROJECT_VERSION = 5546;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -658,7 +658,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 5545;
CURRENT_PROJECT_VERSION = 5546;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ...
... ... @@ -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; //开发版
... ...
... ... @@ -226,6 +226,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
alignment: Alignment.center,
child: Container(
alignment: Alignment.center,
// height: w(35),
width: double.infinity,
// width: width,
// padding: padding,
... ... @@ -239,13 +240,25 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
: MyColours.color_438E93,
width: w(1),
))),
child: Text(
element.mname!,
style: TextStyle(
color: '${currTimeIndex}' == element.ddateSolt
? MyColours.color_F8F9FD
: MyColours.color_438E93,
fontSize: font(14)),
child: Column(
children: [
Text(
element.mname ?? '',
style: TextStyle(
color: '${currTimeIndex}' == element.ddateSolt
? MyColours.color_F8F9FD
: MyColours.color_438E93,
fontSize: font(14)),
),
Text(
element.mdate ?? '',
style: TextStyle(
color: '${currTimeIndex}' == element.ddateSolt
? MyColours.color_F8F9FD
: MyColours.color_438E93,
fontSize: font(12)),
)
],
)),
)),
));
... ... @@ -1407,7 +1420,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
// vertical: ScreenUtil().setWidth(20)
),
decoration: BoxDecoration(
color: MyColours.color_199095,
color: MyColours.color_438E93,
borderRadius: BorderRadius.only(
topLeft: Radius.circular(r(10)),
topRight: Radius.circular(r(10)),
... ... @@ -1450,7 +1463,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
// (currTimeIndex == 3 || currTimeIndex == 1)
// ? ScreenUtil().setWidth(300) + ScreenUtil().setWidth(4)
// : ScreenUtil().setWidth(300),
height: w(28),
// height: w(28),
decoration: BoxDecoration(
color: Colors.transparent,
borderRadius: BorderRadius.only(
... ... @@ -2359,7 +2372,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
detailEntity!.uid,
currTimeIndex,
dateTime,
times )
times)
: await _notebookDetailChangeModel
.setReserveInfoOnly(
context,
... ... @@ -2367,7 +2380,7 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
detailEntity!.uid,
currTimeIndex,
dateTime,
times );
times);
if (_model != null) {
if (ObjectUtil.isNotEmpty(_model.row) ||
ObjectUtil.isNotEmpty(_model.row!.id)) {
... ...
... ... @@ -11,6 +11,7 @@ import 'package:one_key/provider/user_model.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/route/navigator_util.dart';
import 'package:one_key/utils/event_bus.dart';
import 'package:one_key/utils/screen_util.dart';
import 'package:one_key/utils/utils.dart';
import 'package:one_key/widgets/MyDivider.dart';
import 'package:one_key/widgets/h_empty_view.dart';
... ... @@ -642,7 +643,8 @@ class NoteBookItemFState extends State<NoteBookItemF>
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
Wrap(
spacing: w(2),
children: [
notebook.rnameStr == ''
? SizedBox()
... ...
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/models/notebook.dart';
... ... @@ -33,6 +32,7 @@ import 'package:provider/provider.dart';
import '../../models/note_book_only_model.dart';
import '../../provider/marketing_center_provider.dart';
import '../../utils/screen_util.dart';
/**
* 详细模式
... ... @@ -52,8 +52,8 @@ class NoteBookItemSimple extends StatefulWidget {
}
class NoteBookItemSimpleState extends State<NoteBookItemSimple>
// with SingleTickerProviderStateMixin
{
// with SingleTickerProviderStateMixin
{
// bool _large = false;
List cancelReasonList = [];
bool isShowTF = false;
... ... @@ -513,7 +513,6 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
//离店和取消预订
widthBtn = 208.0; //一个按钮
} else {
if (!Utils.getAuthority(context, '取消预订') ||
(!Utils.getAuthority(context, '取消预订') &&
... ... @@ -553,7 +552,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
width: ScreenUtil().setWidth(82 * 2),
alignment: Alignment.center,
child: Text(
notebook.tablename??'',
notebook.tablename ?? '',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
... ... @@ -596,27 +595,26 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
Wrap(
spacing: w(2),
children: [
notebook.rnameStr == ''
? SizedBox()
: Expanded(
child: Text(
notebook.rnameStr!,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: canDo &&
(Utils.getAuthority(
context, '到店') ||
notebook.uid ==
userModel
.user!.openid)
? MyColours.color_260101
: MyColours.color_BFC4D4,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(24)),
),
: Text(
notebook.rnameStr!,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: canDo &&
(Utils.getAuthority(
context, '到店') ||
notebook.uid ==
userModel
.user!.openid)
? MyColours.color_260101
: MyColours.color_BFC4D4,
fontWeight: FontWeight.bold,
fontSize: ScreenUtil().setSp(24)),
),
notebook.phoneStr!.isNotEmpty
? Text(
... ... @@ -893,7 +891,8 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
: Image.asset(
Utils.getImgPath(canDo &&
(Utils.getAuthority(context, '到店') ||
notebook.uid == userModel.user!.openid)
notebook.uid ==
userModel.user!.openid)
? 'ordered_open'
: 'ordered_off'),
width: ScreenUtil().setWidth(80),
... ...
... ... @@ -682,6 +682,8 @@ class NoteBookPageState extends State<NoteBookPage> {
))),
child: Text(
element.mname! + '${total == '(0)' ? '' : total}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: '${currTimeIndex}' == element.ddateSolt
? MyColours.color_F8F9FD
... ...
... ... @@ -3926,13 +3926,28 @@ class TableManagerPageState extends State<TableManagerPage> {
: MyColours.color_438E93,
width: w(1),
))),
child: Text(
element.mname!,
style: TextStyle(
color: '${currTimeIndex}' == element.ddateSolt
? MyColours.color_F8F9FD
: MyColours.color_438E93,
fontSize: font(14)),
child: Column(
children: [
Text(
element.mname ?? '',
// overflow: TextOverflow.ellipsis,
style: TextStyle(
color: '${currTimeIndex}' == element.ddateSolt
? MyColours.color_F8F9FD
: MyColours.color_438E93,
fontSize: font(14)),
),
// VEmptyView(10),
Text(
element.mdate ?? '',
style: TextStyle(
color: '${currTimeIndex}' == element.ddateSolt
? MyColours.color_F8F9FD
: MyColours.color_438E93,
fontSize: font(12)),
)
],
)),
)),
));
... ... @@ -4093,8 +4108,8 @@ class TableManagerPageState extends State<TableManagerPage> {
// ? ScreenUtil().setWidth(300) + ScreenUtil().setWidth(4)
// : ScreenUtil().setWidth(300),
// height: w(28),
height:
(ScreenUtil().screenWidth - w(10) - w(18)) / 4 * 0.4,
// height:
// (ScreenUtil().screenWidth - w(10) - w(18)) / 4 * 0.4,
decoration: BoxDecoration(
color: Colors.transparent,
borderRadius: BorderRadius.only(
... ...
... ... @@ -2530,8 +2530,9 @@ class Utils {
height: 1,
maxLines: 1,
ellipsis: '3',
fontSize: 16*scaleX));
pb2.pushStyle(ui.TextStyle(color: MyColours.color_FFEFC5, fontSize: 16*scaleX));
fontSize: 16 * scaleX));
pb2.pushStyle(
ui.TextStyle(color: MyColours.color_FFEFC5, fontSize: 16 * scaleX));
pb2.addText(
'${Provider.of<UserModel>(context, listen: false).user!.sellername}');
... ... @@ -2552,8 +2553,10 @@ class Utils {
fontWeight: FontWeight.bold,
fontStyle: FontStyle.normal,
height: 1,
fontSize: 16*scaleX));
pb.pushStyle(ui.TextStyle(color: MyColours.color_FFEFC5, fontSize: 16*scaleX));
ellipsis:'...',
fontSize: 16 * scaleX));
pb.pushStyle(
ui.TextStyle(color: MyColours.color_FFEFC5, fontSize: 16 * scaleX));
pb.addText(time);
// 设置文本的宽度约束
... ... @@ -2678,6 +2681,7 @@ class Utils {
fontWeight: FontWeight.bold,
fontStyle: FontStyle.normal,
height: 1,
ellipsis:'...',
fontSize: 16 * scaleX));
pb.pushStyle(
ui.TextStyle(color: MyColours.color_FFEFC5, fontSize: 16 * scaleX));
... ... @@ -2816,6 +2820,7 @@ class Utils {
fontWeight: FontWeight.bold,
height: 1,
fontStyle: FontStyle.normal,
ellipsis:'...',
fontSize: 16 * scaleX));
pb.pushStyle(
ui.TextStyle(color: MyColours.color_FFEFC5, fontSize: 16 * scaleX));
... ... @@ -2956,6 +2961,7 @@ class Utils {
textAlign: TextAlign.center,
fontWeight: FontWeight.bold,
height: 1,
ellipsis:'...',
fontStyle: FontStyle.normal,
fontSize: scaleX * 16));
pb.pushStyle(
... ...