Commit c1bb7cd74eb077a76ac37421b8419a2c64c50aff

Authored by gaiyaguang
1 parent 2095617c

桌位停用bug修复

@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "134" 14 +def flutterVersionCode = "135"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '134' 16 + flutterVersionCode = '135'
17 } 17 }
18 18
19 -def flutterVersionName = "1.3.4" 19 +def flutterVersionName = "1.3.5"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '1.3.4' 21 + flutterVersionName = '1.3.5'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -69,7 +69,7 @@ class Table { @@ -69,7 +69,7 @@ class Table {
69 } 69 }
70 70
71 String get signStr { 71 String get signStr {
72 - if (sign != null) { 72 + if (sign != null&&sign.isNotEmpty) {
73 switch (sign) { 73 switch (sign) {
74 case "1": //已预订 74 case "1": //已预订
75 case "5": //已安排包间 75 case "5": //已安排包间
@@ -81,7 +81,7 @@ class TableItemState extends State<TableItem> { @@ -81,7 +81,7 @@ class TableItemState extends State<TableItem> {
81 height: ScreenUtil().setWidth(widget.height), 81 height: ScreenUtil().setWidth(widget.height),
82 margin: EdgeInsets.all(ScreenUtil().setWidth(9)), 82 margin: EdgeInsets.all(ScreenUtil().setWidth(9)),
83 decoration: BoxDecoration( 83 decoration: BoxDecoration(
84 - color: table.signStr == '已停用' 84 + color: table.enable == '0'
85 ? MyColours.color_E0E0E0 85 ? MyColours.color_E0E0E0
86 : MyColours.color_A9E3E6, 86 : MyColours.color_A9E3E6,
87 borderRadius: BorderRadius.all( 87 borderRadius: BorderRadius.all(
@@ -135,7 +135,7 @@ class TableItemState extends State<TableItem> { @@ -135,7 +135,7 @@ class TableItemState extends State<TableItem> {
135 table.name, 135 table.name,
136 maxLines: 2, 136 maxLines: 2,
137 style: TextStyle( 137 style: TextStyle(
138 - color: table.signStr == '已停用' 138 + color: table.enable == '0'
139 ? MyColours.color_999999 139 ? MyColours.color_999999
140 : MyColours.color_353535, 140 : MyColours.color_353535,
141 fontSize: ScreenUtil().setSp(28), 141 fontSize: ScreenUtil().setSp(28),