Commit 8d552c2f77cdf531dabbf7f293a2e889f2c1fed3

Authored by wdn127929
1 parent f03822cd

客情详情页创建预订

@@ -139,7 +139,6 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -139,7 +139,6 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
139 fontSize: ScreenUtil().setSp(28))))) 139 fontSize: ScreenUtil().setSp(28)))))
140 ], 140 ],
141 ), 141 ),
142 -  
143 ], 142 ],
144 ), 143 ),
145 HEmptyView(30), 144 HEmptyView(30),
@@ -573,7 +572,10 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -573,7 +572,10 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
573 height: ScreenUtil().setWidth(80), 572 height: ScreenUtil().setWidth(80),
574 fontSize: 26, 573 fontSize: 26,
575 isBold: false, 574 isBold: false,
576 - onPressed: () {}, 575 + onPressed: () {
  576 + NavigatorUtil.goTableManagerPage(
  577 + context, customerProvider.guestInfoSunModel.guest);
  578 + },
577 ), 579 ),
578 VEmptyView(30) 580 VEmptyView(30)
579 ], 581 ],
@@ -598,7 +598,10 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> { @@ -598,7 +598,10 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
598 height: ScreenUtil().setWidth(80), 598 height: ScreenUtil().setWidth(80),
599 fontSize: 26, 599 fontSize: 26,
600 isBold: false, 600 isBold: false,
601 - onPressed: () {}, 601 + onPressed: () {
  602 + NavigatorUtil.goTableManagerPage(
  603 + context, customerProvider.guestInfoSunModel.guest);
  604 + },
602 ), 605 ),
603 VEmptyView(30) 606 VEmptyView(30)
604 ], 607 ],
@@ -6,6 +6,7 @@ import 'package:flutter/material.dart'; @@ -6,6 +6,7 @@ import 'package:flutter/material.dart';
6 import 'package:flutter_screenutil/flutter_screenutil.dart'; 6 import 'package:flutter_screenutil/flutter_screenutil.dart';
7 import 'package:one_key/constant/state.dart'; 7 import 'package:one_key/constant/state.dart';
8 import 'package:one_key/models/area.dart'; 8 import 'package:one_key/models/area.dart';
  9 +import 'package:one_key/models/guest_info_model.dart';
