xt / Flutter-ReserveApp · Commits

Go to a project

Commit 85e2d0faa6ee6e5e89a9445090132a5af961a5d0

Authored by wdn127929
1 parent fd42dd74
build: skipped

3.7.2

Inline Side-by-side
Showing 9 changed files with 110 additions and 57 deletions
@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "370" 15 +def flutterVersionCode = "372"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '370' 17 + flutterVersionCode = '372'
18 } 18 }
19 19
20 -def flutterVersionName = "3.7.0" 20 +def flutterVersionName = "3.7.2"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '3.7.0' 22 + flutterVersionName = '3.7.2'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -295,4 +295,4 @@ SPEC CHECKSUMS: @@ -295,4 +295,4 @@ SPEC CHECKSUMS:
295 295
296 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa 296 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
297 297
298 -COCOAPODS: 1.10.1 298 +COCOAPODS: 1.11.3
@@ -487,7 +487,7 @@ @@ -487,7 +487,7 @@
487 CODE_SIGN_IDENTITY = "iPhone Developer"; 487 CODE_SIGN_IDENTITY = "iPhone Developer";
488 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 488 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
489 CODE_SIGN_STYLE = Automatic; 489 CODE_SIGN_STYLE = Automatic;
490 - CURRENT_PROJECT_VERSION = 343; 490 + CURRENT_PROJECT_VERSION = 370;
491 DEVELOPMENT_TEAM = 8J59HM8B82; 491 DEVELOPMENT_TEAM = 8J59HM8B82;
492 ENABLE_BITCODE = NO; 492 ENABLE_BITCODE = NO;
493 FLUTTER_BUILD_MODE = release; 493 FLUTTER_BUILD_MODE = release;
@@ -502,7 +502,7 @@ @@ -502,7 +502,7 @@
502 "$(inherited)", 502 "$(inherited)",
503 "$(PROJECT_DIR)/Flutter", 503 "$(PROJECT_DIR)/Flutter",
504 ); 504 );
505 - MARKETING_VERSION = 3.4.3; 505 + MARKETING_VERSION = 3.7.2;
506 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 506 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
507 PRODUCT_NAME = Runner; 507 PRODUCT_NAME = Runner;
508 PROVISIONING_PROFILE_SPECIFIER = ""; 508 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -632,10 +632,10 @@ @@ -632,10 +632,10 @@
632 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 632 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
633 CODE_SIGN_IDENTITY = "iPhone Developer"; 633 CODE_SIGN_IDENTITY = "iPhone Developer";
634 CODE_SIGN_STYLE = Automatic; 634 CODE_SIGN_STYLE = Automatic;
635 - CURRENT_PROJECT_VERSION = 343; 635 + CURRENT_PROJECT_VERSION = 370;
636 DEVELOPMENT_TEAM = 8J59HM8B82; 636 DEVELOPMENT_TEAM = 8J59HM8B82;
637 ENABLE_BITCODE = NO; 637 ENABLE_BITCODE = NO;
638 - FLUTTER_BUILD_MODE = debug; 638 + FLUTTER_BUILD_MODE = release;
639 FRAMEWORK_SEARCH_PATHS = ( 639 FRAMEWORK_SEARCH_PATHS = (
640 "$(inherited)", 640 "$(inherited)",
641 "$(PROJECT_DIR)/Flutter", 641 "$(PROJECT_DIR)/Flutter",
@@ -647,7 +647,7 @@ @@ -647,7 +647,7 @@
647 "$(inherited)", 647 "$(inherited)",
648 "$(PROJECT_DIR)/Flutter", 648 "$(PROJECT_DIR)/Flutter",
649 ); 649 );
650 - MARKETING_VERSION = 3.4.3; 650 + MARKETING_VERSION = 3.7.2;
651 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 651 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
652 PRODUCT_NAME = Runner; 652 PRODUCT_NAME = Runner;
653 PROVISIONING_PROFILE_SPECIFIER = ""; 653 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -667,7 +667,7 @@ @@ -667,7 +667,7 @@
667 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 667 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
668 CODE_SIGN_IDENTITY = "iPhone Developer"; 668 CODE_SIGN_IDENTITY = "iPhone Developer";
669 CODE_SIGN_STYLE = Automatic; 669 CODE_SIGN_STYLE = Automatic;
670 - CURRENT_PROJECT_VERSION = 343; 670 + CURRENT_PROJECT_VERSION = 370;
671 DEVELOPMENT_TEAM = 8J59HM8B82; 671 DEVELOPMENT_TEAM = 8J59HM8B82;
672 ENABLE_BITCODE = NO; 672 ENABLE_BITCODE = NO;
673 FLUTTER_BUILD_MODE = release; 673 FLUTTER_BUILD_MODE = release;
@@ -682,7 +682,7 @@ @@ -682,7 +682,7 @@
682 "$(inherited)", 682 "$(inherited)",
683 "$(PROJECT_DIR)/Flutter", 683 "$(PROJECT_DIR)/Flutter",
684 ); 684 );
685 - MARKETING_VERSION = 3.4.3; 685 + MARKETING_VERSION = 3.7.2;
686 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 686 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
687 PRODUCT_NAME = Runner; 687 PRODUCT_NAME = Runner;
688 PROVISIONING_PROFILE_SPECIFIER = ""; 688 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -423,8 +423,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -423,8 +423,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
423 showMsg: "加载中，请稍后...", 423 showMsg: "加载中，请稍后...",
424 ); 424 );
425 } else { 425 } else {
426 - return Expanded(  
427 - child: DefaultTextStyle( 426 + return DefaultTextStyle(
428 style: TextStyle(decoration: TextDecoration.none), 427 style: TextStyle(decoration: TextDecoration.none),
429 child: Container( 428 child: Container(
430 color: MyColours.color_ffffff, 429 color: MyColours.color_ffffff,
@@ -674,8 +673,8 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -674,8 +673,8 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
674 ), 673 ),
675 ) 674 )
676 ], 675 ],
677 - ))),  
678 - ); 676 + )))
  677 + ;
