xt / Flutter-ReserveApp · Commits

Go to a project

Commit 9b458971400f7f4e1ba7d98cc3c1194cffbd7ca5

Authored by gaiyaguang
2 parents eae2cebc d4c0e956
build: skipped

ios修改冲突解决

Inline Side-by-side
Showing 23 changed files with 474 additions and 260 deletions
@@ -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/"); 73 + universalLink: "https://xt04.colorcun.com/link/one_key");
74 var result = await isWeChatInstalled; 74 var result = await isWeChatInstalled;
75 LogUtil.v("is installed $result"); 75 LogUtil.v("is installed $result");
76 } 76 }
@@ -55,7 +55,7 @@ class Table { @@ -55,7 +55,7 @@ class Table {
55 55
56 //获取最低消费 56 //获取最低消费
57 String get lowStr{ 57 String get lowStr{
58 - return (low==null||low.isEmpty||low=="0")?"":"最低消费$low元"; 58 + return (low==null||low.isEmpty||low=="0")?"":"最低消费\n$low元";
59 } 59 }
60 60
61 String get signStr{ 61 String get signStr{
@@ -13,6 +13,7 @@ import 'package:one_key/utils/utils.dart'; @@ -13,6 +13,7 @@ import 'package:one_key/utils/utils.dart';
13 import 'package:one_key/widgets/MyDivider.dart'; 13 import 'package:one_key/widgets/MyDivider.dart';
14 import 'package:one_key/widgets/app_bar.dart'; 14 import 'package:one_key/widgets/app_bar.dart';
15 import 'package:one_key/widgets/common_button.dart'; 15 import 'package:one_key/widgets/common_button.dart';
  16 +import 'package:one_key/widgets/need_item.dart';
16 import 'package:one_key/widgets/row_multi_text.dart'; 17 import 'package:one_key/widgets/row_multi_text.dart';
17 import 'package:one_key/widgets/table_item.dart'; 18 import 'package:one_key/widgets/table_item.dart';
18 import 'package:one_key/models/table.dart' as t; 19 import 'package:one_key/models/table.dart' as t;
@@ -83,19 +84,19 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -83,19 +84,19 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
83 showDialog(context: context,builder: (context){ 84 showDialog(context: context,builder: (context){
84 return AlertDialog( 85 return AlertDialog(
85 title: Text("确定拒绝订单吗？\n拒绝后无法联系客户"), 86 title: Text("确定拒绝订单吗？\n拒绝后无法联系客户"),
86 - titleTextStyle: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)), 87 + titleTextStyle: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(32)),
87 content: Text("如果包间类型订满，请及时停用"), 88 content: Text("如果包间类型订满，请及时停用"),
88 - contentTextStyle:TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(22)), 89 + contentTextStyle:TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(28)),
89 actions: <Widget>[ 90 actions: <Widget>[
90 FlatButton( 91 FlatButton(
91 - child: Text("拒绝订单"), 92 + child: Text("拒绝订单",style: TextStyle(fontSize: ScreenUtil().setSp(32)),),
92 onPressed: (){ 93 onPressed: (){
93 Navigator.of(context).pop(); 94 Navigator.of(context).pop();
94 setReserveStatus("6"); 95 setReserveStatus("6");
95 }, 96 },
96 ), 97 ),
97 FlatButton( 98 FlatButton(
98 - child: Text("去安排"), 99 + child: Text("去安排",style: TextStyle(fontSize: ScreenUtil().setSp(32)),),
99 onPressed: () async { 100 onPressed: () async {
100 Navigator.of(context).pop(); 101 Navigator.of(context).pop();
101 String tid=await NavigatorUtil.goSelectTablePage(context,widget.rid,DateTime.fromMillisecondsSinceEpoch(int.parse(detailEntity.ddate)*1000),detailEntity.ddate_solt); 102 String tid=await NavigatorUtil.goSelectTablePage(context,widget.rid,DateTime.fromMillisecondsSinceEpoch(int.parse(detailEntity.ddate)*1000),detailEntity.ddate_solt);
@@ -181,13 +182,13 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -181,13 +182,13 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
181 child: Row( 182 child: Row(
182 mainAxisSize: MainAxisSize.min, 183 mainAxisSize: MainAxisSize.min,
183 children: detailEntity.demands.map((table){ 184 children: detailEntity.demands.map((table){
184 - return TableItem(table); 185 + return NeedItem(table);
185 }).toList(), 186 }).toList(),
186 ), 187 ),
187 ), 188 ),
188 RowMultiText("客户姓名", detailEntity.rnameStr), 189 RowMultiText("客户姓名", detailEntity.rnameStr),
189 RowMultiText("客户电话", detailEntity.phone), 190 RowMultiText("客户电话", detailEntity.phone),
190 - MyDivider(double.infinity, ScreenUtil().setHeight(2)), 191 + MyDivider(double.infinity, ScreenUtil().setHeight(1)),
191 Container( 192 Container(
192 color: MyColours.color_ffffff, 193 color: MyColours.color_ffffff,
193 width: double.infinity, 194 width: double.infinity,
@@ -202,7 +203,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -202,7 +203,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
202 "客户经理", 203 "客户经理",
203 style: TextStyle( 204 style: TextStyle(
204 color: MyColours.color_828282, 205 color: MyColours.color_828282,
205 - fontSize: ScreenUtil().setSp(22)), 206 + fontSize: ScreenUtil().setSp(30)),
206 ), 207 ),
207 ), 208 ),
208 Positioned( 209 Positioned(
@@ -224,7 +225,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -224,7 +225,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
224 cusmanText, 225 cusmanText,
225 style: TextStyle( 226 style: TextStyle(
226 color: MyColours.color_353535, 227 color: MyColours.color_353535,
227 - fontSize: ScreenUtil().setSp(26), 228 + fontSize: ScreenUtil().setSp(30),
228 decoration: TextDecoration.underline, 229 decoration: TextDecoration.underline,
229 ), 230 ),
230 ), 231 ),
@@ -233,7 +234,6 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -233,7 +234,6 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
233 ], 234 ],
234 ), 235 ),
235 ), 236 ),
236 - MyDivider(double.infinity, ScreenUtil().setHeight(2)),  
237 Container( 237 Container(
238 margin: EdgeInsets.only(top: ScreenUtil().setHeight(206)), 238 margin: EdgeInsets.only(top: ScreenUtil().setHeight(206)),
239 child: Column( 239 child: Column(
@@ -242,7 +242,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -242,7 +242,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
242 content: "安排包间", 242 content: "安排包间",
243 width: 669, 243 width: 669,
244 height: 76, 244 height: 76,
245 - fontSize: 26, 245 + fontSize: 34,
246 onPress: () async { 246 onPress: () async {
247 String tid=await NavigatorUtil.goSelectTablePage(context,widget.rid,DateTime.fromMillisecondsSinceEpoch(int.parse(detailEntity.ddate)*1000),detailEntity.ddate_solt); 247 String tid=await NavigatorUtil.goSelectTablePage(context,widget.rid,DateTime.fromMillisecondsSinceEpoch(int.parse(detailEntity.ddate)*1000),detailEntity.ddate_solt);
248 if(tid!=null){ 248 if(tid!=null){
@@ -269,7 +269,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -269,7 +269,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
269 "拒绝订单", 269 "拒绝订单",
270 style: TextStyle( 270 style: TextStyle(
271 color: MyColours.color_199095, 271 color: MyColours.color_199095,
272 - fontSize: ScreenUtil().setSp(26)), 272 + fontSize: ScreenUtil().setSp(34)),
273 ), 273 ),
274 ), 274 ),
275 onTap: () { 275 onTap: () {
@@ -277,7 +277,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -277,7 +277,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
277 }, 277 },
278 )), 278 )),
279 MyDivider( 279 MyDivider(
280 - ScreenUtil().setWidth(1), 280 + ScreenUtil().setWidth(2),
281 ScreenUtil().setHeight(52), 281 ScreenUtil().setHeight(52),
282 color: MyColours.color_199095, 282 color: MyColours.color_199095,
283 ), 283 ),
@@ -288,7 +288,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -288,7 +288,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
288 "联系顾客", 288 "联系顾客",
289 style: TextStyle( 289 style: TextStyle(
290 color: MyColours.color_199095, 290 color: MyColours.color_199095,
291 - fontSize: ScreenUtil().setSp(26)), 291 + fontSize: ScreenUtil().setSp(34)),
292 ), 292 ),
293 ), 293 ),
294 onTap: () { 294 onTap: () {
@@ -13,6 +13,7 @@ import 'package:one_key/utils/utils.dart'; @@ -13,6 +13,7 @@ import 'package:one_key/utils/utils.dart';
13 import 'package:one_key/widgets/MyDivider.dart'; 13 import 'package:one_key/widgets/MyDivider.dart';
14 import 'package:one_key/widgets/app_bar.dart'; 14 import 'package:one_key/widgets/app_bar.dart';
15 import 'package:one_key/widgets/common_button.dart'; 15 import 'package:one_key/widgets/common_button.dart';
  16 +import 'package:one_key/widgets/need_item.dart';
16 import 'package:one_key/widgets/row_multi_text.dart'; 17 import 'package:one_key/widgets/row_multi_text.dart';
17 import 'package:one_key/widgets/table_item.dart'; 18 import 'package:one_key/widgets/table_item.dart';
18 import 'package:one_key/models/table.dart' as t; 19 import 'package:one_key/models/table.dart' as t;
@@ -120,7 +121,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -120,7 +121,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
120 child: Row( 121 child: Row(
121 mainAxisSize: MainAxisSize.min, 122 mainAxisSize: MainAxisSize.min,
122 children: detailEntity.demands.map((table){ 123 children: detailEntity.demands.map((table){
123 - return TableItem(table); 124 + return NeedItem(table);
124 }).toList(), 125 }).toList(),
125 ), 126 ),
126 ) 127 )
@@ -139,7 +140,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -139,7 +140,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
139 ), 140 ),
140 RowMultiText("客户姓名", detailEntity.rnameStr), 141 RowMultiText("客户姓名", detailEntity.rnameStr),
141 RowMultiText("客户电话", detailEntity.phone), 142 RowMultiText("客户电话", detailEntity.phone),
142 - MyDivider(double.infinity, ScreenUtil().setHeight(2)), 143 + MyDivider(double.infinity, ScreenUtil().setHeight(1)),
143 Container( 144 Container(
144 color: MyColours.color_ffffff, 145 color: MyColours.color_ffffff,
145 width: double.infinity, 146 width: double.infinity,
@@ -154,7 +155,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -154,7 +155,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
154 "客户经理", 155 "客户经理",
155 style: TextStyle( 156 style: TextStyle(
156 color: MyColours.color_828282, 157 color: MyColours.color_828282,
157 - fontSize: ScreenUtil().setSp(22)), 158 + fontSize: ScreenUtil().setSp(30)),
158 ), 159 ),
159 ), 160 ),
160 Positioned( 161 Positioned(
@@ -178,7 +179,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -178,7 +179,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
178 cusmanText, 179 cusmanText,
179 style: TextStyle( 180 style: TextStyle(
180 color: MyColours.color_353535, 181 color: MyColours.color_353535,
181 - fontSize: ScreenUtil().setSp(26), 182 + fontSize: ScreenUtil().setSp(30),
182 decoration: TextDecoration.underline, 183 decoration: TextDecoration.underline,
183 ), 184 ),
184 ), 185 ),
@@ -210,14 +211,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -210,14 +211,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
210 width: double.infinity, 211 width: double.infinity,
211 decoration: BoxDecoration( 212 decoration: BoxDecoration(
212 color: MyColours.color_ffffff, 213 color: MyColours.color_ffffff,
213 - border: Border(top:BorderSide(color: MyColours.color_dbe3e3,width: ScreenUtil().setWidth(2))) 214 + border: Border(top:BorderSide(color: MyColours.color_dbe3e3,width: ScreenUtil().setWidth(1)))
214 ), 215 ),
215 padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(20),horizontal: ScreenUtil().setHeight(36)), 216 padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(20),horizontal: ScreenUtil().setHeight(36)),
216 child:CommonButton( 217 child:CommonButton(
217 content: "通知顾客", 218 content: "通知顾客",
218 width: 669, 219 width: 669,
219 - height: 76,  
220 - fontSize: 26, 220 + height: 80,
  221 + fontSize: 34,
221 onPress: () { 222 onPress: () {
222 DialogUtil.showShareDialog(context)?.then((value){ 223 DialogUtil.showShareDialog(context)?.then((value){
223 switch(value){ 224 switch(value){
@@ -142,57 +142,60 @@ class HomePageState extends State<HomePage>{ @@ -142,57 +142,60 @@ class HomePageState extends State<HomePage>{
142 // TODO: implement build 142 // TODO: implement build
143 return new Scaffold( 143 return new Scaffold(
144 bottomNavigationBar: BottomNavigationBar( 144 bottomNavigationBar: BottomNavigationBar(
  145 + iconSize: ScreenUtil().setWidth(70),
  146 + unselectedFontSize: ScreenUtil().setSp(22),
  147 + selectedFontSize: ScreenUtil().setSp(22),
145 backgroundColor: MyColours.color_ffffff, 148 backgroundColor: MyColours.color_ffffff,
146 items: [ 149 items: [
147 BottomNavigationBarItem( 150 BottomNavigationBarItem(
148 icon: Image( 151 icon: Image(
149 image: AssetImage("assets/message_default.png"), 152 image: AssetImage("assets/message_default.png"),
150 - width: ScreenUtil().setWidth(60),  
151 - height: ScreenUtil().setWidth(60), 153 + width: ScreenUtil().setWidth(70),
  154 + height: ScreenUtil().setWidth(70),
152 ), 155 ),
153 activeIcon: Image( 156 activeIcon: Image(
154 image: AssetImage("assets/message_selected.png"), 157 image: AssetImage("assets/message_selected.png"),
155 - width: ScreenUtil().setWidth(60),  
156 - height: ScreenUtil().setWidth(60), 158 + width: ScreenUtil().setWidth(70),
  159 + height: ScreenUtil().setWidth(70),
157 ), 160 ),
158 title: Text( 161 title: Text(
159 "消息中心", 162 "消息中心",
160 style: TextStyle( 163 style: TextStyle(
161 - color: _currIndex == 0 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(16)), 164 + color: _currIndex == 0 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(22)),
162 ), 165 ),
163 ), 166 ),
164 BottomNavigationBarItem( 167 BottomNavigationBarItem(
165 icon: Image( 168 icon: Image(
166 image: AssetImage("assets/notebook_default.png"), 169 image: AssetImage("assets/notebook_default.png"),
167 - width: ScreenUtil().setWidth(60),  
168 - height: ScreenUtil().setWidth(60), 170 + width: ScreenUtil().setWidth(70),
  171 + height: ScreenUtil().setWidth(70),
169 ), 172 ),
170 activeIcon: Image( 173 activeIcon: Image(
171 image: AssetImage("assets/notebook_selected.png"), 174 image: AssetImage("assets/notebook_selected.png"),
172 - width: ScreenUtil().setWidth(60),  
173 - height: ScreenUtil().setWidth(60), 175 + width: ScreenUtil().setWidth(70),
  176 + height: ScreenUtil().setWidth(70),
174 ), 177 ),
175 title: Text( 178 title: Text(
176 "预定本", 179 "预定本",
177 style: TextStyle( 180 style: TextStyle(
178 - color: _currIndex == 1 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(16)), 181 + color: _currIndex == 1 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(22)),
179 ), 182 ),
180 ), 183 ),
181 BottomNavigationBarItem( 184 BottomNavigationBarItem(
182 icon: Image( 185 icon: Image(
183 image: AssetImage("assets/my_default.png"), 186 image: AssetImage("assets/my_default.png"),
184 - width: ScreenUtil().setWidth(60),  
185 - height: ScreenUtil().setWidth(60), 187 + width: ScreenUtil().setWidth(70),
  188 + height: ScreenUtil().setWidth(70),
186 ), 189 ),
187 activeIcon: Image( 190 activeIcon: Image(
188 image: AssetImage("assets/my_selected.png"), 191 image: AssetImage("assets/my_selected.png"),
189 - width: ScreenUtil().setWidth(60),  
190 - height: ScreenUtil().setWidth(60), 192 + width: ScreenUtil().setWidth(70),
  193 + height: ScreenUtil().setWidth(70),
191 ), 194 ),
192 title: Text( 195 title: Text(
193 "我的", 196 "我的",
194 style: TextStyle( 197 style: TextStyle(
195 - color: _currIndex == 2 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(16)), 198 + color: _currIndex == 2 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(22)),
196 ), 199 ),
197 ), 200 ),
198 ], 201 ],
@@ -52,14 +52,14 @@ class InvicationPageState extends State<InvicationPage>{ @@ -52,14 +52,14 @@ class InvicationPageState extends State<InvicationPage>{
52 Image.asset("assets/invication_line_left.png",width: ScreenUtil().setWidth(44),height: ScreenUtil().setWidth(4),), 52 Image.asset("assets/invication_line_left.png",width: ScreenUtil().setWidth(44),height: ScreenUtil().setWidth(4),),
53 Container( 53 Container(
54 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(13)), 54 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(13)),
55 - child: Text(title,style: TextStyle(color: MyColours.color_eadab9,fontSize: ScreenUtil().setSp(22),fontWeight: FontWeight.bold)), 55 + child: Text(title,style: TextStyle(color: MyColours.color_eadab9,fontSize: ScreenUtil().setSp(32))),
56 ), 56 ),
57 Image.asset("assets/invication_line_right.png",width: ScreenUtil().setWidth(44),height: ScreenUtil().setWidth(4),) 57 Image.asset("assets/invication_line_right.png",width: ScreenUtil().setWidth(44),height: ScreenUtil().setWidth(4),)
58 ], 58 ],
59 ), 59 ),
60 Container( 60 Container(
61 margin: EdgeInsets.only(top: ScreenUtil().setHeight(20)), 61 margin: EdgeInsets.only(top: ScreenUtil().setHeight(20)),
62 - child: Text(content,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(26)),), 62 + child: Text(content,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(34)),),
63 ) 63 )
64 ], 64 ],
65 ); 65 );
@@ -102,7 +102,7 @@ class InvicationPageState extends State<InvicationPage>{ @@ -102,7 +102,7 @@ class InvicationPageState extends State<InvicationPage>{
102 child: Center( 102 child: Center(
103 child: Column( 103 child: Column(
104 children: <Widget>[ 104 children: <Widget>[
105 - Image.asset("assets/img_ydap.png",width: ScreenUtil().setWidth(444),height: ScreenUtil().setHeight(234),), 105 + Image.asset("assets/img_ydap.png",width: ScreenUtil().setWidth(500),height: ScreenUtil().setHeight(300),),
106 VEmptyView(69), 106 VEmptyView(69),
107 Row( 107 Row(
108 mainAxisSize: MainAxisSize.min, 108 mainAxisSize: MainAxisSize.min,
@@ -120,7 +120,7 @@ class InvicationPageState extends State<InvicationPage>{ @@ -120,7 +120,7 @@ class InvicationPageState extends State<InvicationPage>{
120 border: Border.all(color: MyColours.color_ffffff,width: ScreenUtil().setWidth(2)), 120 border: Border.all(color: MyColours.color_ffffff,width: ScreenUtil().setWidth(2)),
121 borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(18))) 121 borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(18)))
122 ), 122 ),
123 - child: Text("订包间，用周到安排",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(22),fontWeight: FontWeight.bold),), 123 + child: Text("订包间，用周到安排",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(28)),),
124 ), 124 ),
125 Container( 125 Container(
126 width: ScreenUtil().setWidth(108), 126 width: ScreenUtil().setWidth(108),
@@ -141,14 +141,14 @@ class InvicationPageState extends State<InvicationPage>{ @@ -141,14 +141,14 @@ class InvicationPageState extends State<InvicationPage>{
141 Image.asset("assets/invication_map.png",width: ScreenUtil().setWidth(22),height: ScreenUtil().setWidth(28),), 141 Image.asset("assets/invication_map.png",width: ScreenUtil().setWidth(22),height: ScreenUtil().setWidth(28),),
142 Container( 142 Container(
143 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(13)), 143 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(13)),
144 - child: Text("地址导航",style: TextStyle(color: MyColours.color_eadab9,fontSize: ScreenUtil().setSp(22),fontWeight: FontWeight.bold)), 144 + child: Text("地址导航",style: TextStyle(color: MyColours.color_eadab9,fontSize: ScreenUtil().setSp(32))),
145 ), 145 ),
146 Image.asset("assets/invication_arrow_right.png",width: ScreenUtil().setWidth(14),height: ScreenUtil().setWidth(22),), 146 Image.asset("assets/invication_arrow_right.png",width: ScreenUtil().setWidth(14),height: ScreenUtil().setWidth(22),),
147 ], 147 ],
148 ), 148 ),
149 Container( 149 Container(
150 margin: EdgeInsets.only(top: ScreenUtil().setHeight(20)), 150 margin: EdgeInsets.only(top: ScreenUtil().setHeight(20)),
151 - child: Text(user.sellerAddr,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(26)),), 151 + child: Text(user.sellerAddr,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(34)),),
152 ) 152 )
153 ], 153 ],
154 ) 154 )
@@ -170,7 +170,7 @@ class InvicationPageState extends State<InvicationPage>{ @@ -170,7 +170,7 @@ class InvicationPageState extends State<InvicationPage>{
170 height: double.infinity, 170 height: double.infinity,
171 color: MyColours.color_000000, 171 color: MyColours.color_000000,
172 alignment: Alignment.center, 172 alignment: Alignment.center,
173 - child: Text("发短信",style: TextStyle(color: MyColours.color_eadab9,fontSize: ScreenUtil().setSp(30)),), 173 + child: Text("发短信",style: TextStyle(color: MyColours.color_eadab9,fontSize: ScreenUtil().setSp(34)),),
174 ), 174 ),
175 ), 175 ),
176 Expanded( 176 Expanded(
@@ -184,7 +184,7 @@ class InvicationPageState extends State<InvicationPage>{ @@ -184,7 +184,7 @@ class InvicationPageState extends State<InvicationPage>{
184 height: double.infinity, 184 height: double.infinity,
185 color: MyColours.color_e3d2ac, 185 color: MyColours.color_e3d2ac,
186 alignment: Alignment.center, 186 alignment: Alignment.center,
187 - child: Text("通知客户",style: TextStyle(color: MyColours.color_83734d,fontSize: ScreenUtil().setSp(30)),), 187 + child: Text("通知客户",style: TextStyle(color: MyColours.color_83734d,fontSize: ScreenUtil().setSp(34)),),
188 ), 188 ),
189 ), 189 ),
190 ) 190 )
@@ -139,11 +139,13 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -139,11 +139,13 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
139 controller: _sellerCodeController, 139 controller: _sellerCodeController,
140 focusNode: _sellerCodeFocusNode, 140 focusNode: _sellerCodeFocusNode,
141 autofocus: _sellerCodeController.text.isEmpty, 141 autofocus: _sellerCodeController.text.isEmpty,
  142 + style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28),textBaseline: TextBaseline.alphabetic),
  143 + textAlignVertical: TextAlignVertical.center,
