xt / Flutter-ReserveApp · Commits

Go to a project

Commit 04006d80ef4b9e6e9fbfedc658ecddec9f8bc70c

Authored by wdn127929
1 parent 11629fc1
build: skipped

客情跳转&&转圈显示UI

Inline Side-by-side
Showing 5 changed files with 37 additions and 37 deletions
@@ -20,19 +20,19 @@ if (flutterRoot == null) { @@ -20,19 +20,19 @@ if (flutterRoot == null) {
20 20
21 21
22 22
23 -def flutterVersionCode = "555" 23 +def flutterVersionCode = "556"
24 if (flutterVersionCode == null) { 24 if (flutterVersionCode == null) {
25 - flutterVersionCode = '555' 25 + flutterVersionCode = '556'
26 26
27 27
28 28
29 } 29 }
30 30
31 31
32 -def flutterVersionName = "5.5.5" 32 +def flutterVersionName = "5.5.6"
33 33
34 if (flutterVersionName == null) { 34 if (flutterVersionName == null) {
35 - flutterVersionName = '5.5.5' 35 + flutterVersionName = '5.5.6'
36 36
37 } 37 }
38 38
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; }; 52 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
53 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; }; 53 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
54 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; }; 54 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
55 - 97C146EE1CF9000F007C117D /* w .app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "w .app"; sourceTree = BUILT_PRODUCTS_DIR; }; 55 + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
56 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; 56 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
57 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 57 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
58 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; }; 58 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 97C146EF1CF9000F007C117D /* Products */ = { 119 97C146EF1CF9000F007C117D /* Products */ = {
120 isa = PBXGroup; 120 isa = PBXGroup;
121 children = ( 121 children = (
122 - 97C146EE1CF9000F007C117D /* w .app */, 122 + 97C146EE1CF9000F007C117D /* Runner.app */,
123 331C8081294A63A400263BE5 /* RunnerTests.xctest */, 123 331C8081294A63A400263BE5 /* RunnerTests.xctest */,
124 ); 124 );
125 name = Products; 125 name = Products;
@@ -169,7 +169,7 @@ @@ -169,7 +169,7 @@
169 productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; 169 productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */;
170 productType = "com.apple.product-type.bundle.unit-test"; 170 productType = "com.apple.product-type.bundle.unit-test";
171 }; 171 };
172 - 97C146ED1CF9000F007C117D /* w */ = { 172 + 97C146ED1CF9000F007C117D /* Runner */ = {
173 isa = PBXNativeTarget; 173 isa = PBXNativeTarget;
174 buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; 174 buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
175 buildPhases = ( 175 buildPhases = (
@@ -187,9 +187,9 @@ @@ -187,9 +187,9 @@
187 ); 187 );
188 dependencies = ( 188 dependencies = (
189 ); 189 );
190 - name = "Runner"; 190 + name = Runner;
191 productName = Runner; 191 productName = Runner;
192 - productReference = 97C146EE1CF9000F007C117D /* w .app */; 192 + productReference = 97C146EE1CF9000F007C117D /* Runner.app */;
193 productType = "com.apple.product-type.application"; 193 productType = "com.apple.product-type.application";
194 }; 194 };
195 /* End PBXNativeTarget section */ 195 /* End PBXNativeTarget section */
@@ -225,7 +225,7 @@ @@ -225,7 +225,7 @@
225 projectDirPath = ""; 225 projectDirPath = "";
226 projectRoot = ""; 226 projectRoot = "";
227 targets = ( 227 targets = (
228 - 97C146ED1CF9000F007C117D /* w */, 228 + 97C146ED1CF9000F007C117D /* Runner */,
229 331C8080294A63A400263BE5 /* RunnerTests */, 229 331C8080294A63A400263BE5 /* RunnerTests */,
230 ); 230 );
231 }; 231 };
@@ -365,7 +365,7 @@ @@ -365,7 +365,7 @@
365 /* Begin PBXTargetDependency section */ 365 /* Begin PBXTargetDependency section */
366 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { 366 331C8086294A63A400263BE5 /* PBXTargetDependency */ = {
367 isa = PBXTargetDependency; 367 isa = PBXTargetDependency;
368 - target = 97C146ED1CF9000F007C117D /* w */; 368 + target = 97C146ED1CF9000F007C117D /* Runner */;
369 targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; 369 targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */;
370 }; 370 };
371 /* End PBXTargetDependency section */ 371 /* End PBXTargetDependency section */
@@ -449,7 +449,7 @@ @@ -449,7 +449,7 @@
449 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 449 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
450 CLANG_ENABLE_MODULES = YES; 450 CLANG_ENABLE_MODULES = YES;
451 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 451 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
452 - CURRENT_PROJECT_VERSION = 555; 452 + CURRENT_PROJECT_VERSION = 5560;
453 DEVELOPMENT_TEAM = 8J59HM8B82; 453 DEVELOPMENT_TEAM = 8J59HM8B82;
454 ENABLE_BITCODE = NO; 454 ENABLE_BITCODE = NO;
455 INFOPLIST_FILE = Runner/Info.plist; 455 INFOPLIST_FILE = Runner/Info.plist;
@@ -458,7 +458,7 @@ @@ -458,7 +458,7 @@
458 "$(inherited)", 458 "$(inherited)",
459 "@executable_path/Frameworks", 459 "@executable_path/Frameworks",
460 ); 460 );
461 - MARKETING_VERSION = 5.5.5; 461 + MARKETING_VERSION = 5.5.6;
462 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 462 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
463 PRODUCT_NAME = "$(TARGET_NAME)"; 463 PRODUCT_NAME = "$(TARGET_NAME)";
464 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 464 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -632,7 +632,7 @@ @@ -632,7 +632,7 @@
632 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 632 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
633 CLANG_ENABLE_MODULES = YES; 633 CLANG_ENABLE_MODULES = YES;
634 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 634 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
635 - CURRENT_PROJECT_VERSION = 555; 635 + CURRENT_PROJECT_VERSION = 5560;
636 DEVELOPMENT_TEAM = 8J59HM8B82; 636 DEVELOPMENT_TEAM = 8J59HM8B82;
637 ENABLE_BITCODE = NO; 637 ENABLE_BITCODE = NO;
638 INFOPLIST_FILE = Runner/Info.plist; 638 INFOPLIST_FILE = Runner/Info.plist;
@@ -641,7 +641,7 @@ @@ -641,7 +641,7 @@
641 "$(inherited)", 641 "$(inherited)",
642 "@executable_path/Frameworks", 642 "@executable_path/Frameworks",
643 ); 643 );
644 - MARKETING_VERSION = 5.5.5; 644 + MARKETING_VERSION = 5.5.6;
645 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 645 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
646 PRODUCT_NAME = "$(TARGET_NAME)"; 646 PRODUCT_NAME = "$(TARGET_NAME)";
647 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 647 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -658,7 +658,7 @@ @@ -658,7 +658,7 @@
658 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 658 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
659 CLANG_ENABLE_MODULES = YES; 659 CLANG_ENABLE_MODULES = YES;
660 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 660 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
661 - CURRENT_PROJECT_VERSION = 555; 661 + CURRENT_PROJECT_VERSION = 5560;
662 DEVELOPMENT_TEAM = 8J59HM8B82; 662 DEVELOPMENT_TEAM = 8J59HM8B82;
663 ENABLE_BITCODE = NO; 663 ENABLE_BITCODE = NO;
664 INFOPLIST_FILE = Runner/Info.plist; 664 INFOPLIST_FILE = Runner/Info.plist;
@@ -667,7 +667,7 @@ @@ -667,7 +667,7 @@
667 "$(inherited)", 667 "$(inherited)",
668 "@executable_path/Frameworks", 668 "@executable_path/Frameworks",
669 ); 669 );
670 - MARKETING_VERSION = 5.5.5; 670 + MARKETING_VERSION = 5.5.6;
671 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 671 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
672 PRODUCT_NAME = "$(TARGET_NAME)"; 672 PRODUCT_NAME = "$(TARGET_NAME)";
673 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 673 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -139,7 +139,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> @@ -139,7 +139,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
139 FocusNode pnumF = FocusNode(); 139 FocusNode pnumF = FocusNode();
140 FocusNode priceF = FocusNode(); 140 FocusNode priceF = FocusNode();
141 141
142 - // CollectStoreProvider collectStoreProvider; 142 + late CollectStoreProvider collectStoreProvider;
143 ScrollController controller = ScrollController(); 143 ScrollController controller = ScrollController();
144 String? reserveType = '普通用餐'; 144 String? reserveType = '普通用餐';
145 UploadImageProvider? _uploadImageProvider; 145 UploadImageProvider? _uploadImageProvider;
@@ -174,7 +174,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> @@ -174,7 +174,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
174 offset: value.toString().length))); 174 offset: value.toString().length)));
175 }); 175 });
176 // _getSellerUserAccountType(); 176 // _getSellerUserAccountType();
177 - // getSellerVersion(); 177 + getSellerVersion();
178 // _getReserveTypeField(); 178 // _getReserveTypeField();
179 _initCancel(); 179 _initCancel();
180 _initdDeposit(); 180 _initdDeposit();
@@ -579,11 +579,11 @@ class NotebookDetailPageState extends State<NotebookDetailPage> @@ -579,11 +579,11 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
579 } 579 }
580 } 580 }
581 581
582 - // getSellerVersion() async {  
583 - // await collectStoreProvider.getSellerVersion(context, showLoading: false); 582 + getSellerVersion() async {
  583 + await collectStoreProvider.getSellerVersion(context, showLoading: false);
