xt / Flutter-ReserveApp · Commits

Go to a project

Commit e1bd456d9bdeb9788199a45f67456fe93b13f8bc

Authored by wdn127929
1 parent 42724802
build: skipped

录入预订人信息页面bug

Inline Side-by-side
Showing 17 changed files with 161 additions and 55 deletions
@@ -494,7 +494,7 @@ @@ -494,7 +494,7 @@
494 "$(inherited)", 494 "$(inherited)",
495 "$(PROJECT_DIR)/Flutter", 495 "$(PROJECT_DIR)/Flutter",
496 ); 496 );
497 - MARKETING_VERSION = 3.1.4; 497 + MARKETING_VERSION = 3.1.6;
498 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 498 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
499 PRODUCT_NAME = Runner; 499 PRODUCT_NAME = Runner;
500 PROVISIONING_PROFILE_SPECIFIER = ""; 500 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -639,7 +639,7 @@ @@ -639,7 +639,7 @@
639 "$(inherited)", 639 "$(inherited)",
640 "$(PROJECT_DIR)/Flutter", 640 "$(PROJECT_DIR)/Flutter",
641 ); 641 );
642 - MARKETING_VERSION = 3.1.4; 642 + MARKETING_VERSION = 3.1.6;
643 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 643 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
644 PRODUCT_NAME = Runner; 644 PRODUCT_NAME = Runner;
645 PROVISIONING_PROFILE_SPECIFIER = ""; 645 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -674,7 +674,7 @@ @@ -674,7 +674,7 @@
674 "$(inherited)", 674 "$(inherited)",
675 "$(PROJECT_DIR)/Flutter", 675 "$(PROJECT_DIR)/Flutter",
676 ); 676 );
677 - MARKETING_VERSION = 3.1.4; 677 + MARKETING_VERSION = 3.1.6;
678 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 678 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
679 PRODUCT_NAME = Runner; 679 PRODUCT_NAME = Runner;
680 PROVISIONING_PROFILE_SPECIFIER = ""; 680 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -20,8 +20,11 @@ import 'package:provider/provider.dart'; @@ -20,8 +20,11 @@ import 'package:provider/provider.dart';
20 */ 20 */
21 class EditReserverPage extends StatefulWidget { 21 class EditReserverPage extends StatefulWidget {
22 final String rid; 22 final String rid;
  23 + final String name;
  24 + final String sex;
23 final bool needBtn; 25 final bool needBtn;
24 - EditReserverPage(this.rid, {Key key, this.needBtn}) : super(key: key); 26 + EditReserverPage(this.rid, this.name, this.sex, {Key key, this.needBtn})
  27 + : super(key: key);
25 28
26 @override 29 @override
27 _EditReserverPageState createState() => _EditReserverPageState(); 30 _EditReserverPageState createState() => _EditReserverPageState();
@@ -35,6 +38,27 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -35,6 +38,27 @@ class _EditReserverPageState extends State<EditReserverPage> {
35 bool showPhoneHistory = false; //显示客户历史记录 38 bool showPhoneHistory = false; //显示客户历史记录
36 EasyContactPicker _contactPicker = EasyContactPicker(); 39 EasyContactPicker _contactPicker = EasyContactPicker();
37 40
  41 + @override
  42 + void initState() {
  43 + super.initState();
  44 + WidgetsBinding.instance.addPostFrameCallback((_) {
  45 + if (widget.name != '' &&
  46 + widget.name != null &&
  47 + widget.sex != '' &&
  48 + widget.sex != null) {
  49 + nameStr = widget.name;
  50 + for (var item in detailModel.sexList) {
  51 + item['select'] = false;
  52 + if (item['code'] == widget.sex) {
  53 + item['select'] = true;
  54 + }
  55 + }
  56 + _addNameSuffix(nameStr, _nameSuffix());
  57 + setState(() {});
  58 + }
  59 + });
  60 + }
  61 +
38 _openAddressBook() async { 62 _openAddressBook() async {
39 if (!(await checkContactPermission())) { 63 if (!(await checkContactPermission())) {
40 PermissionStatus permissionStatus = await contactPermissionStatus(); 64 PermissionStatus permissionStatus = await contactPermissionStatus();
@@ -202,7 +226,10 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -202,7 +226,10 @@ class _EditReserverPageState extends State<EditReserverPage> {
202 ), 226 ),
203 // contentPadding: 227 // contentPadding:
204 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 228 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
205 - border: InputBorder.none, 229 + // border: InputBorder.none,
  230 + contentPadding: EdgeInsets.zero,
  231 + border: OutlineInputBorder(
  232 + borderSide: BorderSide.none),
206 ), 233 ),
207 onChanged: (value) { 234 onChanged: (value) {
208 print('ggg'); 235 print('ggg');
@@ -262,6 +289,7 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -262,6 +289,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
262 child: Container( 289 child: Container(
263 height: ScreenUtil().setWidth(60), 290 height: ScreenUtil().setWidth(60),
264 decoration: BoxDecoration( 291 decoration: BoxDecoration(
  292 + // color: Colors.red,
265 border: Border( 293 border: Border(
266 bottom: BorderSide( 294 bottom: BorderSide(
267 width: ScreenUtil().setWidth(2), 295 width: ScreenUtil().setWidth(2),
@@ -282,9 +310,9 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -282,9 +310,9 @@ class _EditReserverPageState extends State<EditReserverPage> {
282 color: MyColours.color_999999, 310 color: MyColours.color_999999,
283 fontSize: ScreenUtil().setSp(30), 311 fontSize: ScreenUtil().setSp(30),
284 ), 312 ),
285 - // contentPadding:  
286 - // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),  
287 - border: InputBorder.none, 313 + contentPadding: EdgeInsets.zero,
  314 + border: OutlineInputBorder(
  315 + borderSide: BorderSide.none),
288 ), 316 ),
289 onChanged: (value) { 317 onChanged: (value) {
290 if (value.isEmpty || 318 if (value.isEmpty ||
@@ -722,7 +722,9 @@ @@ -722,7 +722,9 @@
722 // ), 722 // ),
723 // // contentPadding: 723 // // contentPadding:
724 // // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 724 // // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
725 -// border: InputBorder.none, 725 +// contentPadding: EdgeInsets.zero,
  726 +// border: OutlineInputBorder(
  727 +// borderSide: BorderSide.none),
726 // ), 728 // ),
727 // onChanged: (value) { 729 // onChanged: (value) {
728 // print(value); 730 // print(value);
@@ -1438,7 +1440,7 @@ @@ -1438,7 +1440,7 @@
1438 // color: isSelect ? Colors.white : MyColours.color_353535, 1440 // color: isSelect ? Colors.white : MyColours.color_353535,
1439 // fontSize: ScreenUtil().setSp(28)), 1441 // fontSize: ScreenUtil().setSp(28)),
1440 // ), 1442 // ),
1441 - 1443 +
1442 // ), 1444 // ),
1443 // ); 1445 // );
1444 // } 1446 // }
@@ -579,7 +579,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -579,7 +579,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
579 ), 579 ),
580 // contentPadding: 580 // contentPadding:
581 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 581 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
582 - border: InputBorder.none, 582 + contentPadding: EdgeInsets.zero,
  583 + border: OutlineInputBorder(borderSide: BorderSide.none),
583 ), 584 ),
584 onChanged: (value) { 585 onChanged: (value) {
585 print('ggg'); 586 print('ggg');
@@ -639,7 +640,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -639,7 +640,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
639 ), 640 ),
640 // contentPadding: 641 // contentPadding:
641 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 642 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
642 - border: InputBorder.none, 643 + contentPadding: EdgeInsets.zero,
  644 + border: OutlineInputBorder(borderSide: BorderSide.none),
643 ), 645 ),
644 onChanged: (value) { 646 onChanged: (value) {
645 LogUtil.v("value:$value"); 647 LogUtil.v("value:$value");
@@ -705,7 +707,9 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -705,7 +707,9 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
705 ), 707 ),
706 // contentPadding: 708 // contentPadding:
707 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 709 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
708 - border: InputBorder.none, 710 + contentPadding: EdgeInsets.zero,
  711 + border:
  712 + OutlineInputBorder(borderSide: BorderSide.none),
709 ), 713 ),
710 onChanged: (value) { 714 onChanged: (value) {
711 print(value); 715 print(value);
@@ -1551,7 +1555,11 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1551,7 +1555,11 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1551 ), 1555 ),
1552 // contentPadding: 1556 // contentPadding:
1553 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 1557 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
1554 - border: InputBorder.none, 1558 + contentPadding:
  1559 + EdgeInsets.zero,
  1560 + border: OutlineInputBorder(
  1561 + borderSide:
  1562 + BorderSide.none),
1555 ), 1563 ),
1556 onChanged: (value) { 1564 onChanged: (value) {
1557 print('ggg'); 1565 print('ggg');
@@ -1653,7 +1661,11 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1653,7 +1661,11 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1653 ), 1661 ),
1654 // contentPadding: 1662 // contentPadding:
1655 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 1663 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
1656 - border: InputBorder.none, 1664 + contentPadding:
  1665 + EdgeInsets.zero,
  1666 + border: OutlineInputBorder(
  1667 + borderSide:
  1668 + BorderSide.none),
1657 ), 1669 ),
1658 onChanged: (value) { 1670 onChanged: (value) {
1659 LogUtil.v("value:$value"); 1671 LogUtil.v("value:$value");
@@ -1776,8 +1788,9 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1776,8 +1788,9 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1776 color: MyColours.color_979797, 1788 color: MyColours.color_979797,
1777 fontSize: ScreenUtil().setSp(28), 1789 fontSize: ScreenUtil().setSp(28),
1778 ), 1790 ),
1779 - border: InputBorder.none,  
1780 contentPadding: EdgeInsets.zero, 1791 contentPadding: EdgeInsets.zero,
  1792 + border: OutlineInputBorder(
  1793 + borderSide: BorderSide.none),
1781 ), 1794 ),
1782 keyboardType: TextInputType.text, 1795 keyboardType: TextInputType.text,
1783 onChanged: (value) { 1796 onChanged: (value) {
@@ -2051,6 +2064,17 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -2051,6 +2064,17 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
2051 Utils.showToast("请选择桌位"); 2064 Utils.showToast("请选择桌位");
2052 return; 2065 return;
2053 } 2066 }
  2067 + if (_notebookDetailChangeModel.phoneController.text
  2068 + .trim()
  2069 + .length >
  2070 + 0) {
  2071 + if (!Utils.phoneRegExp(
  2072 + _notebookDetailChangeModel.phoneController.text)) {
  2073 + Utils.showToast('手机号错误，请修改正确');
  2074 + return;
  2075 + }
  2076 + }
  2077 +
2054 SunReserveInfoModel _model = 2078 SunReserveInfoModel _model =
2055 _notebookDetailChangeModel.detailEntity.type == "1" 2079 _notebookDetailChangeModel.detailEntity.type == "1"
2056 ? //判断是否在线预订 2080 ? //判断是否在线预订
@@ -2106,6 +2130,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -2106,6 +2130,8 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
2106 ddate_solt, 2130 ddate_solt,
2107 _model.row.phone, 2131 _model.row.phone,
2108 _model.row.ddateSolt, 2132 _model.row.ddateSolt,
  2133 + _model.row.rname == null ? '' : _model.row.rname,
  2134 + _model.row.sex == null ? '' : _model.row.sex,
2109 tid: _tid, 2135 tid: _tid,
2110 replace: true); 2136 replace: true);
2111 EventBus().emit("refresh_tablemanager"); //刷新桌位 2137 EventBus().emit("refresh_tablemanager"); //刷新桌位
@@ -767,8 +767,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -767,8 +767,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
767 color: MyColours.color_979797, 767 color: MyColours.color_979797,
768 fontSize: ScreenUtil().setSp(28), 768 fontSize: ScreenUtil().setSp(28),
769 ), 769 ),
770 - border: InputBorder.none,  
771 contentPadding: EdgeInsets.zero, 770 contentPadding: EdgeInsets.zero,
  771 + border:
  772 + OutlineInputBorder(borderSide: BorderSide.none),