679 } 678 }
680 }), 679 }),
681 onWillPop: () async { 680 onWillPop: () async {
@@ -415,6 +415,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -415,6 +415,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
415 }, 415 },
416 xgPushClickAction: (Map<String, dynamic> msg) async { 416 xgPushClickAction: (Map<String, dynamic> msg) async {
417 print(msg); 417 print(msg);
  418 +
418 _clearBadge(() {}); 419 _clearBadge(() {});
419 if (Platform.isIOS && msg != null && msg['custom'] != null) { 420 if (Platform.isIOS && msg != null && msg['custom'] != null) {
420 Map custom = json.decode(msg['custom'].toString()); 421 Map custom = json.decode(msg['custom'].toString());
@@ -470,6 +471,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -470,6 +471,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
470 await messageDialogModel.setMessageStatus(context, params); 471 await messageDialogModel.setMessageStatus(context, params);
471 break; 472 break;
472 case "15": 473 case "15":
  474 +
473 //店内消息 475 //店内消息
474 NavigatorUtil.goHomePage(context, 476 NavigatorUtil.goHomePage(context,
475 initialIndex: 1, 477 initialIndex: 1,
@@ -478,6 +480,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -478,6 +480,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
478 dateTime: DateTime.parse(custom['ddate'].replaceAll('/', '-')) 480 dateTime: DateTime.parse(custom['ddate'].replaceAll('/', '-'))
479 .millisecondsSinceEpoch, 481 .millisecondsSinceEpoch,
480 solt: custom['ddate_solt']); 482 solt: custom['ddate_solt']);
  483 +
481 Map<String, String> params = { 484 Map<String, String> params = {
482 "sid": Provider.of<UserModel>(context, listen: false) 485 "sid": Provider.of<UserModel>(context, listen: false)
483 .user 486 .user
@@ -220,7 +220,9 @@ class MessageDialogItemF extends StatelessWidget { @@ -220,7 +220,9 @@ class MessageDialogItemF extends StatelessWidget {
220 ), 220 ),
221 ), 221 ),
222 HEmptyView(34), 222 HEmptyView(34),
223 - message.message_type == "10" || message.message_type == "12" 223 + message.message_type == "10" ||
  224 + message.message_type == "12" ||
  225 + message.message_type == "13"
224 ? Expanded( 226 ? Expanded(
225 child: Column( 227 child: Column(
226 crossAxisAlignment: CrossAxisAlignment.start, 228 crossAxisAlignment: CrossAxisAlignment.start,
@@ -334,27 +336,33 @@ class MessageDialogItemF extends StatelessWidget { @@ -334,27 +336,33 @@ class MessageDialogItemF extends StatelessWidget {
334 fontSize: ScreenUtil().setSp(24)), 336 fontSize: ScreenUtil().setSp(24)),
335 ), 337 ),
336 VEmptyView(8), 338 VEmptyView(8),
337 - Container(  
338 - padding: EdgeInsets.symmetric(  
339 - horizontal: ScreenUtil().setWidth(16),  
340 - vertical: ScreenUtil().setWidth(6)),  
341 - decoration: BoxDecoration(  
342 - color: bgcolor,  
343 - borderRadius: BorderRadius.circular(8)),  
344 - child: Text(  
345 - '${message.message_type == '1' ? message.room_info : message.room_demand}',  
346 - style: TextStyle(  
347 - color: MyColours.color_ffffff,  
348 - fontSize: ScreenUtil().setSp(20)),  
349 - ),  
350 - ) 339 + message.room_demand == '' ||
  340 + message.room_demand == null
  341 + ? SizedBox()
  342 + : Container(
  343 + padding: EdgeInsets.symmetric(
  344 + horizontal: ScreenUtil().setWidth(16),
  345 + vertical: ScreenUtil().setWidth(6)),
  346 + decoration: BoxDecoration(
  347 + color: bgcolor,
  348 + borderRadius: BorderRadius.circular(8)),
  349 + child: Text(
  350 + '${message.room_demand}',
  351 + maxLines: 1,
  352 + overflow: TextOverflow.ellipsis,
  353 + style: TextStyle(
  354 + color: MyColours.color_ffffff,
  355 + fontSize: ScreenUtil().setSp(20)),
  356 + ),
  357 + )
351 ], 358 ],
352 )) 359 ))
353 : SizedBox(), 360 : SizedBox(),
354 message.message_type == "11" || 361 message.message_type == "11" ||
355 message.message_type == "16" || 362 message.message_type == "16" ||
356 message.message_type == "1" 363 message.message_type == "1"
357 - ? Column( 364 + ? Expanded(
  365 + child: Column(
358 crossAxisAlignment: CrossAxisAlignment.start, 366 crossAxisAlignment: CrossAxisAlignment.start,
359 children: [ 367 children: [
360 Text( 368 Text(
@@ -364,22 +372,49 @@ class MessageDialogItemF extends StatelessWidget { @@ -364,22 +372,49 @@ class MessageDialogItemF extends StatelessWidget {
364 fontSize: ScreenUtil().setSp(28)), 372 fontSize: ScreenUtil().setSp(28)),
365 ), 373 ),
366 VEmptyView(8), 374 VEmptyView(8),
367 - message.room_demand == ''  
368 - ? SizedBox()  
369 - : Container(  
370 - padding: EdgeInsets.symmetric(  
371 - horizontal: ScreenUtil().setWidth(16),  
372 - vertical: ScreenUtil().setWidth(6)),  
373 - decoration: BoxDecoration(  
374 - color: bgcolor,  
375 - borderRadius: BorderRadius.circular(8)),  
376 - child: Text(  
377 - '${message.room_demand}',  
378 - style: TextStyle(  
379 - color: MyColours.color_ffffff,  
380 - fontSize: ScreenUtil().setSp(20)),  
381 - ),  
382 - ), 375 + message.message_type == "1"
  376 + ? message.room_info == '' ||
  377 + message.room_info == null
  378 + ? SizedBox()
  379 + : Container(
  380 + padding: EdgeInsets.symmetric(
  381 + horizontal:
  382 + ScreenUtil().setWidth(16),
  383 + vertical: ScreenUtil().setWidth(6)),
  384 + decoration: BoxDecoration(
  385 + color: bgcolor,
  386 + borderRadius:
  387 + BorderRadius.circular(8)),
  388 + child: Text(
  389 + '${message.room_info}',
  390 + maxLines: 1,
  391 + overflow: TextOverflow.ellipsis,
  392 + style: TextStyle(
  393 + color: MyColours.color_ffffff,
  394 + fontSize: ScreenUtil().setSp(20)),
  395 + ),
  396 + )
  397 + : message.room_demand == '' ||
  398 + message.room_demand == null
  399 + ? SizedBox()
  400 + : Container(
  401 + padding: EdgeInsets.symmetric(
  402 + horizontal:
  403 + ScreenUtil().setWidth(16),
  404 + vertical: ScreenUtil().setWidth(6)),
  405 + decoration: BoxDecoration(
  406 + color: bgcolor,
  407 + borderRadius:
  408 + BorderRadius.circular(8)),
  409 + child: Text(
  410 + '${message.room_demand}',
  411 + maxLines: 1,
  412 + overflow: TextOverflow.ellipsis,
  413 + style: TextStyle(
  414 + color: MyColours.color_ffffff,
  415 + fontSize: ScreenUtil().setSp(20)),
  416 + ),
  417 + ),
383 message.message_type == "1" 418 message.message_type == "1"
384 ? SizedBox() 419 ? SizedBox()
385 : Text( 420 : Text(
@@ -393,7 +428,7 @@ class MessageDialogItemF extends StatelessWidget { @@ -393,7 +428,7 @@ class MessageDialogItemF extends StatelessWidget {
393 fontSize: ScreenUtil().setSp(24)), 428 fontSize: ScreenUtil().setSp(24)),
394 ) 429 )
395 ], 430 ],
396 - ) 431 + ))
397 : SizedBox(), 432 : SizedBox(),
398 message.message_type == "15" 433 message.message_type == "15"
399 ? Column( 434 ? Column(
@@ -261,7 +261,9 @@ class MessageItemF extends StatelessWidget { @@ -261,7 +261,9 @@ class MessageItemF extends StatelessWidget {
261 ), 261 ),
262 ), 262 ),
263 HEmptyView(34), 263 HEmptyView(34),
264 - message.message_type == "10" || message.message_type == "12" 264 + message.message_type == "10" ||
  265 + message.message_type == "12" ||
  266 + message.message_type == "13"
