xt / Flutter-ReserveApp · Commits

Go to a project

Commit 41d9bd188e66bae9a6814ca774d543a08fc132cf

Authored by wdn127929
1 parent cd6d31b4
build: skipped

2.7.7

Inline Side-by-side
Showing 5 changed files with 90 additions and 49 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "276" 14 +def flutterVersionCode = "277"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '276' 16 + flutterVersionCode = '277'
17 } 17 }
18 18
19 -def flutterVersionName = "2.7.6" 19 +def flutterVersionName = "2.7.7"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '2.7.6' 21 + flutterVersionName = '2.7.7'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -473,7 +473,7 @@ @@ -473,7 +473,7 @@
473 CODE_SIGN_IDENTITY = "iPhone Developer"; 473 CODE_SIGN_IDENTITY = "iPhone Developer";
474 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 474 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
475 CODE_SIGN_STYLE = Automatic; 475 CODE_SIGN_STYLE = Automatic;
476 - CURRENT_PROJECT_VERSION = 274; 476 + CURRENT_PROJECT_VERSION = 277;
477 DEVELOPMENT_TEAM = 8J59HM8B82; 477 DEVELOPMENT_TEAM = 8J59HM8B82;
478 ENABLE_BITCODE = NO; 478 ENABLE_BITCODE = NO;
479 FLUTTER_BUILD_MODE = release; 479 FLUTTER_BUILD_MODE = release;
@@ -488,7 +488,7 @@ @@ -488,7 +488,7 @@
488 "$(inherited)", 488 "$(inherited)",
489 "$(PROJECT_DIR)/Flutter", 489 "$(PROJECT_DIR)/Flutter",
490 ); 490 );
491 - MARKETING_VERSION = 2.7.4; 491 + MARKETING_VERSION = 2.7.7;
492 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 492 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
493 PRODUCT_NAME = Runner; 493 PRODUCT_NAME = Runner;
494 PROVISIONING_PROFILE_SPECIFIER = ""; 494 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -618,7 +618,7 @@ @@ -618,7 +618,7 @@
618 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 618 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
619 CODE_SIGN_IDENTITY = "iPhone Developer"; 619 CODE_SIGN_IDENTITY = "iPhone Developer";
620 CODE_SIGN_STYLE = Automatic; 620 CODE_SIGN_STYLE = Automatic;
621 - CURRENT_PROJECT_VERSION = 274; 621 + CURRENT_PROJECT_VERSION = 277;
622 DEVELOPMENT_TEAM = 8J59HM8B82; 622 DEVELOPMENT_TEAM = 8J59HM8B82;
623 ENABLE_BITCODE = NO; 623 ENABLE_BITCODE = NO;
624 FLUTTER_BUILD_MODE = release; 624 FLUTTER_BUILD_MODE = release;
@@ -633,7 +633,7 @@ @@ -633,7 +633,7 @@
633 "$(inherited)", 633 "$(inherited)",
634 "$(PROJECT_DIR)/Flutter", 634 "$(PROJECT_DIR)/Flutter",
635 ); 635 );
636 - MARKETING_VERSION = 2.7.4; 636 + MARKETING_VERSION = 2.7.7;
637 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 637 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
638 PRODUCT_NAME = Runner; 638 PRODUCT_NAME = Runner;
639 PROVISIONING_PROFILE_SPECIFIER = ""; 639 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -653,7 +653,7 @@ @@ -653,7 +653,7 @@
653 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 653 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
654 CODE_SIGN_IDENTITY = "iPhone Developer"; 654 CODE_SIGN_IDENTITY = "iPhone Developer";
655 CODE_SIGN_STYLE = Automatic; 655 CODE_SIGN_STYLE = Automatic;
656 - CURRENT_PROJECT_VERSION = 274; 656 + CURRENT_PROJECT_VERSION = 277;
657 DEVELOPMENT_TEAM = 8J59HM8B82; 657 DEVELOPMENT_TEAM = 8J59HM8B82;
658 ENABLE_BITCODE = NO; 658 ENABLE_BITCODE = NO;
659 FLUTTER_BUILD_MODE = release; 659 FLUTTER_BUILD_MODE = release;
@@ -668,7 +668,7 @@ @@ -668,7 +668,7 @@
668 "$(inherited)", 668 "$(inherited)",
669 "$(PROJECT_DIR)/Flutter", 669 "$(PROJECT_DIR)/Flutter",
670 ); 670 );
671 - MARKETING_VERSION = 2.7.4; 671 + MARKETING_VERSION = 2.7.7;
672 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 672 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
673 PRODUCT_NAME = Runner; 673 PRODUCT_NAME = Runner;
674 PROVISIONING_PROFILE_SPECIFIER = ""; 674 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -69,7 +69,7 @@ ReserveDetailSunModel _$ReserveDetailSunModelFromJson( @@ -69,7 +69,7 @@ ReserveDetailSunModel _$ReserveDetailSunModelFromJson(
69 ?.map((e) => 69 ?.map((e) =>
70 e == null ? null : Customers.fromJson(e as Map<String, dynamic>)) 70 e == null ? null : Customers.fromJson(e as Map<String, dynamic>))
71 ?.toList(), 71 ?.toList(),
72 - json['cancel'] == null 72 + json['cancel'] == null || json['cancel'] == ''
73 ? null 73 ? null
74 : Cancel.fromJson(json['cancel'] as Map<String, dynamic>), 74 : Cancel.fromJson(json['cancel'] as Map<String, dynamic>),
75 json['order'] == null 75 json['order'] == null
@@ -620,6 +620,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -620,6 +620,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
620 formatPhone != '') { 620 formatPhone != '') {
621 if (userModel.user.role_name != 621 if (userModel.user.role_name !=
622 '管理员' && 622 '管理员' &&
  623 + userModel.user.role_name !=
  624 + '店长' &&
623 widget.uid != "null" && 625 widget.uid != "null" &&
624 widget.uid != 626 widget.uid !=
625 userModel.user.openid) { 627 userModel.user.openid) {
@@ -632,9 +634,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -632,9 +634,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
632 "客户电话", 634 "客户电话",
633 userModel.user.role_name != 635 userModel.user.role_name !=
634 '管理员' && 636 '管理员' &&
  637 + userModel
  638 + .user.role_name !=
  639 + '店长' &&
635 widget.uid != "null" && 640 widget.uid != "null" &&
636 widget.uid != 641 widget.uid !=
637 - userModel.user.openid && formatPhone.trim().length > 0 642 + userModel
  643 + .user.openid &&
  644 + formatPhone
  645 + .trim()
  646 + .length >
  647 + 0
638 ? Utils.starPhone(formatPhone) 648 ? Utils.starPhone(formatPhone)
639 : formatPhone), 649 : formatPhone),
640 ), 650 ),
@@ -981,14 +991,26 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -981,14 +991,26 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
981 return; 991 return;
982 } 992 }
983 NavigatorUtil.goSmsPage( 993 NavigatorUtil.goSmsPage(
984 - context, detailEntity.id); 994 + context,
  995 + detailEntity.id,
  996 + );
