xt / Flutter-ReserveApp · Commits

Go to a project

Commit a70773f86f3ebda7eee81e4b082ef38a2c399c84

Authored by wdn127929
1 parent e292a7c1
build: skipped

招牌菜调整6张图

Inline Side-by-side
Showing 3 changed files with 113 additions and 4 deletions
@@ -98,6 +98,37 @@ class _DishShowPageState extends State<DishShowPage> { @@ -98,6 +98,37 @@ class _DishShowPageState extends State<DishShowPage> {
98 ? 1 98 ? 1
99 : null; 99 : null;
100 100
  101 + _uploadImageProvider.storeImage4.qiniuUrl =
  102 + marketingCenterProvider.markDataModel.signboard.images.length > 3
  103 + ? marketingCenterProvider.markDataModel.signboard.images[3]
  104 + : null;
  105 +
  106 + _uploadImageProvider.storeImage4.process =
  107 + _uploadImageProvider.storeImage4.qiniuUrl != null &&
  108 + _uploadImageProvider.storeImage4.qiniuUrl != ''
  109 + ? 1
  110 + : null;
  111 + _uploadImageProvider.storeImage5.qiniuUrl =
  112 + marketingCenterProvider.markDataModel.signboard.images.length > 4
  113 + ? marketingCenterProvider.markDataModel.signboard.images[4]
  114 + : null;
  115 +
  116 + _uploadImageProvider.storeImage5.process =
  117 + _uploadImageProvider.storeImage5.qiniuUrl != null &&
  118 + _uploadImageProvider.storeImage5.qiniuUrl != ''
  119 + ? 1
  120 + : null;
  121 + _uploadImageProvider.storeImage6.qiniuUrl =
  122 + marketingCenterProvider.markDataModel.signboard.images.length > 5
  123 + ? marketingCenterProvider.markDataModel.signboard.images[5]
  124 + : null;
  125 +
  126 + _uploadImageProvider.storeImage6.process =
  127 + _uploadImageProvider.storeImage6.qiniuUrl != null &&
  128 + _uploadImageProvider.storeImage6.qiniuUrl != ''
  129 + ? 1
  130 + : null;
  131 +
101 setState(() {}); 132 setState(() {});
102 } 133 }
103 } 134 }
@@ -281,6 +312,45 @@ class _DishShowPageState extends State<DishShowPage> { @@ -281,6 +312,45 @@ class _DishShowPageState extends State<DishShowPage> {
281 setState(() {}); 312 setState(() {});
282 }), 313 }),
283 VEmptyView(18), 314 VEmptyView(18),
  315 + ImgPickerInvitationWidget(
  316 + scrollController: controller,
  317 + model: _uploadImageProvider,
  318 + index: 8,
  319 + imageModel: _uploadImageProvider.storeImage4,
  320 + deleteCallback: () {
  321 + _uploadImageProvider.storeImage4.qiniuUrl = null;
  322 + _uploadImageProvider.storeImage4.file = null;
  323 + _uploadImageProvider.storeImage4.isUpload = false;
  324 + _uploadImageProvider.storeImage4.process = 0.01;
  325 + setState(() {});
  326 + }),
  327 + VEmptyView(18),
  328 + ImgPickerInvitationWidget(
  329 + scrollController: controller,
  330 + model: _uploadImageProvider,
  331 + index: 10,
  332 + imageModel: _uploadImageProvider.storeImage5,
  333 + deleteCallback: () {
  334 + _uploadImageProvider.storeImage5.qiniuUrl = null;
  335 + _uploadImageProvider.storeImage5.file = null;
  336 + _uploadImageProvider.storeImage5.isUpload = false;
  337 + _uploadImageProvider.storeImage5.process = 0.01;
  338 + setState(() {});
  339 + }),
  340 + VEmptyView(18),
  341 + ImgPickerInvitationWidget(
  342 + scrollController: controller,
  343 + model: _uploadImageProvider,
  344 + index: 11,
  345 + imageModel: _uploadImageProvider.storeImage6,
  346 + deleteCallback: () {
  347 + _uploadImageProvider.storeImage6.qiniuUrl = null;
  348 + _uploadImageProvider.storeImage6.file = null;
  349 + _uploadImageProvider.storeImage6.isUpload = false;
  350 + _uploadImageProvider.storeImage6.process = 0.01;
  351 + setState(() {});
  352 + }),
  353 + VEmptyView(18),
284 ], 354 ],
285 ) 355 )
286 ]))), 356 ]))),
@@ -313,6 +383,18 @@ class _DishShowPageState extends State<DishShowPage> { @@ -313,6 +383,18 @@ class _DishShowPageState extends State<DishShowPage> {
313 _uploadImageProvider.storeImage3.qiniuUrl != '') { 383 _uploadImageProvider.storeImage3.qiniuUrl != '') {
314 images.add(_uploadImageProvider.storeImage3.qiniuUrl); 384 images.add(_uploadImageProvider.storeImage3.qiniuUrl);
315 } 385 }
  386 + if (_uploadImageProvider.storeImage4.qiniuUrl != null &&
  387 + _uploadImageProvider.storeImage4.qiniuUrl != '') {
  388 + images.add(_uploadImageProvider.storeImage4.qiniuUrl);
  389 + }
  390 + if (_uploadImageProvider.storeImage5.qiniuUrl != null &&
  391 + _uploadImageProvider.storeImage5.qiniuUrl != '') {
  392 + images.add(_uploadImageProvider.storeImage5.qiniuUrl);
  393 + }
  394 + if (_uploadImageProvider.storeImage6.qiniuUrl != null &&
  395 + _uploadImageProvider.storeImage6.qiniuUrl != '') {
  396 + images.add(_uploadImageProvider.storeImage6.qiniuUrl);
  397 + }
