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 { @@ -25,5 +25,6 @@ enum FromPage {
25 FromPageShowCutomerList, //仅展示客户列表，没有选择按钮 25 FromPageShowCutomerList, //仅展示客户列表，没有选择按钮
26 FromPageIfNeedCreateStore, 26 FromPageIfNeedCreateStore,
27 FromPageMyPage, 27 FromPageMyPage,
28 - FromPageInvicationPage 28 + FromPageInvicationPage,//预订安排
  29 + FromPagePhotoManagerPage,//照片管理
29 } 30 }
@@ -1698,6 +1698,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1698,6 +1698,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1698 Stack( 1698 Stack(
1699 children: [ 1699 children: [
1700 Column( 1700 Column(
  1701 + crossAxisAlignment: CrossAxisAlignment.start,
1701 children: [ 1702 children: [
1702 Align( 1703 Align(
1703 alignment: Alignment.centerLeft, 1704 alignment: Alignment.centerLeft,
@@ -1786,6 +1787,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1786,6 +1787,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1786 VEmptyView(40), 1787 VEmptyView(40),
1787 Container( 1788 Container(
1788 padding: EdgeInsets.only( 1789 padding: EdgeInsets.only(
  1790 + left: ScreenUtil().setWidth(20),
  1791 + right: ScreenUtil().setWidth(20),
1789 bottom: ScreenUtil().setWidth(40)), 1792 bottom: ScreenUtil().setWidth(40)),
1790 child: Wrap( 1793 child: Wrap(
1791 children: _listWidget( 1794 children: _listWidget(
@@ -2039,6 +2042,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -2039,6 +2042,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
2039 ? '' 2042 ? ''
2040 : _model.row.rname, 2043 : _model.row.rname,
2041 _model.row.sex == null ? '' : _model.row.sex, 2044 _model.row.sex == null ? '' : _model.row.sex,
  2045 + _model.row.cusdem,
2042 tid: _tid, 2046 tid: _tid,
2043 replace: true); 2047 replace: true);
2044 } 2048 }
@@ -2481,20 +2485,24 @@ Widget remarkButton({GestureTapCallback onPress, content, isSelect = false}) { @@ -2481,20 +2485,24 @@ Widget remarkButton({GestureTapCallback onPress, content, isSelect = false}) {
2481 return InkWell( 2485 return InkWell(
2482 onTap: onPress, 2486 onTap: onPress,
2483 child: Container( 2487 child: Container(
2484 - height: ScreenUtil().setHeight(48),  
2485 - margin: EdgeInsets.only(right: ScreenUtil().setWidth(20)), 2488 + // height: ScreenUtil().setWidth(50),
  2489 + // alignment: Alignment.center,
  2490 + // margin: EdgeInsets.only(right: ScreenUtil().setWidth(16)),
2486 padding: EdgeInsets.symmetric( 2491 padding: EdgeInsets.symmetric(
2487 horizontal: ScreenUtil().setWidth(20), 2492 horizontal: ScreenUtil().setWidth(20),
2488 - vertical: ScreenUtil().setWidth(6)), 2493 + vertical: ScreenUtil().setWidth(10)),
2489 decoration: BoxDecoration( 2494 decoration: BoxDecoration(
2490 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),  
2491 - color: isSelect ? MyColours.color_199095 : MyColours.color_f5f5f5,  
2492 - ), 2495 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(96)),
  2496 + color: isSelect ? MyColours.color_515151 : MyColours.color_ffffff,
  2497 + border: Border.all(
  2498 + width: ScreenUtil().setWidth(2),
  2499 + color: isSelect ? MyColours.color_FFF0E5 : MyColours.color_DBDBDB,
  2500 + )),
2493 child: Text( 2501 child: Text(
2494 content, 2502 content,
2495 style: TextStyle( 2503 style: TextStyle(
2496 - color: isSelect ? Colors.white : MyColours.color_353535,  
2497 - fontSize: ScreenUtil().setSp(28)), 2504 + color: isSelect ? Colors.white : MyColours.color_999999,
  2505 + fontSize: ScreenUtil().setSp(24)),
2498 ), 2506 ),
2499 ), 2507 ),
2500 ); 2508 );
@@ -2553,6 +2553,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -2553,6 +2553,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
2553 ? '' 2553 ? ''
2554 : detailEntity 2554 : detailEntity
2555 .sex, 2555 .sex,
  2556 + detailEntity.cusdem,
2556 tid: _tid); 2557 tid: _tid);
2557 }, 2558 },
2558 child: Container( 2559 child: Container(
@@ -798,6 +798,7 @@ class _EnterPageState extends State<EnterPage> { @@ -798,6 +798,7 @@ class _EnterPageState extends State<EnterPage> {
798 _model.row.ddateSolt, 798 _model.row.ddateSolt,
799 _model.row.rname == null ? '' : _model.row.rname, 799 _model.row.rname == null ? '' : _model.row.rname,
800 _model.row.sex == null ? '' : _model.row.sex, 800 _model.row.sex == null ? '' : _model.row.sex,
  801 + _model.row.cusdem,
801 tid: _tid, 802 tid: _tid,
802 replace: true); 803 replace: true);
803 } else { 804 } else {
@@ -1429,6 +1429,7 @@ class _HomeEnterPageState extends State<HomeEnterPage> @@ -1429,6 +1429,7 @@ class _HomeEnterPageState extends State<HomeEnterPage>
1429 _model.row.ddateSolt, 1429 _model.row.ddateSolt,
1430 _model.row.rname == null ? '' : _model.row.rname, 1430 _model.row.rname == null ? '' : _model.row.rname,
1431 _model.row.sex == null ? '' : _model.row.sex, 1431 _model.row.sex == null ? '' : _model.row.sex,
  1432 + _model.row.cusdem,
1432 tid: _tid, 1433 tid: _tid,
1433 replace: false); 1434 replace: false);
1434 //今天 明天 其他天 1435 //今天 明天 其他天
This diff could not be displayed because it is too large.
@@ -2,6 +2,7 @@ import 'dart:convert'; @@ -2,6 +2,7 @@ import 'dart:convert';
2 2
3 import 'package:flutter/material.dart'; 3 import 'package:flutter/material.dart';
4 import 'package:flutter_screenutil/flutter_screenutil.dart'; 4 import 'package:flutter_screenutil/flutter_screenutil.dart';
  5 +import 'package:one_key/constant/state.dart';
5 import 'package:one_key/models/table_photo_model.dart'; 6 import 'package:one_key/models/table_photo_model.dart';
6 import 'package:one_key/models/upload_img_model.dart'; 7 import 'package:one_key/models/upload_img_model.dart';
7 import 'package:one_key/pages/online_check/img_picker_widget.dart'; 8 import 'package:one_key/pages/online_check/img_picker_widget.dart';
@@ -21,7 +22,9 @@ import 'package:provider/provider.dart'; @@ -21,7 +22,9 @@ import 'package:provider/provider.dart';
21 class TablePhotoManagerPage extends StatefulWidget { 22 class TablePhotoManagerPage extends StatefulWidget {
22 final String tid; 23 final String tid;
23 final String tname; 24 final String tname;
24 - TablePhotoManagerPage({Key key, this.tid, this.tname}) : super(key: key); 25 + final FromPage fromPage;
  26 + TablePhotoManagerPage({Key key, this.tid, this.tname, this.fromPage})
  27 + : super(key: key);
25 28
26 @override 29 @override
27 _TablePhotoManagerPageState createState() => _TablePhotoManagerPageState(); 30 _TablePhotoManagerPageState createState() => _TablePhotoManagerPageState();
@@ -77,6 +80,7 @@ class _TablePhotoManagerPageState extends State<TablePhotoManagerPage> { @@ -77,6 +80,7 @@ class _TablePhotoManagerPageState extends State<TablePhotoManagerPage> {
77 } 80 }
78 } 81 }
79 bus.emit("refresh_photo_manager"); 82 bus.emit("refresh_photo_manager");
  83 + bus.emit("refresh_photo_invication");
80 } 84 }
81 85
82 print(_uploadImageProvider.tableImageList); 86 print(_uploadImageProvider.tableImageList);
@@ -177,33 +181,37 @@ class _TablePhotoManagerPageState extends State<TablePhotoManagerPage> { @@ -177,33 +181,37 @@ class _TablePhotoManagerPageState extends State<TablePhotoManagerPage> {
177 color: MyColours.color_333333, 181 color: MyColours.color_333333,
178 fontSize: ScreenUtil().setSp(32), 182 fontSize: ScreenUtil().setSp(32),
179 fontWeight: FontWeight.bold)), 183 fontWeight: FontWeight.bold)),
180 - InkWell(  
181 - onTap: () async {  
182 - Navigator.pop(context);  
183 - // Map temp = await NavigatorUtil  
184 - // .goPhotoManagerSelectTablePage(  
185 - // context,  
186 - // "",  
187 - // DateTime.now()  
188 - // .millisecondsSinceEpoch,  
189 - // "1",  
190 - // canChoose: true,  
191 - // object: null,  
192 - // fromPage: "tablePhoto",  
193 - // tid: tid);  
194 - // if (temp != null && temp['tid'] != '') {  
195 - // print(temp['tid']);  
196 - // print(temp['tname']);  
197 - // tname = temp['tname'];  
198 - // tid = temp['tid'];  
199 - // _getTablePhoto(context, temp['tid'],  
200 - // showLoading: true);  
201 - // }  
202 - },  
203 - child: Text('切换桌位',  
204 - style: TextStyle(  
205 - color: MyColours.color_199095,  
206 - fontSize: ScreenUtil().setSp(32)))), 184 + widget.fromPage ==
  185 + FromPage.FromPagePhotoManagerPage
  186 + ? InkWell(
  187 + onTap: () async {
  188 + Navigator.pop(context);
  189 + // Map temp = await NavigatorUtil
  190 + // .goPhotoManagerSelectTablePage(
  191 + // context,
  192 + // "",
  193 + // DateTime.now()
  194 + // .millisecondsSinceEpoch,
  195 + // "1",
  196 + // canChoose: true,
  197 + // object: null,
  198 + // fromPage: "tablePhoto",
  199 + // tid: tid);
  200 + // if (temp != null && temp['tid'] != '') {
  201 + // print(temp['tid']);
  202 + // print(temp['tname']);
  203 + // tname = temp['tname'];
  204 + // tid = temp['tid'];
  205 + // _getTablePhoto(context, temp['tid'],
  206 + // showLoading: true);
  207 + // }
  208 + },
  209 + child: Text('切换桌位',
  210 + style: TextStyle(
  211 + color: MyColours.color_199095,
  212 + fontSize:
  213 + ScreenUtil().setSp(32))))
  214 + : SizedBox(),
207 ], 215 ],
208 )), 216 )),
209 Expanded( 217 Expanded(
@@ -85,6 +85,7 @@ class NoteBookItemFState extends State<NoteBookItemF> @@ -85,6 +85,7 @@ class NoteBookItemFState extends State<NoteBookItemF>
85 widget.notebook.ddate_solt, 85 widget.notebook.ddate_solt,
86 widget.notebook.rname == null ? '' : widget.notebook.rname, 86 widget.notebook.rname == null ? '' : widget.notebook.rname,
87 widget.notebook.sex == null ? '' : widget.notebook.sex, 87 widget.notebook.sex == null ? '' : widget.notebook.sex,
  88 + widget.notebook.cusdem,
88 tid: widget.notebook.tid); 89 tid: widget.notebook.tid);
89 } 90 }
90 } 91 }
@@ -97,6 +97,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple> @@ -97,6 +97,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
97 widget.notebook.ddate_solt, 97 widget.notebook.ddate_solt,
98 widget.notebook.rname == null ? '' : widget.notebook.rname, 98 widget.notebook.rname == null ? '' : widget.notebook.rname,
99 widget.notebook.sex == null ? '' : widget.notebook.sex, 99 widget.notebook.sex == null ? '' : widget.notebook.sex,
  100 + widget.notebook.cusdem,
