Commit ccb9c0c79d9ae3011ab79a43750d19a3ed0f2521

Authored by wdn127929
1 parent 5c62ce1b

新增加标准版首年类型 13

@@ -216,9 +216,19 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -216,9 +216,19 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
216 DateUtil.formatDate(DateTime.now(), format: DateFormats.y_mo_d) + 216 DateUtil.formatDate(DateTime.now(), format: DateFormats.y_mo_d) +
217 ' 00:00:00'; 217 ' 00:00:00';
218 DateTime datenow = DateUtil.getDateTime(from); 218 DateTime datenow = DateUtil.getDateTime(from);
  219 +
219 //比较相差的天数 220 //比较相差的天数
220 - int day = edate.difference(datenow).inDays;  
221 - outDay = day < 0 ? '0' : day.toString(); 221 + int difference = edate.difference(datenow).inDays;
  222 +
  223 + int differenceSeconds = edate.difference(datenow).inSeconds;
  224 +
  225 + if (difference < 0 || (difference == 0 && differenceSeconds <= 0)) {
  226 + //过期
  227 + outDay = '0';
  228 + } else {
  229 + outDay = difference.toString();
  230 + }
  231 +
222 // print(outDay); 232 // print(outDay);
223 } else { 233 } else {
224 outDay = '0'; 234 outDay = '0';
@@ -123,12 +123,14 @@ class CollectStoreProvider with ChangeNotifier { @@ -123,12 +123,14 @@ class CollectStoreProvider with ChangeNotifier {
123 element == '1' || 123 element == '1' ||
124 element == '2' || 124 element == '2' ||
125 element == '3' || 125 element == '3' ||
126 - element == '4'); 126 + element == '4' ||
  127 + element == '13');
127 sellerVersionList.forEach((element) { 128 sellerVersionList.forEach((element) {
128 if (element.vid == '1' || 129 if (element.vid == '1' ||
129 element.vid == '2' || 130 element.vid == '2' ||
130 element.vid == '3' || 131 element.vid == '3' ||
131 - element.vid == '4') { 132 + element.vid == '4' ||
  133 + element.vid == '13') {
132 sellerNormalEdate = element.edate; 134 sellerNormalEdate = element.edate;
133 } 135 }
134 }); 136 });
@@ -140,9 +142,9 @@ class CollectStoreProvider with ChangeNotifier { @@ -140,9 +142,9 @@ class CollectStoreProvider with ChangeNotifier {
140 App.sp.remove("sellerEdate"); 142 App.sp.remove("sellerEdate");
141 } 143 }
142 } 144 }
143 - }else{  
144 - //超能版或者标准版过期  
145 - App.sp.setStringList("sellerEdate", ['-1']); 145 + } else {
  146 + //超能版或者标准版过期
  147 + App.sp.setStringList("sellerEdate", ['-1']);
146 } 148 }
147 149
148 return true; 150 return true;