142 decoration: InputDecoration( 144 decoration: InputDecoration(
143 hintText: "请输入6位商户编码", 145 hintText: "请输入6位商户编码",
144 - hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)), 146 + hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28),),
145 border: InputBorder.none, 147 border: InputBorder.none,
146 - contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(30),horizontal: ScreenUtil().setWidth(10)) 148 + contentPadding: EdgeInsets.symmetric(horizontal: 10,vertical: 14),
147 ), 149 ),
148 onChanged: (_){ 150 onChanged: (_){
149 setActivate(); 151 setActivate();
@@ -174,11 +176,12 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -174,11 +176,12 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
174 child: TextField( 176 child: TextField(
175 controller: _accountController, 177 controller: _accountController,
176 focusNode: _accountFocusNode, 178 focusNode: _accountFocusNode,
  179 + style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),
177 decoration: InputDecoration( 180 decoration: InputDecoration(
178 hintText: "请输入4位工号", 181 hintText: "请输入4位工号",
179 hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)), 182 hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)),
180 border: InputBorder.none, 183 border: InputBorder.none,
181 - contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(30),horizontal: ScreenUtil().setWidth(10)) 184 + contentPadding: EdgeInsets.symmetric(horizontal: 10,vertical: 14),
182 ), 185 ),
183 onChanged: (_){ 186 onChanged: (_){
184 setActivate(); 187 setActivate();
@@ -210,11 +213,12 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -210,11 +213,12 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
210 controller: _pwdController, 213 controller: _pwdController,
211 focusNode: _pwdFocusNode, 214 focusNode: _pwdFocusNode,
212 autofocus: _sellerCodeController.text.isNotEmpty&&_accountController.text.isNotEmpty&&_pwdController.text.isEmpty, 215 autofocus: _sellerCodeController.text.isNotEmpty&&_accountController.text.isNotEmpty&&_pwdController.text.isEmpty,
  216 + style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),
213 decoration: InputDecoration( 217 decoration: InputDecoration(
214 hintText: "请输入密码", 218 hintText: "请输入密码",
215 hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)), 219 hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)),
216 - border: InputBorder.none,  
217 - contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setWidth(30),horizontal: ScreenUtil().setWidth(10)) 220 + border: InputBorder.none,
  221 + contentPadding: EdgeInsets.symmetric(horizontal: 10,vertical: 14),