100 tid: widget.notebook.tid); 101 tid: widget.notebook.tid);
101 } 102 }
102 } 103 }
@@ -58,6 +58,7 @@ class NotebookItemState extends State<NoteBookItem> { @@ -58,6 +58,7 @@ class NotebookItemState extends State<NoteBookItem> {
58 widget.notebook.ddate_solt, 58 widget.notebook.ddate_solt,
59 widget.notebook.rname == null ? '' : widget.notebook.rname, 59 widget.notebook.rname == null ? '' : widget.notebook.rname,
60 widget.notebook.sex == null ? '' : widget.notebook.sex, 60 widget.notebook.sex == null ? '' : widget.notebook.sex,
  61 + widget.notebook.cusdem,
61 tid: widget.notebook.tid); 62 tid: widget.notebook.tid);
62 } 63 }
63 } 64 }
@@ -520,7 +520,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -520,7 +520,7 @@ class TableManagerPageState extends State<TableManagerPage> {
520 contact.phoneNumber.replaceAll(new RegExp(r"\s+"), ""); 520 contact.phoneNumber.replaceAll(new RegExp(r"\s+"), "");
521 nameStr = fullName; 521 nameStr = fullName;
522 // _homeEnterModel.nameController.text = fullName + _nameSuffix(); 522 // _homeEnterModel.nameController.text = fullName + _nameSuffix();
523 - _addNameSuffix(fullName, _nameSuffix()); 523 + _addNameSuffix(fullName, sexStr);
524 }); 524 });
525 } 525 }
526 526
@@ -818,7 +818,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -818,7 +818,7 @@ class TableManagerPageState extends State<TableManagerPage> {
818 _nameNode.unfocus(); 818 _nameNode.unfocus();
819 // _homeEnterModel.nameController.text = 819 // _homeEnterModel.nameController.text =
820 // nameStr + _nameSuffix(); 820 // nameStr + _nameSuffix();
821 - _addNameSuffix(nameStr, _nameSuffix()); 821 + _addNameSuffix(nameStr, sexStr);
822 }, 822 },
823 keyboardType: TextInputType.text, 823 keyboardType: TextInputType.text,
824 ), 824 ),
@@ -1082,7 +1082,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1082,7 +1082,7 @@ class TableManagerPageState extends State<TableManagerPage> {
1082 _addNameSuffix( 1082 _addNameSuffix(
1083 _baseIndoProvider 1083 _baseIndoProvider
1084 .userHistorys[index].rname, 1084 .userHistorys[index].rname,
1085 - _nameSuffix()); 1085 + sexStr);
1086 nameStr = _baseIndoProvider 1086 nameStr = _baseIndoProvider
1087 .userHistorys[index].rname; 1087 .userHistorys[index].rname;
1088 _phoneNode.unfocus(); 1088 _phoneNode.unfocus();
@@ -1226,17 +1226,9 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1226,17 +1226,9 @@ class TableManagerPageState extends State<TableManagerPage> {
1226 height: ScreenUtil().setWidth(34 * 2), 1226 height: ScreenUtil().setWidth(34 * 2),
1227 colors: [ 1227 colors: [
1228 MyColours.color_5CA0AD, 1228 MyColours.color_5CA0AD,
1229 - MyColours.color_238389  
1230 - ])),  
1231 - Expanded(  
1232 - child: GradientButton(  
1233 - left: false,  
1234 - radius: 12,  
1235 - height: ScreenUtil().setWidth(34 * 2),  
1236 - colors: [  
1237 MyColours.color_238389, 1229 MyColours.color_238389,
1238 MyColours.color_2193B0 1230 MyColours.color_2193B0
1239 - ])) 1231 + ])),
1240 ], 1232 ],
1241 ), 1233 ),
1242 ), 1234 ),
@@ -146,10 +146,11 @@ class NavigatorUtil { @@ -146,10 +146,11 @@ class NavigatorUtil {
146 String ddate_solt, 146 String ddate_solt,
147 String name, 147 String name,
148 String sex, 148 String sex,
  149 + String remark,
149 {bool replace = false, 150 {bool replace = false,
150 String tid}) { 151 String tid}) {
151 _navigateTo(context, 152 _navigateTo(context,
152 - "${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", 153 + "${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)}",
153 replace: replace); 154 replace: replace);
154 } 155 }
155 156
@@ -418,9 +419,12 @@ class NavigatorUtil { @@ -418,9 +419,12 @@ class NavigatorUtil {
418 419
419 /// 桌位照片管理 420 /// 桌位照片管理
420 static Future<dynamic> goTablePhotoManagerPage(BuildContext context, 421 static Future<dynamic> goTablePhotoManagerPage(BuildContext context,
421 - {replace = false, String tid, String tname}) { 422 + {replace = false,
  423 + String tid,
  424 + String tname,
  425 + FromPage fromPage = FromPage.FromPagePhotoManagerPage}) {
422 return _navigateTo(context, 426 return _navigateTo(context,
423 - "${Routes.table_photo_manager}?tid=${tid}&tname=${Uri.encodeComponent(tname)}", 427 + "${Routes.table_photo_manager}?tid=${tid}&tname=${Uri.encodeComponent(tname)}&fromPage=${FluroConvertUtils.enumToString(fromPage)}",
424 replace: replace); 428 replace: replace);
425 } 429 }
426 430
@@ -317,10 +317,14 @@ var handleInvicationHandler = new Handler( @@ -317,10 +317,14 @@ var handleInvicationHandler = new Handler(
317 String tid = params["tid"].first; 317 String tid = params["tid"].first;
318 String name = params["name"].first; 318 String name = params["name"].first;
319 String sex = params["sex"].first; 319 String sex = params["sex"].first;
320 - return ChangeNotifierProvider<BaseIndoProvider>(  
321 - create: (_) => BaseIndoProvider(),  
322 - child: InvicationPage(  
323 - rid, tableInfo, ddate, ddateStr, phone, ddate_solt, tid, name, sex)); 320 + String remark = params["remark"].first;
  321 +
  322 + return ChangeNotifierProvider<RemarkManagerModel>(
  323 + create: (_) => RemarkManagerModel(),
  324 + child: ChangeNotifierProvider<BaseIndoProvider>(
  325 + create: (_) => BaseIndoProvider(),
  326 + child: InvicationPage(rid, tableInfo, ddate, ddateStr, phone,
  327 + ddate_solt, tid, name, sex,remark)));
324 }); 328 });
325 329
326 // 发短信 330 // 发短信
@@ -703,9 +707,11 @@ var tablePhotoManagerHandler = new Handler( @@ -703,9 +707,11 @@ var tablePhotoManagerHandler = new Handler(
703 // FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first))); 707 // FluroConvertUtils.fluroCnParamsDecode(params["couponSunModel"].first)));
704 String tid = params["tid"].first; 708 String tid = params["tid"].first;
705 String tname = params["tname"].first; 709 String tname = params["tname"].first;
  710 + FromPage fromPage = FluroConvertUtils.enumFromString<FromPage>(
  711 + FromPage.values, params["fromPage"].first);
706 return ChangeNotifierProvider<TablePhotoManagerModel>( 712 return ChangeNotifierProvider<TablePhotoManagerModel>(
707 create: (_) => TablePhotoManagerModel(), 713 create: (_) => TablePhotoManagerModel(),
708 - child: TablePhotoManagerPage(tid: tid, tname: tname)); 714 + child: TablePhotoManagerPage(tid: tid, tname: tname, fromPage: fromPage));
709 // return ChangeNotifierProvider<UploadImageProvider>( 715 // return ChangeNotifierProvider<UploadImageProvider>(
710 // create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage()); 716 // create: (_) => UploadImageProvider(), child: EnterStoreFrontPhotoPage());
711 }); 717 });
1 import 'package:amap_map_fluttify/amap_map_fluttify.dart'; 1 import 'package:amap_map_fluttify/amap_map_fluttify.dart';
2 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
  4 +import 'package:one_key/res/colors.dart';