772 ), 773 ),
773 keyboardType: TextInputType.text, 774 keyboardType: TextInputType.text,
774 onChanged: (value) { 775 onChanged: (value) {
@@ -2089,6 +2090,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -2089,6 +2090,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
2089 context, 2090 context,
2090 widget 2091 widget
2091 .rid, 2092 .rid,
  2093 + '',
  2094 + '',
2092 needBtn: 2095 needBtn:
2093 false); 2096 false);
2094 }, 2097 },
@@ -2527,6 +2530,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -2527,6 +2530,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
2527 detailEntity.phone, 2530 detailEntity.phone,
2528 detailEntity 2531 detailEntity
2529 .ddate_solt, 2532 .ddate_solt,
  2533 + detailEntity.rname ==
  2534 + null
  2535 + ? ''
  2536 + : detailEntity
  2537 + .rname,
  2538 + detailEntity.sex ==
  2539 + null
  2540 + ? ''
  2541 + : detailEntity
  2542 + .sex,
2530 tid: _tid); 2543 tid: _tid);
2531 }, 2544 },
2532 child: Container( 2545 child: Container(
@@ -424,7 +424,8 @@ class _EnterPageState extends State<EnterPage> { @@ -424,7 +424,8 @@ class _EnterPageState extends State<EnterPage> {
424 ), 424 ),
425 // contentPadding: 425 // contentPadding:
426 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 426 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
427 - border: InputBorder.none, 427 + contentPadding: EdgeInsets.zero,
  428 + border: OutlineInputBorder(borderSide: BorderSide.none),
428 ), 429 ),
429 onChanged: (value) {}, 430 onChanged: (value) {},
430 onEditingComplete: () { 431 onEditingComplete: () {
@@ -480,7 +481,8 @@ class _EnterPageState extends State<EnterPage> { @@ -480,7 +481,8 @@ class _EnterPageState extends State<EnterPage> {
480 ), 481 ),
481 // contentPadding: 482 // contentPadding:
482 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 483 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
483 - border: InputBorder.none, 484 + contentPadding: EdgeInsets.zero,
  485 + border: OutlineInputBorder(borderSide: BorderSide.none),
484 ), 486 ),
485 onChanged: (value) {}, 487 onChanged: (value) {},
486 onEditingComplete: () { 488 onEditingComplete: () {
@@ -531,7 +533,8 @@ class _EnterPageState extends State<EnterPage> { @@ -531,7 +533,8 @@ class _EnterPageState extends State<EnterPage> {
531 ), 533 ),
532 // contentPadding: 534 // contentPadding:
533 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 535 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
534 - border: InputBorder.none, 536 + contentPadding: EdgeInsets.zero,
  537 + border: OutlineInputBorder(borderSide: BorderSide.none),
535 ), 538 ),
536 onChanged: (value) {}, 539 onChanged: (value) {},
537 onEditingComplete: () { 540 onEditingComplete: () {
@@ -793,6 +796,8 @@ class _EnterPageState extends State<EnterPage> { @@ -793,6 +796,8 @@ class _EnterPageState extends State<EnterPage> {
793 ddate_solt, 796 ddate_solt,
794 _model.row.phone, 797 _model.row.phone,
795 _model.row.ddateSolt, 798 _model.row.ddateSolt,
  799 + _model.row.rname == null ? '' : _model.row.rname,
  800 + _model.row.sex == null ? '' : _model.row.sex,
796 tid: _tid, 801 tid: _tid,
797 replace: true); 802 replace: true);
798 } else { 803 } else {
@@ -270,7 +270,8 @@ class _HomeEnterPageState extends State<HomeEnterPage> @@ -270,7 +270,8 @@ class _HomeEnterPageState extends State<HomeEnterPage>
270 ), 270 ),
271 // contentPadding: 271 // contentPadding:
272 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 272 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
273 - border: InputBorder.none, 273 + contentPadding: EdgeInsets.zero,
  274 + border: OutlineInputBorder(borderSide: BorderSide.none),
