xt / Flutter-ReserveApp · Commits

Go to a project

Commit 46cb69694b74eb55d2b00f546ce026f3a4274712

Authored by wdn127929
1 parent 2a064d0b
build: skipped

挪位置,我的页面灰色UI缺失,个人信息模块是否需要

Inline Side-by-side
Showing 9 changed files with 405 additions and 206 deletions
... ... @@ -23,6 +23,7 @@ import 'package:provider/provider.dart';
import '../../../constant/state.dart';
import '../../../provider/comment_manage_provider.dart';
import '../../../route/navigator_util.dart';
import '../../../utils/event_bus.dart';
import '../../../utils/screen_util.dart';
import '../../../utils/utils.dart';
... ... @@ -407,7 +408,13 @@ class _CommentManageHomePageState extends State<CommentManageHomePage> {
Provider.of<CommentManageProvider>(context, listen: true);
return Scaffold(
backgroundColor: MyColours.color_ffffff,
appBar: SystemAppBar('评价管理'),
appBar: SystemAppBar('评价管理',
rightImgName: 'set_g.png',
onTapRight: () {
NavigatorUtil.goCommentsSettingPage(context);
},
),
body: Consumer<CommentManageProvider>(builder: (context1, model, _) {
if (model.pageState != PageState.Success) {
return ExceptionPage(
... ...
... ... @@ -179,204 +179,204 @@ class _MarketingCenterHomePageState extends State<MarketingCenterHomePage> {
child: SingleChildScrollView(
child: Column(
children: [
InkWell(
onTap: () {
if (!collectStoreProvider.sellerRecharge) {
//没有购买优惠券模块
//提示购买
// InkWell(
// onTap: () {
// if (!collectStoreProvider.sellerRecharge) {
// //没有购买优惠券模块
// //提示购买
DialogUtil.showSellerVersionBuyDialog(
context, '储值营销', (v) {});
return;
}
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: () {
if (!collectStoreProvider.sellerOrderCustomer) {
//没有购买提前点餐模块
//提示购买
// DialogUtil.showSellerVersionBuyDialog(
// context, '储值营销', (v) {});
// return;
// }
// 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: () {
// if (!collectStoreProvider.sellerOrderCustomer) {
// //没有购买提前点餐模块
// //提示购买
DialogUtil.showSellerVersionBuyDialog(
context, '提前点餐', (v) {});
return;
}
NavigatorUtil.goOrderSettingPage(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: () {
if (!collectStoreProvider.sellerOrderManager) {
//没有购买经理排菜模块
//提示购买
// DialogUtil.showSellerVersionBuyDialog(
// context, '提前点餐', (v) {});
// return;
// }
// NavigatorUtil.goOrderSettingPage(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: () {
// if (!collectStoreProvider.sellerOrderManager) {
// //没有购买经理排菜模块
// //提示购买
DialogUtil.showSellerVersionBuyDialog(
context, '经理排菜', (v) {});
return;
}
NavigatorUtil.goOrderSettingManagerPage(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.goCommentsSettingPage(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.goCustomerNoticeSettingPage(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)),
// DialogUtil.showSellerVersionBuyDialog(
// context, '经理排菜', (v) {});
// return;
// }
// NavigatorUtil.goOrderSettingManagerPage(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.goCommentsSettingPage(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.goCustomerNoticeSettingPage(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: () {
... ...
... ... @@ -825,8 +825,8 @@ class _MenuManagePageState extends State<MenuManagePage> {
'菜单管理',
rightImgName: 'set_g.png',
onTapRight: () {
NavigatorUtil.goMenuThemeColorSetPage(
context, {'object': menuManageProvider.menuModel});
NavigatorUtil.goMenuSettingHomePage(context, {'object': menuManageProvider.menuModel});
},
),
body: Consumer<MenuManageProvider>(
... ...
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../../models/cookbook_model.dart';
import '../../../provider/collect_store_provider.dart';
import '../../../res/colors.dart';
import '../../../route/navigator_util.dart';
import '../../../utils/dialog_util.dart';
import '../../../utils/screen_util.dart';
import '../../../widgets/system_app_bar.dart';
import '../../../widgets/v_empty_view.dart';
/*
菜单设置home页
*/
class MenuSettingHomePage extends StatefulWidget {
final List<MenuModel> menuModel;
const MenuSettingHomePage({ Key key ,this.menuModel}) : super(key: key);
@override
_MenuSettingHomePageState createState() => _MenuSettingHomePageState();
}
class _MenuSettingHomePageState extends State<MenuSettingHomePage> {
CollectStoreProvider collectStoreProvider;
@override
void initState() {
super.initState();
WidgetsBinding.instance.addPostFrameCallback((_) {
getSellerVersion();
});
}
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context);
setState(() {});
}
_itemWidget(String title, {GestureTapCallback onTap}) {
return InkWell(
onTap: onTap,
child: Container(
height: w(47),
margin: EdgeInsets.only(bottom: w(12), left: w(16)),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: MyColours.color_E7E7E7, width: w(1)))),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
title,
style: TextStyle(
color: MyColours.color_515151, fontSize: font(16)),
),
Padding(
padding: EdgeInsets.only(right: w(12)),
child: Image.asset(
"assets/arrow_right_new.png",
width: w(7),
height: w(11),
),
)
],
)));
}
@override
Widget build(BuildContext context) {
collectStoreProvider =
Provider.of<CollectStoreProvider>(context, listen: true);
return Scaffold(
backgroundColor: MyColours.color_ffffff,
appBar: SystemAppBar('菜单管理配置'),
body: SingleChildScrollView(
child: Column(
children: [
VEmptyView(40),
_itemWidget('客人所见菜单主题配置', onTap: () {
NavigatorUtil.goMenuThemeColorSetPage(
context, {'object': widget.menuModel});
}),
_itemWidget('提前点菜设置', onTap: () async {
if (!collectStoreProvider.sellerOrderCustomer) {
//没有购买提前点餐模块
//提示购买
DialogUtil.showSellerVersionBuyDialog(
context, '提前点餐', (v) {});
return;
}
NavigatorUtil.goOrderSettingPage(context);
}),
],
),
),
);
}
}
\ No newline at end of file
... ...
... ... @@ -1591,6 +1591,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
context, '客户通知')) {
// NavigatorUtil.goMenuManagePage(
// context);
NavigatorUtil.goCustomerNoticeSettingPage(context);
}
},
child: _item(
... ...
... ... @@ -26,6 +26,7 @@ import '../../../provider/plan_dish_provider.dart';
class MyPlanDishHomePage extends StatefulWidget {
final bool needRefrsh;
MyPlanDishHomePage({Key key, this.needRefrsh = false}) : super(key: key);
@override
... ... @@ -132,15 +133,22 @@ class _MyPlanDishHomePageState extends State<MyPlanDishHomePage>
return Scaffold(
backgroundColor: MyColours.color_f3f3f3,
appBar: SystemAppBar('排菜与套餐', onTap: () {
// if (widget.needRefrsh) {
// EventBus().emit('refresh_coupon_invitation');
// } else {
// EventBus().emit('changeStatusColor');
// }
appBar: SystemAppBar(
'排菜与套餐',
onTap: () {
// if (widget.needRefrsh) {
// EventBus().emit('refresh_coupon_invitation');
// } else {
// EventBus().emit('changeStatusColor');
// }
Navigator.of(context).pop();
}),
Navigator.of(context).pop();
},
rightImgName: 'set_g.png',
onTapRight: () {
NavigatorUtil.goOrderSettingManagerPage(context);
},
),
body: Column(
children: <Widget>[
Container(
... ...
... ... @@ -1359,7 +1359,9 @@ class NavigatorUtil {
static Future<dynamic> goMyPlanDishHomePage(
BuildContext context, {
replace = false,
}) {
// if (invoice != null) {
// return _navigateTo(context,
// "${Routes.merge_table_select_page}?invoice=${FluroConvertUtils.object2string(invoice)}",
... ... @@ -2303,4 +2305,25 @@ class NavigatorUtil {
return _navigateTo(context, "${Routes.table_setting_home_page}",
replace: replace);
}
///菜单设置home页面
static Future<dynamic> goMenuSettingHomePage(
BuildContext context,
Map object,
{
replace = false,
}) {
return _navigateTo(context, "${Routes.menu_setting_home_page}?object=${FluroConvertUtils.object2string(object)}",
replace: replace);
}
}
... ...
... ... @@ -252,6 +252,7 @@ import '../pages/my/menu_type/menu_add_dishes_page.dart';
import '../pages/my/menu_type/menu_dish_method_page.dart';
import '../pages/my/menu_type/menu_manage_page.dart';
// import '../pages/my/menu_type/menu_manage_page_new.dart';
import '../pages/my/menu_type/menu_setting_home_page.dart';
import '../pages/my/menu_type/menu_theme_color_set_page.dart';
import '../pages/my/menu_type/menu_unit_page.dart';
import '../pages/my/plan_dish/final_plan_dish_page.dart';
... ... @@ -2516,6 +2517,7 @@ var myPlanDishHomePageHandle = new Handler(
// res.add(TableList.fromJson(item));
// }
// }
return ChangeNotifierProvider<PlanDishProvider>(
create: (_) => PlanDishProvider(), child: MyPlanDishHomePage());
});
... ... @@ -3993,3 +3995,44 @@ var tableSettingHomePageHandle = new Handler(
///菜单设置home页面
var menuSettingHomePageHandle = new Handler(
handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
// String rid = params["rid"].first;
// // String smsTemplate = params["smsTemplate"].first;
// CouponUse use = CouponUse.fromJson(
// json.decode(FluroConvertUtils.fluroCnParamsDecode(params["use"].first)));
// if (params.keys.contains('sunModel')) {
// MealListSunModel sunModel = MealListSunModel.fromJson(json.decode(
// FluroConvertUtils.fluroCnParamsDecode(params["sunModel"].first)));
// return ChangeNotifierProvider<StoreBaseIndoProvider>(
// create: (_) => StoreBaseIndoProvider(),
// child: BookTimeSettingEditPage(sunModel));
// }
List<MenuModel> res = [];
if (params.keys.contains('object')) {
Map object = FluroConvertUtils.string2map(params["object"].first);
List temp = object['object'];
for (var item in temp) {
res.add(MenuModel.fromJson2(item));
}
}
return ChangeNotifierProvider<MenuManageProvider>(
create: (_) => MenuManageProvider(),
child: ChangeNotifierProvider<CollectStoreProvider>(
create: (_) => CollectStoreProvider(),
child: MenuSettingHomePage(menuModel: res)));
});
... ...
... ... @@ -398,6 +398,11 @@ class Routes {
static String table_setting_home_page =
'/table_setting_home_page'; //桌位设置home页
static String menu_setting_home_page =
'/menu_setting_home_page'; //菜单设置home页
static void configureRoutes(FluroRouter router) {
router.notFoundHandler = new Handler(
handlerFunc: (BuildContext context, Map<String, List<String>> params) {
... ... @@ -751,6 +756,9 @@ class Routes {
router.define(table_setting_home_page,
handler: tableSettingHomePageHandle);
router.define(menu_setting_home_page,
handler: menuSettingHomePageHandle);
... ...