316 398
317 if (addDish && images.length == 0) { 399 if (addDish && images.length == 0) {
318 Utils.showToast('请至少上传一张图片!'); 400 Utils.showToast('请至少上传一张图片!');
@@ -39,7 +39,8 @@ class UploadImageProvider extends ChangeNotifier { @@ -39,7 +39,8 @@ class UploadImageProvider extends ChangeNotifier {
39 UploadImgModel storeImage2 = UploadImgModel(); //预订安排介绍 39 UploadImgModel storeImage2 = UploadImgModel(); //预订安排介绍
40 UploadImgModel storeImage3 = UploadImgModel(); //预订安排介绍 40 UploadImgModel storeImage3 = UploadImgModel(); //预订安排介绍
41 UploadImgModel storeImage4 = UploadImgModel(); //预订安排介绍 41 UploadImgModel storeImage4 = UploadImgModel(); //预订安排介绍
42 - 42 + UploadImgModel storeImage5 = UploadImgModel(); //预订安排介绍
  43 + UploadImgModel storeImage6 = UploadImgModel(); //预订安排介绍
43 // List<UploadImgModel> wineImageList = []; //新建存酒 44 // List<UploadImgModel> wineImageList = []; //新建存酒
44 45
45 int countUpload = 0; 46 int countUpload = 0;
@@ -352,7 +352,13 @@ class UploadImageUtil { @@ -352,7 +352,13 @@ class UploadImageUtil {
352 } else if (index == 9) { 352 } else if (index == 9) {
353 //9 预订安排logo 353 //9 预订安排logo
354 uploadImageProvider.logo.process = percent; 354 uploadImageProvider.logo.process = percent;
355 - } else { 355 + }else if (index == 10) {
  356 + //4 预订安排首图
  357 + uploadImageProvider.storeImage5.process = percent;
  358 + } else if (index == 11) {
  359 + //4 预订安排首图
  360 + uploadImageProvider.storeImage6.process = percent;
  361 + } else {
356 //1 二维码 362 //1 二维码
357 uploadImageProvider.erweima.process = percent; 363 uploadImageProvider.erweima.process = percent;
358 } 364 }
@@ -441,7 +447,17 @@ class UploadImageUtil { @@ -441,7 +447,17 @@ class UploadImageUtil {
441 uploadImageProvider.logo.qiniuUrl = imgUrl; 447 uploadImageProvider.logo.qiniuUrl = imgUrl;
442 uploadImageProvider.logo.file = null; 448 uploadImageProvider.logo.file = null;
443 uploadImageProvider.notifyListeners(); 449 uploadImageProvider.notifyListeners();
444 - } 450 + }else if (index == 10) {
  451 + uploadImageProvider.storeImage5.process = 1;
  452 + uploadImageProvider.storeImage5.qiniuUrl = imgUrl;
  453 + uploadImageProvider.storeImage5.file = null;
  454 + uploadImageProvider.notifyListeners();
  455 + } else if (index == 11) {
  456 + uploadImageProvider.storeImage6.process = 1;
  457 + uploadImageProvider.storeImage6.qiniuUrl = imgUrl;
  458 + uploadImageProvider.storeImage6.file = null;
  459 + uploadImageProvider.notifyListeners();
  460 + }
445 }) 461 })
446 ..catchError((dynamic error) { 462 ..catchError((dynamic error) {
447 if (index == 0) { 463 if (index == 0) {
@@ -494,7 +510,17 @@ class UploadImageUtil { @@ -494,7 +510,17 @@ class UploadImageUtil {
494 uploadImageProvider.logo.qiniuUrl = null; 510 uploadImageProvider.logo.qiniuUrl = null;
495 uploadImageProvider.logo.file = null; 511 uploadImageProvider.logo.file = null;
496 uploadImageProvider.notifyListeners(); 512 uploadImageProvider.notifyListeners();
497 - } 513 + }else if (index == 10) {
  514 + uploadImageProvider.storeImage5.process = 0;
  515 + uploadImageProvider.storeImage5.qiniuUrl = null;
  516 + uploadImageProvider.storeImage5.file = null;
  517 + uploadImageProvider.notifyListeners();
  518 + } else if (index == 11) {
  519 + uploadImageProvider.storeImage6.process = 0;
  520 + uploadImageProvider.storeImage6.qiniuUrl = null;
  521 + uploadImageProvider.storeImage6.file = null;
  522 + uploadImageProvider.notifyListeners();
  523 + }
498 // 取消当前任务 524 // 取消当前任务
499 putController.cancel(); 525 putController.cancel();
500 uploadImageProvider.notifyListeners(); 526 uploadImageProvider.notifyListeners();