274 ), 275 ),
275 onChanged: (value) { 276 onChanged: (value) {
276 print('ggg'); 277 print('ggg');
@@ -335,7 +336,8 @@ class _HomeEnterPageState extends State<HomeEnterPage> @@ -335,7 +336,8 @@ class _HomeEnterPageState extends State<HomeEnterPage>
335 ), 336 ),
336 // contentPadding: 337 // contentPadding:
337 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 338 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
338 - border: InputBorder.none, 339 + contentPadding: EdgeInsets.zero,
  340 + border: OutlineInputBorder(borderSide: BorderSide.none),
339 ), 341 ),
340 onChanged: (value) { 342 onChanged: (value) {
341 LogUtil.v("value:$value"); 343 LogUtil.v("value:$value");
@@ -415,7 +417,9 @@ class _HomeEnterPageState extends State<HomeEnterPage> @@ -415,7 +417,9 @@ class _HomeEnterPageState extends State<HomeEnterPage>
415 ), 417 ),
416 // contentPadding: 418 // contentPadding:
417 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 419 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
418 - border: InputBorder.none, 420 + contentPadding: EdgeInsets.zero,
  421 + border:
  422 + OutlineInputBorder(borderSide: BorderSide.none),
419 ), 423 ),
420 onChanged: (value) { 424 onChanged: (value) {
421 print(value); 425 print(value);
@@ -1423,6 +1427,8 @@ class _HomeEnterPageState extends State<HomeEnterPage> @@ -1423,6 +1427,8 @@ class _HomeEnterPageState extends State<HomeEnterPage>
1423 ddate_solt, 1427 ddate_solt,
1424 _model.row.phone, 1428 _model.row.phone,
1425 _model.row.ddateSolt, 1429 _model.row.ddateSolt,
  1430 + _model.row.rname == null ? '' : _model.row.rname,
  1431 + _model.row.sex == null ? '' : _model.row.sex,
1426 tid: _tid, 1432 tid: _tid,
1427 replace: false); 1433 replace: false);
1428 //今天 明天 其他天 1434 //今天 明天 其他天
@@ -34,9 +34,11 @@ class InvicationPage extends StatefulWidget { @@ -34,9 +34,11 @@ class InvicationPage extends StatefulWidget {
34 final String phone; 34 final String phone;
35 final String dateSolt; 35 final String dateSolt;
36 final String tid; 36 final String tid;
  37 + final String name;
  38 + final String sex;
37 39
38 InvicationPage(this.rid, this.tableInfo, this.ddate, this.ddateStr, 40 InvicationPage(this.rid, this.tableInfo, this.ddate, this.ddateStr,
39 - this.phone, this.dateSolt, this.tid); 41 + this.phone, this.dateSolt, this.tid, this.name, this.sex);
40 42
41 @override 43 @override
42 State<StatefulWidget> createState() { 44 State<StatefulWidget> createState() {
@@ -941,7 +943,10 @@ class InvicationPageState extends State<InvicationPage> { @@ -941,7 +943,10 @@ class InvicationPageState extends State<InvicationPage> {
941 //跳转到录入联系人页面 943 //跳转到录入联系人页面
942 String temp = 944 String temp =
943 await NavigatorUtil.goEditReserverPage( 945 await NavigatorUtil.goEditReserverPage(
944 - context, widget.rid, 946 + context,
  947 + widget.rid,
  948 + widget.name,
  949 + widget.sex,
945 needBtn: true); 950 needBtn: true);
946 if (temp != null) { 951 if (temp != null) {
947 reserverPhone = temp; 952 reserverPhone = temp;
@@ -952,7 +957,10 @@ class InvicationPageState extends State<InvicationPage> { @@ -952,7 +957,10 @@ class InvicationPageState extends State<InvicationPage> {
952 //跳转到录入联系人页面 957 //跳转到录入联系人页面
953 String temp = 958 String temp =
954 await NavigatorUtil.goEditReserverPage( 959 await NavigatorUtil.goEditReserverPage(
955 - context, widget.rid, 960 + context,
  961 + widget.rid,
  962 + widget.name,
  963 + widget.sex,
956 needBtn: true); 964 needBtn: true);
957 if (temp != null) { 965 if (temp != null) {
958 reserverPhone = temp; 966 reserverPhone = temp;
@@ -144,12 +144,14 @@ class _BindingPhoneState extends State<BindingPhone> { @@ -144,12 +144,14 @@ class _BindingPhoneState extends State<BindingPhone> {
144 hintStyle: TextStyle( 144 hintStyle: TextStyle(
145 color: MyColours.color_999999, 145 color: MyColours.color_999999,
146 fontSize: ScreenUtil().setSp(26)), 146 fontSize: ScreenUtil().setSp(26)),
147 - border: InputBorder.none,  
148 - contentPadding: EdgeInsets.fromLTRB(  
149 - 0,  
150 - ScreenUtil().setWidth(28),  
151 - ScreenUtil().setWidth(30),  
152 - ScreenUtil().setWidth(28)), 147 + contentPadding: EdgeInsets.zero,
  148 + border: OutlineInputBorder(
  149 + borderSide: BorderSide.none),
  150 + // contentPadding: EdgeInsets.fromLTRB(
  151 + // 0,
  152 + // ScreenUtil().setWidth(28),
  153 + // ScreenUtil().setWidth(30),
  154 + // ScreenUtil().setWidth(28)),
153 ), 155 ),
154 onChanged: (value) { 156 onChanged: (value) {
155 phone = value; 157 phone = value;
@@ -200,12 +202,14 @@ class _BindingPhoneState extends State<BindingPhone> { @@ -200,12 +202,14 @@ class _BindingPhoneState extends State<BindingPhone> {
200 hintStyle: TextStyle( 202 hintStyle: TextStyle(
201 color: MyColours.color_999999, 203 color: MyColours.color_999999,
202 fontSize: ScreenUtil().setSp(26)), 204 fontSize: ScreenUtil().setSp(26)),
203 - border: InputBorder.none,  
204 - contentPadding: EdgeInsets.fromLTRB(  
205 - 0,  
206 - ScreenUtil().setWidth(28),  
207 - ScreenUtil().setWidth(30),  
208 - ScreenUtil().setWidth(28)), 205 + contentPadding: EdgeInsets.zero,
  206 + border: OutlineInputBorder(
  207 + borderSide: BorderSide.none),
  208 + // contentPadding: EdgeInsets.fromLTRB(
  209 + // 0,
  210 + // ScreenUtil().setWidth(28),
  211 + // ScreenUtil().setWidth(30),
  212 + // ScreenUtil().setWidth(28)),
209 ), 213 ),
210 onChanged: (value) { 214 onChanged: (value) {
211 code = value; 215 code = value;
@@ -85,7 +85,7 @@ class _ContactListPageState extends State<ContactListPage> @@ -85,7 +85,7 @@ class _ContactListPageState extends State<ContactListPage>
85 // textAlignVertical: TextAlignVertical.center, 85 // textAlignVertical: TextAlignVertical.center,
86 decoration: InputDecoration( 86 decoration: InputDecoration(
87 contentPadding: EdgeInsets.only( 87 contentPadding: EdgeInsets.only(
88 - right: ScreenUtil().setWidth(70 * 2)), 88 + right: ScreenUtil().setWidth(40 * 2)),
89 hintText: "搜索联系人", 89 hintText: "搜索联系人",
90 hintStyle: TextStyle( 90 hintStyle: TextStyle(
91 color: MyColours.color_999999, 91 color: MyColours.color_999999,
@@ -93,7 +93,8 @@ class _ContactListPageState extends State<ContactListPage> @@ -93,7 +93,8 @@ class _ContactListPageState extends State<ContactListPage>
93 ), 93 ),
94 isCollapsed: 94 isCollapsed:
95 true, //重点，相当于高度包裹的意思，必须设置为true，不然有默认奇妙的最小高度 95 true, //重点，相当于高度包裹的意思，必须设置为true，不然有默认奇妙的最小高度
96 - border: InputBorder.none, 96 + border: OutlineInputBorder(
  97 + borderSide: BorderSide.none),
97 // 左边图标设置 98 // 左边图标设置
98 icon: Image.asset( 99 icon: Image.asset(
99 Utils.getImgPath('search'), 100 Utils.getImgPath('search'),
@@ -31,6 +31,8 @@ class NotebookItemState extends State<NoteBookItem> { @@ -31,6 +31,8 @@ class NotebookItemState extends State<NoteBookItem> {
31 widget.notebook.ddateStr, 31 widget.notebook.ddateStr,
32 widget.notebook.phone, 32 widget.notebook.phone,
33 widget.notebook.ddate_solt, 33 widget.notebook.ddate_solt,
  34 + widget.notebook.rname == null ? '' : widget.notebook.rname,
  35 + widget.notebook.sex == null ? '' : widget.notebook.sex,
34 tid: widget.notebook.tid); 36 tid: widget.notebook.tid);
35 } 37 }
36 } 38 }
@@ -305,9 +305,8 @@ class _StatisticsPageState extends State<StatisticsPage> { @@ -305,9 +305,8 @@ class _StatisticsPageState extends State<StatisticsPage> {
305 color: MyColours.color_999999, 305 color: MyColours.color_999999,
306 fontSize: ScreenUtil().setSp(26), 306 fontSize: ScreenUtil().setSp(26),
307 ), 307 ),
308 -  
309 - contentPadding: EdgeInsets.zero, //ios 17  
310 - border: InputBorder.none, 308 + contentPadding: EdgeInsets.zero,
  309 + border: OutlineInputBorder(borderSide: BorderSide.none),
311 ), 310 ),
312 onChanged: (value) {}, 311 onChanged: (value) {},
313 onEditingComplete: () { 312 onEditingComplete: () {
@@ -155,8 +155,9 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> { @@ -155,8 +155,9 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
155 fontSize: ScreenUtil().setSp(32), 155 fontSize: ScreenUtil().setSp(32),
156 ), 156 ),
157 157
158 - contentPadding: EdgeInsets.zero, //ios 17  
159 - border: InputBorder.none, 158 + contentPadding: EdgeInsets.zero,
  159 + border: OutlineInputBorder(
  160 + borderSide: BorderSide.none),
160 ), 161 ),
161 onChanged: (value) {}, 162 onChanged: (value) {},
162 onEditingComplete: () { 163 onEditingComplete: () {
@@ -257,9 +258,9 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> { @@ -257,9 +258,9 @@ class _StatisticsSmsPageState extends State<StatisticsSmsPage> {
257 fontSize: 258 fontSize:
258 ScreenUtil().setSp(32), 259 ScreenUtil().setSp(32),
259 ), 260 ),
260 - contentPadding:  
261 - EdgeInsets.zero, //ios 17  
262 - border: InputBorder.none, 261 + contentPadding: EdgeInsets.zero,
  262 + border: OutlineInputBorder(
  263 + borderSide: BorderSide.none),
263 ), 264 ),
264 onChanged: (value) {}, 265 onChanged: (value) {},
265 onEditingComplete: () { 266 onEditingComplete: () {
@@ -371,7 +371,9 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> { @@ -371,7 +371,9 @@ class _OnlineCheckEditPageState extends State<OnlineCheckEditPage> {
371 ), 371 ),
372 // contentPadding: 372 // contentPadding:
373 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 373 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
374 - border: InputBorder.none, 374 + contentPadding: EdgeInsets.zero,
  375 + border:
  376 + OutlineInputBorder(borderSide: BorderSide.none),
375 ), 377 ),
376 onChanged: (value) { 378 onChanged: (value) {
377 print(value); 379 print(value);
@@ -667,6 +667,8 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -667,6 +667,8 @@ class TableManagerPageState extends State<TableManagerPage> {
667 ddate_solt, 667 ddate_solt,
668 _model.row.phone, 668 _model.row.phone,
669 _model.row.ddateSolt, 669 _model.row.ddateSolt,
  670 + _model.row.rname == null ? '' : _model.row.rname,
  671 + _model.row.sex == null ? '' : _model.row.sex,
670 tid: _tid, 672 tid: _tid,
671 replace: false); 673 replace: false);
672 // //今天 明天 其他天 674 // //今天 明天 其他天
@@ -117,10 +117,12 @@ class NavigatorUtil { @@ -117,10 +117,12 @@ class NavigatorUtil {
117 String ddateStr, 117 String ddateStr,
118 String phone, 118 String phone,
119 String ddate_solt, 119 String ddate_solt,
  120 + String name,
  121 + String sex,
120 {bool replace = false, 122 {bool replace = false,
121 String tid}) { 123 String tid}) {
122 _navigateTo(context, 124 _navigateTo(context,
123 - "${Routes.invication}?rid=$rid&tid=$tid&tableInfo=${FluroConvertUtils.fluroCnParamsEncode(tableInfo)}&ddate=$ddate&ddateStr=${FluroConvertUtils.fluroCnParamsEncode(ddateStr)}&phone=$phone&ddate_solt=$ddate_solt", 125 + "${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",
124 replace: replace); 126 replace: replace);
125 } 127 }
126 128
@@ -503,10 +505,11 @@ class NavigatorUtil { @@ -503,10 +505,11 @@ class NavigatorUtil {
503 } 505 }
504 506
505 /// 填写预订联系人页面 507 /// 填写预订联系人页面
506 - static Future<dynamic> goEditReserverPage(BuildContext context, String rid, 508 + static Future<dynamic> goEditReserverPage(
  509 + BuildContext context, String rid, String name,String sex,
507 {replace = false, bool needBtn = false}) { 510 {replace = false, bool needBtn = false}) {
508 - return _navigateTo(  
509 - context, "${Routes.edit_reserver_page}?rid=${rid}&needBtn=$needBtn", 511 + return _navigateTo(context,
  512 + "${Routes.edit_reserver_page}?rid=${rid}&needBtn=$needBtn&name=${Uri.encodeComponent(name)}&sex=$sex",
510 replace: replace); 513 replace: replace);
511 } 514 }
512 } 515 }
@@ -137,12 +137,14 @@ var editReserverPageHandle = new Handler( @@ -137,12 +137,14 @@ var editReserverPageHandle = new Handler(
137 String rid = params['rid'].first; 137 String rid = params['rid'].first;
138 // String mid = params['mid'].first; 138 // String mid = params['mid'].first;
139 // String uid = params['uid'].first; 139 // String uid = params['uid'].first;
  140 + String name = params["name"].first;
  141 + String sex = params["sex"].first;
140 bool needBtn = FluroConvertUtils.string2bool(params["needBtn"].first); 142 bool needBtn = FluroConvertUtils.string2bool(params["needBtn"].first);
141 return ChangeNotifierProvider<NotebookDetailModel>( 143 return ChangeNotifierProvider<NotebookDetailModel>(
142 create: (_) => NotebookDetailModel(), 144 create: (_) => NotebookDetailModel(),
143 child: ChangeNotifierProvider<CouponProvider>( 145 child: ChangeNotifierProvider<CouponProvider>(
144 create: (_) => CouponProvider(), 146 create: (_) => CouponProvider(),
145 - child: EditReserverPage(rid, needBtn: needBtn 147 + child: EditReserverPage(rid, name, sex, needBtn: needBtn
146 // mid: mid, 148 // mid: mid,
147 // uid: uid, 149 // uid: uid,
148 // fromNotify: fromNotify, 150 // fromNotify: fromNotify,
@@ -254,10 +256,12 @@ var handleInvicationHandler = new Handler( @@ -254,10 +256,12 @@ var handleInvicationHandler = new Handler(
254 String phone = params["phone"].first; 256 String phone = params["phone"].first;
255 String ddate_solt = params["ddate_solt"].first; 257 String ddate_solt = params["ddate_solt"].first;
256 String tid = params["tid"].first; 258 String tid = params["tid"].first;
  259 + String name = params["name"].first;
  260 + String sex = params["sex"].first;
257 return ChangeNotifierProvider<BaseIndoProvider>( 261 return ChangeNotifierProvider<BaseIndoProvider>(
258 create: (_) => BaseIndoProvider(), 262 create: (_) => BaseIndoProvider(),
259 child: InvicationPage( 263 child: InvicationPage(
260 - rid, tableInfo, ddate, ddateStr, phone, ddate_solt, tid)); 264 + rid, tableInfo, ddate, ddateStr, phone, ddate_solt, tid, name, sex));
261 }); 265 });
262 266
263 // 发短信 267 // 发短信