xt / Flutter-ReserveApp · Commits

Go to a project

Commit 072356f736fdfd2ea2e8495f04885c3a4cea61d1

Authored by wdn127929
1 parent d4b27b4d
build: skipped

新客UI bug

Inline Side-by-side
Showing 2 changed files with 80 additions and 52 deletions
@@ -150,7 +150,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -150,7 +150,7 @@ class TableManagerPageState extends State<TableManagerPage> {
150 1, 150 1,
151 gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( 151 gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
152 crossAxisCount: 4, 152 crossAxisCount: 4,
153 - childAspectRatio: 1, 153 + childAspectRatio: 0.8,
154 mainAxisSpacing: ScreenUtil().setWidth(30), 154 mainAxisSpacing: ScreenUtil().setWidth(30),
155 crossAxisSpacing: ScreenUtil().setWidth(12), 155 crossAxisSpacing: ScreenUtil().setWidth(12),
156 ), 156 ),
@@ -250,7 +250,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -250,7 +250,7 @@ class TableManagerPageState extends State<TableManagerPage> {
250 shouldRebuild: (pre, next) => true, 250 shouldRebuild: (pre, next) => true,
251 selector: (context, model) => data[index], 251 selector: (context, model) => data[index],
252 builder: (context, table, _) { 252 builder: (context, table, _) {
253 - return FTableItem(table, canSelected: true, onSelected: (table) { 253 + return FTableItem(table,canSelected: true, onSelected: (table) {
254 if (table.signStr == '已预订') { 254 if (table.signStr == '已预订') {
255 //进入订座详情页面 255 //进入订座详情页面
256 NavigatorUtil.goNotebookDetailPage( 256 NavigatorUtil.goNotebookDetailPage(
@@ -134,12 +134,14 @@ class FTableItemState extends State<FTableItem> { @@ -134,12 +134,14 @@ class FTableItemState extends State<FTableItem> {
134 // alignment: Alignment.center, 134 // alignment: Alignment.center,
135 children: <Widget>[ 135 children: <Widget>[
136 Container( 136 Container(
137 - alignment: Alignment.center, 137 + // alignment: Alignment.center,
  138 + // color: Colors.blueAccent,
  139 + // height: ScreenUtil().setWidth(widget.height),
138 // padding: EdgeInsets.symmetric( 140 // padding: EdgeInsets.symmetric(
139 // horizontal: ScreenUtil().setWidth(20)), 141 // horizontal: ScreenUtil().setWidth(20)),
140 // margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)), 142 // margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)),
141 child: Column( 143 child: Column(
142 - mainAxisSize: MainAxisSize.min, 144 + // mainAxisSize: MainAxisSize.min,
143 crossAxisAlignment: CrossAxisAlignment.center, 145 crossAxisAlignment: CrossAxisAlignment.center,
144 mainAxisAlignment: MainAxisAlignment.center, 146 mainAxisAlignment: MainAxisAlignment.center,
145 children: <Widget>[ 147 children: <Widget>[
@@ -147,6 +149,7 @@ class FTableItemState extends State<FTableItem> { @@ -147,6 +149,7 @@ class FTableItemState extends State<FTableItem> {
147 ? SizedBox() 149 ? SizedBox()
148 : VEmptyView(10), 150 : VEmptyView(10),
149 Container( 151 Container(
  152 + // color: Colors.red,
150 alignment: Alignment.center, 153 alignment: Alignment.center,
151 child: Text( 154 child: Text(
152 table.name, 155 table.name,
@@ -183,32 +186,53 @@ class FTableItemState extends State<FTableItem> { @@ -183,32 +186,53 @@ class FTableItemState extends State<FTableItem> {
183 table.pnum != '0')) 186 table.pnum != '0'))
184 ? VEmptyView(8) 187 ? VEmptyView(8)
185 : SizedBox(), 188 : SizedBox(),
186 - Text(  
187 - signStr == '已预订' && !isSelf  
188 - ? (table.reserver == null || table.reserver.isEmpty)  
189 - ? (table.pnum != '' &&  
190 - table.pnum != null &&  
191 - table.pnum != '0')  
192 - ? '(${table.pnum}人)'  
193 - : ''  
194 - : '${table.reserver}' +  
195 - (table.pnum != '' &&  
196 - table.pnum != null &&  
197 - table.pnum != '0'  
198 - ? '(${table.pnum}人)'  
199 - : '')  
200 - : table.tableNum,  
201 - style: TextStyle(  
202 - color: signStr == '已预订' && !isSelf  
203 - ? MyColours.color_353535  
204 - : (widget.canSelected && table.selected)  
205 - ? MyColours.color_ffffff  
206 - : MyColours.color_353535,  
207 - fontSize: ScreenUtil().setSp(22),  
208 - decoration: TextDecoration.none,  
209 - fontWeight: FontWeight.normal),  
210 - overflow: TextOverflow.ellipsis,  
211 - ), 189 + signStr == '已预订' && !isSelf
  190 + ? SizedBox()
  191 + : Text(
  192 + table.tableNum,
  193 + style: TextStyle(
  194 + color: signStr == '已预订' && !isSelf
  195 + ? MyColours.color_353535
  196 + : (widget.canSelected && table.selected)
  197 + ? MyColours.color_ffffff
  198 + : MyColours.color_353535,
  199 + fontSize: ScreenUtil().setSp(22),
  200 + decoration: TextDecoration.none,
  201 + fontWeight: FontWeight.normal),
  202 + overflow: TextOverflow.ellipsis,
  203 + ),
  204 + signStr == '已预订' &&
  205 + !isSelf &&
  206 + ((table.reserver != null &&
  207 + !table.reserver.isEmpty) ||
  208 + (table.pnum != '' &&
  209 + table.pnum != null &&
  210 + table.pnum != '0'))
  211 + ? Text(
  212 + (table.reserver == null || table.reserver.isEmpty)
  213 + ? (table.pnum != '' &&
  214 + table.pnum != null &&
  215 + table.pnum != '0')
  216 + ? '(${table.pnum}人)'
  217 + : ''
  218 + : '${table.reserver}' +
  219 + (table.pnum != '' &&
  220 + table.pnum != null &&
  221 + table.pnum != '0'
  222 + ? '(${table.pnum}人)'
  223 + : ''),
  224 + style: TextStyle(
  225 + color: signStr == '已预订' && !isSelf
  226 + ? MyColours.color_353535
  227 + : (widget.canSelected && table.selected)
  228 + ? MyColours.color_ffffff
  229 + : MyColours.color_353535,
  230 + fontSize: ScreenUtil().setSp(22),
  231 + decoration: TextDecoration.none,
  232 + fontWeight: FontWeight.normal),
  233 + overflow: TextOverflow.ellipsis,
  234 + )
  235 + : SizedBox(),
212 236
213 widget.need && signStr == '已预订' && !isSelf 237 widget.need && signStr == '已预订' && !isSelf
214 ? Padding( 238 ? Padding(
@@ -229,27 +253,6 @@ class FTableItemState extends State<FTableItem> { @@ -229,27 +253,6 @@ class FTableItemState extends State<FTableItem> {
229 ), 253 ),
230 ) 254 )
231 : SizedBox(), 255 : SizedBox(),
232 -  
233 - signStr == '已预订' && !isSelf  
234 - ? Container(  
235 - // width: ScreenUtil().setWidth(160),  
236 - height: ScreenUtil().setWidth(34),  
237 - alignment: Alignment.centerLeft,  
238 - padding: EdgeInsets.symmetric(  
239 - horizontal: ScreenUtil().setWidth(10)),  
240 - decoration: BoxDecoration(  
241 - color: MyColours.color_d7d7d7,  
242 - ),  
243 - child: Text(  
244 - '新客',  
245 - style: TextStyle(  
246 - color: MyColours.color_353535,  
247 - fontSize: ScreenUtil().setSp(24),  
248 - decoration: TextDecoration.none,  
249 - fontWeight: FontWeight.normal),  
250 - ),  
251 - )  
252 - : SizedBox()  
253 // VEmptyView(6), 256 // VEmptyView(6),
254 // Text( 257 // Text(
255 // table.lowStr, 258 // table.lowStr,
@@ -263,6 +266,7 @@ class FTableItemState extends State<FTableItem> { @@ -263,6 +266,7 @@ class FTableItemState extends State<FTableItem> {
263 ], 266 ],
264 ), 267 ),
265 ), 268 ),
  269 +
266 signStr == '已预订' && !isSelf 270 signStr == '已预订' && !isSelf
267 ? SizedBox() 271 ? SizedBox()
268 : Positioned( 272 : Positioned(
@@ -358,7 +362,31 @@ class FTableItemState extends State<FTableItem> { @@ -358,7 +362,31 @@ class FTableItemState extends State<FTableItem> {
358 width: ScreenUtil().setWidth(22), 362 width: ScreenUtil().setWidth(22),
359 height: ScreenUtil().setWidth(22), 363 height: ScreenUtil().setWidth(22),
360 ) 364 )
361 - : Container()) 365 + : Container()),
  366 + Positioned(
  367 + bottom: ScreenUtil().setWidth(16),
  368 + right: 0,
  369 + left: 0,
  370 + child: signStr == '已预订' && !isSelf
  371 + ? Container(
  372 + // width: ScreenUtil().setWidth(160),
  373 + height: ScreenUtil().setWidth(34),
  374 + alignment: Alignment.centerLeft,
  375 + padding: EdgeInsets.symmetric(
  376 + horizontal: ScreenUtil().setWidth(10)),
  377 + decoration: BoxDecoration(
  378 + color: MyColours.color_d7d7d7,
  379 + ),
  380 + child: Text(
  381 + '新客',
  382 + style: TextStyle(
  383 + color: MyColours.color_353535,
  384 + fontSize: ScreenUtil().setSp(24),
  385 + decoration: TextDecoration.none,
  386 + fontWeight: FontWeight.normal),
  387 + ),
  388 + )
  389 + : SizedBox())
362 ], 390 ],
363 ), 391 ),
364 ); 392 );