xt / Flutter-ReserveApp · Commits

Go to a project

Commit a3d56b25fefeac9f271c89715958e09c8c537e62

Authored by gaiyaguang
2 parents 44453348 19372b69
build: skipped

android release 关闭混淆

Inline Side-by-side
Showing 6 changed files with 79 additions and 37 deletions
1 -081ce440b595dea4e6dbd6e5e186ed70  
  1 +132d87951dd4c814f02e49539118d6af
@@ -140,4 +140,4 @@ SPEC CHECKSUMS: @@ -140,4 +140,4 @@ SPEC CHECKSUMS:
140 140
141 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c 141 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
142 142
143 -COCOAPODS: 1.9.1 143 +COCOAPODS: 1.9.3
@@ -411,11 +411,16 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -411,11 +411,16 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
411 widget.detailEntity.ddate_solt, 411 widget.detailEntity.ddate_solt,
412 canChoose: true, 412 canChoose: true,
413 object: {'object': _notebookDetailChangeModel.tableList}); 413 object: {'object': _notebookDetailChangeModel.tableList});
414 - if (temp['tid'] != null) {  
415 - setReserveStatus("5", tid: temp['tid']);  
416 - } 414 + // if (temp['tid'] != null) {
  415 + // setReserveStatus("5", tid: temp['tid']);
  416 + // }
417 _notebookDetailChangeModel.tableList = temp['object']; 417 _notebookDetailChangeModel.tableList = temp['object'];
418 - _notebookDetailChangeModel.notifyListeners(); 418 + for (t.TableList item
  419 + in _notebookDetailChangeModel.tableList) {
  420 + item.selected = true;
  421 + }
  422 + setState(() {});
  423 + // _notebookDetailChangeModel.notifyListeners();
