xt / Flutter-ReserveApp · Commits

Go to a project

Commit 741e6eb834a82085d76b7cc84d782bab29e4aa79

Authored by gaiyaguang
1 parent d43abb8c
build: skipped

bug修复

Inline Side-by-side
Showing 7 changed files with 82 additions and 77 deletions
@@ -13,7 +13,7 @@ PODS: @@ -13,7 +13,7 @@ PODS:
13 - Flutter 13 - Flutter
14 - fluwx (0.0.1): 14 - fluwx (0.0.1):
15 - Flutter 15 - Flutter
16 - - WechatOpenSDK (= 1.8.6.2) 16 + - WechatOpenSDK (= 1.8.7.1)
17 - FMDB (2.7.5): 17 - FMDB (2.7.5):
18 - FMDB/standard (= 2.7.5) 18 - FMDB/standard (= 2.7.5)
19 - FMDB/standard (2.7.5) 19 - FMDB/standard (2.7.5)
@@ -47,7 +47,7 @@ PODS: @@ -47,7 +47,7 @@ PODS:
47 - Flutter 47 - Flutter
48 - url_launcher_web (0.0.1): 48 - url_launcher_web (0.0.1):
49 - Flutter 49 - Flutter
50 - - WechatOpenSDK (1.8.6.2) 50 + - WechatOpenSDK (1.8.7.1)
51 51
52 DEPENDENCIES: 52 DEPENDENCIES:
53 - audioplayers (from `.symlinks/plugins/audioplayers/ios`) 53 - audioplayers (from `.symlinks/plugins/audioplayers/ios`)
@@ -125,7 +125,7 @@ SPEC CHECKSUMS: @@ -125,7 +125,7 @@ SPEC CHECKSUMS:
125 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec 125 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
126 flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259 126 flutter_statusbarcolor: 8afb1071ed8c58be929f1e32b36c629771fd2259
127 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b 127 fluttertoast: b644586ef3b16f67fae9a1f8754cef6b2d6b634b
128 - fluwx: 03e098a7284c556d7b197e0b82984eb0b25183af 128 + fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902
129 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a 129 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
130 install_plugin: a13e7ddd2bab0c701b48cd359c26d0394125b6fb 130 install_plugin: a13e7ddd2bab0c701b48cd359c26d0394125b6fb
131 JCore: d75c0306dc99875d323d23e5a063b3a3ef22335a 131 JCore: d75c0306dc99875d323d23e5a063b3a3ef22335a
@@ -142,7 +142,7 @@ SPEC CHECKSUMS: @@ -142,7 +142,7 @@ SPEC CHECKSUMS:
142 url_launcher: a1c0cc845906122c4784c542523d8cacbded5626 142 url_launcher: a1c0cc845906122c4784c542523d8cacbded5626
143 url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 143 url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313
144 url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c 144 url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c
145 - WechatOpenSDK: 8b3ba4239193d1112205c139c94e21934e8f369a 145 + WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44
146 146
147 PODFILE CHECKSUM: a5c9f5cbedb217afa5108d75ed888500ab689803 147 PODFILE CHECKSUM: a5c9f5cbedb217afa5108d75ed888500ab689803
148 148
@@ -70,7 +70,7 @@ class MyAppState extends State<MyApp>{ @@ -70,7 +70,7 @@ class MyAppState extends State<MyApp>{
70 appId: "wx85aa3cdd0f791e65", 70 appId: "wx85aa3cdd0f791e65",
71 doOnAndroid: true, 71 doOnAndroid: true,
72 doOnIOS: true, 72 doOnIOS: true,
73 - universalLink: "https://xt04.colorcun.com/link/one_key"); 73 + universalLink: "https://xt04.colorcun.com/link/");
74 var result = await isWeChatInstalled; 74 var result = await isWeChatInstalled;
75 LogUtil.v("is installed $result"); 75 LogUtil.v("is installed $result");
76 } 76 }
1 import 'package:json_annotation/json_annotation.dart'; 1 import 'package:json_annotation/json_annotation.dart';
  2 +import 'package:one_key/utils/log_util.dart';
