xt / Flutter-ReserveApp · Commits

Go to a project

Commit 65f99c97ee10401c6c9914b3d1eb5c2f1d512c64

Authored by wdn127929
1 parent 3a7b72d4
build: skipped

修复星号电话可以拨打问题和订座详情电话号码非空判断问题

Inline Side-by-side
Showing 2 changed files with 20 additions and 16 deletions
@@ -258,7 +258,7 @@ @@ -258,7 +258,7 @@
258 ); 258 );
259 runOnlyForDeploymentPostprocessing = 0; 259 runOnlyForDeploymentPostprocessing = 0;
260 shellPath = /bin/sh; 260 shellPath = /bin/sh;
261 - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; 261 + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
262 }; 262 };
263 90026E17DA6CEBB932F17F57 /* [CP] Copy Pods Resources */ = { 263 90026E17DA6CEBB932F17F57 /* [CP] Copy Pods Resources */ = {
264 isa = PBXShellScriptBuildPhase; 264 isa = PBXShellScriptBuildPhase;
@@ -291,6 +291,7 @@ @@ -291,6 +291,7 @@
291 runOnlyForDeploymentPostprocessing = 0; 291 runOnlyForDeploymentPostprocessing = 0;
292 shellPath = /bin/sh; 292 shellPath = /bin/sh;
293 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n"; 293 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
  294 + showEnvVarsInLog = 0;
294 }; 295 };
295 9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = { 296 9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = {
296 isa = PBXShellScriptBuildPhase; 297 isa = PBXShellScriptBuildPhase;
@@ -472,7 +473,7 @@ @@ -472,7 +473,7 @@
472 CODE_SIGN_IDENTITY = "iPhone Developer"; 473 CODE_SIGN_IDENTITY = "iPhone Developer";
473 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 474 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
474 CODE_SIGN_STYLE = Automatic; 475 CODE_SIGN_STYLE = Automatic;
475 - CURRENT_PROJECT_VERSION = 272; 476 + CURRENT_PROJECT_VERSION = 274;
476 DEVELOPMENT_TEAM = 8J59HM8B82; 477 DEVELOPMENT_TEAM = 8J59HM8B82;
477 ENABLE_BITCODE = NO; 478 ENABLE_BITCODE = NO;
478 FLUTTER_BUILD_MODE = release; 479 FLUTTER_BUILD_MODE = release;
@@ -487,7 +488,7 @@ @@ -487,7 +488,7 @@
487 "$(inherited)", 488 "$(inherited)",
488 "$(PROJECT_DIR)/Flutter", 489 "$(PROJECT_DIR)/Flutter",
489 ); 490 );
490 - MARKETING_VERSION = 2.7.2; 491 + MARKETING_VERSION = 2.7.4;
491 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 492 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
492 PRODUCT_NAME = Runner; 493 PRODUCT_NAME = Runner;
493 PROVISIONING_PROFILE_SPECIFIER = ""; 494 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -611,17 +612,13 @@ @@ -611,17 +612,13 @@
611 isa = XCBuildConfiguration; 612 isa = XCBuildConfiguration;
612 baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; 613 baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
613 buildSettings = { 614 buildSettings = {
614 - ARCHS = (  
615 - "$(ARCHS_STANDARD)",  
616 - x86_64,  
617 - arm64,  
618 - ); 615 + ARCHS = "$(ARCHS_STANDARD)";
619 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 616 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
620 CLANG_ENABLE_MODULES = YES; 617 CLANG_ENABLE_MODULES = YES;
621 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 618 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
622 CODE_SIGN_IDENTITY = "iPhone Developer"; 619 CODE_SIGN_IDENTITY = "iPhone Developer";
623 CODE_SIGN_STYLE = Automatic; 620 CODE_SIGN_STYLE = Automatic;
624 - CURRENT_PROJECT_VERSION = 272; 621 + CURRENT_PROJECT_VERSION = 274;
625 DEVELOPMENT_TEAM = 8J59HM8B82; 622 DEVELOPMENT_TEAM = 8J59HM8B82;
626 ENABLE_BITCODE = NO; 623 ENABLE_BITCODE = NO;
627 FLUTTER_BUILD_MODE = release; 624 FLUTTER_BUILD_MODE = release;
@@ -636,7 +633,7 @@ @@ -636,7 +633,7 @@
636 "$(inherited)", 633 "$(inherited)",
637 "$(PROJECT_DIR)/Flutter", 634 "$(PROJECT_DIR)/Flutter",
638 ); 635 );
639 - MARKETING_VERSION = 2.7.2; 636 + MARKETING_VERSION = 2.7.4;
640 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 637 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
641 PRODUCT_NAME = Runner; 638 PRODUCT_NAME = Runner;
642 PROVISIONING_PROFILE_SPECIFIER = ""; 639 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -656,7 +653,7 @@ @@ -656,7 +653,7 @@
656 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 653 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
657 CODE_SIGN_IDENTITY = "iPhone Developer"; 654 CODE_SIGN_IDENTITY = "iPhone Developer";
658 CODE_SIGN_STYLE = Automatic; 655 CODE_SIGN_STYLE = Automatic;
659 - CURRENT_PROJECT_VERSION = 272; 656 + CURRENT_PROJECT_VERSION = 274;
660 DEVELOPMENT_TEAM = 8J59HM8B82; 657 DEVELOPMENT_TEAM = 8J59HM8B82;
661 ENABLE_BITCODE = NO; 658 ENABLE_BITCODE = NO;
662 FLUTTER_BUILD_MODE = release; 659 FLUTTER_BUILD_MODE = release;
@@ -671,7 +668,7 @@ @@ -671,7 +668,7 @@
671 "$(inherited)", 668 "$(inherited)",
672 "$(PROJECT_DIR)/Flutter", 669 "$(PROJECT_DIR)/Flutter",
673 ); 670 );
674 - MARKETING_VERSION = 2.7.2; 671 + MARKETING_VERSION = 2.7.4;
675 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 672 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
676 PRODUCT_NAME = Runner; 673 PRODUCT_NAME = Runner;
677 PROVISIONING_PROFILE_SPECIFIER = ""; 674 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -457,8 +457,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -457,8 +457,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
457 UserModel userModel = Provider.of<UserModel>(context, listen: false); 457 UserModel userModel = Provider.of<UserModel>(context, listen: false);
458 print(userModel.user.role_name); 458 print(userModel.user.role_name);
459 print(userModel.user.openid); 459 print(userModel.user.openid);
460 - print(widget.rid);  
461 - print(widget.uid); 460 + print(widget.rid);
  461 + print(widget.uid);