419 }, 424 },
420 child: Row( 425 child: Row(
421 children: [ 426 children: [
@@ -51,7 +51,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -51,7 +51,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
51 Manager manager = Manager(); 51 Manager manager = Manager();
52 List cancelReasonList = []; 52 List cancelReasonList = [];
53 bool isShowTF = false; 53 bool isShowTF = false;
54 - int paddingBottom = 174; 54 + int paddingBottom;
55 int paddingTop = 138; 55 int paddingTop = 138;
56 FocusNode _cancelNode = FocusNode(); 56 FocusNode _cancelNode = FocusNode();
57 TextEditingController _cancelController = TextEditingController(); 57 TextEditingController _cancelController = TextEditingController();
@@ -100,7 +100,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -100,7 +100,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
100 /// 初始化取消原因数据 100 /// 初始化取消原因数据
101 _initCancel() { 101 _initCancel() {
102 isShowTF = false; 102 isShowTF = false;
103 - paddingBottom = 174; 103 + paddingBottom = ScreenUtil.screenHeightDp.ceil() - 138 - 340;
104 cancelReasonList = [ 104 cancelReasonList = [
105 {'title': '顾客取消', 'select': false}, 105 {'title': '顾客取消', 'select': false},
106 {'title': '顾客行程有变', 'select': false}, 106 {'title': '顾客行程有变', 'select': false},
@@ -197,27 +197,35 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -197,27 +197,35 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
197 children: [ 197 children: [
198 Stack( 198 Stack(
199 children: [ 199 children: [
200 - Center(  
201 - child: Text(  
202 - '请选择取消原因',  
203 - style: TextStyle(  
204 - fontSize: ScreenUtil().setSp(34),  
205 - fontWeight: FontWeight.bold,  
206 - decoration: TextDecoration.none,  
207 - color: MyColours.color_353535), 200 + Container(
  201 + height: ScreenUtil().setWidth(48),
  202 + child: Center(
  203 + child: Text(
  204 + '请选择取消原因',
  205 + style: TextStyle(
  206 + fontSize: ScreenUtil().setSp(34),
  207 + fontWeight: FontWeight.bold,
  208 + decoration: TextDecoration.none,
  209 + color: MyColours.color_353535),
  210 + ),
208 ), 211 ),
209 ), 212 ),
210 Positioned( 213 Positioned(
211 top: ScreenUtil().setWidth(8), 214 top: ScreenUtil().setWidth(8),
212 right: ScreenUtil().setWidth(0), 215 right: ScreenUtil().setWidth(0),
213 child: GestureDetector( 216 child: GestureDetector(
214 - onTap: () {  
215 - _initCancel();  
216 - Navigator.of(context).pop();  
217 - },  
218 - child: Image.asset('assets/close.png',  
219 - width: ScreenUtil().setWidth(32)),  
220 - )) 217 + onTap: () {
  218 + _initCancel();
  219 + Navigator.of(context).pop();
  220 + },
  221 + child: Container(
  222 + padding: EdgeInsets.only(left: 20),
  223 + child: Image.asset(
  224 + 'assets/close.png',
  225 + width: ScreenUtil().setWidth(32),
  226 + height: ScreenUtil().setWidth(32),
  227 + ),
  228 + )))
221 ], 229 ],
222 ), 230 ),
223 VEmptyView(60), 231 VEmptyView(60),
@@ -228,12 +236,20 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -228,12 +236,20 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
228 for (var item in cancelReasonList) { 236 for (var item in cancelReasonList) {
229 item['select'] = false; 237 item['select'] = false;
230 isShowTF = false; 238 isShowTF = false;
231 - paddingBottom = 174; 239 + paddingBottom =
  240 + ScreenUtil.screenHeightDp.ceil() -
  241 + 138 -
  242 + 340;
232 if (item['title'] == value['title']) { 243 if (item['title'] == value['title']) {
233 item['select'] = true; 244 item['select'] = true;
234 if (item['title'] == '其他原因') { 245 if (item['title'] == '其他原因') {
235 isShowTF = true; 246 isShowTF = true;
236 - paddingBottom = 130; 247 + // paddingBottom = 130;
  248 + paddingBottom =
  249 + ScreenUtil.screenHeightDp.ceil() -
  250 + 138 -
  251 + 340 -
  252 + 46;
237 } 253 }
238 } 254 }
239 } 255 }
@@ -321,6 +337,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -321,6 +337,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
321 } 337 }
322 338
323 Navigator.of(context).pop(); 339 Navigator.of(context).pop();
  340 + Loading.showLoading(context);
324 setReserveStatus('4', desc: desc); 341 setReserveStatus('4', desc: desc);
325 }, 342 },
326 text: '确认', 343 text: '确认',
@@ -262,14 +262,32 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -262,14 +262,32 @@ class SelectTablePageState extends State<SelectTablePage> {
262 fontSize: 34, 262 fontSize: 34,
263 state: 1, 263 state: 1,
264 onPress: () { 264 onPress: () {
265 - if (selectTables.length > 0) {  
266 - String tid = "";  
267 - for (t.Table table in selectTables) {  
268 - tid += table.id + ","; 265 + if (widget.canChoose) {
  266 + if (widget.tableList.length > 0) {
  267 + String tid = "";
  268 + for (TableList table in widget.tableList) {
  269 + tid += table.id + ",";
  270 + }
  271 + if (widget.tableList.length > 0) {
  272 + tid = tid.substring(0, tid.length - 1);
  273 + }
  274 +
  275 + Map temp = {'object': widget.tableList, 'tid': tid};
  276 + Navigator.of(context).pop(temp);
  277 + }
  278 + } else {
  279 + if (selectTables.length > 0) {
  280 + String tid = "";
  281 + for (t.Table table in selectTables) {
  282 + tid += table.id + ",";
  283 + }
  284 + if (selectTables.length > 0) {
  285 + tid = tid.substring(0, tid.length - 1);
  286 + }
  287 +
  288 + Map temp = {'object': widget.tableList, 'tid': tid};
  289 + Navigator.of(context).pop(temp);
269 } 290 }
270 - tid = tid.substring(0, tid.length - 1);  
271 - Map temp = {'object': widget.tableList, 'tid': tid};  
272 - Navigator.of(context).pop(temp);  
273 } 291 }
274 }, 292 },
275 )) 293 ))
@@ -279,7 +297,8 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -279,7 +297,8 @@ class SelectTablePageState extends State<SelectTablePage> {
279 } 297 }
280 298
281 tableToTableList(t.Table table) { 299 tableToTableList(t.Table table) {
282 - TableList _tableList; 300 + TableList _tableList = TableList(
  301 + '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
283 _tableList.id = table.id; 302 _tableList.id = table.id;
284 _tableList.rid = table.rid; 303 _tableList.rid = table.rid;
285 _tableList.tid = table.tid; 304 _tableList.tid = table.tid;
@@ -295,7 +314,8 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -295,7 +314,8 @@ class SelectTablePageState extends State<SelectTablePage> {
295 _tableList.spell = table.spell; 314 _tableList.spell = table.spell;
296 _tableList.cdate = null; 315 _tableList.cdate = null;
297 _tableList.rname = table.rname; 316 _tableList.rname = table.rname;
298 - _tableList.regionName = null; 317 + _tableList.regionName = table.rname;
  318 + _tableList.selected = true;
299 return _tableList; 319 return _tableList;
300 } 320 }
301 } 321 }
@@ -433,9 +433,9 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -433,9 +433,9 @@ class NotebookDetailChangeModel with ChangeNotifier {
433 int ddate = DateUtil.getDateMsByTimeStr(timeStr); 433 int ddate = DateUtil.getDateMsByTimeStr(timeStr);
434 String tableSelectInfo = ''; 434 String tableSelectInfo = '';
435 for (TableList item in tableList) { 435 for (TableList item in tableList) {
436 - if (item.selected) {  
437 - tableSelectInfo += ',${item.id}';  
438 - } 436 + // if (item.selected) {
  437 + tableSelectInfo += ',${item.id}';
  438 + // }
439 } 439 }
440 print(tableSelectInfo); 440 print(tableSelectInfo);
441 if (tableSelectInfo.startsWith(',')) { 441 if (tableSelectInfo.startsWith(',')) {