xt / Flutter-ReserveApp · Commits

Go to a project

Commit 04ee3843d6956e51fef2202bc76c8f7edc47ee28

Authored by wdn127929
1 parent 78af95be
build: skipped

调整顺序菜品和店铺介绍

Inline Side-by-side
Showing 2 changed files with 346 additions and 199 deletions
@@ -22,6 +22,23 @@ import 'img_picker_invitation_widget.dart'; @@ -22,6 +22,23 @@ import 'img_picker_invitation_widget.dart';
22 * 菜品展示 22 * 菜品展示
23 */ 23 */
24 24
  25 +class ChangeModel {
  26 + int index; //顺序
  27 + UploadImgModel image;
  28 +
  29 + // ChangeModel();
  30 +
  31 + // factory ChangeModel.fromJson(Map<String, dynamic> json) => ChangeModel()
  32 + // ..content = json["content"]
  33 + // ..type = json["type"];
  34 + // // ..order = json['order'];
  35 +
  36 + // Map<String, dynamic> toJson() => <String, dynamic>{
  37 + // "content": content, "type": type,
  38 + // // 'order': order
  39 + // };
  40 +}
  41 +
25 class DishShowPage extends StatefulWidget { 42 class DishShowPage extends StatefulWidget {
26 DishShowPage({Key key}) : super(key: key); 43 DishShowPage({Key key}) : super(key: key);
27 44
@@ -35,11 +52,14 @@ class _DishShowPageState extends State<DishShowPage> { @@ -35,11 +52,14 @@ class _DishShowPageState extends State<DishShowPage> {
35 52
36 UploadImageProvider _uploadImageProvider; 53 UploadImageProvider _uploadImageProvider;
37 ScrollController controller = ScrollController(); 54 ScrollController controller = ScrollController();
  55 + List data = [];
  56 +
38 @override 57 @override
39 void initState() { 58 void initState() {
40 super.initState(); 59 super.initState();
41 60
42 WidgetsBinding.instance.addPostFrameCallback((_) { 61 WidgetsBinding.instance.addPostFrameCallback((_) {
  62 + _initData();
43 _getQiniuInfo(); 63 _getQiniuInfo();
44 getSellerTemplateConf(); 64 getSellerTemplateConf();
45 }); 65 });
@@ -54,6 +74,38 @@ class _DishShowPageState extends State<DishShowPage> { @@ -54,6 +74,38 @@ class _DishShowPageState extends State<DishShowPage> {
54 super.dispose(); 74 super.dispose();
55 } 75 }
56 76
  77 + _initData() {
  78 + ChangeModel changeModel = ChangeModel();
  79 + changeModel.index = 5;
  80 + changeModel.image = _uploadImageProvider.storeImage1;
  81 + data.add(changeModel);
  82 +
  83 + ChangeModel changeModel6 = ChangeModel();
  84 + changeModel6.index = 6;
  85 + changeModel6.image = _uploadImageProvider.storeImage2;
  86 + data.add(changeModel6);
  87 +
  88 + ChangeModel changeModel7 = ChangeModel();
  89 + changeModel7.index = 7;
  90 + changeModel7.image = _uploadImageProvider.storeImage3;
  91 + data.add(changeModel7);
  92 +
  93 + ChangeModel changeModel8 = ChangeModel();
  94 + changeModel8.index = 8;
  95 + changeModel8.image = _uploadImageProvider.storeImage4;
  96 + data.add(changeModel8);
  97 +
  98 + ChangeModel changeModel10 = ChangeModel();
  99 + changeModel10.index = 10;
  100 + changeModel10.image = _uploadImageProvider.storeImage5;
  101 + data.add(changeModel10);
  102 +
  103 + ChangeModel changeModel11 = ChangeModel();
  104 + changeModel11.index = 11;
  105 + changeModel11.image = _uploadImageProvider.storeImage6;
  106 + data.add(changeModel11);
  107 + }
  108 +
57 ///获取七牛云token 109 ///获取七牛云token
58 /// 110 ///
59 _getQiniuInfo() async { 111 _getQiniuInfo() async {
@@ -270,89 +322,108 @@ class _DishShowPageState extends State<DishShowPage> { @@ -270,89 +322,108 @@ class _DishShowPageState extends State<DishShowPage> {
270 // fontSize: font(16), color: MyColours.color_515151), 322 // fontSize: font(16), color: MyColours.color_515151),
271 // ), 323 // ),
272 // ), 324 // ),
273 - Column(  
274 - children: [  
275 - VEmptyView(24),  
276 - ImgPickerInvitationWidget(  
277 - scrollController: controller,  
278 - model: _uploadImageProvider,  
279 - index: 5,  
280 - imageModel: _uploadImageProvider.storeImage1,  
281 - deleteCallback: () {  
282 - _uploadImageProvider.storeImage1.qiniuUrl = null;  
283 - _uploadImageProvider.storeImage1.file = null;  
284 - _uploadImageProvider.storeImage1.isUpload = false;  
285 - _uploadImageProvider.storeImage1.process = 0.01;  
286 - setState(() {});  
287 - }),  
288 - VEmptyView(18),  
289 - ImgPickerInvitationWidget(  
290 - scrollController: controller,  
291 - model: _uploadImageProvider,  
292 - index: 6,  
293 - imageModel: _uploadImageProvider.storeImage2,  
294 - deleteCallback: () {  
295 - _uploadImageProvider.storeImage2.qiniuUrl = null;  
296 - _uploadImageProvider.storeImage2.file = null;  
297 - _uploadImageProvider.storeImage2.isUpload = false;  
298 - _uploadImageProvider.storeImage2.process = 0.01;  
299 - setState(() {});  
300 - }),  
301 - VEmptyView(18),  
302 - ImgPickerInvitationWidget(  
303 - scrollController: controller,  
304 - model: _uploadImageProvider,  
305 - index: 7,  
306 - imageModel: _uploadImageProvider.storeImage3,  
307 - deleteCallback: () {  
308 - _uploadImageProvider.storeImage3.qiniuUrl = null;  
309 - _uploadImageProvider.storeImage3.file = null;  
310 - _uploadImageProvider.storeImage3.isUpload = false;  
311 - _uploadImageProvider.storeImage3.process = 0.01;  
312 - setState(() {});  
313 - }),  
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),  
354 - ],  
355 - ) 325 + VEmptyView(24),
  326 + ReorderableListView(
  327 + shrinkWrap: true,
  328 + scrollController: controller,
  329 + children: <Widget>[
  330 + // _introduceWidget(EdgeInsets.all(w(15)),
  331 + // boxDecoration: BoxDecoration(color: MyColours.color_ffffff)),
  332 + // VEmptyView(18),
  333 +
  334 + for (ChangeModel item in data)
  335 + Container(
  336 + key: ValueKey(item),
  337 + child: Padding(
  338 + padding: EdgeInsets.only(
  339 + bottom: item.index != 11 ? w(9) : 0),
  340 + child: ImgPickerInvitationWidget(
  341 + scrollController: controller,
  342 + model: _uploadImageProvider,
  343 + index: item.index,
  344 + imageModel: item.image,
  345 + deleteCallback: () {
  346 + item.image.qiniuUrl = null;
  347 + item.image.file = null;
  348 + item.image.isUpload = false;
  349 + item.image.process = 0.01;
  350 + setState(() {});
  351 + }))),
  352 + // VEmptyView(18),
  353 + // ImgPickerInvitationWidget(
  354 + // scrollController: controller,
  355 + // model: _uploadImageProvider,
  356 + // index: 6,
  357 + // imageModel: _uploadImageProvider.storeImage2,
  358 + // deleteCallback: () {
  359 + // _uploadImageProvider.storeImage2.qiniuUrl = null;
  360 + // _uploadImageProvider.storeImage2.file = null;
  361 + // _uploadImageProvider.storeImage2.isUpload = false;
  362 + // _uploadImageProvider.storeImage2.process = 0.01;
  363 + // setState(() {});
  364 + // }),
  365 + // VEmptyView(18),
  366 + // ImgPickerInvitationWidget(
  367 + // scrollController: controller,
  368 + // model: _uploadImageProvider,
  369 + // index: 7,
  370 + // imageModel: _uploadImageProvider.storeImage3,
  371 + // deleteCallback: () {
  372 + // _uploadImageProvider.storeImage3.qiniuUrl = null;
  373 + // _uploadImageProvider.storeImage3.file = null;
  374 + // _uploadImageProvider.storeImage3.isUpload = false;
  375 + // _uploadImageProvider.storeImage3.process = 0.01;
  376 + // setState(() {});
  377 + // }),
  378 + // VEmptyView(18),
  379 + // ImgPickerInvitationWidget(
  380 + // scrollController: controller,
  381 + // model: _uploadImageProvider,
  382 + // index: 8,
  383 + // imageModel: _uploadImageProvider.storeImage4,
  384 + // deleteCallback: () {
  385 + // _uploadImageProvider.storeImage4.qiniuUrl = null;
  386 + // _uploadImageProvider.storeImage4.file = null;
  387 + // _uploadImageProvider.storeImage4.isUpload = false;
  388 + // _uploadImageProvider.storeImage4.process = 0.01;
  389 + // setState(() {});
  390 + // }),
  391 + // VEmptyView(18),
  392 + // ImgPickerInvitationWidget(
  393 + // scrollController: controller,
  394 + // model: _uploadImageProvider,
  395 + // index: 10,
  396 + // imageModel: _uploadImageProvider.storeImage5,
  397 + // deleteCallback: () {
  398 + // _uploadImageProvider.storeImage5.qiniuUrl = null;
  399 + // _uploadImageProvider.storeImage5.file = null;
  400 + // _uploadImageProvider.storeImage5.isUpload = false;
  401 + // _uploadImageProvider.storeImage5.process = 0.01;
  402 + // setState(() {});
  403 + // }),
  404 + // VEmptyView(18),
  405 + // ImgPickerInvitationWidget(
  406 + // scrollController: controller,
  407 + // model: _uploadImageProvider,
  408 + // index: 11,
  409 + // imageModel: _uploadImageProvider.storeImage6,
  410 + // deleteCallback: () {
  411 + // _uploadImageProvider.storeImage6.qiniuUrl = null;
  412 + // _uploadImageProvider.storeImage6.file = null;
  413 + // _uploadImageProvider.storeImage6.isUpload = false;
  414 + // _uploadImageProvider.storeImage6.process = 0.01;
  415 + // setState(() {});
  416 + // }),
  417 + // VEmptyView(18),
  418 + ],
  419 + onReorder: (int oldIndex, int newIndex) async {
  420 + if (oldIndex < newIndex) {
  421 + newIndex -= 1;
  422 + }
  423 + var child = data.removeAt(oldIndex);
  424 + data.insert(newIndex, child);
  425 + setState(() {});
  426 + })
356 ]))), 427 ]))),
357 Container( 428 Container(
358 color: MyColours.color_ffffff, 429 color: MyColours.color_ffffff,
@@ -371,30 +442,38 @@ class _DishShowPageState extends State<DishShowPage> { @@ -371,30 +442,38 @@ class _DishShowPageState extends State<DishShowPage> {
371 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 442 FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘
372 443
373 List<String> images = []; 444 List<String> images = [];
374 - if (_uploadImageProvider.storeImage1.qiniuUrl != null &&  
375 - _uploadImageProvider.storeImage1.qiniuUrl != '') {  
376 - images.add(_uploadImageProvider.storeImage1.qiniuUrl);  
377 - }  
378 - if (_uploadImageProvider.storeImage2.qiniuUrl != null &&  
379 - _uploadImageProvider.storeImage2.qiniuUrl != '') {  
380 - images.add(_uploadImageProvider.storeImage2.qiniuUrl);  
381 - }  
382 - if (_uploadImageProvider.storeImage3.qiniuUrl != null &&  
383 - _uploadImageProvider.storeImage3.qiniuUrl != '') {  
384 - images.add(_uploadImageProvider.storeImage3.qiniuUrl);  
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 - } 445 +
  446 + for (int i = 0; i < data.length; i++) {
  447 + ChangeModel imgModel = data[i];
  448 + if (imgModel.image.qiniuUrl != null &&
  449 + imgModel.image.qiniuUrl != '') {
  450 + images.add(imgModel.image.qiniuUrl);
  451 + }
  452 + }
  453 + // if (_uploadImageProvider.storeImage1.qiniuUrl != null &&
  454 + // _uploadImageProvider.storeImage1.qiniuUrl != '') {
  455 + // images.add(_uploadImageProvider.storeImage1.qiniuUrl);
  456 + // }
  457 + // if (_uploadImageProvider.storeImage2.qiniuUrl != null &&
  458 + // _uploadImageProvider.storeImage2.qiniuUrl != '') {
  459 + // images.add(_uploadImageProvider.storeImage2.qiniuUrl);
  460 + // }
  461 + // if (_uploadImageProvider.storeImage3.qiniuUrl != null &&
  462 + // _uploadImageProvider.storeImage3.qiniuUrl != '') {
  463 + // images.add(_uploadImageProvider.storeImage3.qiniuUrl);
  464 + // }
  465 + // if (_uploadImageProvider.storeImage4.qiniuUrl != null &&
  466 + // _uploadImageProvider.storeImage4.qiniuUrl != '') {
  467 + // images.add(_uploadImageProvider.storeImage4.qiniuUrl);
  468 + // }
  469 + // if (_uploadImageProvider.storeImage5.qiniuUrl != null &&
  470 + // _uploadImageProvider.storeImage5.qiniuUrl != '') {
  471 + // images.add(_uploadImageProvider.storeImage5.qiniuUrl);
  472 + // }
  473 + // if (_uploadImageProvider.storeImage6.qiniuUrl != null &&
  474 + // _uploadImageProvider.storeImage6.qiniuUrl != '') {
  475 + // images.add(_uploadImageProvider.storeImage6.qiniuUrl);
  476 + // }
398 477
399 if (addDish && images.length == 0) { 478 if (addDish && images.length == 0) {
400 Utils.showToast('请至少上传一张图片!'); 479 Utils.showToast('请至少上传一张图片!');
@@ -32,6 +32,23 @@ import 'img_picker_invitation_widget.dart'; @@ -32,6 +32,23 @@ import 'img_picker_invitation_widget.dart';
32 * 店铺介绍 32 * 店铺介绍
33 */ 33 */
34 34
  35 +class ChangeModel {
  36 + int index; //顺序
  37 + UploadImgModel image;
  38 +
  39 + // ChangeModel();
  40 +
  41 + // factory ChangeModel.fromJson(Map<String, dynamic> json) => ChangeModel()
  42 + // ..content = json["content"]
  43 + // ..type = json["type"];
  44 + // // ..order = json['order'];
  45 +
  46 + // Map<String, dynamic> toJson() => <String, dynamic>{
  47 + // "content": content, "type": type,
  48 + // // 'order': order
  49 + // };
  50 +}
  51 +
35 class StoreIntroducePage extends StatefulWidget { 52 class StoreIntroducePage extends StatefulWidget {
36 StoreIntroducePage({Key key}) : super(key: key); 53 StoreIntroducePage({Key key}) : super(key: key);
37 54
@@ -55,13 +72,17 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> { @@ -55,13 +72,17 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> {
55 bool addStoreImge = false; //预订安排通知中附加餐厅文字图片 72 bool addStoreImge = false; //预订安排通知中附加餐厅文字图片
56 bool addAbove = false; //餐厅介绍文字显示在第一张图片上 73 bool addAbove = false; //餐厅介绍文字显示在第一张图片上
57 74
58 - StoreBaseIndoProvider _baseIndoProvider; 75 + StoreBaseIndoProvider _baseIndoProvider;
  76 +
  77 + List data = [];
59 78
60 @override 79 @override
61 void initState() { 80 void initState() {
62 super.initState(); 81 super.initState();
63 82
64 WidgetsBinding.instance.addPostFrameCallback((_) async { 83 WidgetsBinding.instance.addPostFrameCallback((_) async {
  84 + _initData();
  85 +
65 UserModel userModel = Provider.of<UserModel>(context, listen: false); 86 UserModel userModel = Provider.of<UserModel>(context, listen: false);
66 sellername = userModel.user.sellername; 87 sellername = userModel.user.sellername;
67 setState(() {}); 88 setState(() {});
@@ -80,6 +101,28 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> { @@ -80,6 +101,28 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> {
80 super.dispose(); 101 super.dispose();
81 } 102 }
82 103
  104 + _initData() {
  105 + ChangeModel changeModel = ChangeModel();
  106 + changeModel.index = 5;
  107 + changeModel.image = _uploadImageProvider.storeImage1;
  108 + data.add(changeModel);
  109 +
  110 + ChangeModel changeModel6 = ChangeModel();
  111 + changeModel6.index = 6;
  112 + changeModel6.image = _uploadImageProvider.storeImage2;
  113 + data.add(changeModel6);
  114 +
  115 + ChangeModel changeModel7 = ChangeModel();
  116 + changeModel7.index = 7;
  117 + changeModel7.image = _uploadImageProvider.storeImage3;
  118 + data.add(changeModel7);
  119 +
  120 + ChangeModel changeModel8 = ChangeModel();
  121 + changeModel8.index = 8;
  122 + changeModel8.image = _uploadImageProvider.storeImage4;
  123 + data.add(changeModel8);
  124 + }
  125 +
83 ///获取七牛云token 126 ///获取七牛云token
84 /// 127 ///
85 _getQiniuInfo() async { 128 _getQiniuInfo() async {
@@ -448,69 +491,97 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> { @@ -448,69 +491,97 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> {
448 491
449 ///图文分开 492 ///图文分开
450 Widget _separateWidget() { 493 Widget _separateWidget() {
451 - return Column(  
452 - crossAxisAlignment: CrossAxisAlignment.start,  
453 - children: [  
454 - // _introduceWidget(EdgeInsets.all(w(15)),  
455 - // boxDecoration: BoxDecoration(color: MyColours.color_ffffff)),  
456 - // VEmptyView(18),  
457 - ImgPickerInvitationWidget(  
458 - scrollController: controller,  
459 - uploadType: UploadType.InvitationStoreType,  
460 - model: _uploadImageProvider,  
461 - index: 5,  
462 - imageModel: _uploadImageProvider.storeImage1,  
463 - deleteCallback: () {  
464 - _uploadImageProvider.storeImage1.qiniuUrl = null;  
465 - _uploadImageProvider.storeImage1.file = null;  
466 - _uploadImageProvider.storeImage1.isUpload = false;  
467 - _uploadImageProvider.storeImage1.process = 0.01;  
468 - setState(() {});  
469 - }),  
470 - VEmptyView(18),  
471 - ImgPickerInvitationWidget(  
472 - scrollController: controller,  
473 - uploadType: UploadType.InvitationStoreType,  
474 - model: _uploadImageProvider,  
475 - index: 6,  
476 - imageModel: _uploadImageProvider.storeImage2,  
477 - deleteCallback: () {  
478 - _uploadImageProvider.storeImage2.qiniuUrl = null;  
479 - _uploadImageProvider.storeImage2.file = null;  
480 - _uploadImageProvider.storeImage2.isUpload = false;  
481 - _uploadImageProvider.storeImage2.process = 0.01;  
482 - setState(() {});  
483 - }),  
484 - VEmptyView(18),  
485 - ImgPickerInvitationWidget(  
486 - scrollController: controller,  
487 - uploadType: UploadType.InvitationStoreType,  
488 - model: _uploadImageProvider,  
489 - index: 7,  
490 - imageModel: _uploadImageProvider.storeImage3,  
491 - deleteCallback: () {  
492 - _uploadImageProvider.storeImage3.qiniuUrl = null;  
493 - _uploadImageProvider.storeImage3.file = null;  
494 - _uploadImageProvider.storeImage3.isUpload = false;  
495 - _uploadImageProvider.storeImage3.process = 0.01;  
496 - setState(() {});  
497 - }),  
498 - VEmptyView(18),  
499 - ImgPickerInvitationWidget(  
500 - scrollController: controller,  
501 - uploadType: UploadType.InvitationStoreType,  
502 - model: _uploadImageProvider,  
503 - index: 8,  
504 - imageModel: _uploadImageProvider.storeImage4,  
505 - deleteCallback: () {  
506 - _uploadImageProvider.storeImage4.qiniuUrl = null;  
507 - _uploadImageProvider.storeImage4.file = null;  
508 - _uploadImageProvider.storeImage4.isUpload = false;  
509 - _uploadImageProvider.storeImage4.process = 0.01;  
510 - setState(() {});  
511 - }),  
512 - ],  
513 - ); 494 + return ReorderableListView(
  495 + shrinkWrap: true,
  496 + scrollController: controller,
  497 + children: <Widget>[
  498 + // _introduceWidget(EdgeInsets.all(w(15)),
  499 + // boxDecoration: BoxDecoration(color: MyColours.color_ffffff)),
  500 + // VEmptyView(18),
  501 +
  502 + for (ChangeModel item in data)
  503 + Container(
  504 + key: ValueKey(item),
  505 + child: Padding(
  506 + padding:
  507 + EdgeInsets.only(bottom: item.index != 8 ? w(9) : 0),
  508 + child: ImgPickerInvitationWidget(
  509 + scrollController: controller,
  510 + uploadType: UploadType.InvitationStoreType,
  511 + model: _uploadImageProvider,
  512 + index: item.index,
  513 + imageModel: item.image,
  514 + deleteCallback: () {
  515 + item.image.qiniuUrl = null;
  516 + item.image.file = null;
  517 + item.image.isUpload = false;
  518 + item.image.process = 0.01;
  519 + setState(() {});
  520 + }))),
  521 +
  522 + // ImgPickerInvitationWidget(
  523 + // scrollController: controller,
  524 + // uploadType: UploadType.InvitationStoreType,
  525 + // model: _uploadImageProvider,
  526 + // index: 6,
  527 + // imageModel: _uploadImageProvider.storeImage2,
  528 + // deleteCallback: () {
  529 + // _uploadImageProvider.storeImage2.qiniuUrl = null;
  530 + // _uploadImageProvider.storeImage2.file = null;
  531 + // _uploadImageProvider.storeImage2.isUpload = false;
  532 + // _uploadImageProvider.storeImage2.process = 0.01;
  533 + // setState(() {});
  534 + // }),
  535 + // VEmptyView(18),
  536 + // ImgPickerInvitationWidget(
  537 + // scrollController: controller,
  538 + // uploadType: UploadType.InvitationStoreType,
  539 + // model: _uploadImageProvider,
  540 + // index: 7,
  541 + // imageModel: _uploadImageProvider.storeImage3,
  542 + // deleteCallback: () {
  543 + // _uploadImageProvider.storeImage3.qiniuUrl = null;
  544 + // _uploadImageProvider.storeImage3.file = null;
  545 + // _uploadImageProvider.storeImage3.isUpload = false;
  546 + // _uploadImageProvider.storeImage3.process = 0.01;
  547 + // setState(() {});
  548 + // }),
  549 + // VEmptyView(18),
  550 + // ImgPickerInvitationWidget(
  551 + // scrollController: controller,
  552 + // uploadType: UploadType.InvitationStoreType,
  553 + // model: _uploadImageProvider,
  554 + // index: 8,
  555 + // imageModel: _uploadImageProvider.storeImage4,
  556 + // deleteCallback: () {
  557 + // _uploadImageProvider.storeImage4.qiniuUrl = null;
  558 + // _uploadImageProvider.storeImage4.file = null;
  559 + // _uploadImageProvider.storeImage4.isUpload = false;
  560 + // _uploadImageProvider.storeImage4.process = 0.01;
  561 + // setState(() {});
  562 + // }),
  563 + ],
  564 + onReorder: (int oldIndex, int newIndex) async {
  565 + if (oldIndex < newIndex) {
  566 + newIndex -= 1;
  567 + }
  568 +
  569 + // var childold = tableManagerModel.areas[oldIndex];
  570 + // Map<String, String> params = {
  571 + // 'sid': Provider.of<UserModel>(context, listen: false)
  572 + // .user
  573 + // .sellerid,
  574 + // 'regionid': childold.rid,
  575 + // 'order_o': tableManagerModel.areas[newIndex].orderId,
  576 + // 'sort': oldIndex < newIndex ? '2' : '1'
  577 + // };
  578 + var child = data.removeAt(oldIndex);
  579 + data.insert(newIndex, child);
  580 + setState(() {});
  581 + // await tableManagerModel.sortByRegion(context, params);
  582 + // //刷新前一页数据
  583 + // bus.emit('refresh_table_area');
  584 + });
514 } 585 }
515 586
516 Widget _item(String title, {bool select, GestureTapCallback onTap}) { 587 Widget _item(String title, {bool select, GestureTapCallback onTap}) {
@@ -544,32 +615,23 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> { @@ -544,32 +615,23 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> {
544 ))); 615 )));
545 } 616 }
546 617
547 -  
548 /// 修改店铺基本信息 618 /// 修改店铺基本信息
549 _setSellerInfoById() async { 619 _setSellerInfoById() async {
550 -  
551 -  
552 -  
553 Map<String, dynamic> params = { 620 Map<String, dynamic> params = {
554 - 'id': Provider.of<UserModel>(context,listen: false).user.sellerid, 621 + 'id': Provider.of<UserModel>(context, listen: false).user.sellerid,
555 }; 622 };
556 623
557 -  
558 params['sellerdesc'] = storeIntroduceC.text; 624 params['sellerdesc'] = storeIntroduceC.text;
559 625
560 -  
561 -  
562 FormData formData = FormData.fromMap(params); 626 FormData formData = FormData.fromMap(params);
563 627
564 SetSellerInfoSunModel sunModel = 628 SetSellerInfoSunModel sunModel =
565 await _baseIndoProvider.setSellerInfoById(context, formData); 629 await _baseIndoProvider.setSellerInfoById(context, formData);
566 if (sunModel != null) { 630 if (sunModel != null) {
567 -  
568 -  
569 //修改成功 631 //修改成功
570 // Utils.showToast('保存店铺信息成功'); 632 // Utils.showToast('保存店铺信息成功');
571 // EventBus().emit('changeStatusColor'); 633 // EventBus().emit('changeStatusColor');
572 - 634 +
573 } else { 635 } else {
574 // Utils.showToast('保存失败'); 636 // Utils.showToast('保存失败');
575 } 637 }
@@ -577,7 +639,7 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> { @@ -577,7 +639,7 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> {
577 639
578 @override 640 @override
579 Widget build(BuildContext context) { 641 Widget build(BuildContext context) {
580 - _baseIndoProvider = 642 + _baseIndoProvider =
581 Provider.of<StoreBaseIndoProvider>(context, listen: false); 643 Provider.of<StoreBaseIndoProvider>(context, listen: false);
582 _uploadImageProvider = 644 _uploadImageProvider =
583 Provider.of<UploadImageProvider>(context, listen: true); 645 Provider.of<UploadImageProvider>(context, listen: true);
@@ -718,27 +780,33 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> { @@ -718,27 +780,33 @@ class _StoreIntroducePageState extends State<StoreIntroducePage> {
718 Utils.showToast('请输入餐厅介绍文字!'); 780 Utils.showToast('请输入餐厅介绍文字!');
719 return false; 781 return false;
720 } 782 }
721 -  
722 783
723 _setSellerInfoById(); //同步店铺简介 784 _setSellerInfoById(); //同步店铺简介
724 785
725 List<String> images = []; 786 List<String> images = [];
726 - if (_uploadImageProvider.storeImage1.qiniuUrl != null &&  
727 - _uploadImageProvider.storeImage1.qiniuUrl != '') {  
728 - images.add(_uploadImageProvider.storeImage1.qiniuUrl);  
729 - }  
730 - if (_uploadImageProvider.storeImage2.qiniuUrl != null &&  
731 - _uploadImageProvider.storeImage2.qiniuUrl != '') {  
732 - images.add(_uploadImageProvider.storeImage2.qiniuUrl);  
733 - }  
734 - if (_uploadImageProvider.storeImage3.qiniuUrl != null &&  
735 - _uploadImageProvider.storeImage3.qiniuUrl != '') {  
736 - images.add(_uploadImageProvider.storeImage3.qiniuUrl);  
737 - }  
738 - if (_uploadImageProvider.storeImage4.qiniuUrl != null &&  
739 - _uploadImageProvider.storeImage4.qiniuUrl != '') {  
740 - images.add(_uploadImageProvider.storeImage4.qiniuUrl); 787 + for (int i = 0; i < data.length; i++) {
  788 + ChangeModel imgModel = data[i];
  789 + if (imgModel.image.qiniuUrl != null &&
  790 + imgModel.image.qiniuUrl != '') {
  791 + images.add(imgModel.image.qiniuUrl);
  792 + }
741 } 793 }
  794 + // if (_uploadImageProvider.storeImage1.qiniuUrl != null &&
  795 + // _uploadImageProvider.storeImage1.qiniuUrl != '') {
  796 + // images.add(_uploadImageProvider.storeImage1.qiniuUrl);
  797 + // }
  798 + // if (_uploadImageProvider.storeImage2.qiniuUrl != null &&
  799 + // _uploadImageProvider.storeImage2.qiniuUrl != '') {
  800 + // images.add(_uploadImageProvider.storeImage2.qiniuUrl);
  801 + // }
  802 + // if (_uploadImageProvider.storeImage3.qiniuUrl != null &&
  803 + // _uploadImageProvider.storeImage3.qiniuUrl != '') {
  804 + // images.add(_uploadImageProvider.storeImage3.qiniuUrl);
  805 + // }
  806 + // if (_uploadImageProvider.storeImage4.qiniuUrl != null &&
  807 + // _uploadImageProvider.storeImage4.qiniuUrl != '') {
  808 + // images.add(_uploadImageProvider.storeImage4.qiniuUrl);
  809 + // }
742 if (images.length == 0) { 810 if (images.length == 0) {
743 Utils.showToast('请至少上传一张图片!'); 811 Utils.showToast('请至少上传一张图片!');
744 return false; 812 return false;