xt / Flutter-ReserveApp · Commits

Go to a project

Commit dda96b5fa380e8c82fb586dcf0a2371f90156eaf

Authored by wdn127929
2 parents 165242de cd82fdb7
build: skipped

合并线上提交版本

Inline Side-by-side
Showing 7 changed files with 333 additions and 49 deletions
@@ -33,9 +33,10 @@ if (flutterRoot == null) { @@ -33,9 +33,10 @@ if (flutterRoot == null) {
33 33
34 34
35 35
36 -def flutterVersionCode = "504" 36 +def flutterVersionCode = "505"
37 if (flutterVersionCode == null) { 37 if (flutterVersionCode == null) {
38 - flutterVersionCode = '504' 38 + flutterVersionCode = '505'
  39 +
39 40
40 41
41 } 42 }
@@ -44,9 +45,11 @@ if (flutterVersionCode == null) { @@ -44,9 +45,11 @@ if (flutterVersionCode == null) {
44 45
45 46
46 47
47 -def flutterVersionName = "5.0.4" 48 +
  49 +def flutterVersionName = "5.0.5"
48 if (flutterVersionName == null) { 50 if (flutterVersionName == null) {
49 - flutterVersionName = '5.0.4' 51 + flutterVersionName = '5.0.5'
  52 +
50 53
51 } 54 }
52 55
@@ -5,3 +5,4 @@ distributionPath=wrapper/dists @@ -5,3 +5,4 @@ distributionPath=wrapper/dists
5 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip 5 distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
6 zipStoreBase=GRADLE_USER_HOME 6 zipStoreBase=GRADLE_USER_HOME
7 zipStorePath=wrapper/dists 7 zipStorePath=wrapper/dists
  8 +
@@ -518,7 +518,8 @@ @@ -518,7 +518,8 @@
518 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 518 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
519 CODE_SIGN_IDENTITY = "Apple Development"; 519 CODE_SIGN_IDENTITY = "Apple Development";
520 CODE_SIGN_STYLE = Automatic; 520 CODE_SIGN_STYLE = Automatic;
521 - CURRENT_PROJECT_VERSION = 501; 521 + CURRENT_PROJECT_VERSION = 504;
  522 +
522 DEVELOPMENT_TEAM = 8J59HM8B82; 523 DEVELOPMENT_TEAM = 8J59HM8B82;
523 ENABLE_BITCODE = NO; 524 ENABLE_BITCODE = NO;
524 FLUTTER_BUILD_MODE = release; 525 FLUTTER_BUILD_MODE = release;
@@ -533,7 +534,9 @@ @@ -533,7 +534,9 @@
533 "$(inherited)", 534 "$(inherited)",
534 "$(PROJECT_DIR)/Flutter", 535 "$(PROJECT_DIR)/Flutter",
535 ); 536 );
536 - MARKETING_VERSION = 5.0.4; 537 +
  538 + MARKETING_VERSION = 5.0.5;
  539 +
537 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 540 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
538 PRODUCT_NAME = Runner; 541 PRODUCT_NAME = Runner;
539 PROVISIONING_PROFILE_SPECIFIER = ""; 542 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -664,7 +667,9 @@ @@ -664,7 +667,9 @@
664 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 667 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
665 CODE_SIGN_IDENTITY = "Apple Development"; 668 CODE_SIGN_IDENTITY = "Apple Development";
666 CODE_SIGN_STYLE = Automatic; 669 CODE_SIGN_STYLE = Automatic;
667 - CURRENT_PROJECT_VERSION = 501; 670 +
  671 + CURRENT_PROJECT_VERSION = 504;
  672 +
668 DEVELOPMENT_TEAM = 8J59HM8B82; 673 DEVELOPMENT_TEAM = 8J59HM8B82;
669 ENABLE_BITCODE = NO; 674 ENABLE_BITCODE = NO;
670 FLUTTER_BUILD_MODE = release; 675 FLUTTER_BUILD_MODE = release;
@@ -679,7 +684,9 @@ @@ -679,7 +684,9 @@
679 "$(inherited)", 684 "$(inherited)",
680 "$(PROJECT_DIR)/Flutter", 685 "$(PROJECT_DIR)/Flutter",
681 ); 686 );
682 - MARKETING_VERSION = 5.0.4; 687 +
  688 + MARKETING_VERSION = 5.0.5;
  689 +
