xt / Flutter-ReserveApp · Commits

Go to a project

Commit 00e1bab8650e2e6fe301f5597e9aa41318729e4d

Authored by wdn127929
1 parent 9c24186d
build: skipped

已预订操作按钮宽度

Inline Side-by-side
Showing 4 changed files with 27 additions and 30 deletions
@@ -112,7 +112,7 @@ class _CompleteCreateStorePageState extends State<CompleteCreateStorePage> { @@ -112,7 +112,7 @@ class _CompleteCreateStorePageState extends State<CompleteCreateStorePage> {
112 // 'userphone': user['phone'], 112 // 'userphone': user['phone'],
113 'token': createStoreModel.userCreateStore.user_token, 113 'token': createStoreModel.userCreateStore.user_token,
114 'nickname': createStoreModel.userCreateStore.nick_name, 114 'nickname': createStoreModel.userCreateStore.nick_name,
115 - // 'edate': seller['edate'] 115 + 'edate': seller['edate']
116 }; 116 };
117 117
118 userModel.saveUserInfo(User.fromJson(userMap)); 118 userModel.saveUserInfo(User.fromJson(userMap));
@@ -533,13 +533,13 @@ class _BaseInfoPersonnalPageState extends State<BaseInfoPersonnalPage> { @@ -533,13 +533,13 @@ class _BaseInfoPersonnalPageState extends State<BaseInfoPersonnalPage> {
533 appBar: SystemAppBar( 533 appBar: SystemAppBar(
534 '个人信息', 534 '个人信息',
535 onTap: () { 535 onTap: () {
536 - EventBus().emit('changeStatusColor'); 536 + // EventBus().emit('changeStatusColor');
537 Navigator.of(context).pop(); 537 Navigator.of(context).pop();
538 }, 538 },
539 ), 539 ),
540 body: WillPopScope( 540 body: WillPopScope(
541 onWillPop: () { 541 onWillPop: () {
542 - EventBus().emit('changeStatusColor'); 542 + // EventBus().emit('changeStatusColor');
543 Navigator.of(context).pop(); 543 Navigator.of(context).pop();
544 }, 544 },
545 child: InkWell( 545 child: InkWell(
@@ -480,25 +480,19 @@ class NoteBookItemFState extends State<NoteBookItemF> @@ -480,25 +480,19 @@ class NoteBookItemFState extends State<NoteBookItemF>
480 if (detail.endsWith('；')) { 480 if (detail.endsWith('；')) {
481 detail = detail.substring(0, detail.length - 1); 481 detail = detail.substring(0, detail.length - 1);
482 } 482 }
483 - double widthBtn = 464.0; 483 + double widthBtn = 464.0; //三个按钮
484 if (notebook.status == '2') { 484 if (notebook.status == '2') {
485 - widthBtn = 208.0;  
486 - }  
487 - // if (userModel.user.role_name == '迎宾') {  
488 - // widthBtn = 328.0;  
489 - // }  
490 - // if (!Utils.getAuthority(context, '取消预订')) {  
491 - // widthBtn = 328.0;  
492 - // }  
493 - // if (!Utils.getAuthority(context, '取消预订') &&  
494 - // notebook.uid == userModel.user.openid) {  
495 - // widthBtn = 464.0;  
496 - // }  
497 - if (notebook.status != '2' && Utils.getAuthority(context, '取消预订') ||  
498 - (!Utils.getAuthority(context, '取消预订') &&  
499 - notebook.uid == userModel.user.openid)) { 485 + //离店和取消预订
  486 +
  487 + widthBtn = 208.0; //一个按钮
  488 +
500 } else { 489 } else {
501 - widthBtn = 328.0; 490 + if (!Utils.getAuthority(context, '取消预订') ||
  491 + (!Utils.getAuthority(context, '取消预订') &&
  492 + notebook.uid != userModel.user.openid)) {
  493 + //没有权限
  494 + widthBtn = 328.0; //2个按钮
  495 + }
502 } 496 }
503 return Stack( 497 return Stack(
504 clipBehavior: Clip.none, 498 clipBehavior: Clip.none,
@@ -490,19 +490,21 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple> @@ -490,19 +490,21 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
490 if (detail.endsWith('；')) { 490 if (detail.endsWith('；')) {
491 detail = detail.substring(0, detail.length - 1); 491 detail = detail.substring(0, detail.length - 1);
492 } 492 }
493 - double widthBtn = 464.0; 493 + double widthBtn = 464.0; //三个按钮
494 if (notebook.status == '2') { 494 if (notebook.status == '2') {
495 - widthBtn = 208.0;  
496 - }  
497 - // if (userModel.user.role_name == '迎宾') {  
498 - // widthBtn = 328.0;  
499 - // }  
500 - if (notebook.status != '2' && Utils.getAuthority(context, '取消预订') ||  
501 - (!Utils.getAuthority(context, '取消预订') &&  
502 - notebook.uid == userModel.user.openid)) { 495 + //离店和取消预订
  496 +
  497 + widthBtn = 208.0; //一个按钮
  498 +
503 } else { 499 } else {
504 - widthBtn = 328.0; 500 + if (!Utils.getAuthority(context, '取消预订') ||
  501 + (!Utils.getAuthority(context, '取消预订') &&
  502 + notebook.uid != userModel.user.openid)) {
  503 + //没有权限
  504 + widthBtn = 328.0; //2个按钮
  505 + }
505 } 506 }
  507 +
506 return Stack( 508 return Stack(
507 clipBehavior: Clip.none, 509 clipBehavior: Clip.none,
508 alignment: Alignment.centerRight, 510 alignment: Alignment.centerRight,
@@ -778,6 +780,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple> @@ -778,6 +780,7 @@ class NoteBookItemSimpleState extends State<NoteBookItemSimple>
778 horizontal: 780 horizontal:
779 ScreenUtil().setWidth(16)), 781 ScreenUtil().setWidth(16)),
780 child: Row( 782 child: Row(
  783 + mainAxisSize: MainAxisSize.min,
781 children: [ 784 children: [
782 Image.asset( 785 Image.asset(
783 Utils.getImgPath( 786 Utils.getImgPath(