Commit 00e1bab8650e2e6fe301f5597e9aa41318729e4d

Authored by wdn127929
1 parent 9c24186d

已预订操作按钮宽度

... ... @@ -112,7 +112,7 @@ class _CompleteCreateStorePageState extends State<CompleteCreateStorePage> {
// 'userphone': user['phone'],
'token': createStoreModel.userCreateStore.user_token,
'nickname': createStoreModel.userCreateStore.nick_name,
// 'edate': seller['edate']
'edate': seller['edate']
};
userModel.saveUserInfo(User.fromJson(userMap));
... ...
... ... @@ -533,13 +533,13 @@ class _BaseInfoPersonnalPageState extends State<BaseInfoPersonnalPage> {
appBar: SystemAppBar(
'个人信息',
onTap: () {
EventBus().emit('changeStatusColor');
// EventBus().emit('changeStatusColor');
Navigator.of(context).pop();
},
),
body: WillPopScope(
onWillPop: () {
EventBus().emit('changeStatusColor');
// EventBus().emit('changeStatusColor');
Navigator.of(context).pop();
},
child: InkWell(
... ...
... ... @@ -480,25 +480,19 @@ class NoteBookItemFState extends State<NoteBookItemF>
if (detail.endsWith(';')) {
detail = detail.substring(0, detail.length - 1);
}
double widthBtn = 464.0;
double widthBtn = 464.0; //三个按钮
if (notebook.status == '2') {
widthBtn = 208.0;
}
// if (userModel.user.role_name == '迎宾') {
// widthBtn = 328.0;
// }
// if (!Utils.getAuthority(context, '取消预订')) {
// widthBtn = 328.0;
// }
// if (!Utils.getAuthority(context, '取消预订') &&
// notebook.uid == userModel.user.openid) {
// widthBtn = 464.0;
// }
if (notebook.status != '2' && Utils.getAuthority(context, '取消预订') ||
(!Utils.getAuthority(context, '取消预订') &&
notebook.uid == userModel.user.openid)) {
//离店和取消预订
widthBtn = 208.0; //一个按钮
} else {
widthBtn = 328.0;
if (!Utils.getAuthority(context, '取消预订') ||
(!Utils.getAuthority(context, '取消预订') &&
notebook.uid != userModel.user.openid)) {
//没有权限
widthBtn = 328.0; //2个按钮
}
}
return Stack(
clipBehavior: Clip.none,
... ...
... ... @@ -490,19 +490,21 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
if (detail.endsWith(';')) {
detail = detail.substring(0, detail.length - 1);
}
double widthBtn = 464.0;
double widthBtn = 464.0; //三个按钮
if (notebook.status == '2') {
widthBtn = 208.0;
}
// if (userModel.user.role_name == '迎宾') {
// widthBtn = 328.0;
// }
if (notebook.status != '2' && Utils.getAuthority(context, '取消预订') ||
(!Utils.getAuthority(context, '取消预订') &&
notebook.uid == userModel.user.openid)) {
//离店和取消预订
widthBtn = 208.0; //一个按钮
} else {
widthBtn = 328.0;
if (!Utils.getAuthority(context, '取消预订') ||
(!Utils.getAuthority(context, '取消预订') &&
notebook.uid != userModel.user.openid)) {
//没有权限
widthBtn = 328.0; //2个按钮
}
}
return Stack(
clipBehavior: Clip.none,
alignment: Alignment.centerRight,
... ... @@ -778,6 +780,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
horizontal:
ScreenUtil().setWidth(16)),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Image.asset(
Utils.getImgPath(
... ...