Commit ac8d74e3ecd19e8dc1994220ac70e3117e82f059

Authored by wdn127929
1 parent 7684885b

kkk

... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "432"
def flutterVersionCode = "433"
if (flutterVersionCode == null) {
flutterVersionCode = '432'
flutterVersionCode = '433'
}
def flutterVersionName = "4.3.2"
def flutterVersionName = "4.3.3"
if (flutterVersionName == null) {
flutterVersionName = '4.3.2'
flutterVersionName = '4.3.3'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -178,7 +178,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
}
if (customerProvider.controllernum.text.trim().length > 0) {
params['reserve_num'] = customerProvider.controlleretime.text;
params['reserve_num'] = customerProvider.controllernum.text;
params['reserve_sort'] = '${dropValue + 1}';
}
... ... @@ -199,7 +199,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
params['reserve_date'] = dayid;
if (customerProvider.controllernum.text.trim().length > 0) {
params['reserve_num'] = customerProvider.controlleretime.text;
params['reserve_num'] = customerProvider.controllernum.text;
params['reserve_sort'] = '${dropValue + 1}';
}
} else {
... ...
... ... @@ -59,7 +59,7 @@ class _CustomerListPageState extends State<CustomerListPage>
ScrollController _scrollCrl = ScrollController();
int dropValue = 0;
bool showDrop = true;
List<String> timeTilte = ['大于', '等于', '小于'];
List<String> timeTilte = ['等于', '小于', '大于'];
bool distribution = false;
@override
... ... @@ -146,7 +146,11 @@ class _CustomerListPageState extends State<CustomerListPage>
// if (item.nickName != null) {
FilterBtnModel model = FilterBtnModel();
model.id = item.uid;
model.title = item.nickName ?? item.account;
model.title = item.nickName == null
? item.account == null
? item.uid
: item.account
: item.nickName;
if (widget.uidStr == model.id) {
model.select = true;
} else {
... ... @@ -265,7 +269,7 @@ class _CustomerListPageState extends State<CustomerListPage>
params['reserve_date'] = dayid;
if (customerProvider.controllernum.text.trim().length > 0) {
params['reserve_num'] = customerProvider.controlleretime.text;
params['reserve_num'] = customerProvider.controllernum.text;
params['reserve_sort'] = '${dropValue + 1}';
}
} else {
... ...
... ... @@ -1553,7 +1553,7 @@ class CustomerProvider extends ChangeNotifier {
if (item.nickName != null) {
FilterBtnModel model = FilterBtnModel();
model.id = item.id;
model.title = item.nickName;
model.title = item.nickName ?? item.account;
model.select = false;
filterManageList.add(model);
}
... ...