Commit 53563bd357ac137869f5d8598da13a506842e7cb

Authored by weixin_45529955
1 parent 546171fa

结构调整 OK

... ... @@ -282,7 +282,7 @@ class _BirthdaySettingPageState extends State<BirthdaySettingPage> {
customerProvider = Provider.of<CustomerProvider>(context, listen: true);
return Scaffold(
backgroundColor: MyColours.color_ffffff,
appBar: SystemAppBar('客户生日提醒及营销'),
appBar: SystemAppBar('客户纪念日提醒及营销'),
body: Consumer<CustomerProvider>(builder: (context1, model, _) {
if (model.pageStateBirthdaySetting != PageState.Success) {
return ExceptionPage(
... ... @@ -354,7 +354,7 @@ class _BirthdaySettingPageState extends State<BirthdaySettingPage> {
MyDivider(double.infinity, w(0.5),
color: MyColours.color_E7E7E7),
VEmptyView(16),
_itemSmsWidget(isPushMemorial, '客户生日到达前发送提醒消息',
_itemSmsWidget(isPushMemorial, '客户纪念日到达前发送提醒消息',
onTap: () {
setState(() {
isPushMemorial = !isPushMemorial;
... ...
... ... @@ -341,7 +341,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
// VEmptyView(24),
InkWell(
onTap: () {
NavigatorUtil.goCustomerNoticeSettingPage(context);
NavigatorUtil.goBirthdaySettingPage(context);
},
child: Padding(
padding: EdgeInsets.only(
... ... @@ -352,7 +352,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
child: Row(
children: [
Text(
'客户通知设置',
'客户纪念日提醒及营销设置',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setWidth(32)),
... ... @@ -375,9 +375,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
color: MyColours.color_E7E7E7)),
VEmptyView(24),
InkWell(
onTap: () {
NavigatorUtil.goBirthdaySettingPage(context);
},
onTap: () {},
child: Padding(
padding: EdgeInsets.only(
left: w(16),
... ... @@ -387,7 +385,7 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
child: Row(
children: [
Text(
'客户纪念日提醒及营销',
'沉睡/流失客户唤醒营销设置',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setWidth(32)),
... ...
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/provider/user_model.dart';
import 'package:one_key/res/colors.dart';
import 'package:one_key/route/navigator_util.dart';
import 'package:one_key/utils/event_bus.dart';
import 'package:one_key/widgets/MyDivider.dart';
import 'package:one_key/widgets/v_empty_view.dart';
import 'package:provider/provider.dart';
import '../../../utils/screen_util.dart';
import '../../../widgets/system_app_bar.dart';
/***
* 会员充值首页
*/
class RechargeFirstHomePage extends StatefulWidget {
RechargeFirstHomePage({
Key? key,
}) : super(key: key);
@override
_RechargeFirstHomePageState createState() => _RechargeFirstHomePageState();
}
class _RechargeFirstHomePageState extends State<RechargeFirstHomePage> {
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {});
}
@override
void dispose() {
EventBus().emit('changeStatusColor');
super.dispose();
}
@override
Widget build(BuildContext context) {
UserModel userModel = Provider.of<UserModel>(context, listen: false);
return Scaffold(
backgroundColor: Colors.white,
appBar: SystemAppBar(
'会员充值',
),
body: Column(
children: [
Expanded(
child: SingleChildScrollView(
child: Column(
children: [
InkWell(
onTap: () async {
//
NavigatorUtil.goRechargeHomePage(
context);
},
child: Padding(
padding: EdgeInsets.only(
left: w(16),
top: w(12),
bottom: w(12),
right: w(12)),
child: Row(
children: [
Text(
'充值优惠活动',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setWidth(32)),
),
Spacer(),
Container(
padding: EdgeInsets.symmetric(
horizontal: w(7), vertical: w(4)),
child: Image.asset(
"assets/arrow_right_new.png",
width: ScreenUtil().setWidth(18),
height: ScreenUtil().setWidth(32),
),
)
],
))),
Padding(
padding: EdgeInsets.only(left: w(16)),
child: MyDivider(double.infinity, w(0.5),
color: MyColours.color_E7E7E7)),
VEmptyView(24),
InkWell(
onTap: () {
//
NavigatorUtil.goPaymentSettingPage(context);
},
child: Padding(
padding: EdgeInsets.only(
left: w(16),
top: w(12),
bottom: w(12),
right: w(12)),
child: Row(
children: [
Text(
'店铺充值记录',
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setWidth(32)),
),
Spacer(),
Container(
padding: EdgeInsets.symmetric(
horizontal: w(7), vertical: w(4)),
child: Image.asset(
"assets/arrow_right_new.png",
width: ScreenUtil().setWidth(18),
height: ScreenUtil().setWidth(32),
),
)
],
))),
Padding(
padding: EdgeInsets.only(left: w(16)),
child: MyDivider(double.infinity, w(0.5),
color: MyColours.color_E7E7E7)),
],
),
)),
],
));
}
}
... ...
... ... @@ -1817,7 +1817,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
context, '储值营销', (v) {});
return;
}
NavigatorUtil.goRechargeHomePage(
NavigatorUtil.goRechargeFirstHomePage(
context);
},
child: _item(
... ...
... ... @@ -2603,4 +2603,17 @@ class NavigatorUtil {
replace: replace);
}
//会员充值首页列表
static Future<dynamic> goRechargeFirstHomePage(
BuildContext context, {
replace = false,
}) {
return _navigateTo(context, "${Routes.recharge_f_home_page}",
replace: replace);
}
}
... ...
... ... @@ -103,6 +103,7 @@ import 'package:one_key/pages/my/finance_manage/vip_record_detail_page.dart';
import 'package:one_key/pages/my/marketing_center/book_notification/marking_interaction_page.dart';
import 'package:one_key/pages/my/marketing_center/recharge/recharge_edit_page.dart';
import 'package:one_key/pages/my/marketing_center/recharge/recharge_type_select_page.dart';
import 'package:one_key/pages/my/marketing_center/recharge_first_home_page.dart';
import 'package:one_key/pages/my/menu_type/menu_home_page.dart';
import 'package:one_key/pages/my/menu_type/menu_set_price_page.dart';
import 'package:one_key/pages/my/personnel_type/base_info_personnal_page.dart';
... ... @@ -4488,22 +4489,24 @@ var orderManageHomePageHandle = new Handler(
var ordehistorySetPageHandle = new Handler(
handlerFunc: (BuildContext? context, Map<dynamic, List<Object>> params) {
return ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(), child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) =>MarketingCenterProvider(),child: OrderHistorySetPage()));
create: (_) => CustomerProvider(),
child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: OrderHistorySetPage()));
});
var orderCancelSetPageHandle = new Handler(
handlerFunc: (BuildContext? context, Map<dynamic, List<Object>> params) {
return ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(), child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) =>MarketingCenterProvider(),child: OrderCancelSetPage()));
create: (_) => CustomerProvider(),
child: ChangeNotifierProvider<MarketingCenterProvider>(
create: (_) => MarketingCenterProvider(),
child: OrderCancelSetPage()));
});
var rechargeFirstHomePageHandle = new Handler(
handlerFunc: (BuildContext? context, Map<dynamic, List<Object>> params) {
return RechargeFirstHomePage();
});
var customLabelPageHandle = new Handler(
... ...
... ... @@ -459,15 +459,10 @@ class Routes {
static String order_manage_home_page =
"/order_manage_home_page"; // 预订订单管理home
static String order_history_set_page =
"/order_history_set_page"; // 预订历史设置
static String order_history_set_page = "/order_history_set_page"; // 预订历史设置
static String order_cancel_set_page =
"/order_cancel_set_page"; // 预订取消设置
static String order_cancel_set_page = "/order_cancel_set_page"; // 预订取消设置
static String recharge_f_home_page = "/recharge_f_home_page"; // 会员充值首页
static void configureRoutes(FluroRouter router) {
router.notFoundHandler = new Handler(
... ... @@ -882,14 +877,13 @@ class Routes {
router.define(order_manage_home_page, handler: orderManageHomePageHandle);
router.define(order_history_set_page, handler: ordehistorySetPageHandle);
router.define( order_history_set_page, handler: ordehistorySetPageHandle);
router.define(order_cancel_set_page, handler: orderCancelSetPageHandle);
router.define(recharge_f_home_page, handler: rechargeFirstHomePageHandle);
router.define( order_cancel_set_page, handler: orderCancelSetPageHandle);
}
}
... ...