xt / Flutter-ReserveApp · Commits

Go to a project

Commit 148f8d18950879ccbf4b9a2c2819c0c3e1e273f7

Authored by wdn
1 parent a22d7081

变更预订、取消预订按钮布局

Inline Side-by-side
Showing 9 changed files with 439 additions and 301 deletions
  1 +{
  2 + // Use IntelliSense to learn about possible attributes.
  3 + // Hover to view descriptions of existing attributes.
  4 + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
  5 + "version": "0.2.0",
  6 + "configurations": [
  7 + {
  8 + "name": "oneKey_wdn",
  9 + "request": "launch",
  10 + "type": "dart"
  11 + }
  12 + ]
  13 +}
  1 +196f9f292c7f47fcf809595ac8fc6ce8
1 # Uncomment this line to define a global platform for your project 1 # Uncomment this line to define a global platform for your project
2 - source 'https://github.com/CocoaPods/Specs.git'  
3 - platform :ios, '8.0' 2 +# source 'https://github.com/CocoaPods/Specs.git'
  3 + platform :ios, '9.0'
4 4
5 # CocoaPods analytics sends network stats synchronously affecting flutter build latency. 5 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
6 ENV['COCOAPODS_DISABLE_STATS'] = 'true' 6 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
1 PODS: 1 PODS:
2 - audioplayers (0.0.1): 2 - audioplayers (0.0.1):
3 - Flutter 3 - Flutter
4 - - connectivity (0.0.1):  
5 - - Flutter  
6 - - Reachability  
7 - - connectivity_macos (0.0.1):  
8 - - Flutter 4 + - Bugly (2.5.71)
9 - Flutter (1.0.0) 5 - Flutter (1.0.0)
  6 + - flutter_bugly (0.0.1):
  7 + - Bugly
  8 + - Flutter
10 - flutter_statusbarcolor (0.0.1): 9 - flutter_statusbarcolor (0.0.1):
11 - Flutter 10 - Flutter
12 - fluttertoast (0.0.2): 11 - fluttertoast (0.0.2):
13 - Flutter 12 - Flutter
14 - fluwx (0.0.1): 13 - fluwx (0.0.1):
15 - Flutter 14 - Flutter
16 - - WechatOpenSDK (= 1.8.6.2) 15 + - WechatOpenSDK (= 1.8.7.1)
17 - FMDB (2.7.5): 16 - FMDB (2.7.5):
18 - FMDB/standard (= 2.7.5) 17 - FMDB/standard (= 2.7.5)
19 - FMDB/standard (2.7.5) 18 - FMDB/standard (2.7.5)
20 - install_plugin (0.0.1): 19 - install_plugin (0.0.1):
21 - Flutter 20 - Flutter
22 - - JCore (2.2.5)  
23 - - JPush (3.3.2): 21 + - JCore (2.3.4)
  22 + - JPush (3.3.6):
24 - JCore (< 3.0.0, >= 2.0.0) 23 - JCore (< 3.0.0, >= 2.0.0)
25 - jpush_flutter (0.0.2): 24 - jpush_flutter (0.0.2):
26 - Flutter 25 - Flutter
27 - JPush 26 - JPush
  27 + - package_info (0.0.1):
  28 + - Flutter
28 - path_provider (0.0.1): 29 - path_provider (0.0.1):
29 - Flutter 30 - Flutter
30 - path_provider_macos (0.0.1): 31 - path_provider_macos (0.0.1):
31 - Flutter 32 - Flutter
32 - permission_handler (4.4.0): 33 - permission_handler (4.4.0):
33 - Flutter 34 - Flutter
34 - - Reachability (3.2)  
35 - shared_preferences (0.0.1): 35 - shared_preferences (0.0.1):
36 - Flutter 36 - Flutter
37 - shared_preferences_macos (0.0.1): 37 - shared_preferences_macos (0.0.1):
@@ -47,18 +47,18 @@ PODS: @@ -47,18 +47,18 @@ PODS:
47 - Flutter 47 - Flutter
48 - url_launcher_web (0.0.1): 48 - url_launcher_web (0.0.1):
49 - Flutter 49 - Flutter
50 - - WechatOpenSDK (1.8.6.2) 50 + - WechatOpenSDK (1.8.7.1)
51 51
52 DEPENDENCIES: 52 DEPENDENCIES:
53 - audioplayers (from `.symlinks/plugins/audioplayers/ios`) 53 - audioplayers (from `.symlinks/plugins/audioplayers/ios`)
54 - - connectivity (from `.symlinks/plugins/connectivity/ios`)  
55 - - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`)  
56 - Flutter (from `Flutter`) 54 - Flutter (from `Flutter`)
  55 + - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
57 - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`) 56 - flutter_statusbarcolor (from `.symlinks/plugins/flutter_statusbarcolor/ios`)
58 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) 57 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
59 - fluwx (from `.symlinks/plugins/fluwx/ios`) 58 - fluwx (from `.symlinks/plugins/fluwx/ios`)
60 - install_plugin (from `.symlinks/plugins/install_plugin/ios`) 59 - install_plugin (from `.symlinks/plugins/install_plugin/ios`)
61 - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`) 60 - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`)
  61 + - package_info (from `.symlinks/plugins/package_info/ios`)
62 - path_provider (from `.symlinks/plugins/path_provider/ios`) 62 - path_provider (from `.symlinks/plugins/path_provider/ios`)
63 - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`) 63 - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`)
64 - permission_handler (from `.symlinks/plugins/permission_handler/ios`) 64 - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
@@ -71,22 +71,20 @@ DEPENDENCIES: @@ -71,22 +71,20 @@ DEPENDENCIES:
71 - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`) 71 - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`)
72 72
73 SPEC REPOS: 73 SPEC REPOS:
74 - https://github.com/CocoaPods/Specs.git: 74 + trunk:
  75 + - Bugly
75 - FMDB 76 - FMDB
76 - JCore 77 - JCore
77 - JPush 78 - JPush
78 - - Reachability  
79 - WechatOpenSDK 79 - WechatOpenSDK
80 80
81 EXTERNAL SOURCES: 81 EXTERNAL SOURCES:
82 audioplayers: 82 audioplayers:
83 :path: ".symlinks/plugins/audioplayers/ios" 83 :path: ".symlinks/plugins/audioplayers/ios"
84 - connectivity:  
85 - :path: ".symlinks/plugins/connectivity/ios"  
86 - connectivity_macos:  
87 - :path: ".symlinks/plugins/connectivity_macos/ios"  
88 Flutter: 84 Flutter:
89 :path: Flutter 85 :path: Flutter
  86 + flutter_bugly:
  87 + :path: ".symlinks/plugins/flutter_bugly/ios"