985 break; 997 break;
986 case 3: //电话 998 case 3: //电话
987 if (detailEntity.phone != null && 999 if (detailEntity.phone != null &&
988 detailEntity 1000 detailEntity
989 .phone.isNotEmpty) { 1001 .phone.isNotEmpty) {
990 - Utils.goPhone(  
991 - detailEntity.phone); 1002 + if (userModel.user.role_name !=
  1003 + '管理员' &&
  1004 + userModel.user.role_name !=
  1005 + '店长' &&
  1006 + widget.uid != "null" &&
  1007 + widget.uid !=
  1008 + userModel.user.openid) {
  1009 + Utils.showToast("您无权拨打该电话");
  1010 + } else {
  1011 + Utils.goPhone(
  1012 + detailEntity.phone);
  1013 + }
992 } else { 1014 } else {
993 Utils.showToast("没有预订人电话信息"); 1015 Utils.showToast("没有预订人电话信息");
994 } 1016 }
@@ -1066,6 +1088,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1066,6 +1088,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1066 decoration: BoxDecoration( 1088 decoration: BoxDecoration(
1067 border: Border.all( 1089 border: Border.all(
1068 color: userModel.user.role_name != '管理员' && 1090 color: userModel.user.role_name != '管理员' &&
  1091 + userModel.user.role_name != '店长' &&
1069 widget.uid != "null" && 1092 widget.uid != "null" &&
1070 widget.uid != userModel.user.openid 1093 widget.uid != userModel.user.openid
1071 ? MyColours.color_999999 1094 ? MyColours.color_999999
@@ -1083,6 +1106,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1083,6 +1106,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1083 child: _cancelAndChangeBtn(() { 1106 child: _cancelAndChangeBtn(() {
1084 print('点击变更预订'); 1107 print('点击变更预订');
1085 if (userModel.user.role_name != '管理员' && 1108 if (userModel.user.role_name != '管理员' &&
  1109 + userModel.user.role_name != '店长' &&
1086 widget.uid != "null" && 1110 widget.uid != "null" &&
1087 widget.uid != userModel.user.openid) { 1111 widget.uid != userModel.user.openid) {
1088 } else { 1112 } else {
@@ -1092,6 +1116,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1092,6 +1116,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1092 }, '变更预订', 1116 }, '变更预订',
1093 fontColor: userModel.user.role_name != 1117 fontColor: userModel.user.role_name !=
1094 '管理员' && 1118 '管理员' &&
  1119 + userModel.user.role_name !=
  1120 + '店长' &&
1095 widget.uid != "null" && 1121 widget.uid != "null" &&
1096 widget.uid != 1122 widget.uid !=
1097 userModel.user.openid 1123 userModel.user.openid
@@ -1101,6 +1127,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1101,6 +1127,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1101 ScreenUtil().setWidth(2), 1127 ScreenUtil().setWidth(2),
1102 ScreenUtil().setWidth(50), 1128 ScreenUtil().setWidth(50),
1103 color: userModel.user.role_name != '管理员' && 1129 color: userModel.user.role_name != '管理员' &&
  1130 + userModel.user.role_name != '店长' &&
1104 widget.uid != "null" && 1131 widget.uid != "null" &&
1105 widget.uid != userModel.user.openid 1132 widget.uid != userModel.user.openid
1106 ? MyColours.color_999999 1133 ? MyColours.color_999999
@@ -1109,6 +1136,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1109,6 +1136,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1109 Expanded( 1136 Expanded(
1110 child: _cancelAndChangeBtn(() { 1137 child: _cancelAndChangeBtn(() {
1111 if (userModel.user.role_name != '管理员' && 1138 if (userModel.user.role_name != '管理员' &&
  1139 + userModel.user.role_name != '店长' &&
1112 widget.uid != "null" && 1140 widget.uid != "null" &&
1113 widget.uid != userModel.user.openid) { 1141 widget.uid != userModel.user.openid) {
1114 } else { 1142 } else {
@@ -1117,6 +1145,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1117,6 +1145,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1117 }, '取消预订', 1145 }, '取消预订',
1118 fontColor: userModel.user.role_name != 1146 fontColor: userModel.user.role_name !=
1119 '管理员' && 1147 '管理员' &&
  1148 + userModel.user.role_name !=
  1149 + '店长' &&
1120 widget.uid != "null" && 1150 widget.uid != "null" &&
1121 widget.uid != 1151 widget.uid !=
1122 userModel.user.openid 1152 userModel.user.openid
@@ -643,7 +643,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -643,7 +643,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
643 VEmptyView(20), 643 VEmptyView(20),
644 Row( 644 Row(
645 // mainAxisSize: MainAxisSize.min, 645 // mainAxisSize: MainAxisSize.min,
646 - crossAxisAlignment: CrossAxisAlignment.center, 646 + crossAxisAlignment: CrossAxisAlignment.start,
647 children: <Widget>[ 647 children: <Widget>[
648 InkWell( 648 InkWell(
649 onTap: () { 649 onTap: () {
@@ -652,50 +652,61 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -652,50 +652,61 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
652 }); 652 });
653 }, 653 },
654 child: Container( 654 child: Container(
655 - // color: Colors.red,  
656 - // height: ScreenUtil().setWidth(34),  
657 - padding: EdgeInsets.only(  
658 - left: ScreenUtil().setWidth(102),  
659 - top: ScreenUtil().setWidth(10),  
660 - bottom: ScreenUtil().setWidth(10)),  
661 - child: Center(  
662 - child: Image.asset(  
663 - _check  
664 - ? "assets/mine_radio_sel.png"  
665 - : "assets/mine_radio_nor.png",  
666 - width: ScreenUtil().setWidth(42),  
667 - height: ScreenUtil().setWidth(42)),  
668 - ))), 655 + alignment: Alignment.topCenter,
  656 + // color: Colors.red,
  657 + height: ScreenUtil().setWidth(134),
  658 + padding: EdgeInsets.only(
  659 + left: ScreenUtil().setWidth(102),
  660 + bottom: ScreenUtil().setWidth(10)),
  661 + child: Image.asset(
  662 + _check
  663 + ? "assets/mine_radio_sel.png"
  664 + : "assets/mine_radio_nor.png",
  665 + width: ScreenUtil().setWidth(42),
  666 + height: ScreenUtil().setWidth(42)),
  667 + )),
669 HEmptyView(6), 668 HEmptyView(6),
670 - Text(  
671 - '已阅读并同意',  
672 - style: TextStyle(  
673 - fontSize: ScreenUtil().setSp(24),  
674 - color: MyColours.color_353535), 669 + Padding(
  670 + padding: EdgeInsets.only(top: ScreenUtil().setWidth(10)),
  671 + child: Text(
  672 + '已阅读并同意',
  673 + style: TextStyle(
  674 + fontSize: ScreenUtil().setSp(24),
  675 + color: MyColours.color_353535),
  676 + ),
675 ), 677 ),
676 InkWell( 678 InkWell(
677 onTap: () { 679 onTap: () {
678 NavigatorUtil.goWebPage(context, '软件服务协议', "xy"); 680 NavigatorUtil.goWebPage(context, '软件服务协议', "xy");
679 }, 681 },
680 - child: Text(  
681 - '《软件服务协议》',  
682 - style: TextStyle(  
683 - fontSize: ScreenUtil().setSp(24),  
684 - color: MyColours.color_2bb5b7),  
685 - ), 682 + child: Padding(
  683 + padding:
  684 + EdgeInsets.only(top: ScreenUtil().setWidth(10)),
  685 + child: Text(
  686 + '《软件服务协议》',
  687 + style: TextStyle(
  688 + fontSize: ScreenUtil().setSp(24),
  689 + color: MyColours.color_2bb5b7),
  690 + )),
686 ), 691 ),
687 - Text('及',  
688 - style: TextStyle(  
689 - fontSize: ScreenUtil().setSp(24),  
690 - color: MyColours.color_353535)), 692 + Padding(
  693 + padding:
  694 + EdgeInsets.only(top: ScreenUtil().setWidth(10)),
  695 + child: Text('及',
  696 + style: TextStyle(
  697 + fontSize: ScreenUtil().setSp(24),
  698 + color: MyColours.color_353535))),
691 InkWell( 699 InkWell(
692 onTap: () { 700 onTap: () {
693 NavigatorUtil.goWebPage(context, '隐私政策', "zc"); 701 NavigatorUtil.goWebPage(context, '隐私政策', "zc");
694 }, 702 },
695 - child: Text('《隐私政策》',  
696 - style: TextStyle(  
697 - fontSize: ScreenUtil().setSp(24),  
698 - color: MyColours.color_2bb5b7)), 703 + child: Padding(
  704 + padding:
  705 + EdgeInsets.only(top: ScreenUtil().setWidth(10)),
  706 + child: Text('《隐私政策》',
  707 + style: TextStyle(
  708 + fontSize: ScreenUtil().setSp(24),
  709 + color: MyColours.color_2bb5b7))),
699 ) 710 )
700 ], 711 ],
701 ), 712 ),