Showing
3 changed files
with
13 additions
and
8 deletions
| @@ -12,14 +12,14 @@ if (flutterRoot == null) { | @@ -12,14 +12,14 @@ if (flutterRoot == null) { | ||
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | -def flutterVersionCode = "407" | 15 | +def flutterVersionCode = "420" |
| 16 | if (flutterVersionCode == null) { | 16 | if (flutterVersionCode == null) { |
| 17 | - flutterVersionCode = '407' | 17 | + flutterVersionCode = '420' |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | -def flutterVersionName = "4.0.7" | 20 | +def flutterVersionName = "4.2.0" |
| 21 | if (flutterVersionName == null) { | 21 | if (flutterVersionName == null) { |
| 22 | - flutterVersionName = '4.0.7' | 22 | + flutterVersionName = '4.2.0' |
| 23 | } | 23 | } |
| 24 | apply plugin: 'com.android.application' | 24 | apply plugin: 'com.android.application' |
| 25 | apply plugin: 'kotlin-android' | 25 | apply plugin: 'kotlin-android' |
| @@ -765,10 +765,13 @@ class NotebookDetailChangeModel with ChangeNotifier { | @@ -765,10 +765,13 @@ class NotebookDetailChangeModel with ChangeNotifier { | ||
| 765 | //餐段发生改变,则重新默认到店时间半小时值 | 765 | //餐段发生改变,则重新默认到店时间半小时值 |
| 766 | if (currTimeIndex == 1) { | 766 | if (currTimeIndex == 1) { |
| 767 | tempTime = '08:00'; | 767 | tempTime = '08:00'; |
| 768 | + ddateSolt = '1'; | ||
| 768 | } else if (currTimeIndex == 2) { | 769 | } else if (currTimeIndex == 2) { |
| 769 | tempTime = '12:00'; | 770 | tempTime = '12:00'; |
| 771 | + ddateSolt = '2'; | ||
| 770 | } else if (currTimeIndex == 3) { | 772 | } else if (currTimeIndex == 3) { |
| 771 | tempTime = '18:00'; | 773 | tempTime = '18:00'; |
| 774 | + ddateSolt = '3'; | ||
| 772 | } | 775 | } |
| 773 | } | 776 | } |
| 774 | 777 | ||
| @@ -827,7 +830,6 @@ class NotebookDetailChangeModel with ChangeNotifier { | @@ -827,7 +830,6 @@ class NotebookDetailChangeModel with ChangeNotifier { | ||
| 827 | // // "uid": userModel.user.openid | 830 | // // "uid": userModel.user.openid |
| 828 | // }; | 831 | // }; |
| 829 | Map<String, String> params = { | 832 | Map<String, String> params = { |
| 830 | - | ||
| 831 | // 'is_set_ddate': isSetDate, | 833 | // 'is_set_ddate': isSetDate, |
| 832 | "sid": userModel.user.sellerid, //商家ID | 834 | "sid": userModel.user.sellerid, //商家ID |
| 833 | "tid": tableSelectInfo, //桌子ID: 格式 2,3,4 | 835 | "tid": tableSelectInfo, //桌子ID: 格式 2,3,4 |
| @@ -2103,11 +2103,14 @@ class DialogUtil { | @@ -2103,11 +2103,14 @@ class DialogUtil { | ||
| 2103 | // globalState = state; | 2103 | // globalState = state; |
| 2104 | 2104 | ||
| 2105 | return Stack(clipBehavior: Clip.none, children: [ | 2105 | return Stack(clipBehavior: Clip.none, children: [ |
| 2106 | - Container( | 2106 | + SingleChildScrollView( |
| 2107 | + child: Container( | ||
| 2107 | // margin: EdgeInsets.only(top: ScreenUtil().setWidth(300)), | 2108 | // margin: EdgeInsets.only(top: ScreenUtil().setWidth(300)), |
| 2108 | padding: EdgeInsets.symmetric( | 2109 | padding: EdgeInsets.symmetric( |
| 2109 | horizontal: ScreenUtil().setWidth(50)), | 2110 | horizontal: ScreenUtil().setWidth(50)), |
| 2110 | - height: ScreenUtil().setWidth(366 * 2), | 2111 | + // height: ScreenUtil().setWidth(366 * 2), |
| 2112 | + // constraints: | ||
| 2113 | + // BoxConstraints(minHeight: w(100), maxHeight: w(100)), | ||
| 2111 | decoration: BoxDecoration( | 2114 | decoration: BoxDecoration( |
| 2112 | borderRadius: | 2115 | borderRadius: |
| 2113 | BorderRadius.circular(ScreenUtil().setWidth(10))), | 2116 | BorderRadius.circular(ScreenUtil().setWidth(10))), |
| @@ -2386,7 +2389,7 @@ class DialogUtil { | @@ -2386,7 +2389,7 @@ class DialogUtil { | ||
| 2386 | ), | 2389 | ), |
| 2387 | ), | 2390 | ), |
| 2388 | ), | 2391 | ), |
| 2389 | - ), | 2392 | + )), |
| 2390 | Positioned( | 2393 | Positioned( |
| 2391 | left: ScreenUtil().setWidth(400), | 2394 | left: ScreenUtil().setWidth(400), |
| 2392 | top: ScreenUtil().setWidth(208 * 2), | 2395 | top: ScreenUtil().setWidth(208 * 2), |
-
Please register or login to post a comment