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 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
};
90026E17DA6CEBB932F17F57 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
... ... @@ -291,6 +291,7 @@
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
showEnvVarsInLog = 0;
};
9B9871E299FA5648CFE77D1A /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
... ... @@ -472,7 +473,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 272;
CURRENT_PROJECT_VERSION = 274;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -487,7 +488,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 2.7.2;
MARKETING_VERSION = 2.7.4;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -611,17 +612,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
buildSettings = {
ARCHS = (
"$(ARCHS_STANDARD)",
x86_64,
arm64,
);
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 272;
CURRENT_PROJECT_VERSION = 274;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -636,7 +633,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 2.7.2;
MARKETING_VERSION = 2.7.4;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -656,7 +653,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 272;
CURRENT_PROJECT_VERSION = 274;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -671,7 +668,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 2.7.2;
MARKETING_VERSION = 2.7.4;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -457,8 +457,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
print(userModel.user.role_name);
print(userModel.user.openid);
print(widget.rid);
print(widget.uid);
print(widget.rid);
print(widget.uid);
return Scaffold(
body: SafeArea(
child: WillPopScope(
... ... @@ -618,7 +618,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
onTap: () {
if (formatPhone != null &&
formatPhone != '') {
DialogUtil.goPhone(formatPhone);
if (userModel.user.role_name !=
'管理员' &&
widget.uid != "null" &&
widget.uid !=
userModel.user.openid) {
} else {
DialogUtil.goPhone(formatPhone);
}
}
},
child: RowMultiText(
... ... @@ -627,7 +634,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
'管理员' &&
widget.uid != "null" &&
widget.uid !=
userModel.user.openid
userModel.user.openid && formatPhone.trim().length > 0
? Utils.starPhone(formatPhone)
: formatPhone),
),
... ...