xt / Flutter-ReserveApp · Commits

Go to a project

Commit fe8ecc4007e5138dedeaca9f5e4a2fc07573b62e

Authored by wdn127929
1 parent 8d552c2f
build: skipped

创建营销任务页面键盘点击空白处回弹、桌位页面返回导航栏、选中用户后标签bug

Inline Side-by-side
Showing 10 changed files with 398 additions and 302 deletions
... ... @@ -12,14 +12,14 @@ if (flutterRoot == null) {
}
def flutterVersionCode = "325"
def flutterVersionCode = "331"
if (flutterVersionCode == null) {
flutterVersionCode = '325'
flutterVersionCode = '331'
}
def flutterVersionName = "3.2.5"
def flutterVersionName = "3.3.1"
if (flutterVersionName == null) {
flutterVersionName = '3.2.5'
flutterVersionName = '3.3.1'
}
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
... ...
... ... @@ -487,7 +487,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 317;
CURRENT_PROJECT_VERSION = 325;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -502,7 +502,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.1.7;
MARKETING_VERSION = 3.3.0;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -632,10 +632,10 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 317;
CURRENT_PROJECT_VERSION = 325;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = debug;
FLUTTER_BUILD_MODE = release;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
... ... @@ -647,7 +647,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.1.7;
MARKETING_VERSION = 3.3.0;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ... @@ -667,7 +667,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 317;
CURRENT_PROJECT_VERSION = 325;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -682,7 +682,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
MARKETING_VERSION = 3.1.7;
MARKETING_VERSION = 3.3.0;
PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
PRODUCT_NAME = Runner;
PROVISIONING_PROFILE_SPECIFIER = "";
... ...
... ... @@ -52,6 +52,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
int dropValue = 0;
bool showDrop = true;
List<String> timeTilte = ['等于', '小于', '大于'];
int filterHydIndex = 0;
@override
void initState() {
... ... @@ -79,7 +80,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
} else if (customerProvider.index == 0) {
customerProvider.hydSelAll = true;
for (FilterBtnModel item in customerProvider.filterHydList) {
item.select = true;
// item.select = true;
item.select = false;
}
}
_getContantData();
... ... @@ -88,7 +90,7 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
WidgetsBinding.instance.addPostFrameCallback((_) async {
bool first = true;
customerProvider.index = tabController.index;
if (widget.fromPage == FromPage.FromPageMakeRecord ) {
if (widget.fromPage == FromPage.FromPageMakeRecord) {
customerProvider.selectCustomer = customerMakingProvider.selectCustomer;
customerProvider.labels = customerMakingProvider.labels;
first = false;
... ... @@ -97,7 +99,8 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
if (tabController.index == 0) {
customerProvider.hydSelAll = true;
for (FilterBtnModel item in customerProvider.filterHydList) {
item.select = true;
// item.select = true;
item.select = false;
}
}
_getContantData(first: first);
... ... @@ -513,6 +516,21 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
});
}, onPressedComplete: () {
Navigator.of(context).pop();
for (FilterBtnModel value
in customerProvider.filterHydList) {
if (value.select) {
if (value.title == '活跃') {
tabController.index = 1;
customerProvider.index = 1;
} else if (value.title == '沉睡') {
tabController.index = 2;
customerProvider.index = 2;
} else if (value.title == '流失') {
tabController.index = 3;
customerProvider.index = 3;
}
}
}
setState(() {
showFilter = false;
});
... ... @@ -634,34 +652,34 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_textWidget('活跃度', MyColours.color_333333, FontWeight.bold, 28),
GestureDetector(
onTap: () {
state(() {
customerProvider.hydSelAll = !customerProvider.hydSelAll;
if (customerProvider.hydSelAll) {
for (FilterBtnModel item
in customerProvider.filterHydList) {
item.select = true;
}
} else {
for (FilterBtnModel item
in customerProvider.filterHydList) {
item.select = false;
}
}
});
},
child: Container(
color: Colors.white,
height: ScreenUtil().setWidth(40),
alignment: Alignment.center,
padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
child: _textWidget(customerProvider.hydSelAll ? '全不选' : '全选',
MyColours.color_199095, FontWeight.normal, 24)),
)
// GestureDetector(
// onTap: () {
// state(() {
// customerProvider.hydSelAll = !customerProvider.hydSelAll;
// if (customerProvider.hydSelAll) {
// for (FilterBtnModel item
// in customerProvider.filterHydList) {
// item.select = true;
// }
// } else {
// for (FilterBtnModel item
// in customerProvider.filterHydList) {
// item.select = false;
// }
// }
// });
// },
// child: Container(
// color: Colors.white,
// height: ScreenUtil().setWidth(40),
// alignment: Alignment.center,
// padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
// child: _textWidget(customerProvider.hydSelAll ? '全不选' : '全选',
// MyColours.color_199095, FontWeight.normal, 24)),
// )
],
),
VEmptyView(30),
... ... @@ -670,9 +688,21 @@ class _MyCustomerListPageState extends State<MyCustomerListPage>
runSpacing: ScreenUtil().setWidth(20),
children: _buildFilterItem(customerProvider.filterHydList, false,
(FilterBtnModel item) {
state(() {
item.select = !item.select;
});
// state(() {
// item.select = !item.select;
// }
// });
for (FilterBtnModel value in customerProvider.filterHydList) {
value.select = false;
}
for (FilterBtnModel value in customerProvider.filterHydList) {
if (item.id == value.id) {
state(() {
value.select = true;
});
}
}
})),
],
);
... ...
... ... @@ -84,7 +84,7 @@ class _MyCustomerPageState extends State<MyCustomerPage> {
Map<String, String> params = {
"uid": Provider.of<UserModel>(context, listen: false).user.openid
};
await customerProvider.getMarketingByUid(context, params);
// await customerProvider.getMarketingByUid(context, params);
MarketingByUidsSunModel myRecordData =
await customerProvider.getMarketingByUid(context, params);
... ...
... ... @@ -438,7 +438,12 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
customerProvider = Provider.of<CustomerProvider>(context, listen: true);
customerMakingProvider =
Provider.of<CustomerMakingProvider>(context, listen: true);
return Scaffold(
return Material(
child: InkWell(
onTap: () {
FocusScope.of(context).requestFocus(new FocusNode());
},
child:Scaffold(
backgroundColor: Color.fromRGBO(246, 248, 250, 1),
key: scaffoldKey,
appBar: SystemAppBar(
... ... @@ -560,7 +565,7 @@ class _MyMakeMarkingPageState extends State<MyMakeMarkingPage> {
),
VEmptyView(40),
],
),
);
)),
));
}
}
... ...
... ... @@ -481,103 +481,108 @@ class _MyMakeMarkingPageOnlyShowState extends State<MyMakeMarkingPageOnlyShow>
customerProvider = Provider.of<CustomerProvider>(context, listen: true);
customerMakingProvider =
Provider.of<CustomerMakingProvider>(context, listen: true);
return Scaffold(
backgroundColor: Color.fromRGBO(246, 248, 250, 1),
key: scaffoldKey,
appBar: SystemAppBar(
'创建营销任务',
onTap: () {
customerMakingProvider.clearData();
Navigator.pop(context);
},
),
body: Column(
children: [
Expanded(
child: SingleChildScrollView(
child: Column(
children: [
VEmptyView(10),
Container(
color: MyColours.color_199095,
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30),
vertical: ScreenUtil().setWidth(30)),
child: Row(
children: [
Expanded(
child: Text(
'已选[全店任务]${widget.sellerList.guestCount}位顾客',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(32)),
)),
HEmptyView(10),
InkWell(
onTap: () {
needClear = false;
NavigatorUtil.goMyShowCustomerListPage(
context,
FromPage.FromPageMakeRecordDetail,
widget.sellerList.gid);
// NavigatorUtil.goMarketingRecordsDetailPage(context);
},
child: Text('仅查看',
style: TextStyle(
decoration: TextDecoration.underline,
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(26)))),
],
),
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30),
),
child: Column(
children: [VEmptyView(50), _contentWidget('输入营销短信内容')],
),
)
],
),
)),
RoundButton(
text: '群发短信',
gradientStart: MyColours.color_199095,
gradientEnd: MyColours.color_199095,
// borderColor: MyColours.color_999999,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(80),
fontSize: 26,
margin:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(230)),
isBold: false,
onPressed: () {
//群发短信
_setMarketingStatusByUid();
},
),
VEmptyView(30),
RoundButton(
text: '取消',
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
textColor: MyColours.color_199095,
borderColor: MyColours.color_199095,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(80),
fontSize: 26,
margin:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(230)),
isBold: false,
onPressed: () {
return Material(
child: InkWell(
onTap: () {
FocusScope.of(context).requestFocus(new FocusNode());
},
child: Scaffold(
backgroundColor: Color.fromRGBO(246, 248, 250, 1),
key: scaffoldKey,
appBar: SystemAppBar(
'创建营销任务',
onTap: () {
customerMakingProvider.clearData();
Navigator.pop(context);
},
),
VEmptyView(40),
],
),
);
body: Column(
children: [
Expanded(
child: SingleChildScrollView(
child: Column(
children: [
VEmptyView(10),
Container(
color: MyColours.color_199095,
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30),
vertical: ScreenUtil().setWidth(30)),
child: Row(
children: [
Expanded(
child: Text(
'已选[全店任务]${widget.sellerList.guestCount}位顾客',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(32)),
)),
HEmptyView(10),
InkWell(
onTap: () {
needClear = false;
NavigatorUtil.goMyShowCustomerListPage(
context,
FromPage.FromPageMakeRecordDetail,
widget.sellerList.gid);
// NavigatorUtil.goMarketingRecordsDetailPage(context);
},
child: Text('仅查看',
style: TextStyle(
decoration: TextDecoration.underline,
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(26)))),
],
),
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30),
),
child: Column(
children: [VEmptyView(50), _contentWidget('输入营销短信内容')],
),
)
],
),
)),
RoundButton(
text: '群发短信',
gradientStart: MyColours.color_199095,
gradientEnd: MyColours.color_199095,
// borderColor: MyColours.color_999999,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(80),
fontSize: 26,
margin: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(230)),
isBold: false,
onPressed: () {
//群发短信
_setMarketingStatusByUid();
},
),
VEmptyView(30),
RoundButton(
text: '取消',
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
textColor: MyColours.color_199095,
borderColor: MyColours.color_199095,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(80),
fontSize: 26,
margin: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(230)),
isBold: false,
onPressed: () {
customerMakingProvider.clearData();
Navigator.pop(context);
},
),
VEmptyView(40),
],
)),
));
}
}
... ...
... ... @@ -80,7 +80,8 @@ class _CustomerListPageState extends State<CustomerListPage>
} else if (customerProvider.index == 0) {
customerProvider.hydSelAll = true;
for (FilterBtnModel item in customerProvider.filterHydList) {
item.select = true;
// item.select = true;
item.select = false;
}
}
_getContantData();
... ... @@ -101,7 +102,8 @@ class _CustomerListPageState extends State<CustomerListPage>
if (tabController.index == 0) {
customerProvider.hydSelAll = true;
for (FilterBtnModel item in customerProvider.filterHydList) {
item.select = true;
// item.select = true;
item.select = false;
}
}
_getContantData(first: first);
... ... @@ -569,6 +571,21 @@ class _CustomerListPageState extends State<CustomerListPage>
});
}, onPressedComplete: () {
Navigator.of(context).pop();
for (FilterBtnModel value
in customerProvider.filterHydList) {
if (value.select) {
if (value.title == '活跃') {
tabController.index = 1;
customerProvider.index = 1;
} else if (value.title == '沉睡') {
tabController.index = 2;
customerProvider.index = 2;
} else if (value.title == '流失') {
tabController.index = 3;
customerProvider.index = 3;
}
}
}
setState(() {
showFilter = false;
});
... ... @@ -711,31 +728,31 @@ class _CustomerListPageState extends State<CustomerListPage>
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
_textWidget('活跃度', MyColours.color_333333, FontWeight.bold, 28),
GestureDetector(
onTap: () {
state(() {
customerProvider.hydSelAll = !customerProvider.hydSelAll;
if (customerProvider.hydSelAll) {
for (FilterBtnModel item
in customerProvider.filterHydList) {
item.select = true;
}
} else {
for (FilterBtnModel item
in customerProvider.filterHydList) {
item.select = false;
}
}
});
},
child: Container(
color: Colors.white,
height: ScreenUtil().setWidth(40),
alignment: Alignment.center,
padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
child: _textWidget(customerProvider.hydSelAll ? '全不选' : '全选',
MyColours.color_199095, FontWeight.normal, 24)),
)
// GestureDetector(
// onTap: () {
// state(() {
// customerProvider.hydSelAll = !customerProvider.hydSelAll;
// if (customerProvider.hydSelAll) {
// for (FilterBtnModel item
// in customerProvider.filterHydList) {
// item.select = true;
// }
// } else {
// for (FilterBtnModel item
// in customerProvider.filterHydList) {
// item.select = false;
// }
// }
// });
// },
// child: Container(
// color: Colors.white,
// height: ScreenUtil().setWidth(40),
// alignment: Alignment.center,
// padding: EdgeInsets.only(left: ScreenUtil().setWidth(130)),
// child: _textWidget(customerProvider.hydSelAll ? '全不选' : '全选',
// MyColours.color_199095, FontWeight.normal, 24)),
// )
],
),
VEmptyView(30),
... ... @@ -744,9 +761,19 @@ class _CustomerListPageState extends State<CustomerListPage>
runSpacing: ScreenUtil().setWidth(20),
children: _buildFilterItem(customerProvider.filterHydList, false,
(FilterBtnModel item) {
state(() {
item.select = !item.select;
});
// state(() {
// item.select = !item.select;
// });
for (FilterBtnModel value in customerProvider.filterHydList) {
value.select = false;
}
for (FilterBtnModel value in customerProvider.filterHydList) {
if (item.id == value.id) {
state(() {
value.select = true;
});
}
}
})),
],
);
... ...
... ... @@ -520,140 +520,146 @@ class _MakeMarkingPageState extends State<MakeMarkingPage> {
customerProvider = Provider.of<CustomerProvider>(context, listen: true);
customerMakingProvider =
Provider.of<CustomerMakingProvider>(context, listen: true);
return Scaffold(
backgroundColor: Color.fromRGBO(246, 248, 250, 1),
key: scaffoldKey,
appBar: SystemAppBar(
'创建营销任务',
onTap: () {
customerMakingProvider.clearData();
Navigator.pop(context);
},
),
body: Column(
children: [
Expanded(
child: SingleChildScrollView(
child: Column(
children: [
VEmptyView(10),
Container(
color: MyColours.color_199095,
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30),
vertical: ScreenUtil().setWidth(30)),
child: Row(
children: [
Expanded(
child: Text(
'已选[${customerMakingProvider.labels}]${customerMakingProvider.selectCustomerSeller.length}位顾客',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(32)),
)),
HEmptyView(10),
InkWell(
onTap: () async {
needClear = false;
if (widget.fromPage ==
FromPage.FromPageMakeRecordDetail) {
customerMakingProvider.selectCustomerSeller =
customerProvider.selectCustomerSeller;
return Material(
child: InkWell(
onTap: () {
FocusScope.of(context).requestFocus(new FocusNode());
},
child: Scaffold(
backgroundColor: Color.fromRGBO(246, 248, 250, 1),
key: scaffoldKey,
appBar: SystemAppBar(
'创建营销任务',
onTap: () {
customerMakingProvider.clearData();
Navigator.pop(context);
},
),
body: Column(
children: [
Expanded(
child: SingleChildScrollView(
child: Column(
children: [
VEmptyView(10),
Container(
color: MyColours.color_199095,
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30),
vertical: ScreenUtil().setWidth(30)),
child: Row(
children: [
Expanded(
child: Text(
'已选[${customerMakingProvider.labels}]${customerMakingProvider.selectCustomerSeller.length}位顾客',
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(32)),
)),
HEmptyView(10),
InkWell(
onTap: () async {
needClear = false;
if (widget.fromPage ==
FromPage.FromPageMakeRecordDetail) {
customerMakingProvider.selectCustomerSeller =
customerProvider.selectCustomerSeller;
await NavigatorUtil.goCustomerListPage(
context, FromPage.FromPageMakeRecord, '');
await NavigatorUtil.goCustomerListPage(
context, FromPage.FromPageMakeRecord, '');
// Map temp =
// Map temp =
customerProvider.labels =
customerMakingProvider.labels;
customerProvider.selectCustomerSeller =
customerMakingProvider.selectCustomerSeller;
gid = '';
for (CustomerBySellerSunModel item
in customerMakingProvider
.selectCustomerSeller) {
gid += '${item.gid},';
}
if (gid.endsWith(',')) {
gid = gid.substring(0, gid.length - 1);
}
customerProvider.labels =
customerMakingProvider.labels;
customerProvider.selectCustomerSeller =
customerMakingProvider
.selectCustomerSeller;
gid = '';
for (CustomerBySellerSunModel item
in customerMakingProvider
.selectCustomerSeller) {
gid += '${item.gid},';
}
if (gid.endsWith(',')) {
gid = gid.substring(0, gid.length - 1);
}
// {
// 'labels': customerProvider.labels,
// 'selectCustomer': customerProvider.selectCustomer
// };
// customerProvider.labels = temp['labels'];
// customerProvider.selectCustomer =
// temp['selectCustomer'];
// customerMakingProvider.labels = temp['labels'];
// customerMakingProvider.selectCustomer =
// temp['selectCustomer'];
setState(() {});
} else {
Navigator.pop(context);
}
// {
// 'labels': customerProvider.labels,
// 'selectCustomer': customerProvider.selectCustomer
// };
// customerProvider.labels = temp['labels'];
// customerProvider.selectCustomer =
// temp['selectCustomer'];
// customerMakingProvider.labels = temp['labels'];
// customerMakingProvider.selectCustomer =
// temp['selectCustomer'];
setState(() {});
} else {
Navigator.pop(context);
}
// NavigatorUtil.goMarketingRecordsDetailPage(context);
},
child: Text('查看',
style: TextStyle(
decoration: TextDecoration.underline,
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(26)))),
],
),
// NavigatorUtil.goMarketingRecordsDetailPage(context);
},
child: Text('查看',
style: TextStyle(
decoration: TextDecoration.underline,
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(26)))),
],
),
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30),
),
child: Column(
children: [VEmptyView(50), _contentWidget('输入营销短信内容')],
),
)
],
),
Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(30),
),
child: Column(
children: [VEmptyView(50), _contentWidget('输入营销短信内容')],
),
)
],
),
)),
RoundButton(
text: '确认下发任务',
gradientStart: MyColours.color_199095,
gradientEnd: MyColours.color_199095,
// borderColor: MyColours.color_999999,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(80),
fontSize: 26,
margin:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(230)),
isBold: false,
onPressed: () {
// NavigatorUtil.goEnterStoreEnvironmentPage(context);
)),
RoundButton(
text: '确认下发任务',
gradientStart: MyColours.color_199095,
gradientEnd: MyColours.color_199095,
// borderColor: MyColours.color_999999,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(80),
fontSize: 26,
margin: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(230)),
isBold: false,
onPressed: () {
// NavigatorUtil.goEnterStoreEnvironmentPage(context);
//确认下发任务
_createMarketingBySeller();
},
),
VEmptyView(30),
RoundButton(
text: '取消',
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
textColor: MyColours.color_199095,
borderColor: MyColours.color_199095,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(80),
fontSize: 26,
margin:
EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(230)),
isBold: false,
onPressed: () {
customerMakingProvider.clearData();
Navigator.pop(context);
},
),
VEmptyView(40),
],
),
);
//确认下发任务
_createMarketingBySeller();
},
),
VEmptyView(30),
RoundButton(
text: '取消',
gradientStart: MyColours.color_ffffff,
gradientEnd: MyColours.color_ffffff,
textColor: MyColours.color_199095,
borderColor: MyColours.color_199095,
radius: ScreenUtil().setWidth(40),
height: ScreenUtil().setWidth(80),
fontSize: 26,
margin: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(230)),
isBold: false,
onPressed: () {
customerMakingProvider.clearData();
Navigator.pop(context);
},
),
VEmptyView(40),
],
)),
));
}
}
... ...
... ... @@ -843,10 +843,17 @@ class TableManagerPageState extends State<TableManagerPage> {
Widget build(BuildContext context) {
tableManagerModel = Provider.of<TableManagerModel>(context, listen: true);
return Scaffold(
appBar: widget.guest == null
? null
: SystemAppBar(
"桌位",
showLeading: true,
onTap: () {
Navigator.pop(context);
},
),
backgroundColor: MyColours.color_ffffff,
body: SafeArea(child:
// appBar: SystemAppBar("桌位", showLeading: false),
Consumer<TableManagerModel>(
body: SafeArea(child: Consumer<TableManagerModel>(
builder: (context, model, child) {
int sum = 3;
int hide = 0;
... ...
... ... @@ -325,6 +325,14 @@ class CustomerProvider extends ChangeNotifier {
}
}
selectCustomer = temp; //把选中的列表，剔除掉现在结果里没有的
List<String> tempLabel = [];
for (CustomerListSunModel item in selectCustomer) {
if (item.select && item.attr != null) {
tempLabel.add(item.attr);
}
}
tempLabel = tempLabel.toSet().toList();
labels = Utils.listToStringEnglish(tempLabel);
getCheckValueMy();
//对于以前有选中的数据，接口请求后，继续赋值
... ... @@ -1400,6 +1408,14 @@ class CustomerProvider extends ChangeNotifier {
customerBySellerList[i] = item;
}
List<String> tempLabel = [];
for (CustomerBySellerSunModel item in selectCustomerSeller) {
if (item.select && item.attr != null) {
tempLabel.add(item.attr);
}
}
tempLabel = tempLabel.toSet().toList();
labels = Utils.listToStringEnglish(tempLabel);
handleList(customerBySellerList, needRefresh: true);
}
... ...