2 3
3 part 'table.g.dart'; 4 part 'table.g.dart';
4 5
@@ -40,16 +41,16 @@ class Table { @@ -40,16 +41,16 @@ class Table {
40 41
41 //获取桌位可坐人数 42 //获取桌位可坐人数
42 String get tableNum{ 43 String get tableNum{
43 - if(max!=null&&max.isNotEmpty&&max!="0"){  
44 - return "最多可坐$max人";  
45 - }else if(table_pnum==null||table_pnum.isEmpty||table_pnum=="0"){ 44 + if(table_pnum==null||table_pnum.isEmpty||table_pnum=="0"){
46 return ""; 45 return "";
47 - }else{ 46 + }else if(most_pnum!=null&&most_pnum.isNotEmpty&&most_pnum!="0"&&most_pnum!="null"){
48 if(table_pnum==most_pnum){ 47 if(table_pnum==most_pnum){
49 return "$table_pnum人"; 48 return "$table_pnum人";
50 }else{ 49 }else{
51 return "$table_pnum-$most_pnum人"; 50 return "$table_pnum-$most_pnum人";
52 } 51 }
  52 + }else{
  53 + return "$table_pnum人";
53 } 54 }
54 } 55 }
55 56
@@ -82,10 +82,10 @@ class InvicationPageState extends State<InvicationPage>{ @@ -82,10 +82,10 @@ class InvicationPageState extends State<InvicationPage>{
82 onTap: (){ 82 onTap: (){
83 Navigator.of(context).pop(); 83 Navigator.of(context).pop();
84 }, 84 },
  85 + behavior: HitTestBehavior.opaque,
85 child: Container( 86 child: Container(
86 width: double.infinity, 87 width: double.infinity,
87 alignment: Alignment.centerLeft, 88 alignment: Alignment.centerLeft,
88 - padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30)),  
89 child: Padding( 89 child: Padding(
90 padding: EdgeInsets.symmetric( 90 padding: EdgeInsets.symmetric(
91 horizontal: ScreenUtil().setWidth(40), 91 horizontal: ScreenUtil().setWidth(40),
@@ -36,78 +36,82 @@ class NotebookItemState extends State<NoteBookItem>{ @@ -36,78 +36,82 @@ class NotebookItemState extends State<NoteBookItem>{
36 36
37 Color textColor=(notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_353535; 37 Color textColor=(notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_353535;
38 38
39 - return GestureDetector(  
40 - onTap: (){  
41 - NavigatorUtil.goNotebookDetailPage(context,notebook.id);  
42 - },  
43 - child: Container(  
44 - width: double.infinity,  
45 - height: ScreenUtil().setHeight(110),  
46 - color: (widget.index % 2 == 0) ? MyColours.color_f7fdfd : MyColours.color_ffffff,  
47 - child: Row(  
48 - children: <Widget>[  
49 - Container(  
50 - width: ScreenUtil().setWidth(171),  
51 - alignment: Alignment.center,  
52 - child: Text(  
53 - notebook.tableinfoStr,  
54 - style: TextStyle(  
55 - color: textColor,  
56 - fontSize: ScreenUtil().setSp(28)),  
57 - ),  
58 - ),  
59 - MyDivider(  
60 - ScreenUtil().setWidth(1),  
61 - ScreenUtil().setHeight(90),  
62 - color: MyColours.color_ededed,  
63 - ),  
64 - Container(  
65 - width: ScreenUtil().setWidth(230),  
66 - alignment: Alignment.center,  
67 - child: Column(  
68 - mainAxisSize: MainAxisSize.min,  
69 - children: <Widget>[  
70 - Text(notebook.rnameStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(28)),),  
71 - VEmptyView(10),  
72 - Text(notebook.phoneStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(22)),)  
73 - ],  
74 - ),  
75 - ),  
76 - MyDivider(  
77 - ScreenUtil().setWidth(1),  
78 - ScreenUtil().setHeight(90),  
79 - color: MyColours.color_ededed, 39 + return Container(
  40 + width: double.infinity,
  41 + height: ScreenUtil().setHeight(110),
  42 + color: (widget.index % 2 == 0) ? MyColours.color_f7fdfd : MyColours.color_ffffff,
  43 + child: Row(
  44 + children: <Widget>[
  45 + GestureDetector(
  46 + onTap: (){
  47 + NavigatorUtil.goNotebookDetailPage(context,notebook.id);
  48 + },
  49 + child: Row(
  50 + children: <Widget>[
  51 + Container(
  52 + width: ScreenUtil().setWidth(171),
  53 + alignment: Alignment.center,
  54 + child: Text(
  55 + notebook.tableinfoStr,
  56 + style: TextStyle(
  57 + color: textColor,
  58 + fontSize: ScreenUtil().setSp(28)),
  59 + ),
  60 + ),
  61 + MyDivider(
  62 + ScreenUtil().setWidth(1),
  63 + ScreenUtil().setHeight(90),
  64 + color: MyColours.color_ededed,
  65 + ),
  66 + Container(
  67 + width: ScreenUtil().setWidth(230),
  68 + alignment: Alignment.center,
  69 + child: Column(
  70 + mainAxisSize: MainAxisSize.min,
  71 + children: <Widget>[
  72 + Text(notebook.rnameStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(28)),),
  73 + VEmptyView(10),
  74 + Text(notebook.phoneStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(22)),)
  75 + ],
  76 + ),
  77 + ),
  78 + MyDivider(
  79 + ScreenUtil().setWidth(1),
  80 + ScreenUtil().setHeight(90),
  81 + color: MyColours.color_ededed,
  82 + ),
  83 + Container(
  84 + width: ScreenUtil().setWidth(159),
  85 + alignment: Alignment.center,
  86 + child: Text(
  87 + notebook.ddateStr,
  88 + style: TextStyle(
  89 + color: textColor,
  90 + fontSize: ScreenUtil().setSp(28)),
  91 + ),
  92 + ),
  93 + ],
80 ), 94 ),
81 - Container(  
82 - width: ScreenUtil().setWidth(159), 95 + ),
  96 + MyDivider(
  97 + ScreenUtil().setWidth(1),
  98 + ScreenUtil().setHeight(90),
  99 + color: MyColours.color_ededed,
  100 + ),
  101 + GestureDetector(
  102 + onTap: _onOperateClick,
  103 + child: Container(
  104 + width: ScreenUtil().setWidth(184),
83 alignment: Alignment.center, 105 alignment: Alignment.center,
84 child: Text( 106 child: Text(
85 - notebook.ddateStr, 107 + notebook.operationText,
86 style: TextStyle( 108 style: TextStyle(
87 - color: textColor, 109 + color: (notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_2bb5b7,
88 fontSize: ScreenUtil().setSp(28)), 110 fontSize: ScreenUtil().setSp(28)),
89 ), 111 ),
90 ), 112 ),
91 - MyDivider(  
92 - ScreenUtil().setWidth(1),  
93 - ScreenUtil().setHeight(90),  
94 - color: MyColours.color_ededed,  
95 - ),  
96 - GestureDetector(  
97 - onTap: _onOperateClick,  
98 - child: Container(  
99 - width: ScreenUtil().setWidth(184),  
100 - alignment: Alignment.center,  
101 - child: Text(  
102 - notebook.operationText,  
103 - style: TextStyle(  
104 - color: (notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_2bb5b7,  
105 - fontSize: ScreenUtil().setSp(28)),  
106 - ),  
107 - ),  
108 - ),  
109 - ],  
110 - ), 113 + ),
  114 + ],
111 ), 115 ),
112 ); 116 );
113 } 117 }
@@ -295,7 +295,7 @@ packages: @@ -295,7 +295,7 @@ packages:
295 name: fluwx 295 name: fluwx
296 url: "https://pub.flutter-io.cn" 296 url: "https://pub.flutter-io.cn"
297 source: hosted 297 source: hosted
298 - version: "2.0.7" 298 + version: "2.0.9"
299 front_end: 299 front_end:
300 dependency: transitive 300 dependency: transitive
301 description: 301 description:
@@ -64,7 +64,7 @@ dependencies: @@ -64,7 +64,7 @@ dependencies:
64 # 日历 64 # 日历
65 table_calendar: ^2.2.1 65 table_calendar: ^2.2.1
66 # 微信SDK 66 # 微信SDK
67 - fluwx: ^2.0.7 67 + fluwx: ^2.0.9
68 #网页，短信，电话 68 #网页，短信，电话
69 url_launcher: ^5.4.2 69 url_launcher: ^5.4.2
70 # 滚轮选择器 70 # 滚轮选择器