xt / Flutter-ReserveApp · Commits

Go to a project

Commit 3fc213f9bab8c81c5d7d66ff3d1414716d5c8031

Authored by wdn127929
1 parent e4c8ee48
build: skipped

实收金额

Inline Side-by-side
Showing 5 changed files with 32 additions and 21 deletions
@@ -86,9 +86,9 @@ Future<void> main() async { @@ -86,9 +86,9 @@ Future<void> main() async {
86 ChangeNotifierProvider<MessageDialogModel>( 86 ChangeNotifierProvider<MessageDialogModel>(
87 create: (_) => MessageDialogModel()..init(), 87 create: (_) => MessageDialogModel()..init(),
88 ), 88 ),
89 - ChangeNotifierProvider<OnlineCheckEditProvider>(  
90 - create: (_) => OnlineCheckEditProvider(),  
91 - ), 89 + // ChangeNotifierProvider<OnlineCheckEditProvider>(
  90 + // create: (_) => OnlineCheckEditProvider(),
  91 + // ),
92 ChangeNotifierProvider<OrderFoodProvider>( 92 ChangeNotifierProvider<OrderFoodProvider>(
93 create: (_) => OrderFoodProvider(), 93 create: (_) => OrderFoodProvider(),
94 ), 94 ),
@@ -1715,7 +1715,10 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1715,7 +1715,10 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1715 _onlineCheckEditProvider 1715 _onlineCheckEditProvider
1716 .orderInfoSunModel 1716 .orderInfoSunModel
1717 .price != 1717 .price !=
1718 - null && 1718 + null && _onlineCheckEditProvider
  1719 + .orderInfoSunModel
  1720 + .price !=
  1721 + '0.00'&&
1719 detailEntity 1722 detailEntity
1720 .status != 1723 .status !=
1721 "4" 1724 "4"
@@ -40,7 +40,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> { @@ -40,7 +40,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> {
40 FocusNode _positionFocusNode = FocusNode(); 40 FocusNode _positionFocusNode = FocusNode();
41 41
42 final picker = ImagePicker(); 42 final picker = ImagePicker();
43 - // OnlineCheckEditProvider _onlineCheckEditProvider; 43 +
44 UploadImageProvider _uploadImageProvider; 44 UploadImageProvider _uploadImageProvider;
45 BaseIndoProvider _baseIndoProvider; 45 BaseIndoProvider _baseIndoProvider;
46 46
@@ -51,7 +51,6 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> { @@ -51,7 +51,6 @@ class _StoreBaseInfoPageState extends State<StoreBaseInfoPage> {
51 Map<String, dynamic> mapAddress; 51 Map<String, dynamic> mapAddress;
52 52
53 final picker = ImagePicker(); 53 final picker = ImagePicker();
54 - // OnlineCheckEditProvider _onlineCheckEditProvider;  
55 UploadImageProvider _uploadImageProvider; 54 UploadImageProvider _uploadImageProvider;
56 StoreBaseIndoProvider _baseIndoProvider; 55 StoreBaseIndoProvider _baseIndoProvider;
57 56
@@ -77,6 +77,7 @@ import 'package:one_key/provider/menu_provider.dart'; @@ -77,6 +77,7 @@ import 'package:one_key/provider/menu_provider.dart';
77 import 'package:one_key/provider/my_model.dart'; 77 import 'package:one_key/provider/my_model.dart';
78 import 'package:one_key/provider/notebook_detail_change_model.dart'; 78 import 'package:one_key/provider/notebook_detail_change_model.dart';
79 import 'package:one_key/provider/notebook_detail_model.dart'; 79 import 'package:one_key/provider/notebook_detail_model.dart';
  80 +import 'package:one_key/provider/online_check_edit_provider.dart';
80 import 'package:one_key/provider/order_food_provider.dart'; 81 import 'package:one_key/provider/order_food_provider.dart';
81 import 'package:one_key/provider/other_login_provider.dart'; 82 import 'package:one_key/provider/other_login_provider.dart';
82 import 'package:one_key/provider/personnel_provider.dart'; 83 import 'package:one_key/provider/personnel_provider.dart';
@@ -116,14 +117,16 @@ var reserveDetailHandler = new Handler( @@ -116,14 +117,16 @@ var reserveDetailHandler = new Handler(
116 bool fromNotify = FluroConvertUtils.string2bool(params["fromNotify"].first); 117 bool fromNotify = FluroConvertUtils.string2bool(params["fromNotify"].first);
117 return ChangeNotifierProvider<RemarkManagerModel>( 118 return ChangeNotifierProvider<RemarkManagerModel>(
118 create: (_) => RemarkManagerModel(), 119 create: (_) => RemarkManagerModel(),
119 - child: ChangeNotifierProvider<NotebookDetailModel>(  
120 - create: (_) => NotebookDetailModel(),  
121 - child: NotebookDetailPage(  
122 - rid,  
123 - mid: mid,  
124 - uid: uid,  
125 - fromNotify: fromNotify,  
126 - ))); 120 + child: ChangeNotifierProvider<OnlineCheckEditProvider>(
  121 + create: (_) => OnlineCheckEditProvider(),
  122 + child: ChangeNotifierProvider<NotebookDetailModel>(
  123 + create: (_) => NotebookDetailModel(),
  124 + child: NotebookDetailPage(
  125 + rid,
  126 + mid: mid,
  127 + uid: uid,
  128 + fromNotify: fromNotify,
  129 + ))));
127 }); 130 });
128 131
129 // 跳转到处理在线预订 132 // 跳转到处理在线预订
@@ -329,11 +332,13 @@ var handleOnlineCheckEditHandler = new Handler( @@ -329,11 +332,13 @@ var handleOnlineCheckEditHandler = new Handler(
329 create: (_) => OrderFoodProvider(), 332 create: (_) => OrderFoodProvider(),
330 child: ChangeNotifierProvider<UploadImageProvider>( 333 child: ChangeNotifierProvider<UploadImageProvider>(
331 create: (_) => UploadImageProvider(), 334 create: (_) => UploadImageProvider(),
332 - child: OnlineCheckEditPage(  
333 - fromNotify: fromNotify,  
334 - rid: rid,  
335 - mid: mid,  
336 - ))); 335 + child: ChangeNotifierProvider<OnlineCheckEditProvider>(
  336 + create: (_) => OnlineCheckEditProvider(),
  337 + child: OnlineCheckEditPage(
  338 + fromNotify: fromNotify,
  339 + rid: rid,
  340 + mid: mid,
  341 + ))));
337 }); 342 });
338 343
339 ///提前买单查看页面 344 ///提前买单查看页面
@@ -343,7 +348,9 @@ var handleOnlineCheckDetailPageHandler = new Handler( @@ -343,7 +348,9 @@ var handleOnlineCheckDetailPageHandler = new Handler(
343 bool fromNotify = FluroConvertUtils.string2bool(params["fromNotify"].first); 348 bool fromNotify = FluroConvertUtils.string2bool(params["fromNotify"].first);
344 return ChangeNotifierProvider<OrderFoodProvider>( 349 return ChangeNotifierProvider<OrderFoodProvider>(
345 create: (_) => OrderFoodProvider(), 350 create: (_) => OrderFoodProvider(),
346 - child: OnlineCheckDetailPage(fromNotify: fromNotify, rid: rid)); 351 + child: ChangeNotifierProvider<OnlineCheckEditProvider>(
  352 + create: (_) => OnlineCheckEditProvider(),
  353 + child: OnlineCheckDetailPage(fromNotify: fromNotify, rid: rid)));
347 }); 354 });
348 355
349 ///发票详情 356 ///发票详情
@@ -353,7 +360,9 @@ var handleInvoiceDetailPageHandler = new Handler( @@ -353,7 +360,9 @@ var handleInvoiceDetailPageHandler = new Handler(
353 bool fromNotify = FluroConvertUtils.string2bool(params["fromNotify"].first); 360 bool fromNotify = FluroConvertUtils.string2bool(params["fromNotify"].first);
354 return ChangeNotifierProvider<OrderFoodProvider>( 361 return ChangeNotifierProvider<OrderFoodProvider>(
355 create: (_) => OrderFoodProvider(), 362 create: (_) => OrderFoodProvider(),
356 - child: InvoiceDetailPage(fromNotify: fromNotify, rid: rid)); 363 + child: ChangeNotifierProvider<OnlineCheckEditProvider>(
  364 + create: (_) => OnlineCheckEditProvider(),
  365 + child: InvoiceDetailPage(fromNotify: fromNotify, rid: rid)));
357 }); 366 });
358 367
359 ///优惠券列表 368 ///优惠券列表