218 ), 222 ),
219 onChanged: (_){ 223 onChanged: (_){
220 setActivate(); 224 setActivate();
@@ -258,7 +262,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -258,7 +262,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
258 }); 262 });
259 }, 263 },
260 child: Container( 264 child: Container(
261 - height: ScreenUtil().setHeight(84), 265 + height: ScreenUtil().setHeight(80),
262 width: ScreenUtil().setWidth(611), 266 width: ScreenUtil().setWidth(611),
263 margin: EdgeInsets.only(top: ScreenUtil().setHeight(56)), 267 margin: EdgeInsets.only(top: ScreenUtil().setHeight(56)),
264 alignment: Alignment.center, 268 alignment: Alignment.center,
@@ -269,7 +273,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -269,7 +273,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
269 ], 273 ],
270 borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8))) 274 borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))
271 ), 275 ),
272 - child: Text("登录",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(30)),), 276 + child: Text("登录",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(34)),),
273 ), 277 ),
274 ); 278 );
275 }, 279 },
@@ -27,83 +27,85 @@ class MessageDialogItem extends StatelessWidget { @@ -27,83 +27,85 @@ class MessageDialogItem extends StatelessWidget {
27 NavigatorUtil.goNotebookDetailPage(context,message.rid.toString()); 27 NavigatorUtil.goNotebookDetailPage(context,message.rid.toString());
28 } 28 }
29 }, 29 },
30 - child: Container(  
31 - margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(22),vertical: ScreenUtil().setWidth(11)),  
32 - padding: EdgeInsets.fromLTRB(  
33 - ScreenUtil().setWidth(17),  
34 - ScreenUtil().setWidth(45),  
35 - ScreenUtil().setWidth(12),  
36 - ScreenUtil().setWidth(34)),  
37 - decoration: BoxDecoration(  
38 - color: MyColours.color_fefefe,  
39 - borderRadius:  
40 - BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))),  
41 - child: Column(  
42 - mainAxisSize: MainAxisSize.min,  
43 - crossAxisAlignment: CrossAxisAlignment.start,  
44 - children: <Widget>[  
45 - Row(  
46 - crossAxisAlignment: CrossAxisAlignment.center, 30 + child: Stack(
  31 + children: <Widget>[
  32 + Container(
  33 + margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(39),vertical: ScreenUtil().setWidth(12)),
  34 + padding: EdgeInsets.fromLTRB(
  35 + ScreenUtil().setWidth(12),
  36 + ScreenUtil().setWidth(45),
  37 + ScreenUtil().setWidth(21),
  38 + ScreenUtil().setWidth(43)),
  39 + decoration: BoxDecoration(
  40 + color: MyColours.color_fefefe,
  41 + borderRadius:
  42 + BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))),
  43 + child:Column(
  44 + mainAxisSize: MainAxisSize.min,
  45 + crossAxisAlignment: CrossAxisAlignment.start,
47 children: <Widget>[ 46 children: <Widget>[
  47 + Row(
  48 + crossAxisAlignment: CrossAxisAlignment.center,
  49 + children: <Widget>[
  50 + Text(
  51 + "在线预订",
  52 + style: TextStyle(
  53 + color: textColor,
  54 + fontSize: ScreenUtil().setSp(28)),
  55 + ),
  56 + Spacer(),
  57 + Text(
  58 + message.cdateStr,
  59 + style: TextStyle(
  60 + color: MyColours.color_999999,
  61 + fontSize: ScreenUtil().setSp(24)),
  62 + ),
  63 + ],
  64 + ),
  65 + VEmptyView(20),
48 Text( 66 Text(
49 - "在线预订", 67 + "包间需求：${message.room_demand}",
50 style: TextStyle( 68 style: TextStyle(
51 color: textColor, 69 color: textColor,
52 - fontSize: ScreenUtil().setSp(26)), 70 + fontSize: ScreenUtil().setSp(28)),
53 ), 71 ),
54 - Spacer(), 72 + VEmptyView(10),
55 Text( 73 Text(
56 - message.cdateStr, 74 + "就餐时间：${message.ddateStr}",
57 style: TextStyle( 75 style: TextStyle(
58 - color: MyColours.color_999999,  
59 - fontSize: ScreenUtil().setSp(22)), 76 + color: textColor,
  77 + fontSize: ScreenUtil().setSp(28)),
60 ), 78 ),
61 - ],  
62 - ),  
63 - VEmptyView(20),  
64 - Text(  
65 - "包间需求：${message.room_demand}",  
66 - style: TextStyle(  
67 - color: textColor,  
68 - fontSize: ScreenUtil().setSp(26)),  
69 - ),  
70 - VEmptyView(10),  
71 - Text(  
72 - "就餐时间：${message.ddateStr}",  
73 - style: TextStyle(  
74 - color: textColor,  
75 - fontSize: ScreenUtil().setSp(26)),  
76 - ),  
77 - VEmptyView(10),  
78 - Row(  
79 - crossAxisAlignment: CrossAxisAlignment.center,  
80 - children: <Widget>[ 79 + VEmptyView(10),
81 Text( 80 Text(
82 "预订人：${message.rnameStr}", 81 "预订人：${message.rnameStr}",
83 style: TextStyle( 82 style: TextStyle(
84 color: textColor, 83 color: textColor,
85 - fontSize: ScreenUtil().setSp(26)), 84 + fontSize: ScreenUtil().setSp(28)),
86 ), 85 ),
87 - Spacer(),  
88 - Offstage(  
89 - offstage: isTreated?true:false,  
90 - child: CommonButton(  
91 - width: 160,  
92 - height: 48,  
93 - fontSize: 26,  
94 - content: "立即处理",  
95 - state: 1,  
96 - onPress: () {  
97 - messageDialogModel.removeMessage(message.id);  
98 - NavigatorUtil.goHandleOnlinePage(context,message.rid.toString(),message.id,replace: messageDialogModel.messages.isEmpty);  
99 - },  
100 - ),  
101 - )  
102 ], 86 ],
103 - )  
104 - ],  
105 - ),  
106 - ), 87 + ),
  88 + ),
  89 + Positioned(
  90 + right: ScreenUtil().setWidth(60),
  91 + bottom: ScreenUtil().setWidth(55),
  92 + child:Offstage(
  93 + offstage: isTreated?true:false,
  94 + child: CommonButton(
  95 + width: 160,
  96 + height: 48,
  97 + fontSize: 28,
  98 + content: "立即处理",
  99 + state: 1,
  100 + onPress: () {
  101 + messageDialogModel.removeMessage(message.id);
  102 + NavigatorUtil.goHandleOnlinePage(context,message.rid.toString(),message.id,replace: messageDialogModel.messages.isEmpty);
  103 + },
  104 + ),
  105 + ),
  106 + )
  107 + ],
  108 + )
