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 { @@ -114,7 +114,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
114 114
115 CollectStoreProvider? collectStoreProvider; 115 CollectStoreProvider? collectStoreProvider;
116 116
117 - Map<String, dynamic>? dataSp = Map(); 117 + Map<String, dynamic> dataSp = Map();
118 118
119 final XgFlutterPlugin tpush = new XgFlutterPlugin(); 119 final XgFlutterPlugin tpush = new XgFlutterPlugin();
120 120
@@ -314,30 +314,26 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -314,30 +314,26 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
314 } 314 }
315 315
316 getSellerVersion() async { 316 getSellerVersion() async {
317 -  
318 -  
319 - bool? success = await collectStoreProvider?.getSellerVersion(context, 317 + bool? success = await collectStoreProvider?.getSellerVersion(context,
320 showLoading: false); 318 showLoading: false);
321 319
322 - if (success ?? false) {  
323 -  
324 - if (Constant.normalApp) {  
325 - _version();  
326 - } else {  
327 - if (collectStoreProvider!.sellerSimple) {  
328 - //极速版  
329 - App.sp!.remove('sellerEdate');  
330 - App.sp!.remove('sellerEdateModule');  
331 - NavigatorUtil.goHomePageSim(context); //跳转到极速版 页面  
332 - } else { 320 + if (success ?? false) {
  321 + if (Constant.normalApp) {
333 _version(); 322 _version();
  323 + } else {
  324 + if (collectStoreProvider!.sellerSimple) {
  325 + //极速版
  326 + App.sp!.remove('sellerEdate');
  327 + App.sp!.remove('sellerEdateModule');
  328 + NavigatorUtil.goHomePageSim(context); //跳转到极速版 页面
  329 + } else {
  330 + _version();
  331 + }
334 } 332 }
  333 + if (widget.initialIndex == 0 ||
  334 + widget.initialIndex == 1 && needRefreshTemp == false) return;
  335 + _initNotification();
335 } 336 }
336 - if (widget.initialIndex == 0 ||  
337 - widget.initialIndex == 1 && needRefreshTemp == false) return;  
338 - _initNotification();  
339 -  
340 - }  
341 } 337 }
342 338
343 _version() { 339 _version() {
@@ -358,7 +354,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -358,7 +354,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
358 }); 354 });
359 print(showData); 355 print(showData);
360 print(dataSp); 356 print(dataSp);
361 - if (dataSp!.length > 0) { 357 + if (dataSp.length > 0) {
362 App.sp!.setString("sellerEdateModule", json.encode(dataSp)); 358 App.sp!.setString("sellerEdateModule", json.encode(dataSp));
363 // var data = json.decode(App.sp.getString('sellerEdateModule')); 359 // var data = json.decode(App.sp.getString('sellerEdateModule'));
364 // var str = App.sp.getString('sellerEdateModule'); 360 // var str = App.sp.getString('sellerEdateModule');
@@ -443,11 +439,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -443,11 +439,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
443 // } 439 // }
444 440
445 _setSpSellerModule(String day, SellerVersionSunModel sellerVersionSunModel) { 441 _setSpSellerModule(String day, SellerVersionSunModel sellerVersionSunModel) {
446 - Map<String?, dynamic> data = Map();  
447 - List? days = []; 442 + Map<String, dynamic> data = Map();
  443 + List days = [];
448 444
449 - if (dataSp!.containsKey(sellerVersionSunModel.vid)) {  
450 - days = dataSp![sellerVersionSunModel.vid]; 445 + if (dataSp.containsKey(sellerVersionSunModel.vid)) {
  446 + days = dataSp[sellerVersionSunModel.vid];
451 } 447 }
452 448
453 //已经存进去过数据 449 //已经存进去过数据
@@ -455,10 +451,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -455,10 +451,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
455 // data = json.decode(App.sp.getString('sellerEdateModule')); 451 // data = json.decode(App.sp.getString('sellerEdateModule'));
456 // days = data[sellerVersionSunModel.vid] ?? []; 452 // days = data[sellerVersionSunModel.vid] ?? [];
457 // } 453 // }
458 - days!.add(day); 454 + days.add(day);
459 print(data); 455 print(data);
460 456
461 - data[sellerVersionSunModel.vid] = days; 457 + if (sellerVersionSunModel.vid != null) {
  458 + data[sellerVersionSunModel.vid!] = days;
  459 + }
462 return data; 460 return data;
463 } 461 }
464 // _setSpSellerModule(String day, SellerVersionSunModel sellerVersionSunModel) { 462 // _setSpSellerModule(String day, SellerVersionSunModel sellerVersionSunModel) {
@@ -485,7 +483,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -485,7 +483,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
485 data = json.decode(App.sp!.getString('sellerEdateModule')!); 483 data = json.decode(App.sp!.getString('sellerEdateModule')!);
486 data!.removeWhere((key, value) => key == sellerVersionSunModel.vid); 484 data!.removeWhere((key, value) => key == sellerVersionSunModel.vid);
487 485
488 - dataSp!.removeWhere((key, value) => key == sellerVersionSunModel.vid); 486 + dataSp.removeWhere((key, value) => key == sellerVersionSunModel.vid);
489 if (data != null && data.length == 0) { 487 if (data != null && data.length == 0) {
490 App.sp!.remove("sellerEdateModule"); 488 App.sp!.remove("sellerEdateModule");
491 } else { 489 } else {
@@ -497,7 +495,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -497,7 +495,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
497 _edateSellerModuleShow( 495 _edateSellerModuleShow(
498 List<SellerVersionSunModel> showData, 496 List<SellerVersionSunModel> showData,
499 SellerVersionSunModel sellerVersionSunModel, 497 SellerVersionSunModel sellerVersionSunModel,
500 - Map<String, dynamic>? dataSp) async { 498 + Map<String, dynamic> dataSp) async {
501 //店铺过期提醒 499 //店铺过期提醒
502 // 计算时间差 500 // 计算时间差
503 //店铺过期日期 501 //店铺过期日期
@@ -521,12 +519,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -521,12 +519,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
521 //7天没有提醒过 519 //7天没有提醒过
522 showData.add(sellerVersionSunModel); //7天已经提醒过了 520 showData.add(sellerVersionSunModel); //7天已经提醒过了
523 521
524 - dataSp!.addAll(_setSpSellerModule('7', sellerVersionSunModel)); 522 + dataSp.addAll(_setSpSellerModule('7', sellerVersionSunModel));
525 } 523 }
526 } else { 524 } else {
527 //7天没有提醒过 525 //7天没有提醒过
528 showData.add(sellerVersionSunModel); //7天已经提醒过了 526 showData.add(sellerVersionSunModel); //7天已经提醒过了
529 - dataSp!.addAll(_setSpSellerModule('7', sellerVersionSunModel)); 527 + dataSp.addAll(_setSpSellerModule('7', sellerVersionSunModel));
530 } 528 }
531 529
532 // _showSellerAlert('7', edate); 530 // _showSellerAlert('7', edate);
@@ -542,12 +540,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -542,12 +540,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
542 if (!days.contains('3')) { 540 if (!days.contains('3')) {
543 //3天没有提醒过 541 //3天没有提醒过
544 showData.add(sellerVersionSunModel); //3天已经提醒过了 542 showData.add(sellerVersionSunModel); //3天已经提醒过了
545 - dataSp!.addAll(_setSpSellerModule('3', sellerVersionSunModel)); 543 + dataSp.addAll(_setSpSellerModule('3', sellerVersionSunModel));
546 } 544 }
547 } else { 545 } else {
548 //3天没有提醒过 546 //3天没有提醒过
549 showData.add(sellerVersionSunModel); //3天已经提醒过了 547 showData.add(sellerVersionSunModel); //3天已经提醒过了
550 - dataSp!.addAll(_setSpSellerModule('3', sellerVersionSunModel)); 548 + dataSp.addAll(_setSpSellerModule('3', sellerVersionSunModel));
551 } 549 }
552 } else if (difference == 2) { 550 } else if (difference == 2) {
553 //过期差2天，提醒一次 551 //过期差2天，提醒一次
@@ -561,12 +559,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -561,12 +559,12 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
561 //2天没有提醒过 559 //2天没有提醒过
562 showData.add(sellerVersionSunModel); //2天已经提醒过了 560 showData.add(sellerVersionSunModel); //2天已经提醒过了
563 // _showSellerAlert('2', edate); 561 // _showSellerAlert('2', edate);
564 - dataSp!.addAll(_setSpSellerModule('2', sellerVersionSunModel)); 562 + dataSp.addAll(_setSpSellerModule('2', sellerVersionSunModel));
565 } 563 }
566 } else { 564 } else {
567 //2天没有提醒过 565 //2天没有提醒过
568 showData.add(sellerVersionSunModel); //3天已经提醒过了 566 showData.add(sellerVersionSunModel); //3天已经提醒过了
569 - dataSp!.addAll(_setSpSellerModule('2', sellerVersionSunModel)); 567 + dataSp.addAll(_setSpSellerModule('2', sellerVersionSunModel));
570 } 568 }
571 } else if (difference == 1) { 569 } else if (difference == 1) {
572 //过期差1天，提醒一次 570 //过期差1天，提醒一次
@@ -580,13 +578,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -580,13 +578,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
580 //1天没有提醒过 578 //1天没有提醒过
581 showData.add(sellerVersionSunModel); //1天已经提醒过了 579 showData.add(sellerVersionSunModel); //1天已经提醒过了
582 // _showSellerAlert('1', edate); 580 // _showSellerAlert('1', edate);
583 - dataSp!.addAll(_setSpSellerModule('1', sellerVersionSunModel)); 581 + dataSp.addAll(_setSpSellerModule('1', sellerVersionSunModel));
584 } 582 }
585 } else { 583 } else {
586 //1天没有提醒过 584 //1天没有提醒过
587 showData.add(sellerVersionSunModel); //1天已经提醒过了 585 showData.add(sellerVersionSunModel); //1天已经提醒过了
588 // _showSellerAlert('1', edate); 586 // _showSellerAlert('1', edate);
589 - dataSp!.addAll(_setSpSellerModule('1', sellerVersionSunModel)); 587 + dataSp.addAll(_setSpSellerModule('1', sellerVersionSunModel));
590 } 588 }
591 } else if (difference == 0 && differenceSeconds > 0) { 589 } else if (difference == 0 && differenceSeconds > 0) {
592 //剩余不足一天 590 //剩余不足一天
@@ -601,14 +599,14 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -601,14 +599,14 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
601 showData.add(sellerVersionSunModel); //0天已经提醒过了 599 showData.add(sellerVersionSunModel); //0天已经提醒过了
602 // _showSellerAlert('0', edate); 600 // _showSellerAlert('0', edate);
603 601
604 - dataSp!.addAll(_setSpSellerModule('0', sellerVersionSunModel)); 602 + dataSp.addAll(_setSpSellerModule('0', sellerVersionSunModel));
605 print(dataSp); 603 print(dataSp);
606 } 604 }
607 } else { 605 } else {
608 //0天没有提醒过 606 //0天没有提醒过
609 showData.add(sellerVersionSunModel); //0天已经提醒过了 607 showData.add(sellerVersionSunModel); //0天已经提醒过了
610 // _showSellerAlert('0', edate); 608 // _showSellerAlert('0', edate);
611 - dataSp!.addAll(_setSpSellerModule('0', sellerVersionSunModel)); 609 + dataSp.addAll(_setSpSellerModule('0', sellerVersionSunModel));
612 print(dataSp); 610 print(dataSp);
613 } 611 }
614 } else if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) { 612 } else if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
1 -  
2 import 'package:common_utils/common_utils.dart'; 1 import 'package:common_utils/common_utils.dart';
3 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
4 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -47,11 +46,16 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -47,11 +46,16 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
47 ScrollController _controller = ScrollController(); 46 ScrollController _controller = ScrollController();
48 int month = 1; 47 int month = 1;
49 48
  49 + int? year;
  50 +
