Commit 3136d350af412e1de7d30aa99ca3a1aed7fb7c69
Merge branch 'v1.1+' of http://123.56.79.57/xt/Flutter-ReserveApp into v1.1+
Showing
1 changed file
with
130 additions
and
128 deletions
| @@ -182,142 +182,144 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { | @@ -182,142 +182,144 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { | ||
| 182 | color: MyColours.color_ffffff, | 182 | color: MyColours.color_ffffff, |
| 183 | child: Column( | 183 | child: Column( |
| 184 | children: <Widget>[ | 184 | children: <Widget>[ |
| 185 | - SingleChildScrollView( | ||
| 186 | - child: Container( | ||
| 187 | - color: MyColours.color_ffffff, | ||
| 188 | - padding: EdgeInsets.symmetric( | ||
| 189 | - horizontal: ScreenUtil().setWidth(43)), | ||
| 190 | - child: Column( | ||
| 191 | - children: <Widget>[ | ||
| 192 | - RowMultiText( | ||
| 193 | - "用餐时段", detailEntity.ddateMd), | ||
| 194 | - Stack( | ||
| 195 | - alignment: Alignment.center, | ||
| 196 | - children: <Widget>[ | ||
| 197 | - Column( | ||
| 198 | - children: <Widget>[ | ||
| 199 | - RowMultiText("用餐时间", | ||
| 200 | - detailEntity.ddateHm), | ||
| 201 | - Offstage( | ||
| 202 | - offstage: | ||
| 203 | - detailEntity.type == "0" | ||
| 204 | - ? false | ||
| 205 | - : true, | ||
| 206 | - child: RowMultiText("用餐人数", | ||
| 207 | - detailEntity.pnum), | ||
| 208 | - ) | ||
| 209 | - ], | ||
| 210 | - ), | ||
| 211 | - Image.asset( | ||
| 212 | - detailEntity.statuImgAssets, | ||
| 213 | - width: ScreenUtil().setWidth(100), | ||
| 214 | - height: ScreenUtil().setWidth(30), | ||
| 215 | - ) | ||
| 216 | - ], | ||
| 217 | - ), | ||
| 218 | - RowMultiText( | ||
| 219 | - "包间需求", | ||
| 220 | - (detailEntity.demands.length | ||
| 221 | - .toString() + | ||
| 222 | - "个") ?? | ||
| 223 | - ""), | ||
| 224 | - Align( | ||
| 225 | - alignment: Alignment.centerRight, | ||
| 226 | - child: Offstage( | ||
| 227 | - offstage: | ||
| 228 | - detailEntity.demands.length > | ||
| 229 | - 0 | ||
| 230 | - ? false | ||
| 231 | - : true, | ||
| 232 | - child: Container( | ||
| 233 | - height: | ||
| 234 | - ScreenUtil().setHeight(210), | ||
| 235 | - child: ListView.builder( | ||
| 236 | - itemBuilder: | ||
| 237 | - (BuildContext contxt, | ||
| 238 | - int index) { | ||
| 239 | - return NeedItem(detailEntity | ||
| 240 | - .demands[index]); | ||
| 241 | - }, | ||
| 242 | - itemCount: detailEntity | ||
| 243 | - .demands.length, | ||
| 244 | - shrinkWrap: true, | ||
| 245 | - scrollDirection: | ||
| 246 | - Axis.horizontal, | ||
| 247 | - ), | ||
| 248 | - ), | ||
| 249 | - )), | ||
| 250 | - RowMultiText( | ||
| 251 | - "客户姓名", detailEntity.rnameStr), | ||
| 252 | - RowMultiText( | ||
| 253 | - "客户电话", detailEntity.phone), | ||
| 254 | - RowMultiText( | ||
| 255 | - "备注信息", detailEntity.cusdem ?? ""), | ||
| 256 | - MyDivider(double.infinity, | ||
| 257 | - ScreenUtil().setHeight(1)), | ||
| 258 | - Container( | ||
| 259 | - color: MyColours.color_ffffff, | ||
| 260 | - width: double.infinity, | ||
| 261 | - height: ScreenUtil().setHeight(80), | ||
| 262 | - alignment: Alignment.center, | ||
| 263 | - child: Stack( | 185 | + Expanded( |
| 186 | + child: SingleChildScrollView( | ||
| 187 | + child: Container( | ||
| 188 | + color: MyColours.color_ffffff, | ||
| 189 | + padding: EdgeInsets.symmetric( | ||
| 190 | + horizontal: ScreenUtil().setWidth(43)), | ||
| 191 | + child: Column( | ||
| 192 | + children: <Widget>[ | ||
| 193 | + RowMultiText( | ||
| 194 | + "用餐时段", detailEntity.ddateMd), | ||
| 195 | + Stack( | ||
| 264 | alignment: Alignment.center, | 196 | alignment: Alignment.center, |
| 265 | children: <Widget>[ | 197 | children: <Widget>[ |
| 266 | - Positioned( | ||
| 267 | - left: 0, | ||
| 268 | - child: Text( | ||
| 269 | - "客户经理", | ||
| 270 | - style: TextStyle( | ||
| 271 | - color: MyColours | ||
| 272 | - .color_828282, | ||
| 273 | - fontSize: ScreenUtil() | ||
| 274 | - .setSp(30)), | ||
| 275 | - ), | 198 | + Column( |
| 199 | + children: <Widget>[ | ||
| 200 | + RowMultiText("用餐时间", | ||
| 201 | + detailEntity.ddateHm), | ||
| 202 | + Offstage( | ||
| 203 | + offstage: | ||
| 204 | + detailEntity.type == "0" | ||
| 205 | + ? false | ||
| 206 | + : true, | ||
| 207 | + child: RowMultiText("用餐人数", | ||
| 208 | + detailEntity.pnum), | ||
| 209 | + ) | ||
| 210 | + ], | ||
| 276 | ), | 211 | ), |
| 277 | - Positioned( | ||
| 278 | - right: 0, | ||
| 279 | - child: GestureDetector( | ||
| 280 | - onTap: () async { | ||
| 281 | - List<String> list = []; | ||
| 282 | - for (Manager manager | ||
| 283 | - in managers) { | ||
| 284 | - list.add( | ||
| 285 | - manager.roleUserName); | ||
| 286 | - } | ||
| 287 | - DialogUtil | ||
| 288 | - .showSelectCusmanDialog( | ||
| 289 | - context, list,(value){ | ||
| 290 | - if(value!=null){ | ||
| 291 | - setState(() { | ||
| 292 | - cusmanText = managers[ | ||
| 293 | - value.first] | ||
| 294 | - .userName; | ||
| 295 | - }); | ||
| 296 | - _setCurrManager(); | ||
| 297 | - } | ||
| 298 | - }) | ||
| 299 | - .then((value) { | ||
| 300 | - | ||
| 301 | - }); | ||
| 302 | - }, | 212 | + Image.asset( |
| 213 | + detailEntity.statuImgAssets, | ||
| 214 | + width: ScreenUtil().setWidth(100), | ||
| 215 | + height: ScreenUtil().setWidth(30), | ||
| 216 | + ) | ||
| 217 | + ], | ||
| 218 | + ), | ||
| 219 | + RowMultiText( | ||
| 220 | + "包间需求", | ||
| 221 | + (detailEntity.demands.length | ||
| 222 | + .toString() + | ||
| 223 | + "个") ?? | ||
| 224 | + ""), | ||
| 225 | + Align( | ||
| 226 | + alignment: Alignment.centerRight, | ||
| 227 | + child: Offstage( | ||
| 228 | + offstage: | ||
| 229 | + detailEntity.demands.length > | ||
| 230 | + 0 | ||
| 231 | + ? false | ||
| 232 | + : true, | ||
| 233 | + child: Container( | ||
| 234 | + height: | ||
| 235 | + ScreenUtil().setHeight(210), | ||
| 236 | + child: ListView.builder( | ||
| 237 | + itemBuilder: | ||
| 238 | + (BuildContext contxt, | ||
| 239 | + int index) { | ||
| 240 | + return NeedItem(detailEntity | ||
| 241 | + .demands[index]); | ||
| 242 | + }, | ||
| 243 | + itemCount: detailEntity | ||
| 244 | + .demands.length, | ||
| 245 | + shrinkWrap: true, | ||
| 246 | + scrollDirection: | ||
| 247 | + Axis.horizontal, | ||
| 248 | + ), | ||
| 249 | + ), | ||
| 250 | + )), | ||
| 251 | + RowMultiText( | ||
| 252 | + "客户姓名", detailEntity.rnameStr), | ||
| 253 | + RowMultiText( | ||
| 254 | + "客户电话", detailEntity.phone), | ||
| 255 | + RowMultiText( | ||
| 256 | + "备注信息", detailEntity.cusdem ?? ""), | ||
| 257 | + MyDivider(double.infinity, | ||
| 258 | + ScreenUtil().setHeight(1)), | ||
| 259 | + Container( | ||
| 260 | + color: MyColours.color_ffffff, | ||
| 261 | + width: double.infinity, | ||
| 262 | + height: ScreenUtil().setHeight(80), | ||
| 263 | + alignment: Alignment.center, | ||
| 264 | + child: Stack( | ||
| 265 | + alignment: Alignment.center, | ||
| 266 | + children: <Widget>[ | ||
| 267 | + Positioned( | ||
| 268 | + left: 0, | ||
| 303 | child: Text( | 269 | child: Text( |
| 304 | - cusmanText, | 270 | + "客户经理", |
| 305 | style: TextStyle( | 271 | style: TextStyle( |
| 306 | - color: MyColours | ||
| 307 | - .color_353535, | ||
| 308 | - fontSize: ScreenUtil() | ||
| 309 | - .setSp(30), | ||
| 310 | - decoration: TextDecoration | ||
| 311 | - .underline, | ||
| 312 | - ), | 272 | + color: MyColours |
| 273 | + .color_828282, | ||
| 274 | + fontSize: ScreenUtil() | ||
| 275 | + .setSp(30)), | ||
| 313 | ), | 276 | ), |
| 314 | ), | 277 | ), |
| 315 | - ) | ||
| 316 | - ], | 278 | + Positioned( |
| 279 | + right: 0, | ||
| 280 | + child: GestureDetector( | ||
| 281 | + onTap: () async { | ||
| 282 | + List<String> list = []; | ||
| 283 | + for (Manager manager | ||
| 284 | + in managers) { | ||
| 285 | + list.add( | ||
| 286 | + manager.roleUserName); | ||
| 287 | + } | ||
| 288 | + DialogUtil | ||
| 289 | + .showSelectCusmanDialog( | ||
| 290 | + context, list,(value){ | ||
| 291 | + if(value!=null){ | ||
| 292 | + setState(() { | ||
| 293 | + cusmanText = managers[ | ||
| 294 | + value.first] | ||
| 295 | + .userName; | ||
| 296 | + }); | ||
| 297 | + _setCurrManager(); | ||
| 298 | + } | ||
| 299 | + }) | ||
| 300 | + .then((value) { | ||
| 301 | + | ||
| 302 | + }); | ||
| 303 | + }, | ||
| 304 | + child: Text( | ||
| 305 | + cusmanText, | ||
| 306 | + style: TextStyle( | ||
| 307 | + color: MyColours | ||
| 308 | + .color_353535, | ||
| 309 | + fontSize: ScreenUtil() | ||
| 310 | + .setSp(30), | ||
| 311 | + decoration: TextDecoration | ||
| 312 | + .underline, | ||
| 313 | + ), | ||
| 314 | + ), | ||
| 315 | + ), | ||
| 316 | + ) | ||
| 317 | + ], | ||
| 318 | + ), | ||
| 317 | ), | 319 | ), |
| 318 | - ), | ||
| 319 | - ], | ||
| 320 | - )), | 320 | + ], |
| 321 | + )), | ||
| 322 | + ), | ||
| 321 | ), | 323 | ), |
| 322 | Container( | 324 | Container( |
| 323 | margin: EdgeInsets.only( | 325 | margin: EdgeInsets.only( |
-
Please register or login to post a comment