xt / Flutter-ReserveApp · Commits

Go to a project

Commit ee80f0229cbd693f61334de5153732c141c01878

Authored by wdn127929
1 parent 9539ecbe
build: skipped

十.【提测变更项内容说明】v4.9.9.1

Inline Side-by-side
Showing 11 changed files with 303 additions and 199 deletions
@@ -17,9 +17,9 @@ if (flutterRoot == null) { @@ -17,9 +17,9 @@ if (flutterRoot == null) {
17 17
18 18
19 19
20 -def flutterVersionCode = "498" 20 +def flutterVersionCode = "499"
21 if (flutterVersionCode == null) { 21 if (flutterVersionCode == null) {
22 - flutterVersionCode = '498' 22 + flutterVersionCode = '499'
23 23
24 24
25 } 25 }
@@ -28,9 +28,9 @@ if (flutterVersionCode == null) { @@ -28,9 +28,9 @@ if (flutterVersionCode == null) {
28 28
29 29
30 30
31 -def flutterVersionName = "4.9.8" 31 +def flutterVersionName = "4.9.9"
32 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
33 - flutterVersionName = '4.9.8' 33 + flutterVersionName = '4.9.9'
34 34
35 } 35 }
36 36
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 50; 6 + objectVersion = 46;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -525,7 +525,7 @@ @@ -525,7 +525,7 @@
525 "$(inherited)", 525 "$(inherited)",
526 "$(PROJECT_DIR)/Flutter", 526 "$(PROJECT_DIR)/Flutter",
527 ); 527 );
528 - MARKETING_VERSION = 4.9.8; 528 + MARKETING_VERSION = 4.9.9;
529 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 529 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
530 PRODUCT_NAME = Runner; 530 PRODUCT_NAME = Runner;
531 PROVISIONING_PROFILE_SPECIFIER = ""; 531 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -659,7 +659,7 @@ @@ -659,7 +659,7 @@
659 CURRENT_PROJECT_VERSION = 490; 659 CURRENT_PROJECT_VERSION = 490;
660 DEVELOPMENT_TEAM = 8J59HM8B82; 660 DEVELOPMENT_TEAM = 8J59HM8B82;
661 ENABLE_BITCODE = NO; 661 ENABLE_BITCODE = NO;
662 - FLUTTER_BUILD_MODE = debug; 662 + FLUTTER_BUILD_MODE = release;
663 FRAMEWORK_SEARCH_PATHS = ( 663 FRAMEWORK_SEARCH_PATHS = (
664 "$(inherited)", 664 "$(inherited)",
665 "$(PROJECT_DIR)/Flutter", 665 "$(PROJECT_DIR)/Flutter",
@@ -671,7 +671,7 @@ @@ -671,7 +671,7 @@
671 "$(inherited)", 671 "$(inherited)",
672 "$(PROJECT_DIR)/Flutter", 672 "$(PROJECT_DIR)/Flutter",
673 ); 673 );
674 - MARKETING_VERSION = 4.9.8; 674 + MARKETING_VERSION = 4.9.9;
675 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 675 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
676 PRODUCT_NAME = Runner; 676 PRODUCT_NAME = Runner;
677 PROVISIONING_PROFILE_SPECIFIER = ""; 677 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -707,7 +707,7 @@ @@ -707,7 +707,7 @@
707 "$(inherited)", 707 "$(inherited)",
708 "$(PROJECT_DIR)/Flutter", 708 "$(PROJECT_DIR)/Flutter",
709 ); 709 );
710 - MARKETING_VERSION = 4.9.8; 710 + MARKETING_VERSION = 4.9.9;
711 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 711 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
712 PRODUCT_NAME = Runner; 712 PRODUCT_NAME = Runner;
713 PROVISIONING_PROFILE_SPECIFIER = ""; 713 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -29,7 +29,7 @@ class UserHistoryEntity extends Object with ISuspensionBean { @@ -29,7 +29,7 @@ class UserHistoryEntity extends Object with ISuspensionBean {
29 String tagIndex; //abcdefg 29 String tagIndex; //abcdefg
30 String get rnameStr { 30 String get rnameStr {
31 if (rname == null || rname == '' || rname == ' ') return ""; 31 if (rname == null || rname == '' || rname == ' ') return "";
32 - return rname; 32 + return rname + sexStr;
33 } 33 }
34 34
35 String get sexStr { 35 String get sexStr {
@@ -12,7 +12,7 @@ UserHistoryEntity _$UserHistoryEntityFromJson(Map<String, dynamic> json) { @@ -12,7 +12,7 @@ UserHistoryEntity _$UserHistoryEntityFromJson(Map<String, dynamic> json) {
12 json['sid'] as String, 12 json['sid'] as String,
13 json['rname'] as String, 13 json['rname'] as String,
14 json['sex'] as String, 14 json['sex'] as String,
15 - json['phone'] as String, 15 + json['phone'] as String ?? '0',
16 json['cusdem'] as String); 16 json['cusdem'] as String);
17 } 17 }
18 18
1 import 'package:easy_contact_picker/easy_contact_picker.dart'; 1 import 'package:easy_contact_picker/easy_contact_picker.dart';
2 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
  3 +import 'package:flutter/services.dart';
3 import 'package:flutter_screenutil/flutter_screenutil.dart'; 4 import 'package:flutter_screenutil/flutter_screenutil.dart';
4 import 'package:one_key/provider/coupon_provider.dart'; 5 import 'package:one_key/provider/coupon_provider.dart';
5 import 'package:one_key/provider/notebook_detail_model.dart'; 6 import 'package:one_key/provider/notebook_detail_model.dart';
@@ -335,6 +336,10 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -335,6 +336,10 @@ class _EditReserverPageState extends State<EditReserverPage> {
335 controller: detailModel.phoneController, 336 controller: detailModel.phoneController,
336 focusNode: _phoneNode, 337 focusNode: _phoneNode,
337 // textAlignVertical: TextAlignVertical.top, 338 // textAlignVertical: TextAlignVertical.top,
  339 + inputFormatters: <TextInputFormatter>[
  340 + LengthLimitingTextInputFormatter(
  341 + 11) //限制长度
  342 + ],
338 decoration: InputDecoration( 343 decoration: InputDecoration(
339 hintText: "电话", 344 hintText: "电话",
340 hintStyle: TextStyle( 345 hintStyle: TextStyle(
@@ -626,6 +631,17 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -626,6 +631,17 @@ class _EditReserverPageState extends State<EditReserverPage> {
626 .userHistorys[index] 631 .userHistorys[index]
627 .phone 632 .phone
628 : ''; 633 : '';
  634 + for (var item in detailModel
  635 + .sexList) {
  636 + item['select'] = false;
  637 + if (item['title'] ==
  638 + detailModel
  639 + .userHistorys[
  640 + index]
  641 + .sexStr) {
  642 + item['select'] = true;
  643 + }
  644 + }
629 // _homeEnterModel.nameController.text = 645 // _homeEnterModel.nameController.text =
630 // _homeEnterModel 646 // _homeEnterModel
631 // .userHistorys[index].rname + 647 // .userHistorys[index].rname +
@@ -700,7 +716,7 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -700,7 +716,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
700 : detailModel 716 : detailModel
701 .userHistorys[ 717 .userHistorys[
702 index] 718 index]
703 - .rname, 719 + .rnameStr,
704 style: TextStyle( 720 style: TextStyle(
705 color: MyColours 721 color: MyColours
706 .color_333333, 722 .color_333333,
@@ -1658,6 +1658,11 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1658,6 +1658,11 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1658 _notebookDetailChangeModel 1658 _notebookDetailChangeModel
1659 .phoneController, 1659 .phoneController,
1660 focusNode: _phoneNode, 1660 focusNode: _phoneNode,
  1661 + inputFormatters: <
  1662 + TextInputFormatter>[
  1663 + LengthLimitingTextInputFormatter(
  1664 + 11) //限制长度
  1665 + ],
1661 // textAlignVertical: TextAlignVertical.top, 1666 // textAlignVertical: TextAlignVertical.top,
1662 decoration: InputDecoration( 1667 decoration: InputDecoration(
1663 hintText: "电话", 1668 hintText: "电话",
@@ -1896,6 +1901,17 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1896,6 +1901,17 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1896 // _homeEnterModel 1901 // _homeEnterModel
1897 // .userHistorys[index].rname + 1902 // .userHistorys[index].rname +
1898 // _nameSuffix(); 1903 // _nameSuffix();
  1904 + for (var item
  1905 + in _notebookDetailChangeModel
  1906 + .sexList) {
  1907 + item['select'] = false;
  1908 + if (item['title'] ==
  1909 + _notebookDetailChangeModel
  1910 + .userHistorys[index]
  1911 + .sexStr) {
  1912 + item['select'] = true;
  1913 + }
  1914 + }
1899 _addNameSuffix( 1915 _addNameSuffix(
1900 _notebookDetailChangeModel 1916 _notebookDetailChangeModel
1901 .userHistorys[index] 1917 .userHistorys[index]
@@ -1953,7 +1969,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1953,7 +1969,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1953 child: Text( 1969 child: Text(
1954 _notebookDetailChangeModel 1970 _notebookDetailChangeModel
1955 .userHistorys[index] 1971 .userHistorys[index]
1956 - .rname, 1972 + .rnameStr,
1957 style: TextStyle( 1973 style: TextStyle(
1958 color: MyColours 1974 color: MyColours
1959 .color_333333, 1975 .color_333333,
@@ -1949,6 +1949,9 @@ class InvicationPageState extends State<InvicationPage> @@ -1949,6 +1949,9 @@ class InvicationPageState extends State<InvicationPage>
1949 color: MyColours.color_353535), 1949 color: MyColours.color_353535),
1950 controller: _baseIndoProvider.phoneController, 1950 controller: _baseIndoProvider.phoneController,
1951 focusNode: _phoneNode, 1951 focusNode: _phoneNode,
  1952 + inputFormatters: <TextInputFormatter>[
  1953 + LengthLimitingTextInputFormatter(11) //限制长度
  1954 + ],
1952 // textAlignVertical: TextAlignVertical.top, 1955 // textAlignVertical: TextAlignVertical.top,
1953 decoration: InputDecoration( 1956 decoration: InputDecoration(
1954 hintText: "预留电话", 1957 hintText: "预留电话",
@@ -2389,6 +2392,12 @@ class InvicationPageState extends State<InvicationPage> @@ -2389,6 +2392,12 @@ class InvicationPageState extends State<InvicationPage>
2389 itemBuilder: (context, index) { 2392 itemBuilder: (context, index) {
2390 return GestureDetector( 2393 return GestureDetector(
2391 onTap: () { 2394 onTap: () {
  2395 + sexStr = _baseIndoProvider
  2396 + .userHistorys[index].sexStr;
  2397 +
  2398 + sexSelectIndex =
  2399 + sexList.indexOf(sexStr);
  2400 +
2392 _getIsMemberByPhone(_baseIndoProvider 2401 _getIsMemberByPhone(_baseIndoProvider
2393 .userHistorys[index].phone); 2402 .userHistorys[index].phone);
2394 needHistory = true; 2403 needHistory = true;
@@ -2443,7 +2452,7 @@ class InvicationPageState extends State<InvicationPage> @@ -2443,7 +2452,7 @@ class InvicationPageState extends State<InvicationPage>
2443 ? '' 2452 ? ''
2444 : _baseIndoProvider 2453 : _baseIndoProvider
2445 .userHistorys[index] 2454 .userHistorys[index]
2446 - .rname, 2455 + .rnameStr,
2447 style: TextStyle( 2456 style: TextStyle(
2448 color: 2457 color:
2449 MyColours.color_333333, 2458 MyColours.color_333333,
@@ -480,37 +480,57 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -480,37 +480,57 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
480 crossAxisAlignment: CrossAxisAlignment.center, 480 crossAxisAlignment: CrossAxisAlignment.center,
481 mainAxisAlignment: MainAxisAlignment.spaceEvenly, 481 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
482 children: [ 482 children: [
483 - Column(  
484 - mainAxisAlignment: MainAxisAlignment.center,  
485 - children: [  
486 - Row(  
487 - children: [  
488 - Text(  
489 - myModel.reserveTotal,  
490 - style: TextStyle(  
491 - fontWeight: FontWeight.bold,  
492 - color: MyColours.color_515151,  
493 - fontSize: ScreenUtil().setSp(40)),  
494 - ),  
495 - Text(  
496 - '个',  
497 - style: TextStyle(  
498 - fontWeight: FontWeight.bold,  
499 - color: MyColours.color_999999,  
500 - fontSize: ScreenUtil().setSp(22)),  
501 - )  
502 - ],  
503 - ),  
504 - VEmptyView(8),  
505 - Text(  
506 - '月订单量',  
507 - style: TextStyle(  
508 - fontWeight: FontWeight.bold,  
509 - color: MyColours.color_BFC4D4,  
510 - fontSize: ScreenUtil().setSp(20)),  
511 - ),  
512 - ],  
513 - ), 483 + InkWell(
  484 + onTap: () {
  485 + NavigatorUtil.goMonthOrderPage(
  486 + context,
  487 + DateTime.now().year.toString(),
  488 + DateTime.now().month.toString(),
  489 + uid: Provider.of<UserModel>(context,
  490 + listen: false)
  491 + .user
  492 + .openid);
  493 + },
  494 + child: Container(
  495 + padding: EdgeInsets.symmetric(
  496 + horizontal: r(20)),
  497 + child: Column(
  498 + mainAxisAlignment:
  499 + MainAxisAlignment.center,
  500 + children: [
  501 + Row(
  502 + children: [
  503 + Text(
  504 + myModel.reserveTotal,
  505 + style: TextStyle(
  506 + fontWeight: FontWeight.bold,
  507 + color:
  508 + MyColours.color_515151,
  509 + fontSize:
  510 + ScreenUtil().setSp(40)),
  511 + ),
  512 + Text(
  513 + '个',
  514 + style: TextStyle(
  515 + fontWeight: FontWeight.bold,
  516 + color:
  517 + MyColours.color_999999,
  518 + fontSize:
  519 + ScreenUtil().setSp(22)),
  520 + )
  521 + ],
  522 + ),
  523 + VEmptyView(8),
  524 + Text(
  525 + '月订单量',
  526 + style: TextStyle(
  527 + fontWeight: FontWeight.bold,
  528 + color: MyColours.color_BFC4D4,
  529 + fontSize:
  530 + ScreenUtil().setSp(20)),
  531 + ),
  532 + ],
  533 + ))),
514 MyDivider( 534 MyDivider(
515 ScreenUtil().setWidth(2), 535 ScreenUtil().setWidth(2),
516 ScreenUtil().setWidth(32 * 2), 536 ScreenUtil().setWidth(32 * 2),
@@ -523,62 +543,71 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -523,62 +543,71 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
523 smsInfoData: smsInfoData); 543 smsInfoData: smsInfoData);
524 } 544 }
525 }, 545 },
526 - child: Column(  
527 - mainAxisAlignment: MainAxisAlignment.center,  
528 - children: [  
529 - Row( 546 + child: Container(
  547 + padding: EdgeInsets.symmetric(
  548 + horizontal: r(20)),
  549 + child: Column(
  550 + mainAxisAlignment:
  551 + MainAxisAlignment.center,
530 children: [ 552 children: [
531 - Text(  
532 - myModel.smsInfo.isNotEmpty  
533 - ? '${myModel.smsInfo}'  
534 - : '0',  
535 - style: TextStyle(  
536 - fontWeight: FontWeight.bold,  
537 - color: MyColours.color_515151,  
538 - fontSize:  
539 - ScreenUtil().setSp(40)), 553 + Row(
  554 + children: [
  555 + Text(
  556 + myModel.smsInfo.isNotEmpty
  557 + ? '${myModel.smsInfo}'
  558 + : '0',
  559 + style: TextStyle(
  560 + fontWeight: FontWeight.bold,
  561 + color:
  562 + MyColours.color_515151,
  563 + fontSize:
  564 + ScreenUtil().setSp(40)),
  565 + ),
  566 + Text(
  567 + '条',
  568 + style: TextStyle(
  569 + fontWeight: FontWeight.bold,
  570 + color:
  571 + MyColours.color_999999,
  572 + fontSize:
  573 + ScreenUtil().setSp(22)),
  574 + )
  575 + ],
540 ), 576 ),
541 - Text(  
542 - '条',  
543 - style: TextStyle(  
544 - fontWeight: FontWeight.bold,  
545 - color: MyColours.color_999999,  
546 - fontSize:  
547 - ScreenUtil().setSp(22)),  
548 - ) 577 + VEmptyView(8),
  578 + RoundButton(
  579 + text: '充值短信',
  580 + gradientStart:
  581 + !Utils.getAuthority(
  582 + context, '充值短信')
  583 + ? MyColours.color_999999
  584 + : MyColours.color_438E93,
  585 + gradientEnd: !Utils.getAuthority(
  586 + context, '充值短信')
  587 + ? MyColours.color_999999
  588 + : MyColours.color_438E93,
  589 + borderColor: !Utils.getAuthority(
  590 + context, '充值短信')
  591 + ? MyColours.color_999999
  592 + : MyColours.color_438E93,
  593 + width:
  594 + ScreenUtil().setWidth(48 * 2),
  595 + height:
  596 + ScreenUtil().setWidth(18 * 2),
  597 + fontSize: 20,
  598 + isBold: true,
  599 + textColor: MyColours.color_ffffff,
  600 + radius: ScreenUtil().setWidth(8),
  601 + onPressed: () {
  602 + if (Utils.getAuthority(
  603 + context, '充值短信')) {
  604 + NavigatorUtil.goSmsManagePage(
  605 + context,
  606 + smsInfoData: smsInfoData);
  607 + }
  608 + })
549 ], 609 ],
550 - ),  
551 - VEmptyView(8),  
552 - RoundButton(  
553 - text: '充值短信',  
554 - gradientStart: !Utils.getAuthority(  
555 - context, '充值短信')  
556 - ? MyColours.color_999999  
557 - : MyColours.color_438E93,  
558 - gradientEnd: !Utils.getAuthority(  
559 - context, '充值短信')  
560 - ? MyColours.color_999999  
561 - : MyColours.color_438E93,  
562 - borderColor: !Utils.getAuthority(  
563 - context, '充值短信')  
564 - ? MyColours.color_999999  
565 - : MyColours.color_438E93,  
566 - width: ScreenUtil().setWidth(48 * 2),  
567 - height: ScreenUtil().setWidth(18 * 2),  
568 - fontSize: 20,  
569 - isBold: true,  
570 - textColor: MyColours.color_ffffff,  
571 - radius: ScreenUtil().setWidth(8),  
572 - onPressed: () {  
573 - if (Utils.getAuthority(  
574 - context, '充值短信')) {  
575 - NavigatorUtil.goSmsManagePage(  
576 - context,  
577 - smsInfoData: smsInfoData);  
578 - }  
579 - })  
580 - ],  
581 - )), 610 + ))),
582 MyDivider( 611 MyDivider(
583 ScreenUtil().setWidth(2), 612 ScreenUtil().setWidth(2),
584 ScreenUtil().setWidth(32 * 2), 613 ScreenUtil().setWidth(32 * 2),
@@ -589,8 +618,9 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -589,8 +618,9 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
589 onTap: () { 618 onTap: () {
590 // NavigatorUtil.goMyIntegralPage(context, 619 // NavigatorUtil.goMyIntegralPage(context,
591 // sunModel: myModel.integralSunModel); 620 // sunModel: myModel.integralSunModel);
  621 + print('fffff');
592 if (outDay != '' && 622 if (outDay != '' &&
593 - !Utils.getAuthority(context, '有效期')) { 623 + Utils.getAuthority(context, '有效期')) {
594 if (outDay == '0') { 624 if (outDay == '0') {
595 DialogUtil 625 DialogUtil
596 .cupertinoAlertSellerHasEdateDialog( 626 .cupertinoAlertSellerHasEdateDialog(
@@ -598,8 +628,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -598,8 +628,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
598 title: '温馨提示', 628 title: '温馨提示',
599 isBold: true, 629 isBold: true,
600 lCallback: () { 630 lCallback: () {
601 - NavigatorUtil.goHomePage(context,  
602 - initialIndex: 4); 631 + // NavigatorUtil.goHomePage(context,
  632 + // initialIndex: 4);
603 }, 633 },
604 rCallback: () { 634 rCallback: () {
605 //立即续费 635 //立即续费
@@ -622,91 +652,104 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -622,91 +652,104 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
622 } 652 }
623 } 653 }
624 }, 654 },
625 - child: Column(  
626 - mainAxisAlignment: MainAxisAlignment.center,  
627 - children: [  
628 - Row( 655 + child: Container(
  656 + padding: EdgeInsets.symmetric(
  657 + horizontal: r(20)),
  658 + child: Column(
  659 + mainAxisAlignment:
  660 + MainAxisAlignment.center,
629 children: [ 661 children: [
630 - Text(  
631 - outDay,  
632 - style: TextStyle(  
633 - fontWeight: FontWeight.bold,  
634 - color: outDay != '' &&  
635 - int.parse(outDay) <= 7  
636 - ? MyColours.color_E34D59  
637 - : MyColours.color_515151,  
638 - fontSize:  
639 - ScreenUtil().setSp(40)), 662 + Row(
  663 + children: [
  664 + Text(
  665 + outDay,
  666 + style: TextStyle(
  667 + fontWeight: FontWeight.bold,
  668 + color: outDay != '' &&
  669 + int.parse(outDay) <=
  670 + 7
  671 + ? MyColours.color_E34D59
  672 + : MyColours
  673 + .color_515151,
  674 + fontSize:
  675 + ScreenUtil().setSp(40)),
  676 + ),
  677 + Text(
  678 + '天',
  679 + style: TextStyle(
  680 + fontWeight: FontWeight.bold,
  681 + color:
  682 + MyColours.color_999999,
  683 + fontSize:
  684 + ScreenUtil().setSp(22)),
  685 + )
  686 + ],
640 ), 687 ),
641 - Text(  
642 - '天',  
643 - style: TextStyle(  
644 - fontWeight: FontWeight.bold,  
645 - color: MyColours.color_999999,  
646 - fontSize:  
647 - ScreenUtil().setSp(22)),  
648 - ) 688 + VEmptyView(8),
  689 + RoundButton(
  690 + text: '有效期',
  691 + gradientStart:
  692 + !Utils.getAuthority(
  693 + context, '有效期')
  694 + ? MyColours.color_999999
  695 + : MyColours.color_438E93,
  696 + gradientEnd: !Utils.getAuthority(
  697 + context, '有效期')
  698 + ? MyColours.color_999999
  699 + : MyColours.color_438E93,
  700 + borderColor: !Utils.getAuthority(
  701 + context, '有效期')
  702 + ? MyColours.color_999999
  703 + : MyColours.color_438E93,
  704 + width:
  705 + ScreenUtil().setWidth(48 * 2),
  706 + height:
  707 + ScreenUtil().setWidth(18 * 2),
  708 + fontSize: 20,
  709 + isBold: true,
  710 + textColor: MyColours.color_ffffff,
  711 + radius: ScreenUtil().setWidth(8),
  712 + onPressed: () {
  713 + if (outDay != '' &&
  714 + Utils.getAuthority(
  715 + context, '有效期')) {
  716 + if (outDay == '0') {
  717 + DialogUtil
  718 + .cupertinoAlertSellerHasEdateDialog(
  719 + context,
  720 + title: '温馨提示',
  721 + isBold: true,
  722 + lCallback: () {
  723 + NavigatorUtil
  724 + .goHomePage(context,
  725 + initialIndex:
  726 + 4);
  727 + },
  728 + rCallback: () {
  729 + //立即续费
  730 + },
  731 + );
  732 + } else {
  733 + DialogUtil
  734 + .cupertinoAlertSellerEdateDialog(
  735 + context,
  736 + title: '温馨提示',
  737 + isBold: true,
  738 + content:
  739 + DateUtil.formatDate(
  740 + edate,
  741 + format:
  742 + DateFormats.full,
  743 + ),
  744 + rCallback: () {
  745 + //立即续费
  746 + },
  747 + );
  748 + }
  749 + }
  750 + })
649 ], 751 ],
650 - ),  
651 - VEmptyView(8),  
652 - RoundButton(  
653 - text: '有效期',  
654 - gradientStart: !Utils.getAuthority(  
655 - context, '有效期')  
656 - ? MyColours.color_999999  
657 - : MyColours.color_438E93,  
658 - gradientEnd: !Utils.getAuthority(  
659 - context, '有效期')  
660 - ? MyColours.color_999999  
661 - : MyColours.color_438E93,  
662 - borderColor: !Utils.getAuthority(  
663 - context, '有效期')  
664 - ? MyColours.color_999999  
665 - : MyColours.color_438E93,  
666 - width: ScreenUtil().setWidth(48 * 2),  
667 - height: ScreenUtil().setWidth(18 * 2),  
668 - fontSize: 20,  
669 - isBold: true,  
670 - textColor: MyColours.color_ffffff,  
671 - radius: ScreenUtil().setWidth(8),  
672 - onPressed: () {  
673 - if (outDay != '' &&  
674 - Utils.getAuthority(  
675 - context, '有效期')) {  
676 - if (outDay == '0') {  
677 - DialogUtil  
678 - .cupertinoAlertSellerHasEdateDialog(  
679 - context,  
680 - title: '温馨提示',  
681 - isBold: true,  
682 - lCallback: () {  
683 - NavigatorUtil.goHomePage(  
684 - context,  
685 - initialIndex: 4);  
686 - },  
687 - rCallback: () {  
688 - //立即续费  
689 - },  
690 - );  
691 - } else {  
692 - DialogUtil  
693 - .cupertinoAlertSellerEdateDialog(  
694 - context,  
695 - title: '温馨提示',  
696 - isBold: true,  
697 - content: DateUtil.formatDate(  
698 - edate,  
699 - format: DateFormats.full,  
700 - ),  
701 - rCallback: () {  
702 - //立即续费  
703 - },  
704 - );  
705 - }  
706 - }  
707 - })  
708 - ],  
709 - )) 752 + )))
710 ], 753 ],
711 ), 754 ),
712 )) 755 ))
@@ -83,8 +83,10 @@ class _SmsManagerPageState extends State<SmsManagerPage> { @@ -83,8 +83,10 @@ class _SmsManagerPageState extends State<SmsManagerPage> {
83 pinned: false, 83 pinned: false,
84 floating: false, 84 floating: false,
85 leading: Container(), 85 leading: Container(),
  86 + backgroundColor: MyColours.color_F8F9FD,
86 expandedHeight: ScreenUtil().setWidth(320 + 40), 87 expandedHeight: ScreenUtil().setWidth(320 + 40),
87 flexibleSpace: FlexibleSpaceBar( 88 flexibleSpace: FlexibleSpaceBar(
  89 + title: null,
88 collapseMode: CollapseMode.pin, 90 collapseMode: CollapseMode.pin,
89 background: Consumer<MyModel>(builder: 91 background: Consumer<MyModel>(builder:
90 (BuildContext context, MyModel model, Widget child) { 92 (BuildContext context, MyModel model, Widget child) {
@@ -116,20 +118,20 @@ class _SmsManagerPageState extends State<SmsManagerPage> { @@ -116,20 +118,20 @@ class _SmsManagerPageState extends State<SmsManagerPage> {
116 Container( 118 Container(
117 // height: ScreenUtil().setWidth(40), 119 // height: ScreenUtil().setWidth(40),
118 child: Text( 120 child: Text(
119 - widget.infoData.lastNum,  
120 - style: TextStyle(  
121 - color: MyColours.color_ffffff,  
122 - fontWeight: FontWeight.bold,  
123 - fontSize: ScreenUtil().setSp(36)),  
124 - )), 121 + widget.infoData.lastNum,
  122 + style: TextStyle(
  123 + color: MyColours.color_ffffff,
  124 + fontWeight: FontWeight.bold,
  125 + fontSize: ScreenUtil().setSp(36)),
  126 + )),
125 Container( 127 Container(
126 // height: ScreenUtil().setWidth(40), 128 // height: ScreenUtil().setWidth(40),
127 child: Text( 129 child: Text(
128 - ' 条',  
129 - style: TextStyle(  
130 - color: MyColours.color_ffffff,  
131 - fontSize: ScreenUtil().setSp(30)),  
132 - )) 130 + ' 条',
  131 + style: TextStyle(
  132 + color: MyColours.color_ffffff,
  133 + fontSize: ScreenUtil().setSp(30)),
  134 + ))
133 ], 135 ],
134 ), 136 ),
135 VEmptyView(80), 137 VEmptyView(80),
@@ -819,6 +819,9 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -819,6 +819,9 @@ class TableManagerPageState extends State<TableManagerPage> {
819 controller: _baseIndoProvider.phoneController, 819 controller: _baseIndoProvider.phoneController,
820 focusNode: _phoneNode, 820 focusNode: _phoneNode,
821 enableInteractiveSelection: true, 821 enableInteractiveSelection: true,
  822 + inputFormatters: <TextInputFormatter>[
  823 + LengthLimitingTextInputFormatter(11) //限制长度
  824 + ],
822 // textAlignVertical: TextAlignVertical.top, 825 // textAlignVertical: TextAlignVertical.top,
823 decoration: InputDecoration( 826 decoration: InputDecoration(
824 hintText: "预留电话", 827 hintText: "预留电话",
@@ -1258,6 +1261,23 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1258,6 +1261,23 @@ class TableManagerPageState extends State<TableManagerPage> {
1258 // _homeEnterModel 1261 // _homeEnterModel
1259 // .userHistorys[index].rname + 1262 // .userHistorys[index].rname +
1260 // _nameSuffix(); 1263 // _nameSuffix();
  1264 + for (var item in _baseIndoProvider
  1265 + .sexList) {
  1266 + item['select'] = false;
  1267 + if (item['title'] ==
  1268 + _baseIndoProvider
  1269 + .userHistorys[index]
  1270 + .sexStr) {
  1271 + item['select'] = true;
  1272 + sexSelectIndex =
  1273 + int.parse(item['code']) -
  1274 + 1;
  1275 + sexStr = _baseIndoProvider
  1276 + .userHistorys[index]
  1277 + .sexStr;
  1278 + }
  1279 + }
  1280 +
1261 _addNameSuffix( 1281 _addNameSuffix(
1262 _baseIndoProvider 1282 _baseIndoProvider
1263 .userHistorys[index] 1283 .userHistorys[index]
@@ -1321,7 +1341,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1321,7 +1341,7 @@ class TableManagerPageState extends State<TableManagerPage> {
1321 ? '' 1341 ? ''
1322 : _baseIndoProvider 1342 : _baseIndoProvider
1323 .userHistorys[index] 1343 .userHistorys[index]
1324 - .rname, 1344 + .rnameStr,
1325 style: TextStyle( 1345 style: TextStyle(
1326 color: MyColours 1346 color: MyColours
1327 .color_333333, 1347 .color_333333,
@@ -6427,8 +6427,7 @@ class DialogUtil { @@ -6427,8 +6427,7 @@ class DialogUtil {
6427 RoundButton( 6427 RoundButton(
6428 text: lTitle, 6428 text: lTitle,
6429 width: (ScreenUtil().screenWidth - 6429 width: (ScreenUtil().screenWidth -
6430 - ScreenUtil().setWidth(62) * 2) /  
6431 - 2, 6430 + ScreenUtil().setWidth(62) * 2),
6432 height: ScreenUtil().setWidth(112), 6431 height: ScreenUtil().setWidth(112),
6433 // radius: ScreenUtil().setWidth(10), 6432 // radius: ScreenUtil().setWidth(10),
6434 gradientStart: Colors.transparent, 6433 gradientStart: Colors.transparent,
@@ -6570,8 +6569,7 @@ class DialogUtil { @@ -6570,8 +6569,7 @@ class DialogUtil {
6570 RoundButton( 6569 RoundButton(
6571 text: lTitle, 6570 text: lTitle,
6572 width: (ScreenUtil().screenWidth - 6571 width: (ScreenUtil().screenWidth -
6573 - ScreenUtil().setWidth(62) * 2) /  
6574 - 2, 6572 + ScreenUtil().setWidth(62) * 2),
6575 height: ScreenUtil().setWidth(112), 6573 height: ScreenUtil().setWidth(112),
6576 // radius: ScreenUtil().setWidth(10), 6574 // radius: ScreenUtil().setWidth(10),
6577 gradientStart: Colors.transparent, 6575 gradientStart: Colors.transparent,