265 ? Expanded( 267 ? Expanded(
266 child: Column( 268 child: Column(
267 crossAxisAlignment: CrossAxisAlignment.start, 269 crossAxisAlignment: CrossAxisAlignment.start,
@@ -387,6 +389,8 @@ class MessageItemF extends StatelessWidget { @@ -387,6 +389,8 @@ class MessageItemF extends StatelessWidget {
387 borderRadius: BorderRadius.circular(8)), 389 borderRadius: BorderRadius.circular(8)),
388 child: Text( 390 child: Text(
389 '${message.room_demand}', 391 '${message.room_demand}',
  392 + maxLines: 1,
  393 + overflow: TextOverflow.ellipsis,
390 style: TextStyle( 394 style: TextStyle(
391 color: MyColours.color_ffffff, 395 color: MyColours.color_ffffff,
392 fontSize: ScreenUtil().setSp(20)), 396 fontSize: ScreenUtil().setSp(20)),
@@ -398,7 +402,8 @@ class MessageItemF extends StatelessWidget { @@ -398,7 +402,8 @@ class MessageItemF extends StatelessWidget {
398 message.message_type == "11" || 402 message.message_type == "11" ||
399 message.message_type == "16" || 403 message.message_type == "16" ||
400 message.message_type == "1" 404 message.message_type == "1"
401 - ? Column( 405 + ? Expanded(
  406 + child: Column(
402 crossAxisAlignment: CrossAxisAlignment.start, 407 crossAxisAlignment: CrossAxisAlignment.start,
403 children: [ 408 children: [
404 Text( 409 Text(
@@ -423,6 +428,8 @@ class MessageItemF extends StatelessWidget { @@ -423,6 +428,8 @@ class MessageItemF extends StatelessWidget {
423 BorderRadius.circular(8)), 428 BorderRadius.circular(8)),
424 child: Text( 429 child: Text(
425 '${message.room_info}', 430 '${message.room_info}',
  431 + maxLines: 1,
  432 + overflow: TextOverflow.ellipsis,
426 style: TextStyle( 433 style: TextStyle(
427 color: MyColours.color_ffffff, 434 color: MyColours.color_ffffff,
428 fontSize: ScreenUtil().setSp(20)), 435 fontSize: ScreenUtil().setSp(20)),
@@ -442,6 +449,8 @@ class MessageItemF extends StatelessWidget { @@ -442,6 +449,8 @@ class MessageItemF extends StatelessWidget {
442 BorderRadius.circular(8)), 449 BorderRadius.circular(8)),
443 child: Text( 450 child: Text(
444 '${message.room_demand}', 451 '${message.room_demand}',
  452 + maxLines: 1,
  453 + overflow: TextOverflow.ellipsis,
445 style: TextStyle( 454 style: TextStyle(
446 color: MyColours.color_ffffff, 455 color: MyColours.color_ffffff,
447 fontSize: ScreenUtil().setSp(20)), 456 fontSize: ScreenUtil().setSp(20)),
@@ -460,7 +469,7 @@ class MessageItemF extends StatelessWidget { @@ -460,7 +469,7 @@ class MessageItemF extends StatelessWidget {
460 fontSize: ScreenUtil().setSp(24)), 469 fontSize: ScreenUtil().setSp(24)),
461 ) 470 )
462 ], 471 ],
463 - ) 472 + ))
464 : SizedBox(), 473 : SizedBox(),
465 message.message_type == "15" 474 message.message_type == "15"
466 ? Column( 475 ? Column(
@@ -3,7 +3,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -3,7 +3,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
3 import 'package:fluwx/fluwx.dart'; 3 import 'package:fluwx/fluwx.dart';
4 import 'package:one_key/constant/state.dart'; 4 import 'package:one_key/constant/state.dart';
5 import 'package:one_key/models/sms_info.dart'; 5 import 'package:one_key/models/sms_info.dart';
  6 +import 'package:one_key/models/store_info.dart';
6 import 'package:one_key/models/version.dart'; 7 import 'package:one_key/models/version.dart';
  8 +import 'package:one_key/provider/create_store_model.dart';
7 import 'package:one_key/provider/my_model.dart'; 9 import 'package:one_key/provider/my_model.dart';
8 import 'package:one_key/provider/update_model.dart'; 10 import 'package:one_key/provider/update_model.dart';
9 import 'package:one_key/provider/user_model.dart'; 11 import 'package:one_key/provider/user_model.dart';
@@ -36,6 +38,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -36,6 +38,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
36 ScrollController controller; 38 ScrollController controller;
37 Version _version; 39 Version _version;
38 SmsInfoData smsInfoData; 40 SmsInfoData smsInfoData;
  41 + CreateStoreModel createStoreModel;
39 42
40 @override 43 @override
41 void initState() { 44 void initState() {
@@ -131,6 +134,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -131,6 +134,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
131 @override 134 @override
132 Widget build(BuildContext context) { 135 Widget build(BuildContext context) {
133 myModel = Provider.of<MyModel>(context, listen: true); 136 myModel = Provider.of<MyModel>(context, listen: true);
  137 + createStoreModel = Provider.of<CreateStoreModel>(context, listen: false);
134 return Scaffold( 138 return Scaffold(
135 appBar: AppBar( 139 appBar: AppBar(
136 backgroundColor: MyColours.color_199095, //把appbar的背景色改成透明 140 backgroundColor: MyColours.color_199095, //把appbar的背景色改成透明
@@ -175,6 +179,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -175,6 +179,8 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
175 height: ScreenUtil().setWidth(50), 179 height: ScreenUtil().setWidth(50),
176 child: Text( 180 child: Text(
177 model.user.sellername, 181 model.user.sellername,
  182 + maxLines: 1,
  183 + overflow: TextOverflow.ellipsis,
178 style: TextStyle( 184 style: TextStyle(
179 color: MyColours.color_ffffff, 185 color: MyColours.color_ffffff,
180 fontSize: ScreenUtil().setSp(36)), 186 fontSize: ScreenUtil().setSp(36)),
@@ -223,7 +229,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -223,7 +229,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
223 )), 229 )),
224 Positioned( 230 Positioned(
225 right: ScreenUtil().setWidth(40), 231 right: ScreenUtil().setWidth(40),
226 - bottom: ScreenUtil().setWidth(156), 232 + bottom: ScreenUtil().setWidth(116),
227 child: RoundButton( 233 child: RoundButton(
228 text: '切换店铺', 234 text: '切换店铺',
229 gradientStart: MyColours.color_ffffff, 235 gradientStart: MyColours.color_ffffff,
@@ -233,14 +239,17 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { @@ -233,14 +239,17 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
233 height: ScreenUtil().setWidth(56), 239 height: ScreenUtil().setWidth(56),
234 fontSize: 28, 240 fontSize: 28,
235 isBold: false, 241 isBold: false,
236 - textColor: App.sp.getBool("accountLogin") 242 + textColor: App.sp.getBool("accountLogin") ?? false
237 ? MyColours.color_999999 243 ? MyColours.color_999999
238 : MyColours.color_199095, 244 : MyColours.color_199095,
239 radius: ScreenUtil().setWidth(20), 245 radius: ScreenUtil().setWidth(20),
240 onPressed: () { 246 onPressed: () {
241 - if (App.sp.getBool("accountLogin")) { 247 + if (App.sp.getBool("accountLogin") ?? false) {
242 return; 248 return;
243 } 249 }
  250 +
  251 + print(createStoreModel.storeInfo);
  252 + createStoreModel.storeInfo = StoreInfo();
244 NavigatorUtil.goIfNeedCreateStorePage(context, 253 NavigatorUtil.goIfNeedCreateStorePage(context,
245 changeStatus: true); 254 changeStatus: true);
246 }, 255 },
@@ -151,12 +151,10 @@ var homeHandler = new Handler( @@ -151,12 +151,10 @@ var homeHandler = new Handler(
151 151
152 String solt = params["solt"].first; 152 String solt = params["solt"].first;
153 153
154 -  
155 DateTime dateTime = params["dateTime"].first == "null" 154 DateTime dateTime = params["dateTime"].first == "null"
156 ? null 155 ? null
157 : DateTime.fromMillisecondsSinceEpoch( 156 : DateTime.fromMillisecondsSinceEpoch(
158 int.parse(params["dateTime"].first)); 157 int.parse(params["dateTime"].first));
159 -  
160 return HomePage( 158 return HomePage(
161 initialIndex: int.parse(initialIndex), 159 initialIndex: int.parse(initialIndex),
162 needReresh: needRefresh, 160 needReresh: needRefresh,