xt / Flutter-ReserveApp · Commits

Go to a project

Commit 53563bd357ac137869f5d8598da13a506842e7cb

Authored by weixin_45529955
1 parent 546171fa

结构调整 OK

Inline Side-by-side
Showing 7 changed files with 174 additions and 31 deletions
@@ -282,7 +282,7 @@ class _BirthdaySettingPageState extends State<BirthdaySettingPage> { @@ -282,7 +282,7 @@ class _BirthdaySettingPageState extends State<BirthdaySettingPage> {
282 customerProvider = Provider.of<CustomerProvider>(context, listen: true); 282 customerProvider = Provider.of<CustomerProvider>(context, listen: true);
283 return Scaffold( 283 return Scaffold(
284 backgroundColor: MyColours.color_ffffff, 284 backgroundColor: MyColours.color_ffffff,
285 - appBar: SystemAppBar('客户生日提醒及营销'), 285 + appBar: SystemAppBar('客户纪念日提醒及营销'),
286 body: Consumer<CustomerProvider>(builder: (context1, model, _) { 286 body: Consumer<CustomerProvider>(builder: (context1, model, _) {
287 if (model.pageStateBirthdaySetting != PageState.Success) { 287 if (model.pageStateBirthdaySetting != PageState.Success) {
288 return ExceptionPage( 288 return ExceptionPage(
@@ -354,7 +354,7 @@ class _BirthdaySettingPageState extends State<BirthdaySettingPage> { @@ -354,7 +354,7 @@ class _BirthdaySettingPageState extends State<BirthdaySettingPage> {
354 MyDivider(double.infinity, w(0.5), 354 MyDivider(double.infinity, w(0.5),
355 color: MyColours.color_E7E7E7), 355 color: MyColours.color_E7E7E7),
356 VEmptyView(16), 356 VEmptyView(16),
357 - _itemSmsWidget(isPushMemorial, '客户生日到达前发送提醒消息', 357 + _itemSmsWidget(isPushMemorial, '客户纪念日到达前发送提醒消息',
358 onTap: () { 358 onTap: () {
359 setState(() { 359 setState(() {
360 isPushMemorial = !isPushMemorial; 360 isPushMemorial = !isPushMemorial;
@@ -341,7 +341,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -341,7 +341,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
341 // VEmptyView(24), 341 // VEmptyView(24),
342 InkWell( 342 InkWell(
343 onTap: () { 343 onTap: () {
344 - NavigatorUtil.goCustomerNoticeSettingPage(context); 344 + NavigatorUtil.goBirthdaySettingPage(context);
345 }, 345 },
346 child: Padding( 346 child: Padding(
347 padding: EdgeInsets.only( 347 padding: EdgeInsets.only(
@@ -352,7 +352,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -352,7 +352,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
352 child: Row( 352 child: Row(
353 children: [ 353 children: [
354 Text( 354 Text(
355 - '客户通知设置', 355 + '客户纪念日提醒及营销设置',
356 style: TextStyle( 356 style: TextStyle(
357 color: MyColours.color_515151, 357 color: MyColours.color_515151,
358 fontSize: ScreenUtil().setWidth(32)), 358 fontSize: ScreenUtil().setWidth(32)),
@@ -375,9 +375,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -375,9 +375,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
375 color: MyColours.color_E7E7E7)), 375 color: MyColours.color_E7E7E7)),
376 VEmptyView(24), 376 VEmptyView(24),
377 InkWell( 377 InkWell(
378 - onTap: () {  
379 - NavigatorUtil.goBirthdaySettingPage(context);  
380 - }, 378 + onTap: () {},
381 child: Padding( 379 child: Padding(
382 padding: EdgeInsets.only( 380 padding: EdgeInsets.only(
383 left: w(16), 381 left: w(16),
@@ -387,7 +385,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> { @@ -387,7 +385,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
387 child: Row( 385 child: Row(
388 children: [ 386 children: [
389 Text( 387 Text(
390 - '客户纪念日提醒及营销', 388 + '沉睡/流失客户唤醒营销设置',
391 style: TextStyle( 389 style: TextStyle(
392 color: MyColours.color_515151, 390 color: MyColours.color_515151,
393 fontSize: ScreenUtil().setWidth(32)), 391 fontSize: ScreenUtil().setWidth(32)),
  1 +import 'package:flutter/material.dart';
  2 +import 'package:flutter_screenutil/flutter_screenutil.dart';
  3 +import 'package:one_key/provider/user_model.dart';
  4 +import 'package:one_key/res/colors.dart';
  5 +import 'package:one_key/route/navigator_util.dart';
  6 +import 'package:one_key/utils/event_bus.dart';
  7 +import 'package:one_key/widgets/MyDivider.dart';
  8 +import 'package:one_key/widgets/v_empty_view.dart';
  9 +import 'package:provider/provider.dart';
  10 +
  11 +import '../../../utils/screen_util.dart';
  12 +import '../../../widgets/system_app_bar.dart';
  13 +
  14 +/***
  15 + * 会员充值首页
  16 + */
  17 +
  18 +class RechargeFirstHomePage extends StatefulWidget {
  19 + RechargeFirstHomePage({
  20 + Key? key,
  21 + }) : super(key: key);
  22 +
  23 + @override
  24 + _RechargeFirstHomePageState createState() => _RechargeFirstHomePageState();
  25 +}
  26 +
  27 +class _RechargeFirstHomePageState extends State<RechargeFirstHomePage> {
  28 + @override
  29 + void initState() {
  30 + super.initState();
  31 +
  32 + WidgetsBinding.instance.addPostFrameCallback((_) {});
  33 + }
  34 +
  35 + @override
  36 + void dispose() {
  37 + EventBus().emit('changeStatusColor');
  38 +
  39 + super.dispose();
  40 + }
  41 +
  42 + @override
  43 + Widget build(BuildContext context) {
  44 + UserModel userModel = Provider.of<UserModel>(context, listen: false);
  45 + return Scaffold(
  46 + backgroundColor: Colors.white,
  47 + appBar: SystemAppBar(
  48 + '会员充值',
  49 + ),
  50 + body: Column(
  51 + children: [
  52 + Expanded(
  53 + child: SingleChildScrollView(
  54 + child: Column(
  55 + children: [
  56 + InkWell(
  57 + onTap: () async {
  58 + //
  59 + NavigatorUtil.goRechargeHomePage(
  60 + context);
  61 + },
  62 + child: Padding(
  63 + padding: EdgeInsets.only(
  64 + left: w(16),
  65 + top: w(12),
  66 + bottom: w(12),
  67 + right: w(12)),
  68 + child: Row(
  69 + children: [
  70 + Text(
  71 + '充值优惠活动',
  72 + style: TextStyle(
  73 + color: MyColours.color_515151,
  74 + fontSize: ScreenUtil().setWidth(32)),
  75 + ),
  76 + Spacer(),
  77 + Container(
  78 + padding: EdgeInsets.symmetric(
  79 + horizontal: w(7), vertical: w(4)),
  80 + child: Image.asset(
  81 + "assets/arrow_right_new.png",
  82 + width: ScreenUtil().setWidth(18),
  83 + height: ScreenUtil().setWidth(32),
  84 + ),
  85 + )
  86 + ],
  87 + ))),
  88 + Padding(
  89 + padding: EdgeInsets.only(left: w(16)),
  90 + child: MyDivider(double.infinity, w(0.5),
  91 + color: MyColours.color_E7E7E7)),
  92 + VEmptyView(24),
  93 + InkWell(
  94 + onTap: () {
  95 + //
  96 + NavigatorUtil.goPaymentSettingPage(context);
  97 + },
  98 + child: Padding(
  99 + padding: EdgeInsets.only(
  100 + left: w(16),
  101 + top: w(12),
  102 + bottom: w(12),
  103 + right: w(12)),
  104 + child: Row(
  105 + children: [
  106 + Text(
  107 + '店铺充值记录',
  108 + style: TextStyle(
  109 + color: MyColours.color_515151,
  110 + fontSize: ScreenUtil().setWidth(32)),
  111 + ),
  112 + Spacer(),
  113 + Container(
  114 + padding: EdgeInsets.symmetric(
  115 + horizontal: w(7), vertical: w(4)),
  116 + child: Image.asset(
  117 + "assets/arrow_right_new.png",
  118 + width: ScreenUtil().setWidth(18),
  119 + height: ScreenUtil().setWidth(32),
  120 + ),
  121 + )
  122 + ],
  123 + ))),
  124 + Padding(
  125 + padding: EdgeInsets.only(left: w(16)),
  126 + child: MyDivider(double.infinity, w(0.5),
  127 + color: MyColours.color_E7E7E7)),
  128 + ],
  129 + ),
  130 + )),
  131 + ],
  132 + ));
  133 + }
  134 +}
@@ -1817,7 +1817,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -1817,7 +1817,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
1817 context, '储值营销', (v) {}); 1817 context, '储值营销', (v) {});
1818 return; 1818 return;
1819 } 1819 }
1820 - NavigatorUtil.goRechargeHomePage( 1820 +
  1821 + NavigatorUtil.goRechargeFirstHomePage(
1821 context); 1822 context);
1822 }, 1823 },
1823 child: _item( 1824 child: _item(
@@ -2603,4 +2603,17 @@ class NavigatorUtil { @@ -2603,4 +2603,17 @@ class NavigatorUtil {
2603 replace: replace); 2603 replace: replace);
2604 } 2604 }
2605 2605
  2606 +
  2607 +
  2608 +
  2609 +
  2610 + //会员充值首页列表
  2611 + static Future<dynamic> goRechargeFirstHomePage(
  2612 + BuildContext context, {
  2613 + replace = false,
  2614 + }) {
  2615 + return _navigateTo(context, "${Routes.recharge_f_home_page}",
  2616 + replace: replace);
  2617 + }
  2618 +
2606 } 2619 }
@@ -103,6 +103,7 @@ import 'package:one_key/pages/my/finance_manage/vip_record_detail_page.dart'; @@ -103,6 +103,7 @@ import 'package:one_key/pages/my/finance_manage/vip_record_detail_page.dart';
103 import 'package:one_key/pages/my/marketing_center/book_notification/marking_interaction_page.dart'; 103 import 'package:one_key/pages/my/marketing_center/book_notification/marking_interaction_page.dart';
104 import 'package:one_key/pages/my/marketing_center/recharge/recharge_edit_page.dart'; 104 import 'package:one_key/pages/my/marketing_center/recharge/recharge_edit_page.dart';
105 import 'package:one_key/pages/my/marketing_center/recharge/recharge_type_select_page.dart'; 105 import 'package:one_key/pages/my/marketing_center/recharge/recharge_type_select_page.dart';
  106 +import 'package:one_key/pages/my/marketing_center/recharge_first_home_page.dart';
106 import 'package:one_key/pages/my/menu_type/menu_home_page.dart'; 107 import 'package:one_key/pages/my/menu_type/menu_home_page.dart';
107 import 'package:one_key/pages/my/menu_type/menu_set_price_page.dart'; 108 import 'package:one_key/pages/my/menu_type/menu_set_price_page.dart';
108 import 'package:one_key/pages/my/personnel_type/base_info_personnal_page.dart'; 109 import 'package:one_key/pages/my/personnel_type/base_info_personnal_page.dart';
@@ -4488,22 +4489,24 @@ var orderManageHomePageHandle = new Handler( @@ -4488,22 +4489,24 @@ var orderManageHomePageHandle = new Handler(
4488 var ordehistorySetPageHandle = new Handler( 4489 var ordehistorySetPageHandle = new Handler(
4489 handlerFunc: (BuildContext? context, Map<dynamic, List<Object>> params) { 4490 handlerFunc: (BuildContext? context, Map<dynamic, List<Object>> params) {
4490 return ChangeNotifierProvider<CustomerProvider>( 4491 return ChangeNotifierProvider<CustomerProvider>(
4491 - create: (_) => CustomerProvider(), child: ChangeNotifierProvider<MarketingCenterProvider>(  
4492 - create: (_) =>MarketingCenterProvider(),child: OrderHistorySetPage()));  
4493 -  
4494 - 4492 + create: (_) => CustomerProvider(),
  4493 + child: ChangeNotifierProvider<MarketingCenterProvider>(
  4494 + create: (_) => MarketingCenterProvider(),
  4495 + child: OrderHistorySetPage()));
4495 }); 4496 });
4496 4497
4497 -  
4498 -  
4499 -  
4500 var orderCancelSetPageHandle = new Handler( 4498 var orderCancelSetPageHandle = new Handler(
4501 handlerFunc: (BuildContext? context, Map<dynamic, List<Object>> params) { 4499 handlerFunc: (BuildContext? context, Map<dynamic, List<Object>> params) {
4502 return ChangeNotifierProvider<CustomerProvider>( 4500 return ChangeNotifierProvider<CustomerProvider>(
4503 - create: (_) => CustomerProvider(), child: ChangeNotifierProvider<MarketingCenterProvider>(  
4504 - create: (_) =>MarketingCenterProvider(),child: OrderCancelSetPage())); 4501 + create: (_) => CustomerProvider(),
  4502 + child: ChangeNotifierProvider<MarketingCenterProvider>(
  4503 + create: (_) => MarketingCenterProvider(),
  4504 + child: OrderCancelSetPage()));
  4505 +});
4505 4506
4506 - 4507 +var rechargeFirstHomePageHandle = new Handler(
  4508 + handlerFunc: (BuildContext? context, Map<dynamic, List<Object>> params) {
  4509 + return RechargeFirstHomePage();
4507 }); 4510 });
4508 4511
4509 var customLabelPageHandle = new Handler( 4512 var customLabelPageHandle = new Handler(
@@ -459,15 +459,10 @@ class Routes { @@ -459,15 +459,10 @@ class Routes {
459 static String order_manage_home_page = 459 static String order_manage_home_page =
460 "/order_manage_home_page"; // 预订订单管理home 460 "/order_manage_home_page"; // 预订订单管理home
461 461
462 - static String order_history_set_page =  
463 - "/order_history_set_page"; // 预订历史设置 462 + static String order_history_set_page = "/order_history_set_page"; // 预订历史设置
464 463
465 -  
466 -  
467 -  
468 -  
469 - static String order_cancel_set_page =  
470 - "/order_cancel_set_page"; // 预订取消设置 464 + static String order_cancel_set_page = "/order_cancel_set_page"; // 预订取消设置
  465 + static String recharge_f_home_page = "/recharge_f_home_page"; // 会员充值首页
471 466
472 static void configureRoutes(FluroRouter router) { 467 static void configureRoutes(FluroRouter router) {
473 router.notFoundHandler = new Handler( 468 router.notFoundHandler = new Handler(
@@ -882,14 +877,13 @@ class Routes { @@ -882,14 +877,13 @@ class Routes {
882 877
883 router.define(order_manage_home_page, handler: orderManageHomePageHandle); 878 router.define(order_manage_home_page, handler: orderManageHomePageHandle);
884 879
  880 + router.define(order_history_set_page, handler: ordehistorySetPageHandle);
885 881
886 - router.define( order_history_set_page, handler: ordehistorySetPageHandle); 882 + router.define(order_cancel_set_page, handler: orderCancelSetPageHandle);
887 883
888 -  
889 884
  885 + router.define(recharge_f_home_page, handler: rechargeFirstHomePageHandle);
890 886
891 - router.define( order_cancel_set_page, handler: orderCancelSetPageHandle);  
892 887
893 -  
894 } 888 }
895 } 889 }