107 ); 109 );
108 } 110 }
109 } 111 }
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:flutter_easyrefresh/easy_refresh.dart'; 2 import 'package:flutter_easyrefresh/easy_refresh.dart';
  3 +import 'package:one_key/pages/message/messsage_item.dart';
3 import 'package:one_key/provider/message_dialog_model.dart'; 4 import 'package:one_key/provider/message_dialog_model.dart';
4 import 'package:one_key/provider/message_model.dart'; 5 import 'package:one_key/provider/message_model.dart';
5 import 'package:one_key/provider/user_model.dart'; 6 import 'package:one_key/provider/user_model.dart';
6 import 'package:provider/provider.dart'; 7 import 'package:provider/provider.dart';
7 import 'package:one_key/utils/event_bus.dart'; 8 import 'package:one_key/utils/event_bus.dart';
8 -import 'message_dialog_item.dart';  
9 9
10 class MessageLeftPage extends StatefulWidget { 10 class MessageLeftPage extends StatefulWidget {
11 @override 11 @override
@@ -61,7 +61,7 @@ class MessageLeftPageState extends State<MessageLeftPage> { @@ -61,7 +61,7 @@ class MessageLeftPageState extends State<MessageLeftPage> {
61 SliverList( 61 SliverList(
62 delegate: 62 delegate:
63 SliverChildBuilderDelegate((BuildContext context, int index) { 63 SliverChildBuilderDelegate((BuildContext context, int index) {
64 - return MessageDialogItem(messages[index]); 64 + return MessageItem(messages[index]);
65 },childCount: messages.length), 65 },childCount: messages.length),
66 ) 66 )
67 ],onRefresh: () async { 67 ],onRefresh: () async {
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:flutter_easyrefresh/easy_refresh.dart'; 2 import 'package:flutter_easyrefresh/easy_refresh.dart';
  3 +import 'package:one_key/pages/message/messsage_item.dart';
3 import 'package:one_key/provider/message_model.dart'; 4 import 'package:one_key/provider/message_model.dart';
4 import 'package:one_key/provider/user_model.dart'; 5 import 'package:one_key/provider/user_model.dart';
5 -import 'package:one_key/utils/log_util.dart';  
6 import 'package:provider/provider.dart'; 6 import 'package:provider/provider.dart';
7 7
8 -import 'message_dialog_item.dart';  
9 -  
10 class MessageRightPage extends StatefulWidget{ 8 class MessageRightPage extends StatefulWidget{
11 @override 9 @override
12 State<StatefulWidget> createState() { 10 State<StatefulWidget> createState() {
@@ -59,7 +57,7 @@ class MessageRightPageState extends State<MessageRightPage>{ @@ -59,7 +57,7 @@ class MessageRightPageState extends State<MessageRightPage>{
59 SliverList( 57 SliverList(
60 delegate: 58 delegate:
61 SliverChildBuilderDelegate((BuildContext context, int index) { 59 SliverChildBuilderDelegate((BuildContext context, int index) {
62 - return MessageDialogItem(messages[index],isTreated: true,); 60 + return MessageItem(messages[index],isTreated: true,);
63 },childCount: messages.length), 61 },childCount: messages.length),
64 ) 62 )
65 ],onRefresh: () async { 63 ],onRefresh: () async {
  1 +import 'package:flutter/material.dart';
  2 +import 'package:flutter_screenutil/flutter_screenutil.dart';
  3 +import 'package:one_key/models/message.dart';
  4 +import 'package:one_key/provider/message_dialog_model.dart';
  5 +import 'package:one_key/res/colors.dart';
  6 +import 'package:one_key/utils/navigator_util.dart';
  7 +import 'package:one_key/widgets/common_button.dart';
  8 +import 'package:one_key/widgets/h_empty_view.dart';
  9 +import 'package:one_key/widgets/v_empty_view.dart';
  10 +import 'package:provider/provider.dart';
  11 +
  12 +class MessageItem extends StatelessWidget {
  13 +
  14 + final Message message;
  15 + final bool isTreated;
  16 + final VoidCallback callback;
  17 + MessageItem(this.message,{this.isTreated=false,this.callback});
  18 +
  19 + @override
  20 + Widget build(BuildContext context) {
  21 + // TODO: implement build
  22 + Color textColor=isTreated?MyColours.color_999999:MyColours.color_353535;
  23 + MessageDialogModel messageDialogModel=Provider.of<MessageDialogModel>(context,listen: false);
  24 + return GestureDetector(
  25 + onTap: (){
  26 + if(isTreated){
  27 + NavigatorUtil.goNotebookDetailPage(context,message.rid.toString());
  28 + }
  29 + },
  30 + child: Stack(
  31 + children: <Widget>[
  32 + Container(
  33 + margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(39),vertical: ScreenUtil().setWidth(12)),
  34 + padding: EdgeInsets.fromLTRB(
  35 + ScreenUtil().setWidth(12),
  36 + ScreenUtil().setWidth(45),
  37 + ScreenUtil().setWidth(21),
  38 + ScreenUtil().setWidth(43)),
  39 + decoration: BoxDecoration(
  40 + color: MyColours.color_fefefe,
  41 + borderRadius:
  42 + BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))),
  43 + child:Column(
  44 + mainAxisSize: MainAxisSize.min,
  45 + crossAxisAlignment: CrossAxisAlignment.start,
  46 + children: <Widget>[
  47 + Row(
  48 + crossAxisAlignment: CrossAxisAlignment.center,
  49 + children: <Widget>[
  50 + Text(
  51 + "在线预订",
  52 + style: TextStyle(
  53 + color: textColor,
  54 + fontSize: ScreenUtil().setSp(28)),
  55 + ),
  56 + Spacer(),
  57 + Text(
  58 + message.cdateStr,
  59 + style: TextStyle(
  60 + color: MyColours.color_999999,
  61 + fontSize: ScreenUtil().setSp(24)),
  62 + ),
  63 + ],
  64 + ),
  65 + VEmptyView(20),
  66 + Text(
  67 + "包间需求：${message.room_demand}",
  68 + style: TextStyle(
  69 + color: textColor,
  70 + fontSize: ScreenUtil().setSp(28)),
  71 + ),
  72 + VEmptyView(10),
  73 + Text(
  74 + "就餐时间：${message.ddateStr}",
  75 + style: TextStyle(
  76 + color: textColor,
  77 + fontSize: ScreenUtil().setSp(28)),
  78 + ),
  79 + VEmptyView(10),
  80 + Text(
  81 + "预订人：${message.rnameStr}",
  82 + style: TextStyle(
  83 + color: textColor,
  84 + fontSize: ScreenUtil().setSp(28)),
  85 + ),
  86 + ],
  87 + ),
  88 + ),
  89 + Positioned(
  90 + right: ScreenUtil().setWidth(60),
  91 + bottom: ScreenUtil().setWidth(55),
  92 + child:Offstage(
  93 + offstage: isTreated?true:false,
  94 + child: CommonButton(
  95 + width: 160,
  96 + height: 48,
  97 + fontSize: 28,
  98 + content: "立即处理",
  99 + state: 1,
  100 + onPress: () {
  101 + messageDialogModel.removeMessage(message.id);
  102 + NavigatorUtil.goHandleOnlinePage(context,message.rid.toString(),message.id);
  103 + },
  104 + ),
  105 + ),
  106 + )
  107 + ],
  108 + )
  109 + );
  110 + }
  111 +}
@@ -40,10 +40,10 @@ class MyPageState extends State<MyPage>{ @@ -40,10 +40,10 @@ class MyPageState extends State<MyPage>{
40 children: <Widget>[ 40 children: <Widget>[
41 VEmptyView(25), 41 VEmptyView(25),
42 Image.asset("assets/my_logo.png",width: ScreenUtil().setWidth(228),height: ScreenUtil().setWidth(228),), 42 Image.asset("assets/my_logo.png",width: ScreenUtil().setWidth(228),height: ScreenUtil().setWidth(228),),
43 - VEmptyView(30),  
44 - Text(model.user.sellername,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(26)),), 43 + VEmptyView(40),
  44 + Text(model.user.sellername,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(32)),),
45 VEmptyView(12), 45 VEmptyView(12),
46 - Text(model.user.account+" | "+model.user.role_name,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(24)),) 46 + Text(model.user.account+" | "+model.user.role_name,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(30)),)
47 ], 47 ],
48 ); 48 );
49 },) 49 },)
@@ -66,9 +66,9 @@ class MyPageState extends State<MyPage>{ @@ -66,9 +66,9 @@ class MyPageState extends State<MyPage>{
66 mainAxisSize: MainAxisSize.min, 66 mainAxisSize: MainAxisSize.min,
67 crossAxisAlignment: CrossAxisAlignment.center, 67 crossAxisAlignment: CrossAxisAlignment.center,
68 children: <Widget>[ 68 children: <Widget>[
69 - Image.asset("assets/icon_exist.png",width: ScreenUtil().setWidth(25),height: ScreenUtil().setWidth(25),), 69 + Image.asset("assets/icon_exist.png",width: ScreenUtil().setWidth(30),height: ScreenUtil().setWidth(30),),
70 HEmptyView(18), 70 HEmptyView(18),
71 - Text("退出登录",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(30))) 71 + Text("退出登录",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(34),))
72 ], 72 ],
73 ), 73 ),
74 ), 74 ),
@@ -42,18 +42,18 @@ class NotebookItemState extends State<NoteBookItem>{ @@ -42,18 +42,18 @@ class NotebookItemState extends State<NoteBookItem>{
42 }, 42 },
43 child: Container( 43 child: Container(
44 width: double.infinity, 44 width: double.infinity,
45 - height: ScreenUtil().setHeight(112), 45 + height: ScreenUtil().setHeight(110),
46 color: (widget.index % 2 == 0) ? MyColours.color_f7fdfd : MyColours.color_ffffff, 46 color: (widget.index % 2 == 0) ? MyColours.color_f7fdfd : MyColours.color_ffffff,
47 child: Row( 47 child: Row(
48 children: <Widget>[ 48 children: <Widget>[
49 Container( 49 Container(
50 - width: ScreenUtil().setWidth(144), 50 + width: ScreenUtil().setWidth(171),
51 alignment: Alignment.center, 51 alignment: Alignment.center,
52 child: Text( 52 child: Text(
53 notebook.tableinfoStr, 53 notebook.tableinfoStr,
54 style: TextStyle( 54 style: TextStyle(
55 color: textColor, 55 color: textColor,
56 - fontSize: ScreenUtil().setSp(26)), 56 + fontSize: ScreenUtil().setSp(28)),
57 ), 57 ),
58 ), 58 ),
59 MyDivider( 59 MyDivider(
@@ -62,13 +62,13 @@ class NotebookItemState extends State<NoteBookItem>{ @@ -62,13 +62,13 @@ class NotebookItemState extends State<NoteBookItem>{
62 color: MyColours.color_ededed, 62 color: MyColours.color_ededed,
63 ), 63 ),
64 Container( 64 Container(
65 - width: ScreenUtil().setWidth(195), 65 + width: ScreenUtil().setWidth(230),
66 alignment: Alignment.center, 66 alignment: Alignment.center,
67 child: Column( 67 child: Column(
68 mainAxisSize: MainAxisSize.min, 68 mainAxisSize: MainAxisSize.min,
69 children: <Widget>[ 69 children: <Widget>[
70 - Text(notebook.rnameStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(26)),),  
71 - VEmptyView(18), 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)),) 72 Text(notebook.phoneStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(22)),)
73 ], 73 ],
74 ), 74 ),
@@ -79,13 +79,13 @@ class NotebookItemState extends State<NoteBookItem>{ @@ -79,13 +79,13 @@ class NotebookItemState extends State<NoteBookItem>{
79 color: MyColours.color_ededed, 79 color: MyColours.color_ededed,
80 ), 80 ),
81 Container( 81 Container(
82 - width: ScreenUtil().setWidth(195), 82 + width: ScreenUtil().setWidth(159),
83 alignment: Alignment.center, 83 alignment: Alignment.center,
84 child: Text( 84 child: Text(
85 notebook.ddateStr, 85 notebook.ddateStr,
86 style: TextStyle( 86 style: TextStyle(
87 color: textColor, 87 color: textColor,
88 - fontSize: ScreenUtil().setSp(26)), 88 + fontSize: ScreenUtil().setSp(28)),
89 ), 89 ),
90 ), 90 ),
91 MyDivider( 91 MyDivider(
@@ -96,13 +96,13 @@ class NotebookItemState extends State<NoteBookItem>{ @@ -96,13 +96,13 @@ class NotebookItemState extends State<NoteBookItem>{
96 GestureDetector( 96 GestureDetector(
97 onTap: _onOperateClick, 97 onTap: _onOperateClick,
98 child: Container( 98 child: Container(
99 - width: ScreenUtil().setWidth(209), 99 + width: ScreenUtil().setWidth(184),
100 alignment: Alignment.center, 100 alignment: Alignment.center,
101 child: Text( 101 child: Text(
102 notebook.operationText, 102 notebook.operationText,
103 style: TextStyle( 103 style: TextStyle(
104 color: (notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_2bb5b7, 104 color: (notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_2bb5b7,
105 - fontSize: ScreenUtil().setSp(26)), 105 + fontSize: ScreenUtil().setSp(28)),
106 ), 106 ),
107 ), 107 ),
108 ), 108 ),
@@ -172,13 +172,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -172,13 +172,13 @@ class NoteBookPageState extends State<NoteBookPage> {
172 child: Row( 172 child: Row(
173 children: <Widget>[ 173 children: <Widget>[
174 Container( 174 Container(
175 - width: ScreenUtil().setWidth(144), 175 + width: ScreenUtil().setWidth(171),
176 alignment: Alignment.center, 176 alignment: Alignment.center,
177 child: Text( 177 child: Text(
178 "桌号", 178 "桌号",
179 style: TextStyle( 179 style: TextStyle(
180 color: MyColours.color_353535, 180 color: MyColours.color_353535,
181 - fontSize: ScreenUtil().setSp(22)), 181 + fontSize: ScreenUtil().setSp(30)),
182 ), 182 ),
183 ), 183 ),
184 MyDivider( 184 MyDivider(
@@ -187,13 +187,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -187,13 +187,13 @@ class NoteBookPageState extends State<NoteBookPage> {
187 color: MyColours.color_ededed, 187 color: MyColours.color_ededed,
188 ), 188 ),
189 Container( 189 Container(
190 - width: ScreenUtil().setWidth(195), 190 + width: ScreenUtil().setWidth(230),
191 alignment: Alignment.center, 191 alignment: Alignment.center,
192 child: Text( 192 child: Text(
193 "用户姓名", 193 "用户姓名",
194 style: TextStyle( 194 style: TextStyle(
195 color: MyColours.color_353535, 195 color: MyColours.color_353535,
196 - fontSize: ScreenUtil().setSp(22)), 196 + fontSize: ScreenUtil().setSp(30)),
197 ), 197 ),
198 ), 198 ),
199 MyDivider( 199 MyDivider(
@@ -202,13 +202,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -202,13 +202,13 @@ class NoteBookPageState extends State<NoteBookPage> {
202 color: MyColours.color_ededed, 202 color: MyColours.color_ededed,
203 ), 203 ),
204 Container( 204 Container(
205 - width: ScreenUtil().setWidth(195), 205 + width: ScreenUtil().setWidth(159),
206 alignment: Alignment.center, 206 alignment: Alignment.center,
207 child: Text( 207 child: Text(
208 "时间", 208 "时间",
209 style: TextStyle( 209 style: TextStyle(
210 color: MyColours.color_353535, 210 color: MyColours.color_353535,
211 - fontSize: ScreenUtil().setSp(22)), 211 + fontSize: ScreenUtil().setSp(30)),
212 ), 212 ),
213 ), 213 ),
214 MyDivider( 214 MyDivider(
@@ -217,13 +217,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -217,13 +217,13 @@ class NoteBookPageState extends State<NoteBookPage> {
217 color: MyColours.color_ededed, 217 color: MyColours.color_ededed,
218 ), 218 ),
219 Container( 219 Container(
220 - width: ScreenUtil().setWidth(209), 220 + width: ScreenUtil().setWidth(184),
221 alignment: Alignment.center, 221 alignment: Alignment.center,
222 child: Text( 222 child: Text(
223 "操作", 223 "操作",
224 style: TextStyle( 224 style: TextStyle(
225 - color: MyColours.color_2bb5b7,  
226 - fontSize: ScreenUtil().setSp(22)), 225 + color: MyColours.color_353535,
  226 + fontSize: ScreenUtil().setSp(30)),
227 ), 227 ),
228 ), 228 ),
229 ], 229 ],
@@ -285,7 +285,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -285,7 +285,7 @@ class NoteBookPageState extends State<NoteBookPage> {
285 dateText, 285 dateText,
286 style: TextStyle( 286 style: TextStyle(
287 color: MyColours.color_2bb5b7, 287 color: MyColours.color_2bb5b7,
288 - fontSize: ScreenUtil().setSp(26)), 288 + fontSize: ScreenUtil().setSp(32)),
289 ), 289 ),
290 ), 290 ),
291 ), 291 ),
@@ -312,13 +312,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -312,13 +312,13 @@ class NoteBookPageState extends State<NoteBookPage> {
312 }, 312 },
313 child: Padding( 313 child: Padding(
314 padding: EdgeInsets.symmetric( 314 padding: EdgeInsets.symmetric(
315 - horizontal: ScreenUtil().setWidth(7)), 315 + horizontal: ScreenUtil().setWidth(10)),
316 child: CommonButton( 316 child: CommonButton(
317 content: "早市", 317 content: "早市",
318 state: currTimeIndex == 1 ? 1 : 0, 318 state: currTimeIndex == 1 ? 1 : 0,
319 - width: ScreenUtil().setWidth(85),  
320 - height: ScreenUtil().setHeight(47),  
321 - fontSize: ScreenUtil().setSp(26), 319 + width: ScreenUtil().setWidth(180),
  320 + height: ScreenUtil().setHeight(75),
  321 + fontSize: 32,
322 )), 322 )),
323 ), 323 ),
324 ), 324 ),
@@ -334,13 +334,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -334,13 +334,13 @@ class NoteBookPageState extends State<NoteBookPage> {
334 }, 334 },
335 child: Padding( 335 child: Padding(
336 padding: EdgeInsets.symmetric( 336 padding: EdgeInsets.symmetric(
337 - horizontal: ScreenUtil().setWidth(7)), 337 + horizontal: ScreenUtil().setWidth(10)),
338 child: CommonButton( 338 child: CommonButton(
339 content: "午市", 339 content: "午市",
340 state: currTimeIndex == 2 ? 1 : 0, 340 state: currTimeIndex == 2 ? 1 : 0,
341 - width: ScreenUtil().setWidth(85),  
342 - height: ScreenUtil().setHeight(47),  
343 - fontSize: ScreenUtil().setSp(26), 341 + width: ScreenUtil().setWidth(180),
  342 + height: ScreenUtil().setHeight(75),
  343 + fontSize: 32,
344 )), 344 )),
345 )), 345 )),
346 Offstage( 346 Offstage(
@@ -355,13 +355,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -355,13 +355,13 @@ class NoteBookPageState extends State<NoteBookPage> {
355 }, 355 },
356 child: Padding( 356 child: Padding(
357 padding: EdgeInsets.symmetric( 357 padding: EdgeInsets.symmetric(
358 - horizontal: ScreenUtil().setWidth(7)), 358 + horizontal: ScreenUtil().setWidth(10)),
359 child: CommonButton( 359 child: CommonButton(
360 content: "晚市", 360 content: "晚市",
361 state: currTimeIndex == 3 ? 1 : 0, 361 state: currTimeIndex == 3 ? 1 : 0,
362 - width: ScreenUtil().setWidth(85),  
363 - height: ScreenUtil().setHeight(47),  
364 - fontSize: ScreenUtil().setSp(26), 362 + width: ScreenUtil().setWidth(180),
  363 + height: ScreenUtil().setHeight(75),
  364 + fontSize: 32,
365 )), 365 )),
366 )), 366 )),
367 ], 367 ],
@@ -383,7 +383,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -383,7 +383,7 @@ class NoteBookPageState extends State<NoteBookPage> {
383 total, 383 total,
384 style: TextStyle( 384 style: TextStyle(
385 color: MyColours.color_131313, 385 color: MyColours.color_131313,
386 - fontSize: ScreenUtil().setSp(18)), 386 + fontSize: ScreenUtil().setSp(24)),
387 ), 387 ),
388 ); 388 );
389 }, 389 },
@@ -76,7 +76,7 @@ class SmsPageState extends State<SmsPage>{ @@ -76,7 +76,7 @@ class SmsPageState extends State<SmsPage>{
76 Container( 76 Container(
77 alignment: Alignment.centerLeft, 77 alignment: Alignment.centerLeft,
78 margin: EdgeInsets.only(top: ScreenUtil().setHeight(30),left: ScreenUtil().setWidth(38)), 78 margin: EdgeInsets.only(top: ScreenUtil().setHeight(30),left: ScreenUtil().setWidth(38)),
79 - child: Text("已自动生成短信通知，可直接发送",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(22)),), 79 + child: Text("已自动生成短信通知，可直接发送",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),),
80 ), 80 ),
81 Container( 81 Container(
82 width: ScreenUtil().setWidth(673), 82 width: ScreenUtil().setWidth(673),
@@ -86,7 +86,7 @@ class SmsPageState extends State<SmsPage>{ @@ -86,7 +86,7 @@ class SmsPageState extends State<SmsPage>{
86 border: Border.all(color: MyColours.color_dbe3e3,width: ScreenUtil().setWidth(2)), 86 border: Border.all(color: MyColours.color_dbe3e3,width: ScreenUtil().setWidth(2)),
87 borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8))), 87 borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8))),
88 ), 88 ),
89 - child: Text(smsContent,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26),)) 89 + child: Text(smsContent,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(30),))
90 ), 90 ),
91 Container( 91 Container(
92 margin: EdgeInsets.only(top: ScreenUtil().setHeight(143)), 92 margin: EdgeInsets.only(top: ScreenUtil().setHeight(143)),
@@ -95,7 +95,7 @@ class SmsPageState extends State<SmsPage>{ @@ -95,7 +95,7 @@ class SmsPageState extends State<SmsPage>{
95 CommonButton( 95 CommonButton(
96 width: 672, 96 width: 672,
97 height: 76, 97 height: 76,
98 - fontSize: 26, 98 + fontSize: 34,
99 content: "直接发送", 99 content: "直接发送",
100 state: 1, 100 state: 1,
101 onPress: (){ 101 onPress: (){
@@ -106,7 +106,7 @@ class SmsPageState extends State<SmsPage>{ @@ -106,7 +106,7 @@ class SmsPageState extends State<SmsPage>{
106 CommonButton( 106 CommonButton(
107 width: 672, 107 width: 672,
108 height: 76, 108 height: 76,
109 - fontSize: 26, 109 + fontSize: 34,
110 content: "复制短信", 110 content: "复制短信",
111 state: 0, 111 state: 0,
112 onPress: () async { 112 onPress: () async {
@@ -200,7 +200,7 @@ class SelectTablePageState extends State<SelectTablePage>{ @@ -200,7 +200,7 @@ class SelectTablePageState extends State<SelectTablePage>{
200 content: "确定", 200 content: "确定",
201 width: 600, 201 width: 600,
202 height: 76, 202 height: 76,
203 - fontSize: 26, 203 + fontSize: 34,
204 state: 1, 204 state: 1,
205 onPress: (){ 205 onPress: (){
206 if(selectTables.length>0){ 206 if(selectTables.length>0){
@@ -28,6 +28,7 @@ class DialogUtil { @@ -28,6 +28,7 @@ class DialogUtil {
28 messageModel.showMessageDialog=true; 28 messageModel.showMessageDialog=true;
29 await showModalBottomSheet<int>( 29 await showModalBottomSheet<int>(
30 context: context, 30 context: context,
  31 + isScrollControlled: true,
31 builder: (BuildContext dialogContext) { 32 builder: (BuildContext dialogContext) {
32 Widget widget = Container( 33 Widget widget = Container(
33 color: MyColours.app_main, 34 color: MyColours.app_main,
@@ -41,7 +42,7 @@ class DialogUtil { @@ -41,7 +42,7 @@ class DialogUtil {
41 mainAxisSize: MainAxisSize.min, 42 mainAxisSize: MainAxisSize.min,
42 children: <Widget>[ 43 children: <Widget>[
43 Container( 44 Container(
44 - height: ScreenUtil().setHeight(53), 45 + margin: EdgeInsets.only(top: ScreenUtil().setWidth(21),bottom: ScreenUtil().setWidth(12)),
45 width: double.infinity, 46 width: double.infinity,
46 child: Stack( 47 child: Stack(
47 alignment: Alignment.center, 48 alignment: Alignment.center,
@@ -50,10 +51,10 @@ class DialogUtil { @@ -50,10 +51,10 @@ class DialogUtil {
50 "您有一条新的消息", 51 "您有一条新的消息",
51 style: TextStyle( 52 style: TextStyle(
52 color: MyColours.color_ffffff, 53 color: MyColours.color_ffffff,
53 - fontSize: ScreenUtil().setSp(26)), 54 + fontSize: ScreenUtil().setSp(32)),
54 ), 55 ),
55 Positioned( 56 Positioned(
56 - right: ScreenUtil().setWidth(8), 57 + right: ScreenUtil().setWidth(23),
57 child: GestureDetector( 58 child: GestureDetector(
58 onTap: () { 59 onTap: () {
59 Navigator.of(dialogContext).pop(); 60 Navigator.of(dialogContext).pop();
@@ -70,7 +71,7 @@ class DialogUtil { @@ -70,7 +71,7 @@ class DialogUtil {
70 )) 71 ))
71 ], 72 ],
72 )), 73 )),
73 - model.messages.length>2?Container( 74 + model.messages.length>3?Container(
74 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(22),vertical: ScreenUtil().setWidth(11)), 75 margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(22),vertical: ScreenUtil().setWidth(11)),
75 padding: EdgeInsets.fromLTRB( 76 padding: EdgeInsets.fromLTRB(
76 ScreenUtil().setWidth(16), 77 ScreenUtil().setWidth(16),
@@ -92,7 +93,7 @@ class DialogUtil { @@ -92,7 +93,7 @@ class DialogUtil {
92 "在线预订", 93 "在线预订",
93 style: TextStyle( 94 style: TextStyle(
94 color: MyColours.color_353535, 95 color: MyColours.color_353535,
95 - fontSize: ScreenUtil().setSp(26)), 96 + fontSize: ScreenUtil().setSp(32)),
96 ), 97 ),
97 Spacer(), 98 Spacer(),
98 Text( 99 Text(
@@ -108,7 +109,7 @@ class DialogUtil { @@ -108,7 +109,7 @@ class DialogUtil {
108 "在线预订：${model.messages.length}个", 109 "在线预订：${model.messages.length}个",
109 style: TextStyle( 110 style: TextStyle(
110 color: MyColours.color_353535, 111 color: MyColours.color_353535,
111 - fontSize: ScreenUtil().setSp(26)), 112 + fontSize: ScreenUtil().setSp(32)),
112 ), 113 ),
113 Row( 114 Row(
114 crossAxisAlignment: CrossAxisAlignment.center, 115 crossAxisAlignment: CrossAxisAlignment.center,
@@ -117,7 +118,7 @@ class DialogUtil { @@ -117,7 +118,7 @@ class DialogUtil {
117 CommonButton( 118 CommonButton(
118 width: 160, 119 width: 160,
119 height: 48, 120 height: 48,
120 - fontSize: 26, 121 + fontSize: 32,
121 content: "立即处理", 122 content: "立即处理",
122 state: 1, 123 state: 1,
123 onPress: () { 124 onPress: () {
@@ -185,7 +186,7 @@ class DialogUtil { @@ -185,7 +186,7 @@ class DialogUtil {
185 }, 186 },
186 titleTextStyle: TextStyle( 187 titleTextStyle: TextStyle(
187 color: MyColours.color_ffffff, 188 color: MyColours.color_ffffff,
188 - fontSize: ScreenUtil().setSp(26)), 189 + fontSize: ScreenUtil().setSp(32)),
189 leftChevronIcon: 190 leftChevronIcon:
190 const Icon(Icons.chevron_left, color: Colors.white), 191 const Icon(Icons.chevron_left, color: Colors.white),
191 rightChevronIcon: 192 rightChevronIcon:
@@ -195,10 +196,10 @@ class DialogUtil { @@ -195,10 +196,10 @@ class DialogUtil {
195 contentPadding: const EdgeInsets.only(bottom: 4.0), 196 contentPadding: const EdgeInsets.only(bottom: 4.0),
196 weekdayStyle: TextStyle( 197 weekdayStyle: TextStyle(
197 color: MyColours.color_2bb5b7, 198 color: MyColours.color_2bb5b7,
198 - fontSize: ScreenUtil().setSp(26)), 199 + fontSize: ScreenUtil().setSp(32)),
199 weekendStyle: TextStyle( 200 weekendStyle: TextStyle(
200 color: MyColours.color_f49a5e, 201 color: MyColours.color_f49a5e,
201 - fontSize: ScreenUtil().setSp(26)), 202 + fontSize: ScreenUtil().setSp(32)),
202 selectedColor: MyColours.color_2bb5b7, 203 selectedColor: MyColours.color_2bb5b7,
203 outsideDaysVisible: false, 204 outsideDaysVisible: false,
204 ), 205 ),
@@ -213,7 +214,7 @@ class DialogUtil { @@ -213,7 +214,7 @@ class DialogUtil {
213 weekday, 214 weekday,
214 style: TextStyle( 215 style: TextStyle(
215 color: MyColours.color_97e9ea, 216 color: MyColours.color_97e9ea,
216 - fontSize: ScreenUtil().setSp(26)), 217 + fontSize: ScreenUtil().setSp(32)),
217 ), 218 ),
218 ); 219 );
219 }, 220 },
@@ -232,7 +233,7 @@ class DialogUtil { @@ -232,7 +233,7 @@ class DialogUtil {
232 .now() 233 .now()
233 .day ? '今' : date.day.toString(), 234 .day ? '今' : date.day.toString(),
234 style: TextStyle().copyWith( 235 style: TextStyle().copyWith(
235 - fontSize: ScreenUtil().setSp(26), 236 + fontSize: ScreenUtil().setSp(32),
236 color: MyColours.color_ffffff), 237 color: MyColours.color_ffffff),
237 ), 238 ),
238 ); 239 );
@@ -250,7 +251,7 @@ class DialogUtil { @@ -250,7 +251,7 @@ class DialogUtil {
250 child: Text( 251 child: Text(
251 '今', 252 '今',
252 style: TextStyle().copyWith( 253 style: TextStyle().copyWith(
253 - fontSize: ScreenUtil().setSp(26), 254 + fontSize: ScreenUtil().setSp(32),
254 color: MyColours.color_2bb5b7), 255 color: MyColours.color_2bb5b7),
255 ), 256 ),
256 ); 257 );
@@ -274,7 +275,7 @@ class DialogUtil { @@ -274,7 +275,7 @@ class DialogUtil {
274 ), 275 ),
275 Positioned( 276 Positioned(
276 right: ScreenUtil().setWidth(62), 277 right: ScreenUtil().setWidth(62),
277 - bottom: ScreenUtil().setHeight(7), 278 + bottom: ScreenUtil().setHeight(20),
278 child: Container( 279 child: Container(
279 child: GestureDetector( 280 child: GestureDetector(
280 onTap: () { 281 onTap: () {
@@ -284,15 +285,15 @@ class DialogUtil { @@ -284,15 +285,15 @@ class DialogUtil {
284 child: Container( 285 child: Container(
285 child: ClipOval( 286 child: ClipOval(
286 child: Container( 287 child: Container(
287 - width: ScreenUtil().setWidth(95),  
288 - height: ScreenUtil().setWidth(95), 288 + width: ScreenUtil().setWidth(100),
  289 + height: ScreenUtil().setWidth(100),
289 alignment: Alignment.center, 290 alignment: Alignment.center,
290 color: MyColours.color_2bb5b7, 291 color: MyColours.color_2bb5b7,
291 child: Text( 292 child: Text(
292 - "回到\n今天", 293 + "今天",
293 style: TextStyle( 294 style: TextStyle(
294 color: MyColours.color_ffffff, 295 color: MyColours.color_ffffff,
295 - fontSize: ScreenUtil().setSp(26)), 296 + fontSize: ScreenUtil().setSp(32)),
296 ), 297 ),
297 )), 298 )),
298 ), 299 ),
@@ -316,7 +317,7 @@ class DialogUtil { @@ -316,7 +317,7 @@ class DialogUtil {
316 Widget widget = Container( 317 Widget widget = Container(
317 width: double.infinity, 318 width: double.infinity,
318 height: ScreenUtil().setHeight(233), 319 height: ScreenUtil().setHeight(233),
319 - color: MyColours.color_dfdfdf, 320 + color: MyColours.color_f1f1f1,
320 child: Row( 321 child: Row(
321 children: <Widget>[ 322 children: <Widget>[
322 Expanded( 323 Expanded(
@@ -329,11 +330,10 @@ class DialogUtil { @@ -329,11 +330,10 @@ class DialogUtil {
329 mainAxisSize: MainAxisSize.min, 330 mainAxisSize: MainAxisSize.min,
330 children: <Widget>[ 331 children: <Widget>[
331 Image.asset( 332 Image.asset(
332 - "assets/icon_wechat.png", width: ScreenUtil().setWidth(126),  
333 - height: ScreenUtil().setWidth(126),),  
334 - VEmptyView(18), 333 + "assets/icon_wechat.png", width: ScreenUtil().setWidth(140),
  334 + height: ScreenUtil().setWidth(140),),
335 Text("微信", style: TextStyle(color: MyColours.color_353535, 335 Text("微信", style: TextStyle(color: MyColours.color_353535,
336 - fontSize: ScreenUtil().setSp(26)),) 336 + fontSize: ScreenUtil().setSp(32)),)
337 ], 337 ],
338 ), 338 ),
339 ), 339 ),
@@ -348,11 +348,10 @@ class DialogUtil { @@ -348,11 +348,10 @@ class DialogUtil {
348 mainAxisSize: MainAxisSize.min, 348 mainAxisSize: MainAxisSize.min,
349 children: <Widget>[ 349 children: <Widget>[
350 Image.asset( 350 Image.asset(
351 - "assets/icon_sms.png", width: ScreenUtil().setWidth(126),  
352 - height: ScreenUtil().setWidth(126),),  
353 - VEmptyView(18), 351 + "assets/icon_sms.png", width: ScreenUtil().setWidth(140),
  352 + height: ScreenUtil().setWidth(140),),
354 Text("短信", style: TextStyle(color: MyColours.color_353535, 353 Text("短信", style: TextStyle(color: MyColours.color_353535,
355 - fontSize: ScreenUtil().setSp(26)),) 354 + fontSize: ScreenUtil().setSp(32)),)
356 ], 355 ],
357 ), 356 ),
358 ), 357 ),
@@ -367,11 +366,10 @@ class DialogUtil { @@ -367,11 +366,10 @@ class DialogUtil {
367 mainAxisSize: MainAxisSize.min, 366 mainAxisSize: MainAxisSize.min,
368 children: <Widget>[ 367 children: <Widget>[
369 Image.asset( 368 Image.asset(
370 - "assets/icon_phone.png", width: ScreenUtil().setWidth(126),  
371 - height: ScreenUtil().setWidth(126),),  
372 - VEmptyView(18), 369 + "assets/icon_phone.png", width: ScreenUtil().setWidth(140),
  370 + height: ScreenUtil().setWidth(140),),
373 Text("电话", style: TextStyle(color: MyColours.color_353535, 371 Text("电话", style: TextStyle(color: MyColours.color_353535,
374 - fontSize: ScreenUtil().setSp(26)),) 372 + fontSize: ScreenUtil().setSp(32)),)
375 ], 373 ],
376 ), 374 ),
377 ), 375 ),
@@ -26,6 +26,7 @@ class MyAppBar extends StatelessWidget { @@ -26,6 +26,7 @@ class MyAppBar extends StatelessWidget {
26 onTap: () { 26 onTap: () {
27 Navigator.of(context).pop(); 27 Navigator.of(context).pop();
28 }, 28 },
  29 + behavior: HitTestBehavior.opaque,
29 child: Padding( 30 child: Padding(
30 padding: EdgeInsets.symmetric( 31 padding: EdgeInsets.symmetric(
31 horizontal: ScreenUtil().setWidth(40), 32 horizontal: ScreenUtil().setWidth(40),
@@ -43,7 +44,10 @@ class MyAppBar extends StatelessWidget { @@ -43,7 +44,10 @@ class MyAppBar extends StatelessWidget {
43 title, 44 title,
44 style: TextStyle( 45 style: TextStyle(
45 color: fontColor, 46 color: fontColor,
46 - fontSize: ScreenUtil().setSp(28)), 47 + fontSize: ScreenUtil().setSp(34),
  48 + fontWeight: FontWeight.normal,
  49 + decoration: TextDecoration.none
  50 + ),
47 ), 51 ),
48 ) 52 )
49 ], 53 ],
@@ -41,7 +41,7 @@ class AreaItemState extends State<AreaItem>{ @@ -41,7 +41,7 @@ class AreaItemState extends State<AreaItem>{
41 color: isSelected?MyColours.color_ffffff:MyColours.color_f1f1f1, 41 color: isSelected?MyColours.color_ffffff:MyColours.color_f1f1f1,
42 border: Border(bottom: BorderSide(color: MyColours.color_ffffff,width: ScreenUtil().setHeight(1))) 42 border: Border(bottom: BorderSide(color: MyColours.color_ffffff,width: ScreenUtil().setHeight(1)))
43 ), 43 ),
44 - child: Text(area.name,style: TextStyle(color: isSelected?MyColours.color_2bb5b7:MyColours.color_828282,fontSize: ScreenUtil().setSp(26),decoration: TextDecoration.none),), 44 + child: Text(area.name,style: TextStyle(color: isSelected?MyColours.color_2bb5b7:MyColours.color_828282,fontSize: ScreenUtil().setSp(32),decoration: TextDecoration.none,fontWeight: FontWeight.normal),),
45 ), 45 ),
46 Positioned( 46 Positioned(
47 left: 0, 47 left: 0,
@@ -54,7 +54,7 @@ class AreaItemState extends State<AreaItem>{ @@ -54,7 +54,7 @@ class AreaItemState extends State<AreaItem>{
54 color: area.count<=0?MyColours.color_999999:MyColours.color_63a6d1, 54 color: area.count<=0?MyColours.color_999999:MyColours.color_63a6d1,
55 borderRadius: BorderRadius.only(topRight: Radius.circular(ScreenUtil().setWidth(8)),bottomRight: Radius.circular(ScreenUtil().setWidth(8))) 55 borderRadius: BorderRadius.only(topRight: Radius.circular(ScreenUtil().setWidth(8)),bottomRight: Radius.circular(ScreenUtil().setWidth(8)))
56 ), 56 ),
57 - child: Text(area.count<=0?"满座":"余${area.count}",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(22),decoration: TextDecoration.none)), 57 + child: Text(area.count<=0?"满座":"余${area.count}",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(26),decoration: TextDecoration.none,fontWeight: FontWeight.normal)),
58 ), 58 ),
59 ), 59 ),
60 ], 60 ],
@@ -34,7 +34,7 @@ class CommonButton extends StatelessWidget { @@ -34,7 +34,7 @@ class CommonButton extends StatelessWidget {
34 break; 34 break;
35 case 0: 35 case 0:
36 boxDecoration = BoxDecoration( 36 boxDecoration = BoxDecoration(
37 - border: Border.all(color: MyColours.color_199095), 37 + border: Border.all(color: MyColours.color_199095,width: ScreenUtil().setWidth(2)),
38 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(5)), 38 borderRadius: BorderRadius.circular(ScreenUtil().setWidth(5)),
39 ); 39 );
40 fontColor=MyColours.color_199095; 40 fontColor=MyColours.color_199095;
  1 +import 'package:flutter/material.dart';
  2 +import 'package:flutter_screenutil/flutter_screenutil.dart';
  3 +import 'package:one_key/res/colors.dart';
  4 +
  5 +import 'package:one_key/models/table.dart' as t;
  6 +import 'package:one_key/widgets/v_empty_view.dart';
  7 +
  8 +class NeedItem extends StatefulWidget{
  9 +
  10 + final t.Table table;
  11 + final bool canSelected;//是否能选中
  12 + final ValueChanged onSelected;
  13 +
  14 + final int height;//高度
  15 +
  16 + NeedItem(this.table,{this.onSelected,this.canSelected=false,this.height=183});
  17 +
  18 + @override
  19 + State<StatefulWidget> createState() {
  20 + // TODO: implement createState
  21 + return new NeedItemState();
  22 + }
  23 +}
  24 +
  25 +class NeedItemState extends State<NeedItem>{
  26 +
  27 + @override
  28 + Widget build(BuildContext context) {
  29 + // TODO: implement build
  30 +
  31 + t.Table table=widget.table;
  32 +
  33 + return GestureDetector(
  34 + onTap: (){
  35 + if(widget.canSelected&&table.signStr.isEmpty){
  36 + setState(() {
  37 + table.selected=!(table.selected??false);
  38 + });
  39 + widget.onSelected(table);
  40 + }
  41 + },
  42 + child: Stack(
  43 + children: <Widget>[
  44 + Container(
  45 + width: ScreenUtil().setWidth(190),
  46 + height: ScreenUtil().setWidth(widget.height),
  47 + alignment: Alignment.center,
  48 + margin:EdgeInsets.all( ScreenUtil().setWidth(9)),
  49 + decoration: BoxDecoration(
  50 + color: MyColours.color_a8e2e4,
  51 + borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))
  52 + ),
  53 + child:Column(
  54 + mainAxisSize: MainAxisSize.min,
  55 + crossAxisAlignment: CrossAxisAlignment.center,
  56 + children: <Widget>[
  57 + Text(table.name,style: TextStyle(color: MyColours.color_131313,fontSize: ScreenUtil().setSp(30),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,),
  58 + Offstage(
  59 + offstage: table.tableNum.isEmpty?true:false,
  60 + child: Column(
  61 + mainAxisSize: MainAxisSize.min,
  62 + children: <Widget>[
  63 + VEmptyView(5),
  64 + Text(table.tableNum,style: TextStyle(color: MyColours.color_777777,fontSize: ScreenUtil().setSp(26),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,),
  65 + ],
  66 + ),
  67 + ),
  68 + Offstage(
  69 + offstage: table.lowStr.isEmpty?true:false,
  70 + child: Column(
  71 + mainAxisSize: MainAxisSize.min,
  72 + children: <Widget>[
  73 + VEmptyView(5),
  74 + Text(table.lowStr,style: TextStyle(color: MyColours.color_2bb5b7,fontSize: ScreenUtil().setSp(24),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,)
  75 + ],
  76 + ),
  77 + )
  78 + ],
  79 + )
  80 + ),
  81 + ],
  82 + ),
  83 + );
  84 + }
  85 +}
@@ -22,11 +22,11 @@ class RowMultiText extends StatelessWidget{ @@ -22,11 +22,11 @@ class RowMultiText extends StatelessWidget{
22 children: <Widget>[ 22 children: <Widget>[
23 Positioned( 23 Positioned(
24 left: 0, 24 left: 0,
25 - child: Text(title,style: TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(22)),), 25 + child: Text(title,style: TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(30)),),
26 ), 26 ),
27 Positioned( 27 Positioned(
28 right: 0, 28 right: 0,
29 - child: Text(content,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),), 29 + child: Text(content,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(30)),),
30 ) 30 )
31 ], 31 ],
32 ), 32 ),
@@ -10,8 +10,10 @@ class TableItem extends StatefulWidget{ @@ -10,8 +10,10 @@ class TableItem extends StatefulWidget{
10 final t.Table table; 10 final t.Table table;
11 final bool canSelected;//是否能选中 11 final bool canSelected;//是否能选中
12 final ValueChanged onSelected; 12 final ValueChanged onSelected;
  13 +
  14 + final int height;//高度
13 15
14 - TableItem(this.table,{this.onSelected,this.canSelected=false}); 16 + TableItem(this.table,{this.onSelected,this.canSelected=false,this.height=183});
15 17
16 @override 18 @override
17 State<StatefulWidget> createState() { 19 State<StatefulWidget> createState() {
@@ -37,67 +39,73 @@ class TableItemState extends State<TableItem>{ @@ -37,67 +39,73 @@ class TableItemState extends State<TableItem>{
37 widget.onSelected(table); 39 widget.onSelected(table);
38 } 40 }
39 }, 41 },
40 - child: Container(  
41 - width: ScreenUtil().setWidth(150),  
42 - height: ScreenUtil().setHeight(183),  
43 - margin:EdgeInsets.all( ScreenUtil().setWidth(9)),  
44 - decoration: BoxDecoration(  
45 - color: MyColours.color_a8e2e4,  
46 - borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))  
47 - ),  
48 - child: Stack(  
49 - alignment: Alignment.center,  
50 - children: <Widget>[  
51 - Positioned(  
52 - left: 0,  
53 - top: 0,  
54 - child: table.tidStr==null?Container():Container(  
55 - width: ScreenUtil().setWidth(60),  
56 - height: ScreenUtil().setHeight(27),  
57 - alignment: Alignment.center,  
58 - decoration: BoxDecoration(  
59 - color: MyColours.color_63a6d1,  
60 - borderRadius: BorderRadius.only(topLeft: Radius.circular(ScreenUtil().setWidth(8)),topRight: Radius.circular(ScreenUtil().setWidth(8)),bottomRight: Radius.circular(ScreenUtil().setWidth(8)))  
61 - ),  
62 - child: Text(table.tidStr,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(19),decoration: TextDecoration.none)),  
63 - ),  
64 - ),  
65 - Container(  
66 - alignment: Alignment.centerLeft,  
67 - child: Column(  
68 - mainAxisSize: MainAxisSize.min,  
69 - crossAxisAlignment: CrossAxisAlignment.start,  
70 - children: <Widget>[  
71 - Text(table.name,style: TextStyle(color: MyColours.color_131313,fontSize: ScreenUtil().setSp(26),decoration: TextDecoration.none),),  
72 - VEmptyView(5),  
73 - Text((table.reserver==null||table.reserver.isEmpty)?table.tableNum:table.reserver,style: TextStyle(color: (table.reserver==null||table.reserver.isEmpty)?MyColours.color_777777:MyColours.color_2bb5b7,fontSize: ScreenUtil().setSp(22),decoration: TextDecoration.none),overflow: TextOverflow.ellipsis,),  
74 - VEmptyView(5),  
75 - Text(table.lowStr,style: TextStyle(color: MyColours.color_777777,fontSize: ScreenUtil().setSp(22),decoration: TextDecoration.none),overflow: TextOverflow.ellipsis,)  
76 - ],  
77 - ), 42 + child: Stack(
  43 + children: <Widget>[
  44 + Container(
  45 + width: ScreenUtil().setWidth(150),
  46 + height: ScreenUtil().setWidth(widget.height),
  47 + margin:EdgeInsets.all( ScreenUtil().setWidth(9)),
  48 + decoration: BoxDecoration(
  49 + color: MyColours.color_a8e2e4,
  50 + borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))
78 ), 51 ),
79 - Positioned(  
80 - bottom: 0,  
81 - left: 0,  
82 - right: 0,  
83 - child: table.signStr.isEmpty?Container():Container(  
84 - width: ScreenUtil().setWidth(150),  
85 - height: ScreenUtil().setHeight(46),  
86 - alignment: Alignment.center,  
87 - decoration: BoxDecoration(  
88 - color:MyColours.color_89c0b7,  
89 - borderRadius: BorderRadius.only(bottomLeft: Radius.circular(ScreenUtil().setWidth(8)),bottomRight: Radius.circular(ScreenUtil().setWidth(8))) 52 + child: Stack(
  53 + alignment: Alignment.center,
  54 + children: <Widget>[
  55 + Positioned(
  56 + left: 0,
  57 + top: 0,
  58 + child: table.tidStr==null?Container():Container(
  59 + width: ScreenUtil().setWidth(70),
  60 + height: ScreenUtil().setHeight(32),
  61 + alignment: Alignment.center,
  62 + decoration: BoxDecoration(
  63 + color: MyColours.color_63a6d1,
  64 + borderRadius: BorderRadius.only(topLeft: Radius.circular(ScreenUtil().setWidth(8)),topRight: Radius.circular(ScreenUtil().setWidth(8)),bottomRight: Radius.circular(ScreenUtil().setWidth(8)))
  65 + ),
  66 + child: Text(table.tidStr,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(24),decoration: TextDecoration.none,fontWeight: FontWeight.normal)),
  67 + ),
  68 + ),
  69 + Container(
  70 + alignment: Alignment.centerLeft,
  71 + margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)),
  72 + child: Column(
  73 + mainAxisSize: MainAxisSize.min,
  74 + crossAxisAlignment: CrossAxisAlignment.start,
  75 + children: <Widget>[
  76 + VEmptyView(20),
  77 + Text(table.name,style: TextStyle(color: MyColours.color_131313,fontSize: ScreenUtil().setSp(30),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,),
  78 + VEmptyView(5),
  79 + Text((table.reserver==null||table.reserver.isEmpty)?table.tableNum:table.reserver,style: TextStyle(color: (table.reserver==null||table.reserver.isEmpty)?MyColours.color_777777:MyColours.color_2bb5b7,fontSize: ScreenUtil().setSp(26),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,),
  80 + VEmptyView(5),
  81 + Text(table.lowStr,style: TextStyle(color: MyColours.color_777777,fontSize: ScreenUtil().setSp(26),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,)
  82 + ],
  83 + ),
  84 + ),
  85 + Positioned(
  86 + bottom: 0,
  87 + left: 0,
  88 + right: 0,
  89 + child: table.signStr.isEmpty?Container():Container(
  90 + width: ScreenUtil().setWidth(150),
  91 + height: ScreenUtil().setHeight(40),
  92 + alignment: Alignment.center,
  93 + decoration: BoxDecoration(
  94 + color:MyColours.color_89c0b7,
  95 + borderRadius: BorderRadius.only(bottomLeft: Radius.circular(ScreenUtil().setWidth(8)),bottomRight: Radius.circular(ScreenUtil().setWidth(8)))
  96 + ),
  97 + child: Text(table.signStr,style: TextStyle(color:MyColours.color_ffffff,fontSize: ScreenUtil().setSp(24),decoration: TextDecoration.none,fontWeight: FontWeight.normal),),
  98 + ),
90 ), 99 ),
91 - child: Text(table.signStr,style: TextStyle(color:MyColours.color_ffffff,fontSize: ScreenUtil().setSp(24),decoration: TextDecoration.none),),  
92 - ), 100 + ],
93 ), 101 ),
94 - Positioned(  
95 - top: 0,  
96 - right: 0,  
97 - child: !(table.selected??false)?Container():Image.asset("assets/icon_selected.png",width: ScreenUtil().setWidth(27),height: ScreenUtil().setWidth(27),)  
98 - )  
99 - ],  
100 - ), 102 + ),
  103 + Positioned(
  104 + top: 3,
  105 + right: 5,
  106 + child: !(table.selected??false)?Container():Image.asset("assets/icon_selected.png",width: ScreenUtil().setWidth(40),height: ScreenUtil().setWidth(40),)
  107 + )
  108 + ],
101 ), 109 ),
102 ); 110 );
103 } 111 }