xt / Flutter-ReserveApp · Commits

Go to a project

Commit f3ca7895b60ea5ce0366ceb2aaead4d19c9a1e8e

Authored by wdn127929
1 parent 9555c583
build: skipped

分页

Inline Side-by-side
Showing 3 changed files with 17 additions and 5 deletions
@@ -131,7 +131,10 @@ class SellerUser extends Object { @@ -131,7 +131,10 @@ class SellerUser extends Object {
131 @JsonKey(name: 'account') 131 @JsonKey(name: 'account')
132 String account; 132 String account;
133 133
134 - SellerUser(this.count, this.nickName, this.uid, this.account); 134 + @JsonKey(name: 'detailStr')
  135 + String detailStr;
  136 +
  137 + SellerUser(this.count, this.nickName, this.uid, this.account, this.detailStr);
135 138
136 factory SellerUser.fromJson(Map<String, dynamic> srcJson) => 139 factory SellerUser.fromJson(Map<String, dynamic> srcJson) =>
137 _$SellerUserFromJson(srcJson); 140 _$SellerUserFromJson(srcJson);
@@ -99,7 +99,8 @@ SellerUser _$SellerUserFromJson(Map<String, dynamic> json) { @@ -99,7 +99,8 @@ SellerUser _$SellerUserFromJson(Map<String, dynamic> json) {
99 json['count'] as String, 99 json['count'] as String,
100 json['nick_name'] as String, 100 json['nick_name'] as String,
101 json['uid'] as String, 101 json['uid'] as String,
102 - json['account'] as String 102 + json['account'] as String,
  103 + json['detailStr'] as String
103 ); 104 );
104 } 105 }
105 106
@@ -108,5 +109,6 @@ Map<String, dynamic> _$SellerUserToJson(SellerUser instance) => @@ -108,5 +109,6 @@ Map<String, dynamic> _$SellerUserToJson(SellerUser instance) =>
108 'count': instance.count, 109 'count': instance.count,
109 'nick_name': instance.nickName, 110 'nick_name': instance.nickName,
110 'uid': instance.uid, 111 'uid': instance.uid,
111 - 'account':instance.account 112 + 'account':instance.account,
  113 + 'detailStr':instance.detailStr
112 }; 114 };
@@ -720,8 +720,10 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -720,8 +720,10 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
720 ); 720 );
721 } 721 }
722 722
723 - Widget _managerWidget(String pnum, String btnTitle, String percent, 723 + Widget _managerWidget(
  724 + String pnum, String btnTitle, String percent, String detailStr,
724 {String uid = ''}) { 725 {String uid = ''}) {
  726 + List detailList = detailStr.split('-');
725 return Container( 727 return Container(
726 // width: w(122), 728 // width: w(122),
727 height: w(116), 729 height: w(116),
@@ -734,6 +736,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -734,6 +736,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
734 Align( 736 Align(
735 alignment: Alignment.centerLeft, 737 alignment: Alignment.centerLeft,
736 child: Container( 738 child: Container(
  739 + // constraints: BoxConstraints(maxHeight: w(24)),
737 padding: EdgeInsets.symmetric(vertical: w(4), horizontal: w(5)), 740 padding: EdgeInsets.symmetric(vertical: w(4), horizontal: w(5)),
738 decoration: BoxDecoration( 741 decoration: BoxDecoration(
739 borderRadius: BorderRadius.circular(r(3)), 742 borderRadius: BorderRadius.circular(r(3)),
@@ -741,6 +744,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -741,6 +744,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
741 Border.all(color: MyColours.color_999999, width: w(1))), 744 Border.all(color: MyColours.color_999999, width: w(1))),
742 child: Text( 745 child: Text(
743 btnTitle, 746 btnTitle,
  747 + maxLines: 1,
  748 + overflow: TextOverflow.ellipsis,
744 style: TextStyle( 749 style: TextStyle(
745 fontSize: font(12), 750 fontSize: font(12),
746 fontWeight: FontWeight.bold, 751 fontWeight: FontWeight.bold,
@@ -952,7 +957,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -952,7 +957,8 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
952 return _managerWidget( 957 return _managerWidget(
953 '${widget.customerProvider.storeSunmodel.distribution}', 958 '${widget.customerProvider.storeSunmodel.distribution}',
954 '未分配经理', 959 '未分配经理',
955 - null); 960 + null,
  961 + '2-2-2');
956 } 962 }
957 963
958 return _managerWidget( 964 return _managerWidget(
@@ -963,6 +969,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> { @@ -963,6 +969,7 @@ class _StoreCustomerHomeLeftPageState extends State<StoreCustomerHomeLeftPage> {
963 ? '' 969 ? ''
964 : '${widget.customerProvider.storeSunmodel.sellerUser[index - 1].nickName ?? widget.customerProvider.storeSunmodel.sellerUser[index - 1].account}', 970 : '${widget.customerProvider.storeSunmodel.sellerUser[index - 1].nickName ?? widget.customerProvider.storeSunmodel.sellerUser[index - 1].account}',
965 null, 971 null,
  972 + '${widget.customerProvider.storeSunmodel.sellerUser[index - 1].detailStr}',
966 uid: widget.customerProvider.storeSunmodel 973 uid: widget.customerProvider.storeSunmodel
967 .sellerUser[index - 1].uid); 974 .sellerUser[index - 1].uid);
968 }), 975 }),