90 flutter_statusbarcolor: 88 flutter_statusbarcolor:
91 :path: ".symlinks/plugins/flutter_statusbarcolor/ios" 89 :path: ".symlinks/plugins/flutter_statusbarcolor/ios"
92 fluttertoast: 90 fluttertoast:
@@ -97,6 +95,8 @@ EXTERNAL SOURCES: @@ -97,6 +95,8 @@ EXTERNAL SOURCES:
97 :path: ".symlinks/plugins/install_plugin/ios" 95 :path: ".symlinks/plugins/install_plugin/ios"
98 jpush_flutter: 96 jpush_flutter:
99 :path: ".symlinks/plugins/jpush_flutter/ios" 97 :path: ".symlinks/plugins/jpush_flutter/ios"
  98 + package_info:
  99 + :path: ".symlinks/plugins/package_info/ios"
100 path_provider: 100 path_provider:
101 :path: ".symlinks/plugins/path_provider/ios" 101 :path: ".symlinks/plugins/path_provider/ios"
102 path_provider_macos: 102 path_provider_macos:
@@ -120,21 +120,21 @@ EXTERNAL SOURCES: @@ -120,21 +120,21 @@ EXTERNAL SOURCES:
120 120
121 SPEC CHECKSUMS: 121 SPEC CHECKSUMS:
122 audioplayers: 84f968cea3f2deab00ec4f8ff53358b3c0b3992c 122 audioplayers: 84f968cea3f2deab00ec4f8ff53358b3c0b3992c
123 - connectivity: 6e94255659cc86dcbef1d452ad3e0491bb1b3e75  
124 - connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191 123 + Bugly: fd066c75c4a0eca1440f9b6a84bd37d51bfc85ac
125 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec 124 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
  125 + flutter_bugly: c9800f4d5bc5bdc27ffdde3417a26ba44266e0c3
126 flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259 126 flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259
127 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b 127 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
128 - fluwx: 03e098a7284c556d7b197e0b82984eb0b25183af 128 + fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902
129 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a 129 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
130 install_plugin: a13e7ddd2bab0c701b48cd359c26d0394125b6fb 130 install_plugin: a13e7ddd2bab0c701b48cd359c26d0394125b6fb
131 - JCore: d75c0306dc99875d323d23e5a063b3a3ef22335a  
132 - JPush: 9468c84a3809dc3ac2fc1c89c6d1d6c858a91bf5 131 + JCore: 8aa29dc57ba3730dd9fe7544ce1a4e1cbe221135
  132 + JPush: a401b946dcc76b37335422487201bc1ecc8dd296
133 jpush_flutter: 69133df35eaf9135e540549b154d992c44f8ee44 133 jpush_flutter: 69133df35eaf9135e540549b154d992c44f8ee44
  134 + package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
