xt / Flutter-ReserveApp · Commits

Go to a project

Commit 7757716728421aee8630985d0feef178831588a1

Authored by wdn127929
1 parent bb9bb759
build: skipped

桌位页面去掉新增区域、新增桌位按钮

Inline Side-by-side
Showing 4 changed files with 29 additions and 30 deletions
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 46; 6 + objectVersion = 50;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -659,7 +659,7 @@ @@ -659,7 +659,7 @@
659 CURRENT_PROJECT_VERSION = 490; 659 CURRENT_PROJECT_VERSION = 490;
660 DEVELOPMENT_TEAM = 8J59HM8B82; 660 DEVELOPMENT_TEAM = 8J59HM8B82;
661 ENABLE_BITCODE = NO; 661 ENABLE_BITCODE = NO;
662 - FLUTTER_BUILD_MODE = release; 662 + FLUTTER_BUILD_MODE = debug;
663 FRAMEWORK_SEARCH_PATHS = ( 663 FRAMEWORK_SEARCH_PATHS = (
664 "$(inherited)", 664 "$(inherited)",
665 "$(PROJECT_DIR)/Flutter", 665 "$(PROJECT_DIR)/Flutter",
@@ -200,14 +200,13 @@ class WineManageSunModel { @@ -200,14 +200,13 @@ class WineManageSunModel {
200 200
201 WineManageSunModel.fromJson(Map<String, dynamic> json) { 201 WineManageSunModel.fromJson(Map<String, dynamic> json) {
202 wineName = json['wine_name']; 202 wineName = json['wine_name'];
203 - wineAmount = double.parse(  
204 - json['wine_amount'] == '' || json['wine_amount'] == null 203 + wineAmount = double.parse(json['wine_amount'] == '' || json['wine_amount'] == null
205 ? '0' 204 ? '0'
206 : json['wine_amount']) 205 : json['wine_amount'])
207 - .toInt()  
208 - .toString(); 206 + .toInt()
  207 + .toString();
209 unit = json['unit']; 208 unit = json['unit'];
210 - wineNumber = json['wine_number'] ?? ""; 209 + wineNumber = json['wine_number']?? "";
211 // wineStock = json['wine_stock'] ?? ""; 210 // wineStock = json['wine_stock'] ?? "";
212 wineStock = double.parse( 211 wineStock = double.parse(
213 json['wine_stock'] == '' || json['wine_stock'] == null 212 json['wine_stock'] == '' || json['wine_stock'] == null
@@ -3501,29 +3501,27 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -3501,29 +3501,27 @@ class TableManagerPageState extends State<TableManagerPage> {
3501 ), 3501 ),
3502 child: Row( 3502 child: Row(
3503 children: [ 3503 children: [
3504 - // Container(  
3505 - // width:  
3506 - // ScreenUtil().setWidth(2),  
3507 - // height:  
3508 - // ScreenUtil().setWidth(80),  
3509 - // decoration: BoxDecoration(  
3510 - // gradient: LinearGradient(  
3511 - // stops: [0, 1, 0],  
3512 - // begin: Alignment.centerLeft,  
3513 - // end: Alignment.centerRight,  
3514 - // colors: [  
3515 - // MyColours.color_F8F9FD,  
3516 - // MyColours.color_F1F0F4,  
3517 - // MyColours.color_F8F9FD,  
3518 - // ],  
3519 - // ),  
3520 - // )),  
3521 - MyDivider(ScreenUtil().setWidth(15),  
3522 - ScreenUtil().setWidth(80),  
3523 - color: MyColours.color_F1F0F4),  
3524 - MyDivider(ScreenUtil().setWidth(2),  
3525 - ScreenUtil().setWidth(80),  
3526 - color: MyColours.color_9C9C9C), 3504 + Container(
  3505 + width: ScreenUtil().setWidth(2),
  3506 + height:
  3507 + ScreenUtil().setWidth(80),
  3508 + decoration: BoxDecoration(
  3509 + gradient: LinearGradient(
  3510 + colors: [
  3511 + MyColours.color_F8F9FD,
  3512 + MyColours.color_C9C9C9,
  3513 + MyColours.color_F8F9FD
  3514 + ],
  3515 + stops: [0.1, 0.5, 1],
  3516 + begin: Alignment.topCenter,
  3517 + end: Alignment.bottomCenter,
  3518 + ))),
  3519 + // MyDivider(ScreenUtil().setWidth(15),
  3520 + // ScreenUtil().setWidth(80),
  3521 + // color: MyColours.color_F1F0F4),
  3522 + // MyDivider(ScreenUtil().setWidth(2),
  3523 + // ScreenUtil().setWidth(80),
  3524 + // color: MyColours.color_9C9C9C),
3527 HEmptyView(30), 3525 HEmptyView(30),
3528 Image.asset( 3526 Image.asset(
3529 model.swichState 3527 model.swichState
@@ -194,6 +194,8 @@ dependencies: @@ -194,6 +194,8 @@ dependencies:
194 # 柱形图 194 # 柱形图
195 fl_chart: ^0.62.0 195 fl_chart: ^0.62.0
196 196
  197 +
  198 +
197 # shimmer: ^3.0.0 199 # shimmer: ^3.0.0
198 200
199 # ai_barcode 3.2.4 201 # ai_barcode 3.2.4