584 584
585 - // setState(() {});  
586 - // } 585 + setState(() {});
  586 + }
587 587
588 ///初始化时间 半个小时 588 ///初始化时间 半个小时
589 _initTime(int dateSolt) { 589 _initTime(int dateSolt) {
@@ -2928,8 +2928,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> @@ -2928,8 +2928,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
2928 // _onlineCheckEditProvider = 2928 // _onlineCheckEditProvider =
2929 // Provider.of<OnlineCheckEditProvider>(context, listen: true); 2929 // Provider.of<OnlineCheckEditProvider>(context, listen: true);
2930 UserModel userModel = Provider.of<UserModel>(context, listen: false); 2930 UserModel userModel = Provider.of<UserModel>(context, listen: false);
2931 - // collectStoreProvider =  
2932 - // Provider.of<CollectStoreProvider>(context, listen: true); 2931 + collectStoreProvider =
  2932 + Provider.of<CollectStoreProvider>(context, listen: true);
2933 2933
2934 // personnelProvider = Provider.of<PersonnelProvider>(context, listen: true); 2934 // personnelProvider = Provider.of<PersonnelProvider>(context, listen: true);
2935 print(userModel.user!.role_name); 2935 print(userModel.user!.role_name);
@@ -4564,10 +4564,10 @@ class NotebookDetailPageState extends State<NotebookDetailPage> @@ -4564,10 +4564,10 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
4564 24, 4564 24,
4565 onPressed: 4565 onPressed:
4566 () { 4566 () {
4567 - if (detailModel! 4567 + if (collectStoreProvider
4568 .sellerNormalSpecial) { 4568 .sellerNormalSpecial) {
4569 //标准版 4569 //标准版
4570 - if (detailModel! 4570 + if (collectStoreProvider
4571 .sellerPreserve) { 4571 .sellerPreserve) {
4572 //进入超能版客情 4572 //进入超能版客情
4573 _goCustomerDetail(true); 4573 _goCustomerDetail(true);
@@ -230,7 +230,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -230,7 +230,7 @@ class NoteBookPageState extends State<NoteBookPage> {
230 currTimeIndex = has ? int.parse(ddateSoltSelect) : 1; 230 currTimeIndex = has ? int.parse(ddateSoltSelect) : 1;
231 } 231 }
232 } 232 }
233 - _getReserveList(); 233 + _getReserveList(needLoading: true);
234 } 234 }
235 235
236 initCurruntIndex() { 236 initCurruntIndex() {
@@ -66,20 +66,20 @@ class NotebookDetailModel extends ChangeNotifier { @@ -66,20 +66,20 @@ class NotebookDetailModel extends ChangeNotifier {
66 66
67 List<SellerVersionSunModel> sellerVersionList = []; 67 List<SellerVersionSunModel> sellerVersionList = [];
68 68
69 - bool sellerCoupon = false; //优惠券营销  
70 - bool sellerRecharge = false; //储值营销  
71 - bool sellerWine = false; //存酒 69 + // bool sellerCoupon = false; //优惠券营销
  70 + // bool sellerRecharge = false; //储值营销
  71 + // bool sellerWine = false; //存酒
72 bool sellerOrderCustomer = false; //用户提前点餐 72 bool sellerOrderCustomer = false; //用户提前点餐
73 bool sellerOrderManager = false; //经理排菜 73 bool sellerOrderManager = false; //经理排菜
74 - bool sellerFeast = false; //宴会 74 + // bool sellerFeast = false; //宴会
75 bool sellerPreserve = false; //客情维护 75 bool sellerPreserve = false; //客情维护
76 - bool sellerMarketing = false; //客情营销  
77 - bool sellerNormal = false; //超能或者标准或高级  
78 - bool sellerSimple = false; //极速版 76 + // bool sellerMarketing = false; //客情营销
  77 + // bool sellerNormal = false; //超能或者标准或高级
  78 + // bool sellerSimple = false; //极速版
79 79
80 - bool sellerNormalSpecial = false; //标准版客情和极速版一样 80 + // bool sellerNormalSpecial = false; //标准版客情和极速版一样
81 81
82 - String sellerNormalEdate = ''; 82 + // String sellerNormalEdate = '';
83 String smsInfo = ''; 83 String smsInfo = '';
84 84
85 String? price = ''; 85 String? price = '';