xt / Flutter-ReserveApp · Commits

Go to a project

Commit f985f1aca0d1bf3f35dec37328d902d6af6a9643

Authored by wdn127929
1 parent 5be83f8a
build: skipped

预订安排-1分钟倒计时and提示信息

Inline Side-by-side
Showing 17 changed files with 87 additions and 67 deletions
... ... @@ -25,5 +25,6 @@ enum FromPage {
FromPageShowCutomerList, //仅展示客户列表，没有选择按钮
FromPageIfNeedCreateStore,
FromPageMyPage,
FromPageInvicationPage
FromPageInvicationPage,//预订安排
FromPagePhotoManagerPage,//照片管理
}
... ...
... ... @@ -1698,6 +1698,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
Stack(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Align(
alignment: Alignment.centerLeft,
... ... @@ -1786,6 +1787,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
VEmptyView(40),
Container(
padding: EdgeInsets.only(
left: ScreenUtil().setWidth(20),
right: ScreenUtil().setWidth(20),
bottom: ScreenUtil().setWidth(40)),
child: Wrap(
children: _listWidget(
... ... @@ -2039,6 +2042,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
? ''
: _model.row.rname,
_model.row.sex == null ? '' : _model.row.sex,
_model.row.cusdem,
tid: _tid,
replace: true);
}
... ... @@ -2481,20 +2485,24 @@ Widget remarkButton({GestureTapCallback onPress, content, isSelect = false}) {
return InkWell(
onTap: onPress,
child: Container(
height: ScreenUtil().setHeight(48),
margin: EdgeInsets.only(right: ScreenUtil().setWidth(20)),
// height: ScreenUtil().setWidth(50),
// alignment: Alignment.center,
// margin: EdgeInsets.only(right: ScreenUtil().setWidth(16)),
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(20),
vertical: ScreenUtil().setWidth(6)),
vertical: ScreenUtil().setWidth(10)),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
color: isSelect ? MyColours.color_199095 : MyColours.color_f5f5f5,
),
borderRadius: BorderRadius.circular(ScreenUtil().setWidth(96)),
color: isSelect ? MyColours.color_515151 : MyColours.color_ffffff,
border: Border.all(
width: ScreenUtil().setWidth(2),
color: isSelect ? MyColours.color_FFF0E5 : MyColours.color_DBDBDB,
)),
child: Text(
content,
style: TextStyle(
color: isSelect ? Colors.white : MyColours.color_353535,
fontSize: ScreenUtil().setSp(28)),
color: isSelect ? Colors.white : MyColours.color_999999,
fontSize: ScreenUtil().setSp(24)),
),
),
);
... ...
... ... @@ -2553,6 +2553,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
? ''
: detailEntity
.sex,
detailEntity.cusdem,
tid: _tid);
},
child: Container(
... ...
... ... @@ -798,6 +798,7 @@ class _EnterPageState extends State<EnterPage> {
_model.row.ddateSolt,
_model.row.rname == null ? '' : _model.row.rname,
_model.row.sex == null ? '' : _model.row.sex,
_model.row.cusdem,
tid: _tid,
replace: true);
} else {
... ...
... ... @@ -1429,6 +1429,7 @@ class _HomeEnterPageState extends State<HomeEnterPage>
_model.row.ddateSolt,
_model.row.rname == null ? '' : _model.row.rname,
_model.row.sex == null ? '' : _model.row.sex,
_model.row.cusdem,
tid: _tid,
replace: false);
//今天 明天 其他天
... ...
This diff could not be displayed because it is too large.
... ... @@ -2,6 +2,7 @@ import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/constant/state.dart';
import 'package:one_key/models/table_photo_model.dart';
import 'package:one_key/models/upload_img_model.dart';
import 'package:one_key/pages/online_check/img_picker_widget.dart';
... ... @@ -21,7 +22,9 @@ import 'package:provider/provider.dart';
class TablePhotoManagerPage extends StatefulWidget {
final String tid;
final String tname;
TablePhotoManagerPage({Key key, this.tid, this.tname}) : super(key: key);
final FromPage fromPage;
TablePhotoManagerPage({Key key, this.tid, this.tname, this.fromPage})
: super(key: key);
@override
_TablePhotoManagerPageState createState() => _TablePhotoManagerPageState();
... ... @@ -77,6 +80,7 @@ class _TablePhotoManagerPageState extends State<TablePhotoManagerPage> {
}
}
bus.emit("refresh_photo_manager");
bus.emit("refresh_photo_invication");
}
print(_uploadImageProvider.tableImageList);
... ... @@ -177,33 +181,37 @@ class _TablePhotoManagerPageState extends State<TablePhotoManagerPage> {
color: MyColours.color_333333,
fontSize: ScreenUtil().setSp(32),
fontWeight: FontWeight.bold)),
InkWell(
onTap: () async {
Navigator.pop(context);
// Map temp = await NavigatorUtil
// .goPhotoManagerSelectTablePage(
// context,
// "",
// DateTime.now()
// .millisecondsSinceEpoch,
// "1",
// canChoose: true,
// object: null,
// fromPage: "tablePhoto",
// tid: tid);
// if (temp != null && temp['tid'] != '') {
// print(temp['tid']);
// print(temp['tname']);
// tname = temp['tname'];
// tid = temp['tid'];
// _getTablePhoto(context, temp['tid'],
// showLoading: true);
// }
},
child: Text('切换桌位',
style: TextStyle(
color: MyColours.color_199095,
fontSize: ScreenUtil().setSp(32)))),
widget.fromPage ==
FromPage.FromPagePhotoManagerPage
? InkWell(
onTap: () async {
Navigator.pop(context);
// Map temp = await NavigatorUtil
// .goPhotoManagerSelectTablePage(
// context,
// "",
// DateTime.now()
// .millisecondsSinceEpoch,
// "1",
// canChoose: true,
// object: null,
// fromPage: "tablePhoto",
// tid: tid);
// if (temp != null && temp['tid'] != '') {
// print(temp['tid']);
// print(temp['tname']);
// tname = temp['tname'];
// tid = temp['tid'];
// _getTablePhoto(context, temp['tid'],
// showLoading: true);
// }
},
child: Text('切换桌位',
style: TextStyle(
color: MyColours.color_199095,
fontSize:
ScreenUtil().setSp(32))))
: SizedBox(),
],
)),
Expanded(
... ...
... ... @@ -85,6 +85,7 @@ class NoteBookItemFState extends State<NoteBookItemF>
widget.notebook.ddate_solt,
widget.notebook.rname == null ? '' : widget.notebook.rname,
widget.notebook.sex == null ? '' : widget.notebook.sex,
widget.notebook.cusdem,
tid: widget.notebook.tid);
}
}
... ...
... ... @@ -97,6 +97,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
widget.notebook.ddate_solt,
widget.notebook.rname == null ? '' : widget.notebook.rname,
widget.notebook.sex == null ? '' : widget.notebook.sex,
widget.notebook.cusdem,
tid: widget.notebook.tid);
}
}
... ...
... ... @@ -58,6 +58,7 @@ class NotebookItemState extends State<NoteBookItem> {
widget.notebook.ddate_solt,
widget.notebook.rname == null ? '' : widget.notebook.rname,
widget.notebook.sex == null ? '' : widget.notebook.sex,
widget.notebook.cusdem,
tid: widget.notebook.tid);
}
}
... ...
... ... @@ -520,7 +520,7 @@ class TableManagerPageState extends State<TableManagerPage> {
contact.phoneNumber.replaceAll(new RegExp(r"\s+"), "");
nameStr = fullName;
// _homeEnterModel.nameController.text = fullName + _nameSuffix();
_addNameSuffix(fullName, _nameSuffix());
_addNameSuffix(fullName, sexStr);
});
}
... ... @@ -818,7 +818,7 @@ class TableManagerPageState extends State<TableManagerPage> {
_nameNode.unfocus();
// _homeEnterModel.nameController.text =
// nameStr + _nameSuffix();
_addNameSuffix(nameStr, _nameSuffix());
_addNameSuffix(nameStr, sexStr);
},
keyboardType: TextInputType.text,
),
... ... @@ -1082,7 +1082,7 @@ class TableManagerPageState extends State<TableManagerPage> {
_addNameSuffix(
_baseIndoProvider
.userHistorys[index].rname,
_nameSuffix());
sexStr);
nameStr = _baseIndoProvider
.userHistorys[index].rname;
_phoneNode.unfocus();
... ... @@ -1226,17 +1226,9 @@ class TableManagerPageState extends State<TableManagerPage> {
height: ScreenUtil().setWidth(34 * 2),
colors: [
MyColours.color_5CA0AD,
MyColours.color_238389
])),
Expanded(
child: GradientButton(
left: false,
radius: 12,
height: ScreenUtil().setWidth(34 * 2),
colors: [
MyColours.color_238389,
MyColours.color_2193B0
]))
])),
],
),
),
... ...
... ... @@ -146,10 +146,11 @@ class NavigatorUtil {
String ddate_solt,
String name,
String sex,
String remark,
{bool replace = false,
String tid}) {
_navigateTo(context,
"${Routes.invication}?rid=$rid&tid=$tid&tableInfo=${FluroConvertUtils.fluroCnParamsEncode(tableInfo)}&ddate=$ddate&ddateStr=${FluroConvertUtils.fluroCnParamsEncode(ddateStr)}&phone=$phone&ddate_solt=$ddate_solt&name=${Uri.encodeComponent(name)}&sex=$sex",
"${Routes.invication}?rid=$rid&tid=$tid&tableInfo=${FluroConvertUtils.fluroCnParamsEncode(tableInfo)}&ddate=$ddate&ddateStr=${FluroConvertUtils.fluroCnParamsEncode(ddateStr)}&phone=$phone&ddate_solt=$ddate_solt&name=${Uri.encodeComponent(name)}&sex=$sex&remark=${remark == null ? '' : Uri.encodeComponent(remark)}",
replace: replace);
}
... ... @@ -418,9 +419,12 @@ class NavigatorUtil {
/// 桌位照片管理
static Future<dynamic> goTablePhotoManagerPage(BuildContext context,
{replace = false, String tid, String tname}) {
{replace = false,
String tid,
String tname,
FromPage fromPage = FromPage.FromPagePhotoManagerPage}) {
return _navigateTo(context,
"${Routes.table_photo_manager}?tid=${tid}&tname=${Uri.encodeComponent(tname)}",
"${Routes.table_photo_manager}?tid=${tid}&tname=${Uri.encodeComponent(tname)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}",
replace: replace);
}
... ...
... ... @@ -317,10 +317,14 @@ var handleInvicationHandler = new Handler(
String tid = params["tid"].first;
String name = params["name"].first;
String sex = params["sex"].first;
return ChangeNotifierProvider<BaseIndoProvider>(
create: (_) => BaseIndoProvider(),
child: InvicationPage(
rid, tableInfo, ddate, ddateStr, phone, ddate_solt, tid, name, sex));
String remark = params["remark"].first;
return ChangeNotifierProvider<RemarkManagerModel>(
create: (_) => RemarkManagerModel(),
child: ChangeNotifierProvider<BaseIndoProvider>(
create: (_) => BaseIndoProvider(),
child: InvicationPage(rid, tableInfo, ddate, ddateStr, phone,
ddate_solt, tid, name, sex,remark)));
});
// 发短信
... ... @@ -703,9 +707,11 @@ var tablePhotoManagerHandler = new Handler(
// FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first)));
String tid = params["tid"].first;
String tname = params["tname"].first;
FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>(
FromPage.values, params["fromPage"].first);
return ChangeNotifierProvider<TablePhotoManagerModel>(
create: (_) => TablePhotoManagerModel(),
child: TablePhotoManagerPage(tid: tid, tname: tname));
child: TablePhotoManagerPage(tid: tid, tname: tname, fromPage: fromPage));
// return ChangeNotifierProvider<UploadImageProvider>(
// create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
});
... ...
import 'package:amap_map_fluttify/amap_map_fluttify.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/res/colors.dart';
class GradientButton extends StatelessWidget {
final List<Color> colors;
final double height;
final bool left;
final double radius;
const GradientButton(
{Key key, this.colors, this.height, this.left = true, this.radius = 0})
const GradientButton({Key key, this.colors, this.height,this.radius = 0})
: super(key: key);
@override
... ... @@ -19,13 +19,8 @@ class GradientButton extends StatelessWidget {
height: height,
decoration: BoxDecoration(
gradient: LinearGradient(colors: colors), // 渐变色
borderRadius: left
? BorderRadius.only(
topLeft: Radius.circular(ScreenUtil().setWidth(radius)),
bottomLeft: Radius.circular(ScreenUtil().setWidth(radius)))
: BorderRadius.only(
topRight: Radius.circular(ScreenUtil().setWidth(radius)),
bottomRight: Radius.circular(ScreenUtil().setWidth(radius)))),
borderRadius:
BorderRadius.all(Radius.circular(ScreenUtil().setWidth(radius)))),
);
}
}
... ...