xt / Flutter-ReserveApp · Commits

Go to a project

Commit 6381d95ae5d007a262ac207e1533a145dfee3d0a

Authored by weixin_45529955
1 parent f6c7526f
build: skipped

客情列表增加人均消费金额筛选条件

Inline Side-by-side
Showing 6 changed files with 482 additions and 155 deletions
... ... @@ -20,19 +20,19 @@ if (flutterRoot == null) {
def flutterVersionCode = "560"
def flutterVersionCode = "561"
if (flutterVersionCode == null) {
flutterVersionCode = '560'
flutterVersionCode = '561'
}
def flutterVersionName = "5.6.0"
def flutterVersionName = "5.6.1"
if (flutterVersionName == null) {
flutterVersionName = '5.6.0'
flutterVersionName = '5.6.1'
}
... ...
... ... @@ -277,10 +277,14 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
... ... @@ -294,10 +298,14 @@
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
... ... @@ -449,7 +457,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 560;
CURRENT_PROJECT_VERSION = 5610;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -458,7 +466,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.6.0;
MARKETING_VERSION = 5.6.1;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -632,7 +640,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 560;
CURRENT_PROJECT_VERSION = 5610;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -641,7 +649,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.6.0;
MARKETING_VERSION = 5.6.1;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ... @@ -658,7 +666,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 560;
CURRENT_PROJECT_VERSION = 5610;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
... ... @@ -667,7 +675,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.6.0;
MARKETING_VERSION = 5.6.1;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
... ...
... ... @@ -10,10 +10,10 @@ class Constant {
*
* 测试账号变更，已经删除0001 账户 代替为 0019！！！！！！！注意！！！！！！！！！！！！！！
* */
static const WXMiniProgramType wxMiniProgramType =
WXMiniProgramType.release; //正式版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.preview; //体验版
// WXMiniProgramType.release; //正式版
static const WXMiniProgramType wxMiniProgramType =
WXMiniProgramType.preview; //体验版
// static const WXMiniProgramType wxMiniProgramType =
// WXMiniProgramType.test; //开发版
... ...
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/constant/state.dart';
... ... @@ -262,11 +263,40 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
params['reserve_num'] = customerProvider!.controllernum.text;
params['reserve_sort'] = '${dropValue! + 1}';
}
bool tempMoney = customerProvider!.filterMoneyList.any((value) {
return value.select == true;
});
if (tempMoney) {
//快捷金额选择
String smoney = '';
String emoney = '';
for (FilterBtnModel item in customerProvider!.filterMoneyList) {
if (item.select!) {
if (item.id == '300') {
smoney = '300';
emoney = '-1';
} else {
List<String> strList = item.id!.split('-');
smoney = strList[0];
emoney = strList[1];
}
}
}
params['average'] = '${smoney},${emoney}';
} else {
if (customerProvider!.controllersmoney.text.trim().length > 0 &&
customerProvider!.controlleremoney.text.trim().length > 0) {
params['average'] =
'${customerProvider!.controllersmoney.text},${customerProvider!.controlleremoney.text}';
}
}
bool temp = customerProvider!.filterDayList.any((value) {
return value.select == true;
});
if (temp == true) {
if (temp) {
if (customerProvider!.controllernum.text.trim().length == 0) {
Utils.showToast('请输入多少次预订');
return;
... ... @@ -735,6 +765,12 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
in customerProvider!.filterDayList) {
item.select = false;
}
for (FilterBtnModel item
in customerProvider!.filterMoneyList) {
item.select = false;
}
customerProvider!.controllersmoney.text = '';
customerProvider!.controlleremoney.text = '';
customerProvider!.controllerstime.text = '';
customerProvider!.controlleretime.text = '';
customerProvider!.controllernum.text = '';
... ... @@ -771,6 +807,38 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
// return;
// }
// }
if (customerProvider!.controllersmoney.text.trim().length >
0 &&
customerProvider!.controlleremoney.text.trim().length ==
0) {
Utils.showToast('请输入人均消费结束金额');
return;
}
if (customerProvider!.controllersmoney.text.trim().length ==
0 &&
customerProvider!.controlleremoney.text.trim().length >
0) {
Utils.showToast('请输入人均消费开始金额');
return;
}
if (customerProvider!.controllersmoney.text.trim().length >
0 &&
customerProvider!.controlleremoney.text.trim().length >
0) {
double smoney = double.tryParse(
customerProvider!.controllersmoney.text) ??
0.0;
double emoney = double.tryParse(
customerProvider!.controlleremoney.text) ??
0.0;
if (smoney > emoney) {
Utils.showToast('人均消费金额筛选区间起始金额不能大于结束金额');
return;
}
}
bool temp = customerProvider!.filterDayList.any((value) {
return value.select == true;
});
... ... @@ -839,24 +907,30 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
showFilter = false;
});
customerProvider!.hydSelAll = false;
for (FilterBtnModel item
in customerProvider!.filterHydList) {
item.select = false;
}
customerProvider!.labelSelAll = false;
for (FilterBtnModel item
in customerProvider!.filterLabelList) {
item.select = false;
}
for (FilterBtnModel item
in customerProvider!.filterDayList) {
item.select = false;
}
customerProvider!.controllerstime.text = '';
customerProvider!.controlleretime.text = '';
customerProvider!.controllernum.text = '';
dropValue = 0;
// customerProvider!.hydSelAll = false;
// for (FilterBtnModel item
// in customerProvider!.filterHydList) {
// item.select = false;
// }
// customerProvider!.labelSelAll = false;
// for (FilterBtnModel item
// in customerProvider!.filterLabelList) {
// item.select = false;
// }
// for (FilterBtnModel item
// in customerProvider!.filterDayList) {
// item.select = false;
// }
// for (FilterBtnModel item
// in customerProvider!.filterMoneyList) {
// item.select = false;
// }
// customerProvider!.controllerstime.text = '';
// customerProvider!.controlleretime.text = '';
// customerProvider!.controllersmoney.text = '';
// customerProvider!.controlleremoney.text = '';
// customerProvider!.controllernum.text = '';
// dropValue = 0;
});
}
},
... ... @@ -914,7 +988,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
// print('object');
// },
child: Container(
height: ScreenUtil().setWidth(92 + 52 + 30 * 3 + 90) +
height: ScreenUtil()
.setWidth(92 + 52 + 30 * 3 + 90 + 20) +
ScreenUtil().statusBarHeight,
// width: s,
width: ScreenUtil().screenWidth,
... ... @@ -1165,19 +1240,25 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_textWidget('人均消费金额', MyColours.color_515151, FontWeight.bold, 28),
// GestureDetector(
// onTap: () {
// customerProvider.controllersmoney.text = '';
// customerProvider.controlleremoney.text = '';
// },
// child: Container(
// color: Colors.white,
// height: ScreenUtil().setWidth(40),
// alignment: Alignment.center,
// padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
// child: _textWidget(
// '清空', MyColours.color_199095, FontWeight.normal, 24),
// ))
GestureDetector(
onTap: () {
customerProvider!.controllersmoney.text = '';
customerProvider!.controlleremoney.text = '';
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
value.select = false;
}
// customerProvider.controllernum.text = '';
state(() {});
},
child: Container(
color: Colors.white,
height: ScreenUtil().setWidth(40),
alignment: Alignment.center,
padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
child: _textWidget(
'清空', MyColours.color_199095, FontWeight.normal, 24),
))
],
),
VEmptyView(20),
... ... @@ -1188,6 +1269,17 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
Expanded(
child: _textFeildWidget(customerProvider!.controllersmoney,
customerProvider!.smoneyFocus, state, (value) {
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
value.select = false;
}
// customerProvider.controllernum.text = '';
state(() {});
// setState(() {});
// _searchSellerLocation();
// customerProvider.searchData(value);
//输入框
}, unit: '元')),
HEmptyView(10),
... ... @@ -1195,42 +1287,76 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
HEmptyView(10),
Expanded(
child: _textFeildWidget(customerProvider!.controlleremoney,
customerProvider!.emoneyFocus, state, (value) {},
unit: '元')),
customerProvider!.emoneyFocus, state, (value) {
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
value.select = false;
}
// customerProvider.controllernum.text = '';
state(() {});
}, unit: '元')),
],
)),
VEmptyView(40),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_textWidget('人均消费能力', MyColours.color_515151, FontWeight.bold, 28),
// GestureDetector(
// onTap: () {
// customerProvider.controllersmoney.text = '';
// customerProvider.controlleremoney.text = '';
// },
// child: Container(
// color: Colors.white,
// height: ScreenUtil().setWidth(40),
// alignment: Alignment.center,
// padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
// child: _textWidget(
// '清空', MyColours.color_199095, FontWeight.normal, 24),
// ))
],
),
VEmptyView(20),
Row(
children: [
HEmptyView(20),
_textWidget('最高的', MyColours.color_199095, FontWeight.normal, 24),
HEmptyView(10),
Expanded(
child: _textFeildWidget(customerProvider!.controllermaxmoney,
customerProvider!.maxmoneyFocus, state, (value) {},
unit: '%')),
],
),
Padding(
padding: EdgeInsets.only(left: w(10)),
child: Row(children: [
_textWidget('或', MyColours.color_000000, FontWeight.normal, 24),
HEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children: _buildFilterItem(
customerProvider!.filterMoneyList,
false,
(FilterBtnModel item) {
// if (customerProvider.stimeFocus.hasFocus) {
// customerProvider.controllerstime.text = item.id;
// }
// if (customerProvider.etimeFocus.hasFocus) {
// customerProvider.controlleretime.text = item.id;
// }
customerProvider!.controllersmoney.text = '';
customerProvider!.controlleremoney.text = '';
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
value.select = false;
}
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
if (item.id == value.id) {
state(() {
value.select = true;
});
}
}
// state(() {
// item.select = !item.select;
// });
},
))
])),
VEmptyView(40),
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// _textWidget('人均消费能力', MyColours.color_515151, FontWeight.bold, 28),
// ],
// ),
// VEmptyView(20),
// Row(
// children: [
// HEmptyView(20),
// _textWidget('最高的', MyColours.color_199095, FontWeight.normal, 24),
// HEmptyView(10),
// Expanded(
// child: _textFeildWidget(customerProvider!.controllermaxmoney,
// customerProvider!.maxmoneyFocus, state, (value) {},
// unit: '%')),
// ],
// ),
],
);
}
... ... @@ -1249,6 +1375,10 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
customerProvider!.controllerstime.text = '';
customerProvider!.controlleretime.text = '';
customerProvider!.controllernum.text = '';
for (FilterBtnModel value
in customerProvider!.filterDayList) {
value.select = false;
}
state(() {
dropValue = 0;
});
... ... @@ -1540,6 +1670,14 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
controller: controller,
focusNode: focusNode,
// autofocus: true,
inputFormatters: unit == '天'
? [FilteringTextInputFormatter.digitsOnly]
: unit == '元'
? [
FilteringTextInputFormatter.allow(
RegExp("[0-9.]")),
]
: [],
style: TextStyle(
color: MyColours.color_515151,
... ... @@ -1600,11 +1738,12 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
bottomRight: Radius.circular(ScreenUtil().setWidth(20)),
bottomLeft: Radius.circular(ScreenUtil().setWidth(20)))),
margin: EdgeInsets.only(
left: ScreenUtil().setWidth(40),
bottom: ScreenUtil().setWidth(140),
right: ScreenUtil().setWidth(40)),
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)),
// top: w(10),
// left: ScreenUtil().setWidth(40),
bottom: ScreenUtil().setWidth(140),
// right: ScreenUtil().setWidth(40)
),
padding: EdgeInsets.only(left: w(20), right: w(20)),
child: Column(
children: [
Expanded(
... ... @@ -1636,7 +1775,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
// 消费
// _consume(state),
_consume(state),
// VEmptyView(40),
_advancedFilterWidget(state)
],
... ... @@ -1644,6 +1783,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
)),
// ),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
width: ScreenUtil().screenWidth -
... ...
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_easyrefresh/easy_refresh.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
... ... @@ -359,6 +360,36 @@ class _CustomerListPageState extends State<CustomerListPage>
// params['etime'] = customerProvider.controlleretime.text;
// }
bool tempMoney = customerProvider!.filterMoneyList.any((value) {
return value.select == true;
});
if (tempMoney) {
//快捷金额选择
String smoney = '';
String emoney = '';
for (FilterBtnModel item in customerProvider!.filterMoneyList) {
if (item.select!) {
if (item.id == '300') {
smoney = '300';
emoney = '-1';
} else {
List<String> strList = item.id!.split('-');
smoney = strList[0];
emoney = strList[1];
}
}
}
params['average'] = '${smoney},${emoney}';
} else {
if (customerProvider!.controllersmoney.text.trim().length > 0 &&
customerProvider!.controlleremoney.text.trim().length > 0) {
params['average'] =
'${customerProvider!.controllersmoney.text},${customerProvider!.controlleremoney.text}';
}
}
bool temp = customerProvider!.filterDayList.any((value) {
return value.select == true;
});
... ... @@ -804,12 +835,50 @@ class _CustomerListPageState extends State<CustomerListPage>
in customerProvider!.filterDayList) {
item.select = false;
}
for (FilterBtnModel item
in customerProvider!.filterMoneyList) {
item.select = false;
}
customerProvider!.controllersmoney.text = '';
customerProvider!.controlleremoney.text = '';
customerProvider!.controllerstime.text = '';
customerProvider!.controlleretime.text = '';
customerProvider!.controllernum.text = '';
dropValue = 0;
});
}, onPressedComplete: () {
if (customerProvider!.controllersmoney.text.trim().length >
0 &&
customerProvider!.controlleremoney.text.trim().length ==
0) {
Utils.showToast('请输入人均消费结束金额');
return;
}
if (customerProvider!.controllersmoney.text.trim().length ==
0 &&
customerProvider!.controlleremoney.text.trim().length >
0) {
Utils.showToast('请输入人均消费开始金额');
return;
}
if (customerProvider!.controllersmoney.text.trim().length >
0 &&
customerProvider!.controlleremoney.text.trim().length >
0) {
double smoney = double.tryParse(
customerProvider!.controllersmoney.text) ??
0.0;
double emoney = double.tryParse(
customerProvider!.controlleremoney.text) ??
0.0;
if (smoney > emoney) {
Utils.showToast('人均消费金额筛选区间起始金额不能大于结束金额');
return;
}
}
bool temp = customerProvider!.filterDayList.any((value) {
return value.select == true;
});
... ... @@ -879,24 +948,31 @@ class _CustomerListPageState extends State<CustomerListPage>
setState(() {
showFilter = false;
});
customerProvider!.hydSelAll = false;
for (FilterBtnModel item
in customerProvider!.filterHydList) {
item.select = false;
}
customerProvider!.labelSelAll = false;
for (FilterBtnModel item
in customerProvider!.filterLabelList) {
item.select = false;
}
for (FilterBtnModel item
in customerProvider!.filterDayList) {
item.select = false;
}
customerProvider!.controllerstime.text = '';
customerProvider!.controlleretime.text = '';
customerProvider!.controllernum.text = '';
dropValue = 0;
// customerProvider!.hydSelAll = false;
// for (FilterBtnModel item
// in customerProvider!.filterHydList) {
// item.select = false;
// }
// customerProvider!.labelSelAll = false;
// for (FilterBtnModel item
// in customerProvider!.filterLabelList) {
// item.select = false;
// }
// for (FilterBtnModel item
// in customerProvider!.filterDayList) {
// item.select = false;
// }
// for (FilterBtnModel item
// in customerProvider!.filterMoneyList) {
// item.select = false;
// }
// customerProvider!.controllersmoney.text = '';
// customerProvider!.controlleremoney.text = '';
// customerProvider!.controllerstime.text = '';
// customerProvider!.controlleretime.text = '';
// customerProvider!.controllernum.text = '';
// dropValue = 0;
});
}
},
... ... @@ -953,8 +1029,9 @@ class _CustomerListPageState extends State<CustomerListPage>
// print('object');
// },
child: Container(
height: ScreenUtil().setWidth(92 + 52 + 30 * 3 + 90) +
ScreenUtil().statusBarHeight,
height:
ScreenUtil().setWidth(92 + 52 + 30 * 3 + 90 + 20) +
ScreenUtil().statusBarHeight,
// width: s,
width: ScreenUtil().screenWidth,
// color: Colors.red,
... ... @@ -1200,19 +1277,25 @@ class _CustomerListPageState extends State<CustomerListPage>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_textWidget('人均消费金额', MyColours.color_515151, FontWeight.bold, 28),
// GestureDetector(
// onTap: () {
// customerProvider.controllersmoney.text = '';
// customerProvider.controlleremoney.text = '';
// },
// child: Container(
// color: Colors.white,
// height: ScreenUtil().setWidth(40),
// alignment: Alignment.center,
// padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
// child: _textWidget(
// '清空', MyColours.color_199095, FontWeight.normal, 24),
// ))
GestureDetector(
onTap: () {
customerProvider!.controllersmoney.text = '';
customerProvider!.controlleremoney.text = '';
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
value.select = false;
}
// customerProvider.controllernum.text = '';
state(() {});
},
child: Container(
color: Colors.white,
height: ScreenUtil().setWidth(40),
alignment: Alignment.center,
padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
child: _textWidget(
'清空', MyColours.color_199095, FontWeight.normal, 24),
))
],
),
VEmptyView(20),
... ... @@ -1223,6 +1306,17 @@ class _CustomerListPageState extends State<CustomerListPage>
Expanded(
child: _textFeildWidget(customerProvider!.controllersmoney,
customerProvider!.smoneyFocus, state, (value) {
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
value.select = false;
}
// customerProvider.controllernum.text = '';
state(() {});
// setState(() {});
// _searchSellerLocation();
// customerProvider.searchData(value);
//输入框
}, unit: '元')),
HEmptyView(10),
... ... @@ -1230,42 +1324,76 @@ class _CustomerListPageState extends State<CustomerListPage>
HEmptyView(10),
Expanded(
child: _textFeildWidget(customerProvider!.controlleremoney,
customerProvider!.emoneyFocus, state, (value) {},
unit: '元')),
customerProvider!.emoneyFocus, state, (value) {
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
value.select = false;
}
// customerProvider.controllernum.text = '';
state(() {});
}, unit: '元')),
],
)),
VEmptyView(40),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_textWidget('人均消费能力', MyColours.color_515151, FontWeight.bold, 28),
// GestureDetector(
// onTap: () {
// customerProvider.controllersmoney.text = '';
// customerProvider.controlleremoney.text = '';
// },
// child: Container(
// color: Colors.white,
// height: ScreenUtil().setWidth(40),
// alignment: Alignment.center,
// padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
// child: _textWidget(
// '清空', MyColours.color_199095, FontWeight.normal, 24),
// ))
],
),
VEmptyView(20),
Row(
children: [
HEmptyView(20),
_textWidget('最高的', MyColours.color_199095, FontWeight.normal, 24),
HEmptyView(10),
Expanded(
child: _textFeildWidget(customerProvider!.controllermaxmoney,
customerProvider!.maxmoneyFocus, state, (value) {},
unit: '%')),
],
),
Padding(
padding: EdgeInsets.only(left: w(10)),
child: Row(children: [
_textWidget('或', MyColours.color_000000, FontWeight.normal, 24),
HEmptyView(20),
Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: ScreenUtil().setWidth(20),
runSpacing: ScreenUtil().setWidth(20),
children: _buildFilterItem(
customerProvider!.filterMoneyList,
false,
(FilterBtnModel item) {
// if (customerProvider.stimeFocus.hasFocus) {
// customerProvider.controllerstime.text = item.id;
// }
// if (customerProvider.etimeFocus.hasFocus) {
// customerProvider.controlleretime.text = item.id;
// }
customerProvider!.controllersmoney.text = '';
customerProvider!.controlleremoney.text = '';
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
value.select = false;
}
for (FilterBtnModel value
in customerProvider!.filterMoneyList) {
if (item.id == value.id) {
state(() {
value.select = true;
});
}
}
// state(() {
// item.select = !item.select;
// });
},
))
])),
VEmptyView(40),
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// _textWidget('人均消费能力', MyColours.color_515151, FontWeight.bold, 28),
// ],
// ),
// VEmptyView(20),
// Row(
// children: [
// HEmptyView(20),
// _textWidget('最高的', MyColours.color_199095, FontWeight.normal, 24),
// HEmptyView(10),
// Expanded(
// child: _textFeildWidget(customerProvider!.controllermaxmoney,
// customerProvider!.maxmoneyFocus, state, (value) {},
// unit: '%')),
// ],
// ),
],
);
}
... ... @@ -1337,6 +1465,10 @@ class _CustomerListPageState extends State<CustomerListPage>
customerProvider!.controllerstime.text = '';
customerProvider!.controlleretime.text = '';
customerProvider!.controllernum.text = '';
for (FilterBtnModel value
in customerProvider!.filterDayList) {
value.select = false;
}
state(() {
dropValue = 0;
});
... ... @@ -1624,6 +1756,15 @@ class _CustomerListPageState extends State<CustomerListPage>
focusNode: focusNode,
// autofocus: true,
inputFormatters: unit == '天'
? [FilteringTextInputFormatter.digitsOnly]
: unit == '元'
? [
FilteringTextInputFormatter.allow(
RegExp("[0-9.]")),
]
: [],
style: TextStyle(
color: MyColours.color_515151,
fontSize: ScreenUtil().setSp(26)),
... ... @@ -1683,9 +1824,10 @@ class _CustomerListPageState extends State<CustomerListPage>
bottomRight: Radius.circular(ScreenUtil().setWidth(20)),
bottomLeft: Radius.circular(ScreenUtil().setWidth(20)))),
margin: EdgeInsets.only(
left: ScreenUtil().setWidth(40),
bottom: ScreenUtil().setWidth(140),
right: ScreenUtil().setWidth(40)),
// left: ScreenUtil().setWidth(40),
bottom: ScreenUtil().setWidth(140),
// right: ScreenUtil().setWidth(40)
),
padding:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)),
child: Column(
... ... @@ -1716,7 +1858,7 @@ class _CustomerListPageState extends State<CustomerListPage>
VEmptyView(40),
_labelWidget(state),
VEmptyView(40),
// _consume(state),
_consume(state),
// VEmptyView(40),
_advancedFilterWidget(state)
],
... ... @@ -1724,6 +1866,7 @@ class _CustomerListPageState extends State<CustomerListPage>
)),
// ),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Container(
width: ScreenUtil().screenWidth -
... ...
... ... @@ -104,6 +104,7 @@ class CustomerProvider extends ChangeNotifier {
List<FilterBtnModel> filterHydList = []; //活跃度
List<FilterBtnModel> filterLabelList = []; //自定义标签
List<FilterBtnModel> filterDayList = []; //高级筛选---天数 7、30、60、120
List<FilterBtnModel> filterMoneyList = []; //0-100 100-200 200-300 300以上
bool hydSelAll = false;
bool labelSelAll = false;
bool manageSelAll = false;
... ... @@ -395,6 +396,41 @@ class CustomerProvider extends ChangeNotifier {
model3.select = false;
filterDayList.add(model3);
filterMoneyList = [];
FilterBtnModel modelm = FilterBtnModel();
modelm.id = '0-100';
modelm.title = '0-100';
modelm.select = false;
filterMoneyList.add(modelm);
FilterBtnModel model1m = FilterBtnModel();
model1m.id = '100-200';
model1m.title = '100-200';
model1m.select = false;
filterMoneyList.add(model1m);
FilterBtnModel model2m = FilterBtnModel();
model2m.id = '200-300';
model2m.title = '200-300';
model2m.select = false;
filterMoneyList.add(model2m);
FilterBtnModel model3m = FilterBtnModel();
model3m.id = '300';
model3m.title = '300以上';
model3m.select = false;
filterMoneyList.add(model3m);
filterHydList = [];
// FilterBtnModel modelhyd1 = FilterBtnModel();
// modelhyd1.id = '0';
... ...