xt / Flutter-ReserveApp · Commits

Go to a project

Commit 1f5fcf556094b66afef62ed70ab207297fb7d532

Authored by wdn127929
1 parent 8db668e9
build: skipped

搜索历史记录人展示客情经理信息

Inline Side-by-side
Showing 7 changed files with 124 additions and 66 deletions
... ... @@ -23,6 +23,12 @@ class UserHistoryEntity extends Object with ISuspensionBean {
@JsonKey(name: 'cusdem')
String cusdem;
@JsonKey(name: 'nick_name')
String nickName;
@JsonKey(name: 'uid')
String uid;
List<String> pinyinList; //全拼数组
String pinyin; //全拼字母
String pinyinFirst; //首字母
... ... @@ -57,6 +63,8 @@ class UserHistoryEntity extends Object with ISuspensionBean {
this.sex,
this.phone,
this.cusdem,
this.nickName,
this.uid
);
factory UserHistoryEntity.fromJson(Map<String, dynamic> srcJson) =>
... ...
... ... @@ -8,12 +8,15 @@ part of 'user_history_entity.dart';
UserHistoryEntity _$UserHistoryEntityFromJson(Map<String, dynamic> json) {
return UserHistoryEntity(
json['id'] as String,
json['sid'] as String,
json['rname'] as String,
json['sex'] as String,
json['phone'] as String ?? '0',
json['cusdem'] as String);
json['id'] as String,
json['sid'] as String,
json['rname'] as String,
json['sex'] as String,
json['phone'] as String ?? '0',
json['cusdem'] as String,
json['nick_name'] as String ?? '',
json['uid'] as String,
);
}
Map<String, dynamic> _$UserHistoryEntityToJson(UserHistoryEntity instance) =>
... ... @@ -23,5 +26,7 @@ Map<String, dynamic> _$UserHistoryEntityToJson(UserHistoryEntity instance) =>
'rname': instance.rname,
'sex': instance.sex,
'phone': instance.phone,
'cusdem': instance.cusdem
'cusdem': instance.cusdem,
'nick_name': instance.nickName,
'uid': instance.uid
};
... ...
... ... @@ -48,7 +48,6 @@ class _EditReserverPageState extends State<EditReserverPage> {
ScrollController _scrollCrl = ScrollController();
@override
void initState() {
super.initState();
... ... @@ -696,31 +695,34 @@ class _EditReserverPageState extends State<EditReserverPage> {
2))
: BorderSide
.none)),
child: Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
child: Wrap(
// mainAxisAlignment:
// MainAxisAlignment
// .spaceBetween,
runAlignment: WrapAlignment.center,
children: [
Text(
_nameNode.hasFocus ? ( detailModel
_nameNode.hasFocus
? (detailModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: detailModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: detailModel
.userHistorys[
index]
.rnameStr): ( detailModel
.rnameStr)
: (detailModel
.userHistorys[
index]
.phone ==
null
? ''
: detailModel
.userHistorys[
index]
.phone ==
null
? ''
: detailModel
.userHistorys[
index]
.phone),
.phone),
style: TextStyle(
color: MyColours
.color_333333,
... ... @@ -729,34 +731,47 @@ class _EditReserverPageState extends State<EditReserverPage> {
.setSp(32)),
),
HEmptyView(20),
Expanded(
child: Text(
_nameNode.hasFocus ?(detailModel
Text(
_nameNode.hasFocus
? (detailModel
.userHistorys[
index]
.phone ==
null
? ''
: detailModel
.userHistorys[
index]
.phone ==
null
? ''
: detailModel
.userHistorys[
index]
.phone):( detailModel
.phone)
: (detailModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: detailModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: detailModel
.userHistorys[
index]
.rnameStr) ,
.rnameStr),
style: TextStyle(
color: MyColours
.color_333333,
fontSize:
ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Text(
detailModel
.userHistorys[index]
.nickName,
style: TextStyle(
color: MyColours
.color_333333,
fontSize:
ScreenUtil()
.setSp(32)),
))
),
],
),
),
... ...
... ... @@ -1970,10 +1970,12 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
.setWidth(
2))
: BorderSide.none)),
child: Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
child: Wrap(
// mainAxisAlignment:
// MainAxisAlignment
// .spaceBetween,
runAlignment:
WrapAlignment.center,
children: [
Text(
_nameNode.hasFocus
... ... @@ -1990,8 +1992,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
.setSp(32)),
),
HEmptyView(20),
Expanded(
child: Text(
Text(
_nameNode.hasFocus
? _notebookDetailChangeModel
.userHistorys[index]
... ... @@ -2004,7 +2005,18 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
))
),
HEmptyView(20),
Text(
_notebookDetailChangeModel
.userHistorys[index]
.nickName,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
],
),
),
... ...
... ... @@ -2514,9 +2514,8 @@ class InvicationPageState extends State<InvicationPage>
width: ScreenUtil()
.setWidth(2))
: BorderSide.none)),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
child: Wrap(
runAlignment: WrapAlignment.center,
children: [
Text(
_nameNode.hasFocus
... ... @@ -2545,8 +2544,7 @@ class InvicationPageState extends State<InvicationPage>
ScreenUtil().setSp(32)),
),
HEmptyView(20),
Expanded(
child: Text(
Text(
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
... ... @@ -2571,7 +2569,18 @@ class InvicationPageState extends State<InvicationPage>
MyColours.color_333333,
fontSize:
ScreenUtil().setSp(32)),
))
),
HEmptyView(20),
Text(
_baseIndoProvider
.userHistorys[index]
.nickName,
style: TextStyle(
color:
MyColours.color_333333,
fontSize:
ScreenUtil().setSp(32)),
),
],
),
),
... ...
... ... @@ -95,7 +95,7 @@ class _ContantRightPageState extends State<ContantRightPage> {
_contacts[i].phones == null
? ''
: _contacts[i].phones.first.value.replaceAll(' ', ''),
'');
'','','');
item.pinyin = _contacts[i].displayName == null
? ''
: PinyinHelper.getPinyin(_contacts[i].displayName)
... ...
... ... @@ -1334,10 +1334,9 @@ class TableManagerPageState extends State<TableManagerPage> {
width: ScreenUtil()
.setWidth(2))
: BorderSide.none)),
child: Row(
mainAxisAlignment:
MainAxisAlignment
.spaceBetween,
child: Wrap(
runAlignment:
WrapAlignment.center,
children: [
Text(
_nameNode.hasFocus
... ... @@ -1368,8 +1367,7 @@ class TableManagerPageState extends State<TableManagerPage> {
.setSp(32)),
),
HEmptyView(20),
Expanded(
child: Text(
Text(
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
... ... @@ -1396,7 +1394,18 @@ class TableManagerPageState extends State<TableManagerPage> {
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
))
),
HEmptyView(20),
Text(
_baseIndoProvider
.userHistorys[index]
.nickName,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
],
),
),
... ...