50 @override 51 @override
51 void initState() { 52 void initState() {
52 // TODO: implement initState 53 // TODO: implement initState
53 super.initState(); 54 super.initState();
54 month = int.parse(widget.month!); 55 month = int.parse(widget.month!);
  56 + if (widget.year != null) {
  57 + year = int.parse(widget.year.toString());
  58 + }
55 59
56 WidgetsBinding.instance.addPostFrameCallback((_) { 60 WidgetsBinding.instance.addPostFrameCallback((_) {
57 if (widget.monthStaticsData == null) { 61 if (widget.monthStaticsData == null) {
@@ -92,10 +96,10 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -92,10 +96,10 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
92 {isShowLoading = false, VoidCallback? callback}) async { 96 {isShowLoading = false, VoidCallback? callback}) async {
93 Map<String, String?> params = { 97 Map<String, String?> params = {
94 'sellerid': Provider.of<UserModel>(context, listen: false).user!.sellerid, 98 'sellerid': Provider.of<UserModel>(context, listen: false).user!.sellerid,
95 - 'year': widget.year.toString(), 99 + 'year': year.toString(),
96 'month': month.toString() 100 'month': month.toString()
97 }; 101 };
98 - if (widget.uid != null && widget.uid != ''&& widget.uid != 'null') { 102 + if (widget.uid != null && widget.uid != '' && widget.uid != 'null') {
99 params['uid'] = widget.uid; 103 params['uid'] = widget.uid;
100 } 104 }
101 await customerProvider.getSellerCountsListByMonth(context, params, 105 await customerProvider.getSellerCountsListByMonth(context, params,
@@ -118,7 +122,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -118,7 +122,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
118 Row( 122 Row(
119 children: [ 123 children: [
120 Container( 124 Container(
121 - width: w(150), 125 + width: w(152),
122 height: w(96), 126 height: w(96),
123 padding: EdgeInsets.symmetric(horizontal: w(12)), 127 padding: EdgeInsets.symmetric(horizontal: w(12)),
124 child: Column( 128 child: Column(
@@ -129,11 +133,15 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -129,11 +133,15 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
129 InkWell( 133 InkWell(
130 onTap: () { 134 onTap: () {
131 if (month == 1) { 135 if (month == 1) {
132 - // if (widget.year == 136 + // if (year ==
133 // DateTime.now().year.toString()) { 137 // DateTime.now().year.toString()) {
134 // month = DateTime.now().month; 138 // month = DateTime.now().month;
135 // } else { 139 // } else {
136 month = 12; 140 month = 12;
  141 + if (year != null) {
  142 + year = year! - 1;
  143 + }
  144 +
137 // } 145 // }
138 setState(() {}); 146 setState(() {});
139 _getSellerCountsListByMonth( 147 _getSellerCountsListByMonth(
@@ -188,10 +196,14 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -188,10 +196,14 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
188 ), 196 ),
189 InkWell( 197 InkWell(
190 onTap: () { 198 onTap: () {
191 - if (widget.year ==  
192 - DateTime.now().year.toString()) { 199 + if (year == DateTime.now().year.toString()) {
193 if (month == 12) { 200 if (month == 12) {
194 month = 1; 201 month = 1;
  202 +
  203 + if (year != null) {
  204 + year = year! + 1;
  205 + }
  206 +
195 setState(() {}); 207 setState(() {});
196 _getSellerCountsListByMonth( 208 _getSellerCountsListByMonth(
197 isShowLoading: true, 209 isShowLoading: true,
@@ -214,6 +226,10 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -214,6 +226,10 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
214 } 226 }
215 } else if (month == 12) { 227 } else if (month == 12) {
216 month = 1; 228 month = 1;
  229 +
  230 + if (year != null) {
  231 + year = year! + 1;
  232 + }
217 setState(() {}); 233 setState(() {});
218 _getSellerCountsListByMonth( 234 _getSellerCountsListByMonth(
219 isShowLoading: true, 235 isShowLoading: true,
@@ -252,7 +268,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -252,7 +268,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
252 ), 268 ),
253 VEmptyView(20), 269 VEmptyView(20),
254 Text( 270 Text(
255 - '${widget.year}年', 271 + '${year}年',
256 style: TextStyle( 272 style: TextStyle(
257 fontSize: font(14), color: MyColours.color_515151), 273 fontSize: font(14), color: MyColours.color_515151),
258 ) 274 )
@@ -559,13 +575,13 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -559,13 +575,13 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
559 shrinkWrap: true, 575 shrinkWrap: true,
560 padding: EdgeInsets.symmetric(horizontal: w(10)), 576 padding: EdgeInsets.symmetric(horizontal: w(10)),
561 itemBuilder: (context, index) { 577 itemBuilder: (context, index) {
562 - DayList daylist =  
563 - customerProvider.monthStaticsData!.dayList![index]; 578 + DayList daylist = customerProvider
  579 + .monthStaticsData!.dayList![index];
564 return InkWell( 580 return InkWell(
565 onTap: () { 581 onTap: () {
566 NavigatorUtil.goDayOrderPage( 582 NavigatorUtil.goDayOrderPage(
567 context, 583 context,
568 - widget.year.toString(), 584 + year.toString(),
569 month.toString(), 585 month.toString(),
570 daylist.days.toString(), 586 daylist.days.toString(),
571 daylist, 587 daylist,
@@ -604,7 +620,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -604,7 +620,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
604 VEmptyView(40), 620 VEmptyView(40),
605 Text( 621 Text(
606 nongliShow( 622 nongliShow(
607 - widget.year!, 623 + year.toString(),
608 month.toString(), 624 month.toString(),
609 daylist.days.toString())!, 625 daylist.days.toString())!,
610 style: TextStyle( 626 style: TextStyle(
@@ -614,7 +630,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -614,7 +630,7 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
614 VEmptyView(10), 630 VEmptyView(10),
615 Text( 631 Text(
616 weekdayShow( 632 weekdayShow(
617 - widget.year!, 633 + year.toString(),
618 month.toString(), 634 month.toString(),
619 daylist.days.toString()), 635 daylist.days.toString()),
620 style: TextStyle( 636 style: TextStyle(