134 path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d 135 path_provider: fb74bd0465e96b594bb3b5088ee4a4e7bb1f2a9d
135 path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0 136 path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0
136 permission_handler: f615215121f43c1640d2b8500d4ad749512828a8 137 permission_handler: f615215121f43c1640d2b8500d4ad749512828a8
137 - Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96  
138 shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01 138 shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01
139 shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087 139 shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
140 shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9 140 shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
@@ -142,8 +142,8 @@ SPEC CHECKSUMS: @@ -142,8 +142,8 @@ SPEC CHECKSUMS:
142 url_launcher: a1c0cc845906122c4784c542523d8cacbded5626 142 url_launcher: a1c0cc845906122c4784c542523d8cacbded5626
143 url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 143 url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
144 url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c 144 url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
145 - WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a 145 + WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44
146 146
147 -PODFILE CHECKSUM: a5c9f5cbedb217afa5108d75ed888500ab689803 147 +PODFILE CHECKSUM: 6d186dc4668603071619657511aa873d9a684d13
148 148
149 -COCOAPODS: 1.9.1 149 +COCOAPODS: 1.9.3
@@ -9,11 +9,7 @@ @@ -9,11 +9,7 @@
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 10 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 11 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12 - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };  
13 - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };  
14 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 12 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
15 - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };  
16 - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };  
17 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 13 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
18 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 14 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
19 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; 15 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
@@ -27,8 +23,6 @@ @@ -27,8 +23,6 @@
27 dstPath = ""; 23 dstPath = "";
28 dstSubfolderSpec = 10; 24 dstSubfolderSpec = 10;
29 files = ( 25 files = (
30 - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,  
31 - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,  
32 ); 26 );
33 name = "Embed Frameworks"; 27 name = "Embed Frameworks";
34 runOnlyForDeploymentPostprocessing = 0; 28 runOnlyForDeploymentPostprocessing = 0;
@@ -41,13 +35,11 @@ @@ -41,13 +35,11 @@
41 22513BD076488FBD50F0303F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; }; 35 22513BD076488FBD50F0303F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
42 2DCAB49DF131E02F3BAF38E1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; }; 36 2DCAB49DF131E02F3BAF38E1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
43 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; }; 37 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
44 - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };  
45 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; }; 38 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
46 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; 39 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
47 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; }; 40 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
48 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; }; 41 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
49 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; }; 42 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
50 - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };  
51 97C146EE1CF9000F007C117D /* 一键订.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "一键订.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 43 97C146EE1CF9000F007C117D /* 一键订.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "一键订.app"; sourceTree = BUILT_PRODUCTS_DIR; };
52 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; 44 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
53 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 45 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -64,8 +56,6 @@ @@ -64,8 +56,6 @@
64 isa = PBXFrameworksBuildPhase; 56 isa = PBXFrameworksBuildPhase;
65 buildActionMask = 2147483647; 57 buildActionMask = 2147483647;
66 files = ( 58 files = (
67 - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,  
68 - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */,  
69 A7F352227F0F121A53D9A543 /* Pods_Runner.framework in Frameworks */, 59 A7F352227F0F121A53D9A543 /* Pods_Runner.framework in Frameworks */,
70 ); 60 );
71 runOnlyForDeploymentPostprocessing = 0; 61 runOnlyForDeploymentPostprocessing = 0;
@@ -94,9 +84,7 @@ @@ -94,9 +84,7 @@
94 9740EEB11CF90186004384FC /* Flutter */ = { 84 9740EEB11CF90186004384FC /* Flutter */ = {
95 isa = PBXGroup; 85 isa = PBXGroup;
96 children = ( 86 children = (
97 - 3B80C3931E831B6300D905FE /* App.framework */,  
98 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, 87 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
99 - 9740EEBA1CF902C7004384FC /* Flutter.framework */,  
100 9740EEB21CF90195004384FC /* Debug.xcconfig */, 88 9740EEB21CF90195004384FC /* Debug.xcconfig */,
101 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 89 7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
102 9740EEB31CF90195004384FC /* Generated.xcconfig */, 90 9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -235,7 +223,7 @@ @@ -235,7 +223,7 @@
235 ); 223 );
236 runOnlyForDeploymentPostprocessing = 0; 224 runOnlyForDeploymentPostprocessing = 0;
237 shellPath = /bin/sh; 225 shellPath = /bin/sh;
238 - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; 226 + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
239 }; 227 };
240 9740EEB61CF901F6004384FC /* Run Script */ = { 228 9740EEB61CF901F6004384FC /* Run Script */ = {
241 isa = PBXShellScriptBuildPhase; 229 isa = PBXShellScriptBuildPhase;
@@ -324,7 +312,6 @@ @@ -324,7 +312,6 @@
324 /* Begin XCBuildConfiguration section */ 312 /* Begin XCBuildConfiguration section */
325 249021D3217E4FDB00AE95B9 /* Profile */ = { 313 249021D3217E4FDB00AE95B9 /* Profile */ = {
326 isa = XCBuildConfiguration; 314 isa = XCBuildConfiguration;
327 - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;  
328 buildSettings = { 315 buildSettings = {
329 ALWAYS_SEARCH_USER_PATHS = NO; 316 ALWAYS_SEARCH_USER_PATHS = NO;
330 CLANG_ANALYZER_NONNULL = YES; 317 CLANG_ANALYZER_NONNULL = YES;
@@ -382,7 +369,8 @@ @@ -382,7 +369,8 @@
382 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 369 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
383 CLANG_ENABLE_MODULES = YES; 370 CLANG_ENABLE_MODULES = YES;
384 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 371 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
385 - CODE_SIGN_STYLE = Manual; 372 + CODE_SIGN_IDENTITY = "Apple Development";
  373 + CODE_SIGN_STYLE = Automatic;
386 CURRENT_PROJECT_VERSION = 3; 374 CURRENT_PROJECT_VERSION = 3;
387 DEVELOPMENT_TEAM = 8J59HM8B82; 375 DEVELOPMENT_TEAM = 8J59HM8B82;
388 ENABLE_BITCODE = NO; 376 ENABLE_BITCODE = NO;
@@ -399,7 +387,7 @@ @@ -399,7 +387,7 @@
399 MARKETING_VERSION = 1.0.3; 387 MARKETING_VERSION = 1.0.3;
400 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 388 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
401 PRODUCT_NAME = "一键订"; 389 PRODUCT_NAME = "一键订";
402 - PROVISIONING_PROFILE_SPECIFIER = "OneKey Distribution Profile"; 390 + PROVISIONING_PROFILE_SPECIFIER = "";
403 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 391 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
404 SWIFT_VERSION = 5.0; 392 SWIFT_VERSION = 5.0;
405 VERSIONING_SYSTEM = "apple-generic"; 393 VERSIONING_SYSTEM = "apple-generic";
@@ -408,7 +396,6 @@ @@ -408,7 +396,6 @@
408 }; 396 };
409 97C147031CF9000F007C117D /* Debug */ = { 397 97C147031CF9000F007C117D /* Debug */ = {
410 isa = XCBuildConfiguration; 398 isa = XCBuildConfiguration;
411 - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;  
412 buildSettings = { 399 buildSettings = {
413 ALWAYS_SEARCH_USER_PATHS = NO; 400 ALWAYS_SEARCH_USER_PATHS = NO;
414 CLANG_ANALYZER_NONNULL = YES; 401 CLANG_ANALYZER_NONNULL = YES;
@@ -466,7 +453,6 @@ @@ -466,7 +453,6 @@
466 }; 453 };
467 97C147041CF9000F007C117D /* Release */ = { 454 97C147041CF9000F007C117D /* Release */ = {
468 isa = XCBuildConfiguration; 455 isa = XCBuildConfiguration;
469 - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;  
470 buildSettings = { 456 buildSettings = {
471 ALWAYS_SEARCH_USER_PATHS = NO; 457 ALWAYS_SEARCH_USER_PATHS = NO;
472 CLANG_ANALYZER_NONNULL = YES; 458 CLANG_ANALYZER_NONNULL = YES;
@@ -542,7 +528,7 @@ @@ -542,7 +528,7 @@
542 MARKETING_VERSION = 1.0.3; 528 MARKETING_VERSION = 1.0.3;
543 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 529 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
544 PRODUCT_NAME = "一键订"; 530 PRODUCT_NAME = "一键订";
545 - PROVISIONING_PROFILE_SPECIFIER = "Push Development Profile"; 531 + PROVISIONING_PROFILE_SPECIFIER = wdn_yjd;
546 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 532 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
547 SWIFT_OPTIMIZATION_LEVEL = "-Onone"; 533 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
548 SWIFT_VERSION = 5.0; 534 SWIFT_VERSION = 5.0;
@@ -21,7 +21,6 @@ import 'package:one_key/widgets/v_empty_view.dart'; @@ -21,7 +21,6 @@ import 'package:one_key/widgets/v_empty_view.dart';
21 import 'package:provider/provider.dart'; 21 import 'package:provider/provider.dart';
22 22
23 class NotebookDetailPage extends StatefulWidget { 23 class NotebookDetailPage extends StatefulWidget {
24 -  
25 final String rid; 24 final String rid;
26 25
27 NotebookDetailPage(this.rid); 26 NotebookDetailPage(this.rid);
@@ -34,227 +33,366 @@ class NotebookDetailPage extends StatefulWidget { @@ -34,227 +33,366 @@ class NotebookDetailPage extends StatefulWidget {
34 } 33 }
35 34
36 class NotebookDetailPageState extends State<NotebookDetailPage> { 35 class NotebookDetailPageState extends State<NotebookDetailPage> {
37 -  
38 - NotebookDetailModel detailModel= NotebookDetailModel(); 36 + NotebookDetailModel detailModel = NotebookDetailModel();
39 37
40 NotebookDetail detailEntity; 38 NotebookDetail detailEntity;
41 39
42 - String cusmanText="";  
43 -  
44 - List<Manager> managers=[];//客户经理 40 + String cusmanText = "";
  41 +
  42 + List<Manager> managers = []; //客户经理
45 43
46 - Manager manager=Manager(); 44 + Manager manager = Manager();
47 45
48 @override 46 @override
49 void initState() { 47 void initState() {
50 // TODO: implement initState 48 // TODO: implement initState
51 super.initState(); 49 super.initState();
52 WidgetsBinding.instance.addPostFrameCallback((_) async { 50 WidgetsBinding.instance.addPostFrameCallback((_) async {
53 - detailEntity=await detailModel.getReserveDetail(context, {  
54 - "rid":widget.rid, 51 + detailEntity = await detailModel.getReserveDetail(context, {
  52 + "rid": widget.rid,
55 }); 53 });
56 setState(() { 54 setState(() {
57 - cusmanText=detailEntity.cusman.isEmpty?"请选择":detailEntity.cusman; 55 + cusmanText = detailEntity.cusman.isEmpty ? "请选择" : detailEntity.cusman;
58 }); 56 });
59 - managers=await detailModel.getManagers(context); 57 + managers = await detailModel.getManagers(context);
60 }); 58 });
61 } 59 }
62 60
63 //设置当前客户经理 61 //设置当前客户经理
64 - _setCurrManager(){  
65 - manager=managers.firstWhere((manager)=>manager.userName==cusmanText,orElse: ()=>Manager());  
66 - if(manager.id==null||manager.id.toString().isEmpty)return;  
67 - Map<String,String> params={  
68 - "rid":detailEntity.id,  
69 - "cusman_id":manager.id.toString(),  
70 - "cusman":manager.userName 62 + _setCurrManager() {
  63 + manager = managers.firstWhere((manager) => manager.userName == cusmanText,
  64 + orElse: () => Manager());
  65 + if (manager.id == null || manager.id.toString().isEmpty) return;
  66 + Map<String, String> params = {
  67 + "rid": detailEntity.id,
  68 + "cusman_id": manager.id.toString(),
  69 + "cusman": manager.userName
71 }; 70 };
72 detailModel.setReserveCusmnan(context, params); 71 detailModel.setReserveCusmnan(context, params);
73 } 72 }
74 73
  74 + /// 取消预订， 变更预订按钮
  75 + Widget _cancelAndChangeBtn(GestureTapCallback onTap, String title) {
  76 + return InkWell(
  77 + onTap: onTap,
  78 + child: Align(
  79 + alignment: Alignment.center,
  80 + child: Text(title,
  81 + style: TextStyle(
  82 + color: MyColours.color_199095,
  83 + fontSize: ScreenUtil().setSp(34))),
  84 + ),
  85 + );
  86 + }
75 87
76 @override 88 @override
77 Widget build(BuildContext context) { 89 Widget build(BuildContext context) {
78 // TODO: implement build 90 // TODO: implement build
79 return SafeArea( 91 return SafeArea(
80 - child: detailEntity==null?Container(  
81 - width: double.infinity,  
82 - height: double.infinity,  
83 - color: MyColours.color_ffffff,  
84 - ):Container(  
85 - color: MyColours.color_ffffff,  
86 - child: Column(  
87 - children: <Widget>[  
88 - MyAppBar(  
89 - "订座详情",  
90 - showBack: true,  
91 - ),  
92 - Expanded(  
93 - child: DefaultTextStyle(style: TextStyle(decoration: TextDecoration.none),child: Container(  
94 - color: MyColours.color_ffffff,  
95 - child: SingleChildScrollView(  
96 - child: Container(  
97 - color: MyColours.color_ffffff,  
98 - padding:  
99 - EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(43)),  
100 - child: Column(  
101 - children: <Widget>[  
102 - RowMultiText("用餐时段", detailEntity.ddateMd),  
103 - Stack(  
104 - alignment: Alignment.center,  
105 - children: <Widget>[  
106 - Column(  
107 - children: <Widget>[  
108 - RowMultiText("用餐时间", detailEntity.ddateHm),  
109 - Offstage(  
110 - offstage: detailEntity.type=="0"?false:true,  
111 - child: RowMultiText("用餐人数", detailEntity.pnum),  
112 - )  
113 - ],  
114 - ),  
115 - Image.asset(detailEntity.statuImgAssets,width: ScreenUtil().setWidth(100),height: ScreenUtil().setWidth(30),)  
116 - ],  
117 - ),  
118 - Offstage(  
119 - offstage: detailEntity.demands.length<=0?true:false,  
120 - child: Column(  
121 - children: <Widget>[  
122 - RowMultiText("包间需求", (detailEntity.demands.length.toString()+"个")??""),  
123 - Align(  
124 - alignment: Alignment.centerRight,  
125 - child: Offstage(  
126 - offstage: detailEntity.demands.length>0?false:true,  
127 - child: Container(  
128 - height: ScreenUtil().setHeight(210),  
129 - child: ListView.builder(itemBuilder: (BuildContext contxt,int index){  
130 - return NeedItem(detailEntity.demands[index]);  
131 - },itemCount: detailEntity.demands.length,shrinkWrap: true,scrollDirection: Axis.horizontal,), 92 + child: detailEntity == null
  93 + ? Container(
  94 + width: double.infinity,
  95 + height: double.infinity,
  96 + color: MyColours.color_ffffff,
  97 + )
  98 + : Container(
  99 + color: MyColours.color_ffffff,
  100 + child: Column(
  101 + children: <Widget>[
  102 + MyAppBar(
  103 + "订座详情",
  104 + showBack: true,
  105 + ),
  106 + Expanded(
  107 + child: DefaultTextStyle(
  108 + style: TextStyle(decoration: TextDecoration.none),
  109 + child: Container(
  110 + color: MyColours.color_ffffff,
  111 + child: SingleChildScrollView(
  112 + child: Container(
  113 + color: MyColours.color_ffffff,
  114 + padding: EdgeInsets.symmetric(
  115 + horizontal: ScreenUtil().setWidth(43)),
  116 + child: Column(
  117 + children: <Widget>[
  118 + RowMultiText("用餐时段", detailEntity.ddateMd),
  119 + Stack(
  120 + alignment: Alignment.center,
  121 + children: <Widget>[
  122 + Column(
  123 + children: <Widget>[
  124 + RowMultiText(
  125 + "用餐时间", detailEntity.ddateHm),
  126 + Offstage(
  127 + offstage: detailEntity.type == "0"
  128 + ? false
  129 + : true,
  130 + child: RowMultiText(
  131 + "用餐人数", detailEntity.pnum),
  132 + )
  133 + ],
  134 + ),
  135 + Image.asset(
  136 + detailEntity.statuImgAssets,
  137 + width: ScreenUtil().setWidth(100),
  138 + height: ScreenUtil().setWidth(30),
  139 + )
  140 + ],
132 ), 141 ),
133 - )  
134 - )  
135 - ],  
136 - ),  
137 - ),  
138 - RowMultiText("预订桌位", (detailEntity.tables.length.toString()+"个")),  
139 - Align(  
140 - alignment: Alignment.centerRight,  
141 - child: Offstage(  
142 - offstage: detailEntity.tables.length>0?false:true,  
143 - child: Container(  
144 - height: ScreenUtil().setHeight(210),  
145 - child: ListView.builder(itemBuilder: (BuildContext contxt,int index){  
146 - return TableItem(detailEntity.tables[index]);  
147 - },itemCount: detailEntity.tables.length,shrinkWrap: true,scrollDirection: Axis.horizontal,),  
148 - ),  
149 - )  
150 - ),  
151 - RowMultiText("客户姓名", detailEntity.rnameStr),  
152 - RowMultiText("客户电话", detailEntity.phone??""),  
153 - RowMultiText("备注信息",detailEntity.cusdem??""),  
154 - MyDivider(double.infinity, ScreenUtil().setHeight(1)),  
155 - Container(  
156 - color: MyColours.color_ffffff,  
157 - width: double.infinity,  
158 - height: ScreenUtil().setHeight(80),  
159 - alignment: Alignment.center,  
160 - child: Stack(  
161 - alignment: Alignment.center,  
162 - children: <Widget>[  
163 - Positioned(  
164 - left: 0,  
165 - child: Text(  
166 - "客户经理",  
167 - style: TextStyle(  
168 - color: MyColours.color_828282,  
169 - fontSize: ScreenUtil().setSp(30)),  
170 - ),  
171 - ),  
172 - Positioned(  
173 - right: 0,  
174 - child: GestureDetector(  
175 - onTap: () async {  
176 - List<String> list=[];  
177 - for(Manager manager in managers){  
178 - list.add(manager.roleUserName);  
179 - }  
180 - DialogUtil.showSelectCusmanDialog(context,list).then((value){  
181 - if(value!=null){  
182 - setState(() {  
183 - cusmanText=managers[value.first].userName;  
184 - });  
185 - _setCurrManager();  
186 - }  
187 - });  
188 - },  
189 - child: Text(  
190 - cusmanText,  
191 - style: TextStyle(  
192 - color: MyColours.color_353535,  
193 - fontSize: ScreenUtil().setSp(30),  
194 - decoration: TextDecoration.underline, 142 + Offstage(
  143 + offstage: detailEntity.demands.length <= 0
  144 + ? true
  145 + : false,
  146 + child: Column(
  147 + children: <Widget>[
  148 + RowMultiText(
  149 + "包间需求",
  150 + (detailEntity.demands.length
  151 + .toString() +
  152 + "个") ??
  153 + ""),
  154 + Align(
  155 + alignment: Alignment.centerRight,
  156 + child: Offstage(
  157 + offstage: detailEntity
  158 + .demands.length >
  159 + 0
  160 + ? false
  161 + : true,
  162 + child: Container(
  163 + height: ScreenUtil()
  164 + .setHeight(210),
  165 + child: ListView.builder(
  166 + itemBuilder:
  167 + (BuildContext contxt,
  168 + int index) {
  169 + return NeedItem(
  170 + detailEntity
  171 + .demands[index]);
  172 + },
  173 + itemCount: detailEntity
  174 + .demands.length,
  175 + shrinkWrap: true,
  176 + scrollDirection:
  177 + Axis.horizontal,
  178 + ),
  179 + ),
  180 + ))
  181 + ],
  182 + ),
  183 + ),
  184 + RowMultiText(
  185 + "预订桌位",
  186 + (detailEntity.tables.length.toString() +
  187 + "个")),
  188 + Align(
  189 + alignment: Alignment.centerRight,
  190 + child: Offstage(
  191 + offstage:
  192 + detailEntity.tables.length > 0
  193 + ? false
  194 + : true,
  195 + child: Container(
  196 + height: ScreenUtil().setHeight(210),
  197 + child: ListView.builder(
  198 + itemBuilder: (BuildContext contxt,
  199 + int index) {
  200 + return TableItem(
  201 + detailEntity.tables[index]);
  202 + },
  203 + itemCount:
  204 + detailEntity.tables.length,
  205 + shrinkWrap: true,
  206 + scrollDirection: Axis.horizontal,
  207 + ),
  208 + ),
  209 + )),
  210 + RowMultiText("客户姓名", detailEntity.rnameStr),
  211 + RowMultiText(
  212 + "客户电话", detailEntity.phone ?? ""),
  213 + RowMultiText(
  214 + "备注信息", detailEntity.cusdem ?? ""),
  215 + MyDivider(double.infinity,
  216 + ScreenUtil().setHeight(1)),
  217 + Container(
  218 + color: MyColours.color_ffffff,
  219 + width: double.infinity,
  220 + height: ScreenUtil().setHeight(80),
  221 + alignment: Alignment.center,
  222 + child: Stack(
  223 + alignment: Alignment.center,
  224 + children: <Widget>[
  225 + Positioned(
  226 + left: 0,
  227 + child: Text(
  228 + "客户经理",
  229 + style: TextStyle(
  230 + color: MyColours.color_828282,
  231 + fontSize:
  232 + ScreenUtil().setSp(30)),
  233 + ),
  234 + ),
  235 + Positioned(
  236 + right: 0,
  237 + child: GestureDetector(
  238 + onTap: () async {
  239 + List<String> list = [];
  240 + for (Manager manager
  241 + in managers) {
  242 + list.add(
  243 + manager.roleUserName);
  244 + }
  245 + DialogUtil
  246 + .showSelectCusmanDialog(
  247 + context, list)
  248 + .then((value) {
  249 + if (value != null) {
  250 + setState(() {
  251 + cusmanText =
  252 + managers[value.first]
  253 + .userName;
  254 + });
  255 + _setCurrManager();
  256 + }
  257 + });
  258 + },
  259 + child: Text(
  260 + cusmanText,
  261 + style: TextStyle(
  262 + color: MyColours.color_353535,
  263 + fontSize:
  264 + ScreenUtil().setSp(30),
  265 + decoration:
  266 + TextDecoration.underline,
  267 + ),
  268 + ),
  269 + ),
  270 + )
  271 + ],
  272 + ),
  273 + ),
  274 + RowMultiText(
  275 + "记录人", detailEntity.note_name ?? ""),
  276 + Offstage(
  277 + offstage: (detailEntity.status == "4" &&
  278 + detailEntity.cancel != null)
  279 + ? false
  280 + : true,
  281 + child: Column(
  282 + children: <Widget>[
  283 + MyDivider(double.infinity,
  284 + ScreenUtil().setHeight(2)),
  285 + RowMultiText("取消原因",
  286 + detailEntity.cancel?.desc ?? ""),
  287 + RowMultiText(
  288 + "取消时间",
  289 + detailEntity.cancel?.cdateStr ??
  290 + ""),
  291 + RowMultiText("操作人",
  292 + detailEntity.cancel?.uname ?? ""),
  293 + ],
195 ), 294 ),
196 ), 295 ),
197 - ),  
198 - )  
199 - ],  
200 - ), 296 + ],
  297 + )),
201 ), 298 ),
202 - RowMultiText("记录人", detailEntity.note_name??""),  
203 - Offstage(  
204 - offstage: (detailEntity.status=="4"&&detailEntity.cancel!=null)?false:true,  
205 - child: Column(  
206 - children: <Widget>[  
207 - MyDivider(double.infinity, ScreenUtil().setHeight(2)),  
208 - RowMultiText("取消原因", detailEntity.cancel?.desc??""),  
209 - RowMultiText("取消时间", detailEntity.cancel?.cdateStr??""),  
210 - RowMultiText("操作人", detailEntity.cancel?.uname??""),  
211 - ],  
212 - ), 299 + )),
  300 + ),
  301 + Offstage(
  302 + offstage: (detailEntity.status == "3" ||
  303 + detailEntity.status == "4" ||
  304 + detailEntity.status == "6")
  305 + ? true
  306 + : false,
  307 + child: Container(
  308 + width: double.infinity,
  309 + decoration: BoxDecoration(
  310 + color: MyColours.color_ffffff,
  311 + border: Border(
  312 + top: BorderSide(
  313 + color: MyColours.color_dbe3e3,
  314 + width: ScreenUtil().setWidth(1)))),
  315 + padding: EdgeInsets.symmetric(
  316 + horizontal: ScreenUtil().setHeight(40)),
  317 + margin: EdgeInsets.symmetric(
  318 + vertical: ScreenUtil().setHeight(20)),
  319 + child: CommonButton(
  320 + content: "通知客户",
  321 + width: 669,
  322 + height: 80,
  323 + fontSize: 34,
  324 + onPress: () {
  325 + DialogUtil.showShareDialog(context)?.then((value) {
  326 + switch (value) {
  327 + case 1: //微信
  328 + NavigatorUtil.goInvicationPage(
  329 + context,
  330 + detailEntity.id,
  331 + detailEntity.tableinfoStr,
  332 + detailEntity.ddate,
  333 + detailEntity.ddateStr);
  334 + break;
  335 + case 2: //短信
  336 + NavigatorUtil.goSmsPage(
  337 + context, detailEntity.id);
  338 + break;
  339 + case 3: //电话
  340 + if (detailEntity.phone != null &&
  341 + detailEntity.phone.isNotEmpty) {
  342 + Utils.goPhone(detailEntity.phone);
  343 + } else {
  344 + Utils.showToast("没有客户电话！");
  345 + }
  346 + break;
  347 + }
  348 + });
  349 + },
  350 + ),
  351 + ),
  352 + ),
  353 + Offstage(
  354 + offstage: (detailEntity.status == "3" ||
  355 + detailEntity.status == "4" ||
  356 + detailEntity.status == "6")
  357 + ? true
  358 + : false,
  359 + child: Container(
  360 + width: double.infinity,
  361 + height: ScreenUtil().setWidth(80),
  362 + margin: EdgeInsets.symmetric(
  363 + horizontal: ScreenUtil().setHeight(40)),
  364 + decoration: BoxDecoration(
  365 + border: Border.all(
  366 + color: MyColours.color_199095,
  367 + width: ScreenUtil().setWidth(2)),
  368 + borderRadius:
  369 + BorderRadius.circular(ScreenUtil().setWidth(5)),
  370 + ),
  371 + // child: Text('fff'),
  372 + child: Material(
  373 + child: Row(
  374 + children: [
  375 + Expanded(
  376 + child: _cancelAndChangeBtn(() {
  377 + print('点击变更预订');
  378 + }, '变更预订')),
  379 + MyDivider(
  380 + ScreenUtil().setWidth(2),
  381 + ScreenUtil().setWidth(50),
  382 + color: MyColours.color_199095,
213 ), 383 ),
  384 + Expanded(
  385 + child: _cancelAndChangeBtn(() {
  386 + print('点击取消预订');
  387 + }, '取消预订')),
214 ], 388 ],
215 )), 389 )),
216 - ),  
217 - )),  
218 - ),  
219 - Offstage(  
220 - offstage: (detailEntity.status=="3"||detailEntity.status=="4"||detailEntity.status=="6")?true:false,  
221 - child: Container(  
222 - width: double.infinity,  
223 - decoration: BoxDecoration(  
224 - color: MyColours.color_ffffff,  
225 - border: Border(top:BorderSide(color: MyColours.color_dbe3e3,width: ScreenUtil().setWidth(1)))  
226 - ),  
227 - padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(20),horizontal: ScreenUtil().setHeight(36)),  
228 - child:CommonButton(  
229 - content: "通知顾客",  
230 - width: 669,  
231 - height: 80,  
232 - fontSize: 34,  
233 - onPress: () {  
234 - DialogUtil.showShareDialog(context)?.then((value){  
235 - switch(value){  
236 - case 1://微信  
237 - NavigatorUtil.goInvicationPage(context,detailEntity.id,detailEntity.tableinfoStr,detailEntity.ddate,detailEntity.ddateStr);  
238 - break;  
239 - case 2://短信  
240 - NavigatorUtil.goSmsPage(context, detailEntity.id);  
241 - break;  
242 - case 3://电话  
243 - if(detailEntity.phone!=null&&detailEntity.phone.isNotEmpty){  
244 - Utils.goPhone(detailEntity.phone);  
245 - }else{  
246 - Utils.showToast("没有客户电话！");  
247 - }  
248 - break;  
249 - }  
250 - });  
251 - },  
252 - ), 390 + ),
  391 + ),
  392 + VEmptyView(ScreenUtil().setWidth(60))
  393 + ],
253 ), 394 ),
254 - )  
255 - ],  
256 - ),  
257 - ), 395 + ),
258 ); 396 );
259 } 397 }
260 } 398 }
@@ -27,13 +27,13 @@ class Utils { @@ -27,13 +27,13 @@ class Utils {
27 } 27 }
28 28
29 //给数字前面加0 29 //给数字前面加0
30 - static String addZeroNumber(int num){  
31 - return num<10?"0"+num.toString():num.toString(); 30 + static String addZeroNumber(int num) {
  31 + return num < 10 ? "0" + num.toString() : num.toString();
32 } 32 }
33 33
34 //转换日期数字 34 //转换日期数字
35 - static String formatWeekDayNum(int num){  
36 - switch(num){ 35 + static String formatWeekDayNum(int num) {
  36 + switch (num) {
37 case 1: 37 case 1:
38 return "一"; 38 return "一";
39 case 2: 39 case 2:
@@ -69,39 +69,40 @@ class Utils { @@ -69,39 +69,40 @@ class Utils {
69 69
70 //跳转拨打电话页面 70 //跳转拨打电话页面
71 static goPhone(String phoneNum) async { 71 static goPhone(String phoneNum) async {
72 - String url="tel:$phoneNum";  
73 - if(await canLaunch(url)){ 72 + String url = "tel:$phoneNum";
  73 + if (await canLaunch(url)) {
74 await launch(url); 74 await launch(url);
75 - }else{ 75 + } else {
76 LogUtil.e("Could not launch $url"); 76 LogUtil.e("Could not launch $url");
77 } 77 }
78 } 78 }
79 79
80 //跳转拨打电话页面 80 //跳转拨打电话页面
81 static goHelp() async { 81 static goHelp() async {
82 - String url="https://support.qq.com/product/152856";  
83 - if(await canLaunch(url)){ 82 + String url = "https://support.qq.com/product/152856";
  83 + if (await canLaunch(url)) {
84 await launch(url); 84 await launch(url);
85 - }else{ 85 + } else {
86 LogUtil.e("Could not launch $url"); 86 LogUtil.e("Could not launch $url");
87 } 87 }
88 } 88 }
89 89
90 //获取应用版本昊 90 //获取应用版本昊
91 static Future<String> getCurrVersion() async { 91 static Future<String> getCurrVersion() async {
92 - PackageInfo packageInfo=await PackageInfo.fromPlatform();  
93 - String version=packageInfo.version; 92 + PackageInfo packageInfo = await PackageInfo.fromPlatform();
  93 + String version = packageInfo.version;
94 return version; 94 return version;
95 } 95 }
96 96
97 //比较两个日期是否同一天 97 //比较两个日期是否同一天
98 - static isOneDay(DateTime one,DateTime two){  
99 - if(one.year==two.year&&one.month==two.month&&one.day==two.day)return true; 98 + static isOneDay(DateTime one, DateTime two) {
  99 + if (one.year == two.year && one.month == two.month && one.day == two.day)
  100 + return true;
100 return false; 101 return false;
101 } 102 }
102 103
103 //分享邀请函 104 //分享邀请函
104 - static goShareInvicationToWeChat(String rid){ 105 + static goShareInvicationToWeChat(String rid) {
105 String _webPageUrl = "http://colorcun.com/"; 106 String _webPageUrl = "http://colorcun.com/";
106 String _thumbnail = 107 String _thumbnail =
107 "https://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148572.jpg"; 108 "https://qn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148572.jpg";
@@ -115,13 +116,12 @@ class Utils { @@ -115,13 +116,12 @@ class Utils {
115 title: _title, 116 title: _title,
116 path: _path, 117 path: _path,
117 description: _description, 118 description: _description,
118 - thumbnail: WeChatImage.network(_thumbnail)  
119 - ); 119 + thumbnail: WeChatImage.network(_thumbnail));
120 shareToWeChat(model); 120 shareToWeChat(model);
121 } 121 }
122 122
123 //检查网络连接 123 //检查网络连接
124 - static Future<bool> checkConnectiviy()async{ 124 + static Future<bool> checkConnectiviy() async {
125 var connectivityResult = await (new Connectivity().checkConnectivity()); 125 var connectivityResult = await (new Connectivity().checkConnectivity());
126 if (connectivityResult == ConnectivityResult.mobile) { 126 if (connectivityResult == ConnectivityResult.mobile) {
127 // I am connected to a mobile network. 127 // I am connected to a mobile network.
@@ -8,13 +8,6 @@ packages: @@ -8,13 +8,6 @@ packages:
8 url: "https://pub.flutter-io.cn" 8 url: "https://pub.flutter-io.cn"
9 source: hosted 9 source: hosted
10 version: "0.36.4" 10 version: "0.36.4"
11 - archive:  
12 - dependency: transitive  
13 - description:  
14 - name: archive  
15 - url: "https://pub.flutter-io.cn"  
16 - source: hosted  
17 - version: "2.0.11"  
18 args: 11 args:
19 dependency: transitive 12 dependency: transitive
20 description: 13 description:
@@ -28,7 +21,7 @@ packages: @@ -28,7 +21,7 @@ packages:
28 name: async 21 name: async
29 url: "https://pub.flutter-io.cn" 22 url: "https://pub.flutter-io.cn"
30 source: hosted 23 source: hosted
31 - version: "2.4.0" 24 + version: "2.4.2"
32 audioplayers: 25 audioplayers:
33 dependency: "direct main" 26 dependency: "direct main"
34 description: 27 description:
@@ -42,7 +35,7 @@ packages: @@ -42,7 +35,7 @@ packages:
42 name: boolean_selector 35 name: boolean_selector
43 url: "https://pub.flutter-io.cn" 36 url: "https://pub.flutter-io.cn"
44 source: hosted 37 source: hosted
45 - version: "1.0.5" 38 + version: "2.0.0"
46 build: 39 build:
47 dependency: transitive 40 dependency: transitive
48 description: 41 description:
@@ -106,13 +99,20 @@ packages: @@ -106,13 +99,20 @@ packages:
106 url: "https://pub.flutter-io.cn" 99 url: "https://pub.flutter-io.cn"
107 source: hosted 100 source: hosted
108 version: "2.0.0" 101 version: "2.0.0"
  102 + characters:
  103 + dependency: transitive
  104 + description:
  105 + name: characters
  106 + url: "https://pub.flutter-io.cn"
  107 + source: hosted
  108 + version: "1.0.0"
109 charcode: 109 charcode:
110 dependency: transitive 110 dependency: transitive
111 description: 111 description:
112 name: charcode 112 name: charcode
113 url: "https://pub.flutter-io.cn" 113 url: "https://pub.flutter-io.cn"
114 source: hosted 114 source: hosted
115 - version: "1.1.2" 115 + version: "1.1.3"
116 checked_yaml: 116 checked_yaml:
117 dependency: transitive 117 dependency: transitive
118 description: 118 description:
@@ -120,6 +120,13 @@ packages: @@ -120,6 +120,13 @@ packages:
120 url: "https://pub.flutter-io.cn" 120 url: "https://pub.flutter-io.cn"
121 source: hosted 121 source: hosted
122 version: "1.0.2" 122 version: "1.0.2"
  123 + clock:
  124 + dependency: transitive
  125 + description:
  126 + name: clock
  127 + url: "https://pub.flutter-io.cn"
  128 + source: hosted
  129 + version: "1.0.1"
123 code_builder: 130 code_builder:
124 dependency: transitive 131 dependency: transitive
125 description: 132 description:
@@ -133,28 +140,35 @@ packages: @@ -133,28 +140,35 @@ packages:
133 name: collection 140 name: collection
134 url: "https://pub.flutter-io.cn" 141 url: "https://pub.flutter-io.cn"
135 source: hosted 142 source: hosted
136 - version: "1.14.11" 143 + version: "1.14.13"
137 connectivity: 144 connectivity:
138 dependency: "direct main" 145 dependency: "direct main"
139 description: 146 description:
140 name: connectivity 147 name: connectivity
141 url: "https://pub.flutter-io.cn" 148 url: "https://pub.flutter-io.cn"
142 source: hosted 149 source: hosted
143 - version: "0.4.8+2" 150 + version: "0.4.9+2"
  151 + connectivity_for_web:
  152 + dependency: transitive
  153 + description:
  154 + name: connectivity_for_web
  155 + url: "https://pub.flutter-io.cn"
  156 + source: hosted
  157 + version: "0.3.1+2"
144 connectivity_macos: 158 connectivity_macos:
145 dependency: transitive 159 dependency: transitive
146 description: 160 description:
147 name: connectivity_macos 161 name: connectivity_macos
148 url: "https://pub.flutter-io.cn" 162 url: "https://pub.flutter-io.cn"
149 source: hosted 163 source: hosted
150 - version: "0.1.0+2" 164 + version: "0.1.0+4"
151 connectivity_platform_interface: 165 connectivity_platform_interface:
152 dependency: transitive 166 dependency: transitive
153 description: 167 description:
154 name: connectivity_platform_interface 168 name: connectivity_platform_interface
155 url: "https://pub.flutter-io.cn" 169 url: "https://pub.flutter-io.cn"
156 source: hosted 170 source: hosted
157 - version: "1.0.3" 171 + version: "1.0.6"
158 convert: 172 convert:
159 dependency: transitive 173 dependency: transitive
160 description: 174 description:
@@ -210,14 +224,21 @@ packages: @@ -210,14 +224,21 @@ packages:
210 name: extended_image 224 name: extended_image
211 url: "https://pub.flutter-io.cn" 225 url: "https://pub.flutter-io.cn"
212 source: hosted 226 source: hosted
213 - version: "0.7.1" 227 + version: "1.1.1"
214 extended_image_library: 228 extended_image_library:
215 dependency: transitive 229 dependency: transitive
216 description: 230 description:
217 name: extended_image_library 231 name: extended_image_library
218 url: "https://pub.flutter-io.cn" 232 url: "https://pub.flutter-io.cn"
219 source: hosted 233 source: hosted
220 - version: "0.2.0" 234 + version: "0.3.0"
  235 + fake_async:
  236 + dependency: transitive
  237 + description:
  238 + name: fake_async
  239 + url: "https://pub.flutter-io.cn"
  240 + source: hosted
  241 + version: "1.1.0"
221 fixnum: 242 fixnum:
222 dependency: transitive 243 dependency: transitive
223 description: 244 description:
@@ -231,7 +252,7 @@ packages: @@ -231,7 +252,7 @@ packages:
231 name: fluro 252 name: fluro
232 url: "https://pub.flutter-io.cn" 253 url: "https://pub.flutter-io.cn"
233 source: hosted 254 source: hosted
234 - version: "1.6.1" 255 + version: "1.6.3"
235 flutter: 256 flutter:
236 dependency: "direct main" 257 dependency: "direct main"
237 description: flutter 258 description: flutter
@@ -366,13 +387,6 @@ packages: @@ -366,13 +387,6 @@ packages:
366 url: "https://pub.flutter-io.cn" 387 url: "https://pub.flutter-io.cn"
367 source: hosted 388 source: hosted
368 version: "3.1.3" 389 version: "3.1.3"
369 - image:  
370 - dependency: transitive  
371 - description:  
372 - name: image  
373 - url: "https://pub.flutter-io.cn"  
374 - source: hosted  
375 - version: "2.1.4"  
376 install_plugin: 390 install_plugin:
377 dependency: "direct main" 391 dependency: "direct main"
378 description: 392 description:
@@ -449,7 +463,7 @@ packages: @@ -449,7 +463,7 @@ packages:
449 name: matcher 463 name: matcher
450 url: "https://pub.flutter-io.cn" 464 url: "https://pub.flutter-io.cn"
451 source: hosted 465 source: hosted
452 - version: "0.12.6" 466 + version: "0.12.8"
453 meta: 467 meta:
454 dependency: transitive 468 dependency: transitive
455 description: 469 description:
@@ -512,7 +526,7 @@ packages: @@ -512,7 +526,7 @@ packages:
512 name: path 526 name: path
513 url: "https://pub.flutter-io.cn" 527 url: "https://pub.flutter-io.cn"
514 source: hosted 528 source: hosted
515 - version: "1.6.4" 529 + version: "1.7.0"
516 path_provider: 530 path_provider:
517 dependency: "direct main" 531 dependency: "direct main"
518 description: 532 description:
@@ -555,13 +569,6 @@ packages: @@ -555,13 +569,6 @@ packages:
555 url: "https://pub.flutter-io.cn" 569 url: "https://pub.flutter-io.cn"
556 source: hosted 570 source: hosted
557 version: "1.0.0" 571 version: "1.0.0"
558 - petitparser:  
559 - dependency: transitive  
560 - description:  
561 - name: petitparser  
562 - url: "https://pub.flutter-io.cn"  
563 - source: hosted  
564 - version: "2.4.0"  
565 platform: 572 platform:
566 dependency: transitive 573 dependency: transitive
567 description: 574 description:
@@ -678,7 +685,7 @@ packages: @@ -678,7 +685,7 @@ packages:
678 name: source_span 685 name: source_span
679 url: "https://pub.flutter-io.cn" 686 url: "https://pub.flutter-io.cn"
680 source: hosted 687 source: hosted
681 - version: "1.5.5" 688 + version: "1.7.0"
682 sqflite: 689 sqflite:
683 dependency: "direct main" 690 dependency: "direct main"
684 description: 691 description:
@@ -692,7 +699,7 @@ packages: @@ -692,7 +699,7 @@ packages:
692 name: stack_trace 699 name: stack_trace
693 url: "https://pub.flutter-io.cn" 700 url: "https://pub.flutter-io.cn"
694 source: hosted 701 source: hosted
695 - version: "1.9.3" 702 + version: "1.9.5"
696 stream_channel: 703 stream_channel:
697 dependency: transitive 704 dependency: transitive
698 description: 705 description:
@@ -741,7 +748,7 @@ packages: @@ -741,7 +748,7 @@ packages:
741 name: test_api 748 name: test_api
742 url: "https://pub.flutter-io.cn" 749 url: "https://pub.flutter-io.cn"
743 source: hosted 750 source: hosted
744 - version: "0.2.11" 751 + version: "0.2.17"
745 timing: 752 timing:
746 dependency: transitive 753 dependency: transitive
747 description: 754 description:
@@ -755,7 +762,7 @@ packages: @@ -755,7 +762,7 @@ packages:
755 name: typed_data 762 name: typed_data
756 url: "https://pub.flutter-io.cn" 763 url: "https://pub.flutter-io.cn"
757 source: hosted 764 source: hosted
758 - version: "1.1.6" 765 + version: "1.2.0"
759 url_launcher: 766 url_launcher:
760 dependency: "direct main" 767 dependency: "direct main"
761 description: 768 description:
@@ -812,13 +819,6 @@ packages: @@ -812,13 +819,6 @@ packages:
812 url: "https://pub.flutter-io.cn" 819 url: "https://pub.flutter-io.cn"
813 source: hosted 820 source: hosted
814 version: "1.1.0" 821 version: "1.1.0"
815 - xml:  
816 - dependency: transitive  
817 - description:  
818 - name: xml  
819 - url: "https://pub.flutter-io.cn"  
820 - source: hosted  
821 - version: "3.5.0"  
822 yaml: 822 yaml:
823 dependency: transitive 823 dependency: transitive
824 description: 824 description:
@@ -827,5 +827,5 @@ packages: @@ -827,5 +827,5 @@ packages:
827 source: hosted 827 source: hosted
828 version: "2.2.0" 828 version: "2.2.0"
829 sdks: 829 sdks:
830 - dart: ">=2.7.0 <3.0.0"  
831 - flutter: ">=1.12.13+hotfix.5 <1.16.0" 830 + dart: ">=2.9.0-14.0.dev <3.0.0"
  831 + flutter: ">=1.17.0 <2.0.0"
@@ -42,7 +42,7 @@ dependencies: @@ -42,7 +42,7 @@ dependencies:
42 # 文件系统访问 42 # 文件系统访问
43 path_provider: ^1.6.5 43 path_provider: ^1.6.5
44 # 官方image组件扩展，支持多种图片效果展示 44 # 官方image组件扩展，支持多种图片效果展示
45 - extended_image: ^0.7.1 45 + extended_image: ^1.1.1
46 # 任意位置访问navigator 46 # 任意位置访问navigator
47 get_it: ^3.0.1 47 get_it: ^3.0.1
48 # 刷新加载 48 # 刷新加载