9 10
10 import 'package:one_key/models/reserve_info_model.dart'; 11 import 'package:one_key/models/reserve_info_model.dart';
11 12
@@ -37,6 +38,8 @@ import 'package:one_key/models/table_list.dart' as table; @@ -37,6 +38,8 @@ import 'package:one_key/models/table_list.dart' as table;
37 const scrollDuration = Duration(microseconds: 500); 38 const scrollDuration = Duration(microseconds: 500);
38 39
39 class TableManagerPage extends StatefulWidget { 40 class TableManagerPage extends StatefulWidget {
  41 + final Guest guest;
  42 + TableManagerPage({this.guest});
40 @override 43 @override
41 State<StatefulWidget> createState() { 44 State<StatefulWidget> createState() {
42 // TODO: implement createState 45 // TODO: implement createState
@@ -504,8 +507,9 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -504,8 +507,9 @@ class TableManagerPageState extends State<TableManagerPage> {
504 ), 507 ),
505 RoundButton( 508 RoundButton(
506 onPressed: () async { 509 onPressed: () async {
507 - SunReserveInfoModel _model = await tableManagerModel  
508 - .setReserveInfo(context, needKeep: true); 510 + SunReserveInfoModel _model =
  511 + await tableManagerModel.setReserveInfo(context,
  512 + needKeep: true, guest: widget.guest);
509 if (_model != null && 513 if (_model != null &&
510 ObjectUtil.isNotEmpty(_model.row) && 514 ObjectUtil.isNotEmpty(_model.row) &&
511 ObjectUtil.isNotEmpty(_model.row.id)) { 515 ObjectUtil.isNotEmpty(_model.row.id)) {
@@ -610,8 +614,9 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -610,8 +614,9 @@ class TableManagerPageState extends State<TableManagerPage> {
610 ), 614 ),
611 RoundButton( 615 RoundButton(
612 onPressed: () async { 616 onPressed: () async {
613 - SunReserveInfoModel _model = await tableManagerModel  
614 - .setReserveInfo(context, needKeep: true); 617 + SunReserveInfoModel _model =
  618 + await tableManagerModel.setReserveInfo(context,
  619 + needKeep: true, guest: widget.guest);
615 if (_model != null && 620 if (_model != null &&
616 ObjectUtil.isNotEmpty(_model.row) && 621 ObjectUtil.isNotEmpty(_model.row) &&
617 ObjectUtil.isNotEmpty(_model.row.id)) { 622 ObjectUtil.isNotEmpty(_model.row.id)) {
@@ -5,6 +5,7 @@ import 'package:one_key/constant/error.dart'; @@ -5,6 +5,7 @@ import 'package:one_key/constant/error.dart';
5 import 'package:one_key/constant/state.dart'; 5 import 'package:one_key/constant/state.dart';
6 import 'package:one_key/models/area.dart'; 6 import 'package:one_key/models/area.dart';
7 import 'package:one_key/models/area_model.dart'; 7 import 'package:one_key/models/area_model.dart';
  8 +import 'package:one_key/models/guest_info_model.dart';
8 import 'package:one_key/models/notebook.dart'; 9 import 'package:one_key/models/notebook.dart';
9 import 'package:one_key/models/reserve_info_model.dart'; 10 import 'package:one_key/models/reserve_info_model.dart';
10 import 'package:one_key/models/tableOuter.dart'; 11 import 'package:one_key/models/tableOuter.dart';
@@ -248,7 +249,7 @@ class TableManagerModel with ChangeNotifier { @@ -248,7 +249,7 @@ class TableManagerModel with ChangeNotifier {
248 249
249 ///录入更改内部预订 250 ///录入更改内部预订
250 Future<SunReserveInfoModel> setReserveInfo(BuildContext context, 251 Future<SunReserveInfoModel> setReserveInfo(BuildContext context,
251 - {needKeep = false}) async { 252 + {needKeep = false, Guest guest}) async {
252 if (selectTables.length == 0) { 253 if (selectTables.length == 0) {
253 Utils.showToast('请选择桌位'); 254 Utils.showToast('请选择桌位');
254 return null; 255 return null;
@@ -324,6 +325,18 @@ class TableManagerModel with ChangeNotifier { @@ -324,6 +325,18 @@ class TableManagerModel with ChangeNotifier {
324 // 'phone': '', 325 // 'phone': '',
325 // "cusdem": '' 326 // "cusdem": ''
326 }; 327 };
  328 + if (guest != null) {
  329 + if (guest.rnameStr != '') {
  330 + params['rname'] = guest.rnameStr;
  331 + }
  332 + if (guest.sex != '0' && guest.sex != null) {
  333 + params['sex'] = guest.sex;
  334 + }
  335 + if (guest.phone != null) {
  336 + params['phone'] = guest.phone;
  337 + }
  338 + }
  339 +
327 print(params); 340 print(params);
328 BaseResp<Map<String, dynamic>> baseResp = await DioUtil() 341 BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
329 .request<Map<String, dynamic>>( 342 .request<Map<String, dynamic>>(
@@ -762,4 +762,15 @@ class NavigatorUtil { @@ -762,4 +762,15 @@ class NavigatorUtil {
762 context, "${Routes.my_customer_order_page}?idstr=${id}&phone=${phone}", 762 context, "${Routes.my_customer_order_page}?idstr=${id}&phone=${phone}",
763 replace: replace); 763 replace: replace);
764 } 764 }
  765 +
  766 + ///客情详情----再次预订
  767 + static Future<dynamic> goTableManagerPage(
  768 + BuildContext context,
  769 + Guest guest, {
  770 + replace = false,
  771 + }) {
  772 + return _navigateTo(context,
  773 + "${Routes.table_manager_page}?guest=${FluroConvertUtils.object2string(guest)}",
  774 + replace: replace);
  775 + }
765 } 776 }
@@ -100,6 +100,7 @@ import 'package:one_key/pages/online_check/online_check_edit_page.dart'; @@ -100,6 +100,7 @@ import 'package:one_key/pages/online_check/online_check_edit_page.dart';
100 import 'package:one_key/pages/sms/sms_page.dart'; 100 import 'package:one_key/pages/sms/sms_page.dart';
101 import 'package:one_key/pages/table/select_table_page.dart'; 101 import 'package:one_key/pages/table/select_table_page.dart';
102 import 'package:one_key/pages/my/photo_type/table_photo_manager_page.dart'; 102 import 'package:one_key/pages/my/photo_type/table_photo_manager_page.dart';
  103 +import 'package:one_key/pages/table/table_manager_page.dart';
103 import 'package:one_key/pages/webview/webview_page.dart'; 104 import 'package:one_key/pages/webview/webview_page.dart';
104 import 'package:one_key/provider/base_info_provider.dart'; 105 import 'package:one_key/provider/base_info_provider.dart';
105 import 'package:one_key/provider/book_set_time_model.dart'; 106 import 'package:one_key/provider/book_set_time_model.dart';
@@ -121,6 +122,7 @@ import 'package:one_key/provider/sms_recharge_provider.dart'; @@ -121,6 +122,7 @@ import 'package:one_key/provider/sms_recharge_provider.dart';
121 import 'package:one_key/provider/statistics_provider.dart'; 122 import 'package:one_key/provider/statistics_provider.dart';
122 import 'package:one_key/provider/store_base_info_provider.dart'; 123 import 'package:one_key/provider/store_base_info_provider.dart';
123 import 'package:one_key/provider/store_detail_model.dart'; 124 import 'package:one_key/provider/store_detail_model.dart';
  125 +import 'package:one_key/provider/table_manager_model.dart';
124 import 'package:one_key/provider/table_photo_manager_provider.dart'; 126 import 'package:one_key/provider/table_photo_manager_provider.dart';
125 import 'package:one_key/provider/upload_img_provider.dart'; 127 import 'package:one_key/provider/upload_img_provider.dart';
126 import 'package:one_key/utils/fluro_convert_utils.dart'; 128 import 'package:one_key/utils/fluro_convert_utils.dart';
@@ -1167,3 +1169,17 @@ var myCustomerOrderPageHandle = new Handler( @@ -1167,3 +1169,17 @@ var myCustomerOrderPageHandle = new Handler(
1167 create: (_) => CustomerProvider(), 1169 create: (_) => CustomerProvider(),
1168 child: MyCustomerOrderPage(id: idstr, phone: phone)); 1170 child: MyCustomerOrderPage(id: idstr, phone: phone));
1169 }); 1171 });
  1172 +
  1173 +///客情列表详情---再次预订
  1174 +var tableManagerPageHandle = new Handler(
  1175 + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
  1176 + Guest guest = Guest.fromJson(json
  1177 + .decode(FluroConvertUtils.fluroCnParamsDecode(params["guest"].first)));
  1178 + // UserHistoryEntity userHistoryEntity = UserHistoryEntity.fromJson(json.decode(
  1179 + // FluroConvertUtils.fluroCnParamsDecode(
  1180 + // params["userHistoryEntity"].first)));
  1181 + return ChangeNotifierProvider<TableManagerModel>(
  1182 + create: (_) => TableManagerModel(),
  1183 + child: TableManagerPage(guest:guest),
  1184 + );
  1185 +});
@@ -94,7 +94,8 @@ class Routes { @@ -94,7 +94,8 @@ class Routes {
94 94
95 static String my_festival_edit_page = "/my_festival_edit_page"; //编辑纪念日 95 static String my_festival_edit_page = "/my_festival_edit_page"; //编辑纪念日
96 static String my_customer_order_page = "/my_customer_order_page"; //客户订单 96 static String my_customer_order_page = "/my_customer_order_page"; //客户订单
97 - static String show_customer_list_page = "/show_customer_list_page"; //仅展示的客户列表 --- 商家 97 + static String show_customer_list_page =
  98 + "/show_customer_list_page"; //仅展示的客户列表 --- 商家
98 static String seller_my_marketing_records_detail_page = 99 static String seller_my_marketing_records_detail_page =
99 "/seller_my_marketing_records_detail_page"; //我的客情---营销详情----全店任务详情 100 "/seller_my_marketing_records_detail_page"; //我的客情---营销详情----全店任务详情
100 static String my_make_marketing_page_only_show = 101 static String my_make_marketing_page_only_show =
@@ -102,6 +103,7 @@ class Routes { @@ -102,6 +103,7 @@ class Routes {
102 103
103 static String my_show_customer_list_page = 104 static String my_show_customer_list_page =
104 "/my_show_customer_list_page"; //仅展示的客户列表----我的 105 "/my_show_customer_list_page"; //仅展示的客户列表----我的
  106 + static String table_manager_page = "/table_manager_page"; //客情再次预订跳转的桌位预订页面
105 107
106 static void configureRoutes(FluroRouter router) { 108 static void configureRoutes(FluroRouter router) {
107 router.notFoundHandler = new Handler( 109 router.notFoundHandler = new Handler(
@@ -209,5 +211,6 @@ class Routes { @@ -209,5 +211,6 @@ class Routes {
209 handler: myMakeMarkingPageOnlyShowHandle); 211 handler: myMakeMarkingPageOnlyShowHandle);
210 router.define(my_show_customer_list_page, 212 router.define(my_show_customer_list_page,
211 handler: myShowCustomerListPageHandle); 213 handler: myShowCustomerListPageHandle);
  214 + router.define(table_manager_page, handler: tableManagerPageHandle);
212 } 215 }
213 } 216 }