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 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5130;
CURRENT_PROJECT_VERSION = 5132;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -658,7 +658,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5130;
CURRENT_PROJECT_VERSION = 5132;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -694,7 +694,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5130;
CURRENT_PROJECT_VERSION = 5132;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -91,7 +91,6 @@ class Constant {
],
'变更预订': [
'管理员',
'店长',
'前台',
],
'取消预订': [
... ... @@ -142,7 +141,7 @@ class Constant {
'管理员',
'店长',
],
'电话': ['管理员', '店长', '前台', '迎宾'],
// '电话': ['管理员', '店长', '前台', '迎宾'],
'新建优惠': [
'管理员',
'店长',
... ... @@ -188,5 +187,9 @@ class Constant {
'管理员',
'店长',
],
'订座详情-电话': [
'管理员',
'前台',
],
};
}
... ...
... ... @@ -92,6 +92,7 @@ class NotebookDetail {
String type; //0 内部订单 1 在线预订
String note_name;
String nick_name;
String role_name;
String seller_user_phone;
String channel;
String cdate;
... ... @@ -104,9 +105,7 @@ class NotebookDetail {
String gid;
String place_order_name; //下单人
dynamic is_user_comments; //是否评价过
dynamic is_user_comments; //是否评价过
String get statuImgAssets {
switch (status) {
... ...
... ... @@ -28,6 +28,7 @@ NotebookDetail _$NotebookDetailFromJson(Map<String, dynamic> json) {
..type = json['type'] as String
..note_name = json['note_name'] as String
..nick_name = json['nick_name'] as String
..role_name = json['role_name'] as String
..seller_user_phone = json['seller_user_phone'] as String
..channel = json['channel'] as String
..cdate = json['cdate'] as String
... ... @@ -75,6 +76,7 @@ Map<String, dynamic> _$NotebookDetailToJson(NotebookDetail instance) =>
'type': instance.type,
'note_name': instance.note_name,
'nick_name': instance.nick_name,
'role_name': instance.role_name,
'seller_user_phone': instance.seller_user_phone,
'channel': instance.channel,
'cdate': instance.cdate,
... ...
... ... @@ -2587,11 +2587,18 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
'') {
if (Utils.getAuthority(
context,
'电话') ||
'订座详情-电话') ||
widget.uid ==
userModel
.user
.openid) {
.openid ||
(userModel
.user.role_name ==
'店长' &&
detailEntity.role_name !=
'管理员' &&
detailEntity.role_name !=
'店长')) {
DialogUtil
.goPhone(
formatPhone);
... ... @@ -2603,8 +2610,19 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
detailEntity.phone ==
null
? ''
: detailEntity
.phone,
: (Utils.getAuthority(context, '订座详情-电话') ||
widget.uid ==
userModel
.user.openid ||
(userModel.user.role_name == '店长' &&
detailEntity.role_name !=
'管理员' &&
detailEntity.role_name !=
'店长'))
? detailEntity
.phone
: Utils.starPhone(detailEntity
.phone),
textColor: MyColours
.color_333333))
],
... ... @@ -3381,7 +3399,12 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
if (Utils.getAuthority(
context, '变更预订') ||
widget.uid ==
userModel.user.openid) {
userModel.user.openid ||
(userModel.user.role_name == '店长' &&
detailEntity.role_name !=
'管理员' &&
detailEntity.role_name !=
'店长')) {
NavigatorUtil
.goNoteBookChangeFPage(
context,
... ... @@ -3398,10 +3421,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
border: Border.all(
width: w(1),
color: !(Utils.getAuthority(
context, '变更预订') ||
widget.uid ==
userModel
.user.openid)
context, '变更预订') ||
widget.uid ==
userModel.user.openid ||
(userModel.user.role_name == '店长' &&
detailEntity.role_name !=
'管理员' &&
detailEntity.role_name !=
'店长'))
? MyColours.color_999999
: MyColours.color_199095,
),
... ... @@ -3414,13 +3441,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
alignment: Alignment.center,
child: Text('变更预订',
style: TextStyle(
color: !(Utils
.getAuthority(
context,
'变更预订') ||
widget.uid ==
userModel.user
.openid)
color: !(Utils.getAuthority(
context, '变更预订') ||
widget.uid ==
userModel.user.openid ||
(userModel.user.role_name == '店长' &&
detailEntity.role_name !=
'管理员' &&
detailEntity.role_name !=
'店长'))
? MyColours
.color_999999
: MyColours
... ...
import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
... ... @@ -125,6 +126,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// TODO: implement initState
super.initState();
LogUtil.v("home_initState");
// CachedNetworkImage.evictFromCache(
// 'https://qn.colorcun.com/template/heilanguodu-6.png');
FlutterBugly.init(androidAppId: "f71a313f42", iOSAppId: "3089e4587e");
needRefreshTemp = widget.needReresh;
_channel.setMethodCallHandler(platformCallHandler); //设置监听
... ... @@ -1237,7 +1240,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// _getAllUnMessages();
});
// }
break;
case AppLifecycleState.inactive:
print('inactive');
... ... @@ -1262,7 +1265,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
_getAllUnMessages() {
MessageDialogModel messageModel =
Provider.of<MessageDialogModel>(context, listen: false);
messageModel.messages = [];
getUntreatedMessage(() {
... ...