4 5
5 class GradientButton extends StatelessWidget { 6 class GradientButton extends StatelessWidget {
6 final List<Color> colors; 7 final List<Color> colors;
7 final double height; 8 final double height;
8 - final bool left; 9 +
9 final double radius; 10 final double radius;
10 11
11 - const GradientButton(  
12 - {Key key, this.colors, this.height, this.left = true, this.radius = 0}) 12 + const GradientButton({Key key, this.colors, this.height,this.radius = 0})
13 : super(key: key); 13 : super(key: key);
14 14
15 @override 15 @override
@@ -19,13 +19,8 @@ class GradientButton extends StatelessWidget { @@ -19,13 +19,8 @@ class GradientButton extends StatelessWidget {
19 height: height, 19 height: height,
20 decoration: BoxDecoration( 20 decoration: BoxDecoration(
21 gradient: LinearGradient(colors: colors), // 渐变色 21 gradient: LinearGradient(colors: colors), // 渐变色
22 - borderRadius: left  
23 - ? BorderRadius.only(  
24 - topLeft: Radius.circular(ScreenUtil().setWidth(radius)),  
25 - bottomLeft: Radius.circular(ScreenUtil().setWidth(radius)))  
26 - : BorderRadius.only(  
27 - topRight: Radius.circular(ScreenUtil().setWidth(radius)),  
28 - bottomRight: Radius.circular(ScreenUtil().setWidth(radius)))), 22 + borderRadius:
  23 + BorderRadius.all(Radius.circular(ScreenUtil().setWidth(radius)))),
29 ); 24 );
30 } 25 }
31 } 26 }