xt / Flutter-ReserveApp · Commits

Go to a project

Commit 55ebf60fe3760b1882ac393b38d6fafd2ae4a73a

Authored by wdn127929
1 parent 0915ccfa
build: skipped

订单详情页面电话是否显示全

Inline Side-by-side
Showing 6 changed files with 62 additions and 26 deletions
@@ -512,7 +512,7 @@ @@ -512,7 +512,7 @@
512 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 512 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
513 CODE_SIGN_IDENTITY = "Apple Development"; 513 CODE_SIGN_IDENTITY = "Apple Development";
514 CODE_SIGN_STYLE = Automatic; 514 CODE_SIGN_STYLE = Automatic;
515 - CURRENT_PROJECT_VERSION = 5130; 515 + CURRENT_PROJECT_VERSION = 5132;
516 DEVELOPMENT_TEAM = 8J59HM8B82; 516 DEVELOPMENT_TEAM = 8J59HM8B82;
517 ENABLE_BITCODE = NO; 517 ENABLE_BITCODE = NO;
518 FLUTTER_BUILD_MODE = release; 518 FLUTTER_BUILD_MODE = release;
@@ -658,7 +658,7 @@ @@ -658,7 +658,7 @@
658 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 658 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
659 CODE_SIGN_IDENTITY = "Apple Development"; 659 CODE_SIGN_IDENTITY = "Apple Development";
660 CODE_SIGN_STYLE = Automatic; 660 CODE_SIGN_STYLE = Automatic;
661 - CURRENT_PROJECT_VERSION = 5130; 661 + CURRENT_PROJECT_VERSION = 5132;
662 DEVELOPMENT_TEAM = 8J59HM8B82; 662 DEVELOPMENT_TEAM = 8J59HM8B82;
663 ENABLE_BITCODE = NO; 663 ENABLE_BITCODE = NO;
664 FLUTTER_BUILD_MODE = release; 664 FLUTTER_BUILD_MODE = release;
@@ -694,7 +694,7 @@ @@ -694,7 +694,7 @@
694 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 694 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
695 CODE_SIGN_IDENTITY = "Apple Development"; 695 CODE_SIGN_IDENTITY = "Apple Development";
696 CODE_SIGN_STYLE = Automatic; 696 CODE_SIGN_STYLE = Automatic;
697 - CURRENT_PROJECT_VERSION = 5130; 697 + CURRENT_PROJECT_VERSION = 5132;
698 DEVELOPMENT_TEAM = 8J59HM8B82; 698 DEVELOPMENT_TEAM = 8J59HM8B82;
699 ENABLE_BITCODE = NO; 699 ENABLE_BITCODE = NO;
700 FLUTTER_BUILD_MODE = release; 700 FLUTTER_BUILD_MODE = release;
@@ -91,7 +91,6 @@ class Constant { @@ -91,7 +91,6 @@ class Constant {
91 ], 91 ],
92 '变更预订': [ 92 '变更预订': [
93 '管理员', 93 '管理员',
94 - '店长',  
95 '前台', 94 '前台',
96 ], 95 ],
97 '取消预订': [ 96 '取消预订': [
@@ -142,7 +141,7 @@ class Constant { @@ -142,7 +141,7 @@ class Constant {
142 '管理员', 141 '管理员',
143 '店长', 142 '店长',
144 ], 143 ],
145 - '电话': ['管理员', '店长', '前台', '迎宾'], 144 + // '电话': ['管理员', '店长', '前台', '迎宾'],
146 '新建优惠': [ 145 '新建优惠': [
147 '管理员', 146 '管理员',
148 '店长', 147 '店长',
@@ -188,5 +187,9 @@ class Constant { @@ -188,5 +187,9 @@ class Constant {
188 '管理员', 187 '管理员',
189 '店长', 188 '店长',
190 ], 189 ],
  190 + '订座详情-电话': [
  191 + '管理员',
  192 + '前台',
  193 + ],
191 }; 194 };
192 } 195 }
@@ -92,6 +92,7 @@ class NotebookDetail { @@ -92,6 +92,7 @@ class NotebookDetail {
92 String type; //0 内部订单 1 在线预订 92 String type; //0 内部订单 1 在线预订
93 String note_name; 93 String note_name;
94 String nick_name; 94 String nick_name;
  95 + String role_name;
95 String seller_user_phone; 96 String seller_user_phone;
96 String channel; 97 String channel;
97 String cdate; 98 String cdate;
@@ -104,9 +105,7 @@ class NotebookDetail { @@ -104,9 +105,7 @@ class NotebookDetail {
104 String gid; 105 String gid;
105 String place_order_name; //下单人 106 String place_order_name; //下单人
106 107
107 - dynamic is_user_comments; //是否评价过  
108 -  
109 - 108 + dynamic is_user_comments; //是否评价过
110 109
111 String get statuImgAssets { 110 String get statuImgAssets {
112 switch (status) { 111 switch (status) {
@@ -28,6 +28,7 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) { @@ -28,6 +28,7 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) {
28 ..type = json['type'] as String 28 ..type = json['type'] as String
29 ..note_name = json['note_name'] as String 29 ..note_name = json['note_name'] as String
30 ..nick_name = json['nick_name'] as String 30 ..nick_name = json['nick_name'] as String
  31 + ..role_name = json['role_name'] as String
31 ..seller_user_phone = json['seller_user_phone'] as String 32 ..seller_user_phone = json['seller_user_phone'] as String
32 ..channel = json['channel'] as String 33 ..channel = json['channel'] as String
33 ..cdate = json['cdate'] as String 34 ..cdate = json['cdate'] as String
@@ -75,6 +76,7 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) => @@ -75,6 +76,7 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) =>
75 'type': instance.type, 76 'type': instance.type,
76 'note_name': instance.note_name, 77 'note_name': instance.note_name,
77 'nick_name': instance.nick_name, 78 'nick_name': instance.nick_name,
  79 + 'role_name': instance.role_name,
78 'seller_user_phone': instance.seller_user_phone, 80 'seller_user_phone': instance.seller_user_phone,
79 'channel': instance.channel, 81 'channel': instance.channel,
80 'cdate': instance.cdate, 82 'cdate': instance.cdate,
@@ -2587,11 +2587,18 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -2587,11 +2587,18 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
2587 '') { 2587 '') {
2588 if (Utils.getAuthority( 2588 if (Utils.getAuthority(
2589 context, 2589 context,
2590 - '电话') || 2590 + '订座详情-电话') ||
2591 widget.uid == 2591 widget.uid ==
2592 userModel 2592 userModel
2593 .user 2593 .user
2594 - .openid) { 2594 + .openid ||
  2595 + (userModel
  2596 + .user.role_name ==
  2597 + '店长' &&
  2598 + detailEntity.role_name !=
  2599 + '管理员' &&
  2600 + detailEntity.role_name !=
  2601 + '店长')) {
2595 DialogUtil 2602 DialogUtil
2596 .goPhone( 2603 .goPhone(
2597 formatPhone); 2604 formatPhone);
@@ -2603,8 +2610,19 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -2603,8 +2610,19 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
2603 detailEntity.phone == 2610 detailEntity.phone ==
2604 null 2611 null
2605 ? '' 2612 ? ''
2606 - : detailEntity  
2607 - .phone, 2613 + : (Utils.getAuthority(context, '订座详情-电话') ||
  2614 + widget.uid ==
  2615 + userModel
  2616 + .user.openid ||
  2617 + (userModel.user.role_name == '店长' &&
  2618 + detailEntity.role_name !=
  2619 + '管理员' &&
  2620 + detailEntity.role_name !=
  2621 + '店长'))
  2622 + ? detailEntity
  2623 + .phone
  2624 + : Utils.starPhone(detailEntity
  2625 + .phone),
2608 textColor: MyColours 2626 textColor: MyColours
2609 .color_333333)) 2627 .color_333333))
2610 ], 2628 ],
@@ -3381,7 +3399,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -3381,7 +3399,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
3381 if (Utils.getAuthority( 3399 if (Utils.getAuthority(
3382 context, '变更预订') || 3400 context, '变更预订') ||
3383 widget.uid == 3401 widget.uid ==
3384 - userModel.user.openid) { 3402 + userModel.user.openid ||
  3403 + (userModel.user.role_name == '店长' &&
  3404 + detailEntity.role_name !=
  3405 + '管理员' &&
  3406 + detailEntity.role_name !=
  3407 + '店长')) {
3385 NavigatorUtil 3408 NavigatorUtil
3386 .goNoteBookChangeFPage( 3409 .goNoteBookChangeFPage(
3387 context, 3410 context,
@@ -3398,10 +3421,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -3398,10 +3421,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
3398 border: Border.all( 3421 border: Border.all(
3399 width: w(1), 3422 width: w(1),
3400 color: !(Utils.getAuthority( 3423 color: !(Utils.getAuthority(
3401 - context, '变更预订') ||  
3402 - widget.uid ==  
3403 - userModel  
3404 - .user.openid) 3424 + context, '变更预订') ||
  3425 + widget.uid ==
  3426 + userModel.user.openid ||
  3427 + (userModel.user.role_name == '店长' &&
  3428 + detailEntity.role_name !=
  3429 + '管理员' &&
  3430 + detailEntity.role_name !=
  3431 + '店长'))
3405 ? MyColours.color_999999 3432 ? MyColours.color_999999
3406 : MyColours.color_199095, 3433 : MyColours.color_199095,
3407 ), 3434 ),
@@ -3414,13 +3441,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -3414,13 +3441,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
3414 alignment: Alignment.center, 3441 alignment: Alignment.center,
3415 child: Text('变更预订', 3442 child: Text('变更预订',
3416 style: TextStyle( 3443 style: TextStyle(
3417 - color: !(Utils  
3418 - .getAuthority(  
3419 - context,  
3420 - '变更预订') ||  
3421 - widget.uid ==  
3422 - userModel.user  
3423 - .openid) 3444 + color: !(Utils.getAuthority(
  3445 + context, '变更预订') ||
  3446 + widget.uid ==
  3447 + userModel.user.openid ||
  3448 + (userModel.user.role_name == '店长' &&
  3449 + detailEntity.role_name !=
  3450 + '管理员' &&
  3451 + detailEntity.role_name !=
  3452 + '店长'))
3424 ? MyColours 3453 ? MyColours
3425 .color_999999 3454 .color_999999
3426 : MyColours 3455 : MyColours
1 import 'dart:async'; 1 import 'dart:async';
2 import 'dart:convert'; 2 import 'dart:convert';
3 import 'dart:io'; 3 import 'dart:io';
  4 +import 'package:cached_network_image/cached_network_image.dart';
4 import 'package:common_utils/common_utils.dart'; 5 import 'package:common_utils/common_utils.dart';
5 import 'package:flutter/cupertino.dart'; 6 import 'package:flutter/cupertino.dart';
6 import 'package:flutter/material.dart'; 7 import 'package:flutter/material.dart';
@@ -125,6 +126,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -125,6 +126,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
125 // TODO: implement initState 126 // TODO: implement initState
126 super.initState(); 127 super.initState();
127 LogUtil.v("home_initState"); 128 LogUtil.v("home_initState");
  129 + // CachedNetworkImage.evictFromCache(
  130 + // 'https://qn.colorcun.com/template/heilanguodu-6.png');
128 FlutterBugly.init(androidAppId: "f71a313f42", iOSAppId: "3089e4587e"); 131 FlutterBugly.init(androidAppId: "f71a313f42", iOSAppId: "3089e4587e");
129 needRefreshTemp = widget.needReresh; 132 needRefreshTemp = widget.needReresh;
130 _channel.setMethodCallHandler(platformCallHandler); //设置监听 133 _channel.setMethodCallHandler(platformCallHandler); //设置监听
@@ -1237,7 +1240,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -1237,7 +1240,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
1237 // _getAllUnMessages(); 1240 // _getAllUnMessages();
1238 }); 1241 });
1239 // } 1242 // }
1240 - 1243 +
1241 break; 1244 break;
1242 case AppLifecycleState.inactive: 1245 case AppLifecycleState.inactive:
1243 print('inactive'); 1246 print('inactive');
@@ -1262,7 +1265,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -1262,7 +1265,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
1262 _getAllUnMessages() { 1265 _getAllUnMessages() {
1263 MessageDialogModel messageModel = 1266 MessageDialogModel messageModel =
1264 Provider.of<MessageDialogModel>(context, listen: false); 1267 Provider.of<MessageDialogModel>(context, listen: false);
1265 - 1268 +
1266 messageModel.messages = []; 1269 messageModel.messages = [];
1267 1270
1268 getUntreatedMessage(() { 1271 getUntreatedMessage(() {