xt / Flutter-ReserveApp · Commits

Go to a project

Commit f6d34073a9a4bbf35b96eb9ab23209e5937b5d9e

Authored by wdn127929
1 parent d0471654
build: skipped

订座详情调整

Inline Side-by-side
Showing 4 changed files with 118 additions and 62 deletions
... ... @@ -138,6 +138,7 @@ class Constant {
'前台',
],
'人数': ['管理员', '店长', '前台'],
'订座详情-添加一项':['管理员', '店长', '前台'],
'图片备注': ['管理员', '店长', '前台'],
'用餐类型': ['管理员', '店长', '前台'],
'服务人员': ['管理员', '店长', '前台'],
... ...
... ... @@ -2150,7 +2150,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
}
///预订订金UI
Widget _deposit() {
Widget _deposit(bool add) {
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
VEmptyView(30),
MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
... ... @@ -2169,14 +2169,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
width: w(72),
height: w(22),
fontSize: 24,
textColor: MyColours.color_438E93,
textColor: add ? MyColours.color_438E93 : MyColours.color_999999,
isBold: false,
borderColor: MyColours.color_438E93,
borderColor: add ? MyColours.color_438E93 : MyColours.color_999999,
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
onPressed: () {
NavigatorUtil.goBookDepositPage(
context, detailModel!.detailModelAllSunModel!.id);
if (add) {
NavigatorUtil.goBookDepositPage(
context, detailModel!.detailModelAllSunModel!.id);
}
},
),
],
... ... @@ -2230,18 +2232,22 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
data.insertUid)
InkWell(
onTap: () {
//弹框确认是否删除
DialogUtil.cupertinoAlertDialog(context,
title: "",
content: "是否确定删除?",
isBoldContent: true,
contentColor: MyColours.color_E6000000,
rTitle: "删除", rCallback: () {
_delReserveDepositByid(data.id);
});
if (add) {
//弹框确认是否删除
DialogUtil.cupertinoAlertDialog(context,
title: "",
content: "是否确定删除?",
isBoldContent: true,
contentColor:
MyColours.color_E6000000,
rTitle: "删除", rCallback: () {
_delReserveDepositByid(data.id);
});
}
},
child: Image.asset(
Utils.getImgPath('delete_g'),
Utils.getImgPath(
add ? 'delete_g' : 'f_delete_red_un'),
width: w(20),
))
],
... ... @@ -2293,7 +2299,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
}
///核餐确认UI
Widget _verifyFood() {
Widget _verifyFood(bool add) {
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
VEmptyView(30),
MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
... ... @@ -2312,13 +2318,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
width: w(72),
height: w(22),
fontSize: 24,
textColor: MyColours.color_438E93,
textColor: add ? MyColours.color_438E93 : MyColours.color_999999,
isBold: false,
borderColor: MyColours.color_438E93,
borderColor: add ? MyColours.color_438E93 : MyColours.color_999999,
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
onPressed: () {
NavigatorUtil.goVerifyFoodPage(context, widget.rid);
if (add) {
NavigatorUtil.goVerifyFoodPage(context, widget.rid);
}
},
),
],
... ... @@ -2346,12 +2354,13 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
color: MyColours.color_515151,
fontSize: font(14)),
),
Text(
'${data.nickName} ${data.cdateStr}',
overflow: TextOverflow.ellipsis,
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(14)),
Expanded(
child: Text('${data.nickName} ${data.cdateStr}',
overflow: TextOverflow.ellipsis,
maxLines: 10,
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(14))),
),
]),
Align(
... ... @@ -2551,13 +2560,16 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
style:
TextStyle(color: MyColours.color_515151, fontSize: font(14)),
),
Spacer(),
Text(
HEmptyView(10),
Expanded(
child: Text(
'${detailModel!.detailModelAllSunModel!.nickName ?? ''} ${_getDateTime(detailModel!.detailModelAllSunModel!.cdate)}',
overflow: TextOverflow.ellipsis,
maxLines: 10,
textAlign: TextAlign.right,
style:
TextStyle(color: MyColours.color_999999, fontSize: font(14)),
),
)),
if (showimage) HEmptyView(16),
if (showimage)
InkWell(
... ... @@ -2612,14 +2624,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
color: MyColours.color_515151,
fontSize: font(14)),
),
Spacer(),
Text(
HEmptyView(10),
Expanded(
child: Text(
'${data.nickName ?? ''} ${data.upDate}',
overflow: TextOverflow.ellipsis,
maxLines: 10,
textAlign: TextAlign.right,
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(14)),
),
)),
if (show) HEmptyView(16),
if (show)
InkWell(
... ... @@ -2858,6 +2873,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
detailModel!.detailModelAllSunModel!.guestUid ||
userModel.user!.role_name == '管理员' ||
userModel.user!.role_name == '店长';
bool add = Utils.getAuthority(context, '订座详情-添加一项') ||
widget.uid == userModel.user!.openid;
return Column(
children: [
Expanded(
... ... @@ -4348,8 +4366,30 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
? detailModel!.detailModelAllSunModel!.phone
: Utils.starPhone(detailModel!.detailModelAllSunModel!.phone!),
textColor: MyColours.color_515151,
textColorR: MyColours.color_438E93,
imageName: 'phone_detail')),
textColorR:(Utils.getAuthority(
context,
'订座详情-电话') ||
widget.uid ==
userModel
.user!
.openid ||
(userModel.user!.role_name == '店长' &&
detailModel!.detailModelAllSunModel!.roleName !=
'管理员' &&
detailModel!.detailModelAllSunModel!.roleName !=
'店长'))? MyColours.color_438E93:MyColours.color_999999,
imageName:(Utils.getAuthority(
context,
'订座详情-电话') ||
widget.uid ==
userModel
.user!
.openid ||
(userModel.user!.role_name == '店长' &&
detailModel!.detailModelAllSunModel!.roleName !=
'管理员' &&
detailModel!.detailModelAllSunModel!.roleName !=
'店长'))? 'phone_detail':'h_call')),
RowMultiText("专属经理",
'${detailModel!.detailModelAllSunModel!.placeOrderName ?? ''}',
textColor: MyColours
... ... @@ -4516,8 +4556,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage>
],
),
_deposit(),
_verifyFood(),
_deposit(add),
_verifyFood(add),
_imageRemark(),
_operatingRecord(),
... ...
... ... @@ -594,7 +594,7 @@ class TableManagerPageState extends State<TableManagerPage> {
getDzSellerConf() async {
MarketingCenterProvider marketingCenterProvider =
Provider.of<MarketingCenterProvider>(context, listen: false);
bool success = await marketingCenterProvider.getDzSellerConf(context);
bool success = await marketingCenterProvider.getDzSellerConf(context,showLoading: tableManagerModel?.pageStateOrReserve == PageState.Loading ?false:true );
if (success && marketingCenterProvider.dzSellerConfModel != null) {
isAddOver = marketingCenterProvider.dzSellerConfModel!.isAddOver == '1'
? true
... ...
... ... @@ -420,7 +420,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
}
getSellerVersion() async {
await collectStoreProvider.getSellerVersion(context);
await collectStoreProvider.getSellerVersion(context,showLoading: false);
setState(() {});
}
... ... @@ -1889,7 +1889,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
}
///预订订金UI
Widget _deposit() {
Widget _deposit(bool add) {
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
VEmptyView(30),
MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
... ... @@ -1908,13 +1908,15 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
width: w(72),
height: w(22),
fontSize: 24,
textColor: MyColours.color_438E93,
textColor: add ? MyColours.color_438E93 : MyColours.color_999999,
isBold: false,
borderColor: MyColours.color_438E93,
borderColor: add ? MyColours.color_438E93 : MyColours.color_999999,
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
onPressed: () {
NavigatorUtil.goBookDepositPage(context, detailEntity.id);
if (add) {
NavigatorUtil.goBookDepositPage(context, detailEntity.id);
}
},
),
],
... ... @@ -2031,7 +2033,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
}
///核餐确认UI
Widget _verifyFood() {
Widget _verifyFood(bool add) {
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
VEmptyView(30),
MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
... ... @@ -2050,13 +2052,15 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
width: w(72),
height: w(22),
fontSize: 24,
textColor: MyColours.color_438E93,
textColor: add ? MyColours.color_438E93 : MyColours.color_999999,
isBold: false,
borderColor: MyColours.color_438E93,
borderColor: add ? MyColours.color_438E93 : MyColours.color_999999,
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
onPressed: () {
NavigatorUtil.goVerifyFoodPage(context, widget.rid);
if (add) {
NavigatorUtil.goVerifyFoodPage(context, widget.rid);
}
},
),
],
... ... @@ -2288,13 +2292,16 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
style:
TextStyle(color: MyColours.color_515151, fontSize: font(14)),
),
Spacer(),
Text(
HEmptyView(10),
Expanded(
child: Text(
'${detailEntity.place_order_name ?? ''} ${_getDateTime(detailEntity.cdate)}',
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.right,
maxLines: 10,
style:
TextStyle(color: MyColours.color_999999, fontSize: font(14)),
),
)),
if (showimage) HEmptyView(16),
if (showimage)
InkWell(
... ... @@ -2336,14 +2343,17 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
color: MyColours.color_515151,
fontSize: font(14)),
),
Spacer(),
Text(
HEmptyView(10),
Expanded(
child: Text(
'${data.nickName ?? ''} ${data.upDate}',
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.right,
maxLines: 10,
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(14)),
),
)),
if (show) HEmptyView(16),
if (show)
InkWell(
... ... @@ -2554,6 +2564,8 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
detailEntity.guest_uid ||
userModel.user!.role_name == '管理员' ||
userModel.user!.role_name == '店长';
bool add = Utils.getAuthority(context, '订座详情-添加一项') ||
widget.uid == userModel.user!.openid;
return Column(
children: [
Expanded(
... ... @@ -3890,11 +3902,9 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
textColor: MyColours
.color_515151),
(detailEntity.status == "4" &&
detailEntity
.cancel !=
detailEntity.cancel !=
null &&
(detailEntity.phone ==
null ||
(detailEntity.phone == null ||
detailEntity.phone ==
''))
? SizedBox()
... ... @@ -3944,11 +3954,16 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
.phone!),
textColor: MyColours
.color_515151,
textColorR:
MyColours
.color_438E93,
imageName:
'phone_detail')),
textColorR: (Utils.getAuthority(context, '订座详情-电话') || widget.uid == userModel.user!.openid || (userModel.user!.role_name == '店长' && detailModel!.detailModelAllSunModel!.roleName != '管理员' && detailModel!.detailModelAllSunModel!.roleName != '店长'))
? MyColours
.color_438E93
: MyColours
.color_999999,
imageName: (Utils.getAuthority(context, '订座详情-电话') ||
widget.uid == userModel.user!.openid ||
(userModel.user!.role_name == '店长' && detailModel!.detailModelAllSunModel!.roleName != '管理员' && detailModel!.detailModelAllSunModel!.roleName != '店长'))
? 'phone_detail'
: 'h_call')),
(detailEntity.status ==
"4" &&
detailEntity
... ... @@ -4111,8 +4126,8 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim>
],
),
_deposit(),
_verifyFood(),
_deposit(add),
_verifyFood(add),
_imageRemark(),
_operatingRecord(),
... ...