683 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 690 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
684 PRODUCT_NAME = Runner; 691 PRODUCT_NAME = Runner;
685 PROVISIONING_PROFILE_SPECIFIER = ""; 692 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -700,7 +707,8 @@ @@ -700,7 +707,8 @@
700 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 707 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
701 CODE_SIGN_IDENTITY = "Apple Development"; 708 CODE_SIGN_IDENTITY = "Apple Development";
702 CODE_SIGN_STYLE = Automatic; 709 CODE_SIGN_STYLE = Automatic;
703 - CURRENT_PROJECT_VERSION = 501; 710 + CURRENT_PROJECT_VERSION = 504;
  711 +
704 DEVELOPMENT_TEAM = 8J59HM8B82; 712 DEVELOPMENT_TEAM = 8J59HM8B82;
705 ENABLE_BITCODE = NO; 713 ENABLE_BITCODE = NO;
706 FLUTTER_BUILD_MODE = release; 714 FLUTTER_BUILD_MODE = release;
@@ -715,7 +723,9 @@ @@ -715,7 +723,9 @@
715 "$(inherited)", 723 "$(inherited)",
716 "$(PROJECT_DIR)/Flutter", 724 "$(PROJECT_DIR)/Flutter",
717 ); 725 );
718 - MARKETING_VERSION = 5.0.4; 726 +
  727 + MARKETING_VERSION = 5.0.5;
  728 +