462 return Scaffold( 462 return Scaffold(
463 body: SafeArea( 463 body: SafeArea(
464 child: WillPopScope( 464 child: WillPopScope(
@@ -618,7 +618,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -618,7 +618,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
618 onTap: () { 618 onTap: () {
619 if (formatPhone != null && 619 if (formatPhone != null &&
620 formatPhone != '') { 620 formatPhone != '') {
621 - DialogUtil.goPhone(formatPhone); 621 + if (userModel.user.role_name !=
  622 + '管理员' &&
  623 + widget.uid != "null" &&
  624 + widget.uid !=
  625 + userModel.user.openid) {
  626 + } else {
  627 + DialogUtil.goPhone(formatPhone);
  628 + }
622 } 629 }
623 }, 630 },
624 child: RowMultiText( 631 child: RowMultiText(
@@ -627,7 +634,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -627,7 +634,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
627 '管理员' && 634 '管理员' &&
628 widget.uid != "null" && 635 widget.uid != "null" &&
629 widget.uid != 636 widget.uid !=
630 - userModel.user.openid 637 + userModel.user.openid && formatPhone.trim().length > 0
631 ? Utils.starPhone(formatPhone) 638 ? Utils.starPhone(formatPhone)
632 : formatPhone), 639 : formatPhone),
633 ), 640 ),