xt / Flutter-ReserveApp · Commits

Go to a project

Commit 25099666d842c59194d1c8affd8606bf898d8649

Authored by weixin_45529955
1 parent 372d9bd8

月度订单页面切换年

Inline Side-by-side
Showing 2 changed files with 66 additions and 52 deletions
... ... @@ -114,7 +114,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
CollectStoreProvider? collectStoreProvider;
Map<String, dynamic>? dataSp = Map();
Map<String, dynamic> dataSp = Map();
final XgFlutterPlugin tpush = new XgFlutterPlugin();
... ... @@ -314,30 +314,26 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
}
getSellerVersion() async {
bool? success = await collectStoreProvider?.getSellerVersion(context,
bool? success = await collectStoreProvider?.getSellerVersion(context,
showLoading: false);
if (success ?? false) {
if (Constant.normalApp) {
_version();
} else {
if (collectStoreProvider!.sellerSimple) {
//极速版
App.sp!.remove('sellerEdate');
App.sp!.remove('sellerEdateModule');
NavigatorUtil.goHomePageSim(context); //跳转到极速版 页面
} else {
if (success ?? false) {
if (Constant.normalApp) {
_version();
} else {
if (collectStoreProvider!.sellerSimple) {
//极速版
App.sp!.remove('sellerEdate');
App.sp!.remove('sellerEdateModule');
NavigatorUtil.goHomePageSim(context); //跳转到极速版 页面
} else {
_version();
}
}
if (widget.initialIndex == 0 ||
widget.initialIndex == 1 && needRefreshTemp == false) return;
_initNotification();
}
if (widget.initialIndex == 0 ||
widget.initialIndex == 1 && needRefreshTemp == false) return;
_initNotification();
}
}
_version() {
... ... @@ -358,7 +354,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
});
print(showData);
print(dataSp);
if (dataSp!.length > 0) {
if (dataSp.length > 0) {
App.sp!.setString("sellerEdateModule", json.encode(dataSp));
// var data = json.decode(App.sp.getString('sellerEdateModule'));
// var str = App.sp.getString('sellerEdateModule');
... ... @@ -443,11 +439,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// }
_setSpSellerModule(String day, SellerVersionSunModel sellerVersionSunModel) {
Map<String?, dynamic> data = Map();
List? days = [];
Map<String, dynamic> data = Map();
List days = [];
if (dataSp!.containsKey(sellerVersionSunModel.vid)) {
days = dataSp![sellerVersionSunModel.vid];
if (dataSp.containsKey(sellerVersionSunModel.vid)) {
days = dataSp[sellerVersionSunModel.vid];
}
//已经存进去过数据
... ... @@ -455,10 +451,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
// data = json.decode(App.sp.getString('sellerEdateModule'));
// days = data[sellerVersionSunModel.vid] ?? [];
// }
days!.add(day);
days.add(day);
print(data);
data[sellerVersionSunModel.vid] = days;
if (sellerVersionSunModel.vid != null) {
data[sellerVersionSunModel.vid!] = days;
}
return data;
}
// _setSpSellerModule(String day, SellerVersionSunModel sellerVersionSunModel) {
... ... @@ -485,7 +483,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
data = json.decode(App.sp!.getString('sellerEdateModule')!);
data!.removeWhere((key, value) => key == sellerVersionSunModel.vid);
dataSp!.removeWhere((key, value) => key == sellerVersionSunModel.vid);
dataSp.removeWhere((key, value) => key == sellerVersionSunModel.vid);
if (data != null && data.length == 0) {
App.sp!.remove("sellerEdateModule");
} else {
... ... @@ -497,7 +495,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
_edateSellerModuleShow(
List<SellerVersionSunModel> showData,
SellerVersionSunModel sellerVersionSunModel,
Map<String, dynamic>? dataSp) async {
Map<String, dynamic> dataSp) async {
//店铺过期提醒
// 计算时间差
//店铺过期日期
... ... @@ -521,12 +519,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
//7天没有提醒过
showData.add(sellerVersionSunModel); //7天已经提醒过了
dataSp!.addAll(_setSpSellerModule('7', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('7', sellerVersionSunModel));
}
} else {
//7天没有提醒过
showData.add(sellerVersionSunModel); //7天已经提醒过了
dataSp!.addAll(_setSpSellerModule('7', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('7', sellerVersionSunModel));
}
// _showSellerAlert('7', edate);
... ... @@ -542,12 +540,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
if (!days.contains('3')) {
//3天没有提醒过
showData.add(sellerVersionSunModel); //3天已经提醒过了
dataSp!.addAll(_setSpSellerModule('3', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('3', sellerVersionSunModel));
}
} else {
//3天没有提醒过
showData.add(sellerVersionSunModel); //3天已经提醒过了
dataSp!.addAll(_setSpSellerModule('3', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('3', sellerVersionSunModel));
}
} else if (difference == 2) {
//过期差2天，提醒一次
... ... @@ -561,12 +559,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
//2天没有提醒过
showData.add(sellerVersionSunModel); //2天已经提醒过了
// _showSellerAlert('2', edate);
dataSp!.addAll(_setSpSellerModule('2', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('2', sellerVersionSunModel));
}
} else {
//2天没有提醒过
showData.add(sellerVersionSunModel); //3天已经提醒过了
dataSp!.addAll(_setSpSellerModule('2', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('2', sellerVersionSunModel));
}
} else if (difference == 1) {
//过期差1天，提醒一次
... ... @@ -580,13 +578,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
//1天没有提醒过
showData.add(sellerVersionSunModel); //1天已经提醒过了
// _showSellerAlert('1', edate);
dataSp!.addAll(_setSpSellerModule('1', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('1', sellerVersionSunModel));
}
} else {
//1天没有提醒过
showData.add(sellerVersionSunModel); //1天已经提醒过了
// _showSellerAlert('1', edate);
dataSp!.addAll(_setSpSellerModule('1', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('1', sellerVersionSunModel));
}
} else if (difference == 0 && differenceSeconds > 0) {
//剩余不足一天
... ... @@ -601,14 +599,14 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
showData.add(sellerVersionSunModel); //0天已经提醒过了
// _showSellerAlert('0', edate);
dataSp!.addAll(_setSpSellerModule('0', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('0', sellerVersionSunModel));
print(dataSp);
}
} else {
//0天没有提醒过
showData.add(sellerVersionSunModel); //0天已经提醒过了
// _showSellerAlert('0', edate);
dataSp!.addAll(_setSpSellerModule('0', sellerVersionSunModel));
dataSp.addAll(_setSpSellerModule('0', sellerVersionSunModel));
print(dataSp);
}
} else if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
... ...
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
... ... @@ -47,11 +46,16 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
ScrollController _controller = ScrollController();
int month = 1;
int? year;
@override
void initState() {
// TODO: implement initState
super.initState();
month = int.parse(widget.month!);
if (widget.year != null) {
year = int.parse(widget.year.toString());
}
WidgetsBinding.instance.addPostFrameCallback((_) {
if (widget.monthStaticsData == null) {
... ... @@ -92,10 +96,10 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
{isShowLoading = false, VoidCallback? callback}) async {
Map<String, String?> params = {
'sellerid': Provider.of<UserModel>(context, listen: false).user!.sellerid,
'year': widget.year.toString(),
'year': year.toString(),
'month': month.toString()
};
if (widget.uid != null && widget.uid != ''&& widget.uid != 'null') {
if (widget.uid != null && widget.uid != '' && widget.uid != 'null') {
params['uid'] = widget.uid;
}
await customerProvider.getSellerCountsListByMonth(context, params,
... ... @@ -118,7 +122,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
Row(
children: [
Container(
width: w(150),
width: w(152),
height: w(96),
padding: EdgeInsets.symmetric(horizontal: w(12)),
child: Column(
... ... @@ -129,11 +133,15 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
InkWell(
onTap: () {
if (month == 1) {
// if (widget.year ==
// if (year ==
// DateTime.now().year.toString()) {
// month = DateTime.now().month;
// } else {
month = 12;
if (year != null) {
year = year! - 1;
}
// }
setState(() {});
_getSellerCountsListByMonth(
... ... @@ -188,10 +196,14 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
),
InkWell(
onTap: () {
if (widget.year ==
DateTime.now().year.toString()) {
if (year == DateTime.now().year.toString()) {
if (month == 12) {
month = 1;
if (year != null) {
year = year! + 1;
}
setState(() {});
_getSellerCountsListByMonth(
isShowLoading: true,
... ... @@ -214,6 +226,10 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
}
} else if (month == 12) {
month = 1;
if (year != null) {
year = year! + 1;
}
setState(() {});
_getSellerCountsListByMonth(
isShowLoading: true,
... ... @@ -252,7 +268,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
),
VEmptyView(20),
Text(
'${widget.year}年',
'${year}年',
style: TextStyle(
fontSize: font(14), color: MyColours.color_515151),
)
... ... @@ -559,13 +575,13 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
shrinkWrap: true,
padding: EdgeInsets.symmetric(horizontal: w(10)),
itemBuilder: (context, index) {
DayList daylist =
customerProvider.monthStaticsData!.dayList![index];
DayList daylist = customerProvider
.monthStaticsData!.dayList![index];
return InkWell(
onTap: () {
NavigatorUtil.goDayOrderPage(
context,
widget.year.toString(),
year.toString(),
month.toString(),
daylist.days.toString(),
daylist,
... ... @@ -604,7 +620,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
VEmptyView(40),
Text(
nongliShow(
widget.year!,
year.toString(),
month.toString(),
daylist.days.toString())!,
style: TextStyle(
... ... @@ -614,7 +630,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
VEmptyView(10),
Text(
weekdayShow(
widget.year!,
year.toString(),
month.toString(),
daylist.days.toString()),
style: TextStyle(
... ...