Commit 4d7541b07f24c60f9436d62d892aba177902297e

Authored by wdn127929
1 parent b1029e7e

半小时时间死循环&&店铺地址null值报错

@@ -100,6 +100,7 @@ class _CouponPosterPageState extends State<CouponPosterPage> { @@ -100,6 +100,7 @@ class _CouponPosterPageState extends State<CouponPosterPage> {
100 User user = Provider.of<UserModel>(context, listen: false).user; 100 User user = Provider.of<UserModel>(context, listen: false).user;
101 String times = '营业时间:'; 101 String times = '营业时间:';
102 if (user.morning != "") { 102 if (user.morning != "") {
  103 +
103 times += user.morning; 104 times += user.morning;
104 } 105 }
105 if (user.noon != "") { 106 if (user.noon != "") {
@@ -109,7 +110,7 @@ class _CouponPosterPageState extends State<CouponPosterPage> { @@ -109,7 +110,7 @@ class _CouponPosterPageState extends State<CouponPosterPage> {
109 times += ' ${user.night}'; 110 times += ' ${user.night}';
110 } 111 }
111 String phone = user.sellerphone.replaceAll(',', ' '); 112 String phone = user.sellerphone.replaceAll(',', ' ');
112 - String address = '地址:' + user.sellerAddr; 113 + String address = '地址:' + user.sellerAddr??'';
113 String title = "${user.sellername}向您推荐一张优惠券"; 114 String title = "${user.sellername}向您推荐一张优惠券";
114 String name = ''; 115 String name = '';
115 if (widget.couponSunModel.isType == '1') { 116 if (widget.couponSunModel.isType == '1') {
@@ -345,9 +345,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -345,9 +345,9 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
345 /*获取结束分钟*/ 345 /*获取结束分钟*/
346 int endMinute = int.parse(endTemp[1]); 346 int endMinute = int.parse(endTemp[1]);
347 if (endMinute == 15) { 347 if (endMinute == 15) {
348 - endDate = '${endHour}:00'; 348 + endDate = '${endTemp[0]}:00';
349 } else if (endMinute == 45) { 349 } else if (endMinute == 45) {
350 - endDate = '${endHour}:30'; 350 + endDate = '${endTemp[0]}:30';
351 } 351 }
352 List res = []; 352 List res = [];
353 bool tempLimit = true; 353 bool tempLimit = true;
@@ -144,9 +144,9 @@ class SelectTableFPageState extends State<SelectTableFPage> { @@ -144,9 +144,9 @@ class SelectTableFPageState extends State<SelectTableFPage> {
144 /*获取结束分钟*/ 144 /*获取结束分钟*/
145 int endMinute = int.parse(endTemp[1]); 145 int endMinute = int.parse(endTemp[1]);
146 if (endMinute == 15) { 146 if (endMinute == 15) {
147 - endDate = '${endHour}:00'; 147 + endDate = '${endTemp[0]}:00';
148 } else if (endMinute == 45) { 148 } else if (endMinute == 45) {
149 - endDate = '${endHour}:30'; 149 + endDate = '${endTemp[0]}:30';
150 } 150 }
151 List res = []; 151 List res = [];
152 bool tempLimit = true; 152 bool tempLimit = true;
@@ -762,9 +762,9 @@ class InvicationPageState extends State<InvicationPage> @@ -762,9 +762,9 @@ class InvicationPageState extends State<InvicationPage>
762 /*获取结束分钟*/ 762 /*获取结束分钟*/
763 int endMinute = int.parse(endTemp[1]); 763 int endMinute = int.parse(endTemp[1]);
764 if (endMinute == 15) { 764 if (endMinute == 15) {
765 - endDate = '${endHour}:00'; 765 + endDate = '${endTemp[0]}:00';
766 } else if (endMinute == 45) { 766 } else if (endMinute == 45) {
767 - endDate = '${endHour}:30'; 767 + endDate = '${endTemp[0]}:30';
768 } 768 }
769 List<String> res = []; 769 List<String> res = [];
770 bool tempLimit = true; 770 bool tempLimit = true;
@@ -4693,7 +4693,7 @@ class InvicationPageState extends State<InvicationPage> @@ -4693,7 +4693,7 @@ class InvicationPageState extends State<InvicationPage>
4693 radius: ScreenUtil().setWidth(8), 4693 radius: ScreenUtil().setWidth(8),
4694 isBold: false, 4694 isBold: false,
4695 onPressed: () async { 4695 onPressed: () async {
4696 - dynamic isSuccess = await Utils.goShareInvicationToWeChat( 4696 + dynamic isSuccess = await Utils.goShareInvicationToWeChat(
4697 context, 4697 context,
4698 widget.rid, 4698 widget.rid,
4699 Provider.of<UserModel>(context, listen: false).user.openid, 4699 Provider.of<UserModel>(context, listen: false).user.openid,
@@ -146,9 +146,9 @@ class PhotoManagerPageState extends State<PhotoManagerPage> { @@ -146,9 +146,9 @@ class PhotoManagerPageState extends State<PhotoManagerPage> {
146 /*获取结束分钟*/ 146 /*获取结束分钟*/
147 int endMinute = int.parse(endTemp[1]); 147 int endMinute = int.parse(endTemp[1]);
148 if (endMinute == 15) { 148 if (endMinute == 15) {
149 - endDate = '${endHour}:00'; 149 + endDate = '${endTemp[0]}:00';
150 } else if (endMinute == 45) { 150 } else if (endMinute == 45) {
151 - endDate = '${endHour}:30'; 151 + endDate = '${endTemp[0]}:30';
152 } 152 }
153 List res = []; 153 List res = [];
154 bool tempLimit = true; 154 bool tempLimit = true;
@@ -235,7 +235,9 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -235,7 +235,9 @@ class TableManagerPageState extends State<TableManagerPage> {
235 _user.morning = sellerInfoSunModel.data.dailyShow.morning; 235 _user.morning = sellerInfoSunModel.data.dailyShow.morning;
236 _user.noon = sellerInfoSunModel.data.dailyShow.noon; 236 _user.noon = sellerInfoSunModel.data.dailyShow.noon;
237 _user.night = sellerInfoSunModel.data.dailyShow.night; 237 _user.night = sellerInfoSunModel.data.dailyShow.night;
238 - _user.sellerAddr = sellerInfoSunModel.data.realAddress; 238 +
  239 + _user.sellerAddr =
  240 + '${sellerInfoSunModel.data.mapAddress}${sellerInfoSunModel.data.realAddress ?? ''}';
239 await UserModel().saveUserInfo(_user); 241 await UserModel().saveUserInfo(_user);
240 } 242 }
241 } 243 }
@@ -334,9 +334,9 @@ class EnterModel with ChangeNotifier { @@ -334,9 +334,9 @@ class EnterModel with ChangeNotifier {
334 /*获取结束分钟*/ 334 /*获取结束分钟*/
335 int endMinute = int.parse(endTemp[1]); 335 int endMinute = int.parse(endTemp[1]);
336 if (endMinute == 15) { 336 if (endMinute == 15) {
337 - endDate = '${endHour}:00'; 337 + endDate = '${endTemp[0]}:00';
338 } else if (endMinute == 45) { 338 } else if (endMinute == 45) {
339 - endDate = '${endHour}:30'; 339 + endDate = '${endTemp[0]}:30';
340 } 340 }
341 List res = []; 341 List res = [];
342 bool tempLimit = true; 342 bool tempLimit = true;
@@ -218,9 +218,9 @@ class HomeEnterModel with ChangeNotifier { @@ -218,9 +218,9 @@ class HomeEnterModel with ChangeNotifier {
218 int endMinute = int.parse(endTemp[1]); 218 int endMinute = int.parse(endTemp[1]);
219 if (endMinute == 15) { 219 if (endMinute == 15) {
220 220
221 - endDate = '${endHour}:00'; 221 + endDate = '${endTemp[0]}:00';
222 } else if (endMinute == 45) { 222 } else if (endMinute == 45) {
223 - endDate = '${endHour}:30'; 223 + endDate = '${endTemp[0]}:30';
224 } 224 }
225 List res = []; 225 List res = [];
226 bool tempLimit = true; 226 bool tempLimit = true;
@@ -237,9 +237,9 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -237,9 +237,9 @@ class NotebookDetailChangeModel with ChangeNotifier {
237 /*获取结束分钟*/ 237 /*获取结束分钟*/
238 int endMinute = int.parse(endTemp[1]); 238 int endMinute = int.parse(endTemp[1]);
239 if (endMinute == 15) { 239 if (endMinute == 15) {
240 - endDate = '${endHour}:00'; 240 + endDate = '${endTemp[0]}:00';
241 } else if (endMinute == 45) { 241 } else if (endMinute == 45) {
242 - endDate = '${endHour}:30'; 242 + endDate = '${endTemp[0]}:30';
243 } 243 }
244 List res = []; 244 List res = [];
245 bool tempLimit = true; 245 bool tempLimit = true;
@@ -373,9 +373,9 @@ class TableManagerModel with ChangeNotifier { @@ -373,9 +373,9 @@ class TableManagerModel with ChangeNotifier {
373 /*获取结束分钟*/ 373 /*获取结束分钟*/
374 int endMinute = int.parse(endTemp[1]); 374 int endMinute = int.parse(endTemp[1]);
375 if (endMinute == 15) { 375 if (endMinute == 15) {
376 - endDate = '${endHour}:00'; 376 + endDate = '${endTemp[0]}:00';
377 } else if (endMinute == 45) { 377 } else if (endMinute == 45) {
378 - endDate = '${endHour}:30'; 378 + endDate = '${endTemp[0]}:30';
379 } 379 }
380 List<String> res = []; 380 List<String> res = [];
381 bool tempLimit = true; 381 bool tempLimit = true;
@@ -118,9 +118,9 @@ class SetTimeWidget { @@ -118,9 +118,9 @@ class SetTimeWidget {
118 /*获取结束分钟*/ 118 /*获取结束分钟*/
119 int endMinute = int.parse(endTemp[1]); 119 int endMinute = int.parse(endTemp[1]);
120 if (endMinute == 15) { 120 if (endMinute == 15) {
121 - endDate = '${endHour}:00'; 121 + endDate = '${endTemp[0]}:00';
122 } else if (endMinute == 45) { 122 } else if (endMinute == 45) {
123 - endDate = '${endHour}:30'; 123 + endDate = '${endTemp[0]}:30';
124 } 124 }
125 List res = []; 125 List res = [];
126 bool tempLimit = true; 126 bool tempLimit = true;