719 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 729 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
720 PRODUCT_NAME = Runner; 730 PRODUCT_NAME = Runner;
721 PROVISIONING_PROFILE_SPECIFIER = ""; 731 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -191,32 +191,34 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore> @@ -191,32 +191,34 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
191 _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true); 191 _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true);
192 return Scaffold( 192 return Scaffold(
193 backgroundColor: Colors.white, 193 backgroundColor: Colors.white,
194 - appBar: SystemAppBar('选择店铺',  
195 - // leftTitle: '上一步', 194 + appBar: SystemAppBar(
  195 + '选择店铺',
  196 + // leftTitle: '上一步',
196 197
197 - rightImgName: 'add_check_store.png', onTapRight: () {  
198 - if (otherLoginProvider.pageState != PageState.Success) {  
199 - // if (!App.sp.containsKey('openid') ||  
200 - // App.sp.get("openid") == null ||  
201 - // App.sp.get("openid") == '') {  
202 - //跳转小程序  
203 - Utils.goMiniProgramCreatePage(context);  
204 - // } else {  
205 - // //跳转至新建店铺流程  
206 - // NavigatorUtil.goEnterStoreNamePage(context);  
207 - // }  
208 - } else {  
209 - // if (!App.sp.containsKey('openid') ||  
210 - // App.sp.get("openid") == null ||  
211 - // App.sp.get("openid") == '') {  
212 - // //跳转小程序  
213 - // Utils.goMiniProgramCreatePage(context);  
214 - // } else {  
215 - //跳转至新建店铺流程  
216 - NavigatorUtil.goEnterStoreNamePage(context);  
217 - // }  
218 - }  
219 - }), 198 + // rightImgName: 'add_check_store.png', onTapRight: () {
  199 + // if (otherLoginProvider.pageState != PageState.Success) {
  200 + // // if (!App.sp.containsKey('openid') ||
  201 + // // App.sp.get("openid") == null ||
  202 + // // App.sp.get("openid") == '') {
  203 + // //跳转小程序
  204 + // Utils.goMiniProgramCreatePage(context);
  205 + // // } else {
  206 + // // //跳转至新建店铺流程
  207 + // // NavigatorUtil.goEnterStoreNamePage(context);
  208 + // // }
  209 + // } else {
  210 + // // if (!App.sp.containsKey('openid') ||
  211 + // // App.sp.get("openid") == null ||
  212 + // // App.sp.get("openid") == '') {
  213 + // // //跳转小程序
  214 + // // Utils.goMiniProgramCreatePage(context);
  215 + // // } else {
  216 + // //跳转至新建店铺流程
  217 + // NavigatorUtil.goEnterStoreNamePage(context);
  218 + // // }
  219 + // }
  220 + // }
  221 + ),
220 body: Container( 222 body: Container(
221 // margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(40)), 223 // margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(40)),
222 padding: 224 padding:
@@ -279,15 +281,19 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore> @@ -279,15 +281,19 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
279 // )), 281 // )),
280 // ])); 282 // ]));
281 // } 283 // }
282 - return ExceptionPage(  
283 - pageState: model.pageState,  
284 - callback: () {  
285 - _checkSellerAcc(showLoading: true);  
286 - },  
287 - emptyMsg: "您还没有绑定任何店铺",  
288 - emptyImg: "empty_search",  
289 - showMsg: "加载中，请稍后...",  
290 - ); 284 + return InkWell(
  285 + onTap: () {
  286 + Utils.goPhone("400-000-9690");
  287 + },
  288 + child: ExceptionPage(
  289 + pageState: model.pageState,
  290 + callback: () {
  291 + _checkSellerAcc(showLoading: true);
  292 + },
  293 + emptyMsg: "您还没有绑定任何店铺，请与400 000 9690 联系。",
  294 + emptyImg: "empty_search",
  295 + showMsg: "加载中，请稍后...",
  296 + ));
291 } else { 297 } else {
292 return 298 return
293 // VEmptyView(40), 299 // VEmptyView(40),
@@ -373,15 +373,252 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver { @@ -373,15 +373,252 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
373 App.sp.remove("unionid"); 373 App.sp.remove("unionid");
374 } 374 }
375 Map<String, String> params = { 375 Map<String, String> params = {
376 - "seller_code": "001297", 376 + "seller_code": "004352",
377 "alias": "ssahdahgdafgahjkhakjgh", 377 "alias": "ssahdahgdafgahjkhakjgh",
378 - "account": "0001", 378 + "account": "0000",
379 "password": "123456" 379 "password": "123456"
380 }; 380 };
381 value.login(context, params).then((value) { 381 value.login(context, params).then((value) {
382 // setState(() { 382 // setState(() {
383 // // errorText = value ?? ""; 383 // // errorText = value ?? "";
384 // }); 384 // });
  385 +
  386 +
  387 +
  388 +
  389 +
  390 +
  391 +
  392 +
  393 +
  394 +
  395 +
  396 +
  397 +
  398 +
  399 +
  400 +
  401 +
  402 +
  403 +
  404 +
  405 +
  406 +
  407 +
  408 +
  409 +
  410 +
  411 +
  412 +
  413 +
  414 +
  415 +
  416 +
  417 +
  418 +
  419 +
  420 +
  421 +
  422 +
  423 +
  424 +
  425 +
  426 +
  427 +
  428 +
  429 +
  430 +
  431 +
  432 +
  433 +
  434 +
  435 +
  436 +
  437 +
  438 +
  439 +
  440 +
  441 +
  442 +
  443 +
  444 +
  445 +
  446 +
  447 +
  448 +
  449 +
  450 +
  451 +
  452 +
  453 +
  454 +
  455 +
  456 +
  457 +
  458 +
  459 +
  460 +
  461 +
  462 +
  463 +
  464 +
  465 +
  466 +
  467 +
  468 +
  469 +
  470 +
  471 +
  472 +
  473 +
  474 +
  475 +
  476 +
  477 +
  478 +
  479 +
  480 +
  481 +
  482 +
  483 +
  484 +
  485 +
  486 +
  487 +
  488 +
  489 +
  490 +
  491 +
  492 +
  493 +
  494 +
  495 +
  496 +
  497 +
  498 +
  499 +
  500 +
  501 +
  502 +
  503 +
  504 +
  505 +
  506 +
  507 +
  508 +
  509 +
  510 +
  511 +
  512 +
  513 +
  514 +
  515 +
  516 +
  517 +
  518 +
  519 +
  520 +
  521 +
  522 +
  523 +
  524 +
  525 +
  526 +
  527 +
  528 +
  529 +
  530 +
  531 +
  532 +
  533 +
  534 +
  535 +
  536 +
  537 +
  538 +
  539 +
  540 +
  541 +
  542 +
  543 +
  544 +
  545 +
  546 +
  547 +
  548 +
  549 +
  550 +
  551 +
  552 +
  553 +
  554 +
  555 +
  556 +
  557 +
  558 +
  559 +
  560 +
  561 +
  562 +
  563 +
  564 +
  565 +
  566 +
  567 +
  568 +
  569 +
  570 +
  571 +
  572 +
  573 +
  574 +
  575 +
  576 +
  577 +
  578 +
  579 +
  580 +
  581 +
  582 +
  583 +
  584 +
  585 +
  586 +
  587 +
  588 +
  589 +
  590 +
  591 +
  592 +
  593 +
  594 +
  595 +
  596 +
  597 +
  598 +
  599 +
  600 +
  601 +
  602 +
  603 +
  604 +
  605 +
  606 +
  607 +
  608 +
  609 +
  610 +
  611 +
  612 +
  613 +
  614 +
  615 +
  616 +
  617 +
  618 +
  619 +
  620 +
  621 +
385 }); 622 });
386 } 623 }
387 624
@@ -48,7 +48,8 @@ class OtherLoginProvider extends ChangeNotifier { @@ -48,7 +48,8 @@ class OtherLoginProvider extends ChangeNotifier {
48 {isShowLoading = true, showLoading = false}) async { 48 {isShowLoading = true, showLoading = false}) async {
49 BaseResp<dynamic> baseResp = await DioUtil() 49 BaseResp<dynamic> baseResp = await DioUtil()
50 .request<dynamic>(context, Method.get, HttpUrl.check_seller_acc, 50 .request<dynamic>(context, Method.get, HttpUrl.check_seller_acc,
51 - data: params, showLoading:pageState == PageState.Loading ? false:showLoading) 51 + data: params,
  52 + showLoading: pageState == PageState.Loading ? false : showLoading)
52 .catchError((error) { 53 .catchError((error) {
53 print(error); 54 print(error);
54 }); 55 });
@@ -668,19 +668,45 @@ class TableManagerModel with ChangeNotifier { @@ -668,19 +668,45 @@ class TableManagerModel with ChangeNotifier {
668 //获取预订（原来普通预订和宴会预订） 668 //获取预订（原来普通预订和宴会预订）
669 _getReserveListAndFeastData(context, params, showloading, 669 _getReserveListAndFeastData(context, params, showloading,
670 {bool selfDismiss = false}) async { 670 {bool selfDismiss = false}) async {
  671 + String hmsS = ''; //起始
  672 + String hmsE = ''; //结束
  673 + String keys = '';
  674 + // if (currTimeIndex == 1) {
  675 + // //早市
  676 + // keys = 'morning';
  677 + // } else if (currTimeIndex == 2) {
  678 + // //午市
  679 + // keys = 'noon';
  680 + // } else if (currTimeIndex == 3) {
  681 + // //晚市
  682 + // keys = 'night';
  683 + // }
  684 +
  685 + // if (keys != '') {
  686 + // List temp = dailyMap[keys];
  687 + // hmsS = " ${temp.first}:00";
  688 + // hmsE = " ${temp.last}:59";
  689 + // } else {
  690 + // hmsS = " 00:00:00";
  691 + // hmsE = " 23:59:59";
  692 + // }
  693 + hmsS = " 00:00:00";
  694 + hmsE = " 23:59:59";
  695 +
671 UserModel userModel = Provider.of<UserModel>(context, listen: false); 696 UserModel userModel = Provider.of<UserModel>(context, listen: false);
672 String timeStrStart = dateTime.year.toString() + 697 String timeStrStart = dateTime.year.toString() +
673 "-" + 698 "-" +
674 Utils.addZeroNumber(dateTime.month) + 699 Utils.addZeroNumber(dateTime.month) +
675 "-" + 700 "-" +
676 Utils.addZeroNumber(dateTime.day) + 701 Utils.addZeroNumber(dateTime.day) +
677 - " 00:00:00"; 702 + hmsS;
  703 +
678 String timeStrEnd = dateTime.year.toString() + 704 String timeStrEnd = dateTime.year.toString() +
679 "-" + 705 "-" +
680 Utils.addZeroNumber(dateTime.month) + 706 Utils.addZeroNumber(dateTime.month) +
681 "-" + 707 "-" +
682 Utils.addZeroNumber(dateTime.day) + 708 Utils.addZeroNumber(dateTime.day) +
683 - " 23:59:59"; 709 + hmsE;
684 String start = 710 String start =
685 (DateUtil.getDateMsByTimeStr(timeStrStart) / 1000).floor().toString(); 711 (DateUtil.getDateMsByTimeStr(timeStrStart) / 1000).floor().toString();
686 String end = 712 String end =