Commit ac8d74e3ecd19e8dc1994220ac70e3117e82f059

Authored by wdn127929
1 parent 7684885b

kkk

@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "432" 15 +def flutterVersionCode = "433"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '432' 17 + flutterVersionCode = '433'
18 } 18 }
19 19
20 -def flutterVersionName = "4.3.2" 20 +def flutterVersionName = "4.3.3"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '4.3.2' 22 + flutterVersionName = '4.3.3'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -178,7 +178,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -178,7 +178,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
178 } 178 }
179 179
180 if (customerProvider.controllernum.text.trim().length > 0) { 180 if (customerProvider.controllernum.text.trim().length > 0) {
181 - params['reserve_num'] = customerProvider.controlleretime.text; 181 + params['reserve_num'] = customerProvider.controllernum.text;
182 params['reserve_sort'] = '${dropValue + 1}'; 182 params['reserve_sort'] = '${dropValue + 1}';
183 } 183 }
184 184
@@ -199,7 +199,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage> @@ -199,7 +199,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
199 199
200 params['reserve_date'] = dayid; 200 params['reserve_date'] = dayid;
201 if (customerProvider.controllernum.text.trim().length > 0) { 201 if (customerProvider.controllernum.text.trim().length > 0) {
202 - params['reserve_num'] = customerProvider.controlleretime.text; 202 + params['reserve_num'] = customerProvider.controllernum.text;
203 params['reserve_sort'] = '${dropValue + 1}'; 203 params['reserve_sort'] = '${dropValue + 1}';
204 } 204 }
205 } else { 205 } else {
@@ -59,7 +59,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -59,7 +59,7 @@ class _CustomerListPageState extends State<CustomerListPage>
59 ScrollController _scrollCrl = ScrollController(); 59 ScrollController _scrollCrl = ScrollController();
60 int dropValue = 0; 60 int dropValue = 0;
61 bool showDrop = true; 61 bool showDrop = true;
62 - List<String> timeTilte = ['大于', '等于', '小于']; 62 + List<String> timeTilte = ['等于', '小于', '大于'];
63 bool distribution = false; 63 bool distribution = false;
64 64
65 @override 65 @override
@@ -146,7 +146,11 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -146,7 +146,11 @@ class _CustomerListPageState extends State<CustomerListPage>
146 // if (item.nickName != null) { 146 // if (item.nickName != null) {
147 FilterBtnModel model = FilterBtnModel(); 147 FilterBtnModel model = FilterBtnModel();
148 model.id = item.uid; 148 model.id = item.uid;
149 - model.title = item.nickName ?? item.account; 149 + model.title = item.nickName == null
  150 + ? item.account == null
  151 + ? item.uid
  152 + : item.account
  153 + : item.nickName;
150 if (widget.uidStr == model.id) { 154 if (widget.uidStr == model.id) {
151 model.select = true; 155 model.select = true;
152 } else { 156 } else {
@@ -265,7 +269,7 @@ class _CustomerListPageState extends State<CustomerListPage> @@ -265,7 +269,7 @@ class _CustomerListPageState extends State<CustomerListPage>
265 269
266 params['reserve_date'] = dayid; 270 params['reserve_date'] = dayid;
267 if (customerProvider.controllernum.text.trim().length > 0) { 271 if (customerProvider.controllernum.text.trim().length > 0) {
268 - params['reserve_num'] = customerProvider.controlleretime.text; 272 + params['reserve_num'] = customerProvider.controllernum.text;
269 params['reserve_sort'] = '${dropValue + 1}'; 273 params['reserve_sort'] = '${dropValue + 1}';
270 } 274 }
271 } else { 275 } else {
@@ -1553,7 +1553,7 @@ class CustomerProvider extends ChangeNotifier { @@ -1553,7 +1553,7 @@ class CustomerProvider extends ChangeNotifier {
1553 if (item.nickName != null) { 1553 if (item.nickName != null) {
1554 FilterBtnModel model = FilterBtnModel(); 1554 FilterBtnModel model = FilterBtnModel();
1555 model.id = item.id; 1555 model.id = item.id;
1556 - model.title = item.nickName; 1556 + model.title = item.nickName ?? item.account;
1557 model.select = false; 1557 model.select = false;
1558 filterManageList.add(model); 1558 filterManageList.add(model);
1559 } 1559 }