Commit 2b02a47c66d8ef337920a64a667a661bcc91d926

Authored by wdn127929
1 parent 86f48245

宴会详情页面灰屏

@@ -12,14 +12,14 @@ if (flutterRoot == null) { @@ -12,14 +12,14 @@ if (flutterRoot == null) {
12 } 12 }
13 13
14 14
15 -def flutterVersionCode = "420" 15 +def flutterVersionCode = "421"
16 if (flutterVersionCode == null) { 16 if (flutterVersionCode == null) {
17 - flutterVersionCode = '420' 17 + flutterVersionCode = '421'
18 } 18 }
19 19
20 -def flutterVersionName = "4.2.0" 20 +def flutterVersionName = "4.2.1"
21 if (flutterVersionName == null) { 21 if (flutterVersionName == null) {
22 - flutterVersionName = '4.2.0' 22 + flutterVersionName = '4.2.1'
23 } 23 }
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
25 apply plugin: 'kotlin-android' 25 apply plugin: 'kotlin-android'
@@ -46,7 +46,9 @@ import '../../widgets/special_text/my_extended_text_selection_controls.dart'; @@ -46,7 +46,9 @@ import '../../widgets/special_text/my_extended_text_selection_controls.dart';
46 class FeastCreatePage extends StatefulWidget { 46 class FeastCreatePage extends StatefulWidget {
47 final GetBanquetByIdNewSunModel banquetDetail; 47 final GetBanquetByIdNewSunModel banquetDetail;
48 final bool isCreate; 48 final bool isCreate;
49 - FeastCreatePage({Key key, this.banquetDetail, this.isCreate = false}) 49 + final String rid;
  50 + FeastCreatePage(
  51 + {Key key, this.banquetDetail, this.isCreate = false, this.rid})
50 : super(key: key); 52 : super(key: key);
51 53
52 @override 54 @override
@@ -262,6 +264,11 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -262,6 +264,11 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
262 feastModel.sessionsSunModelList.add(sessionsSunModel); 264 feastModel.sessionsSunModelList.add(sessionsSunModel);
263 }); 265 });
264 266
  267 + if (xuantaiData.length == 0) {
  268 + xuantaiData.add(initSetXuanTaiModel(index: 0));
  269 + feastModel.rid = widget.rid;
  270 + }
  271 +
265 /** 272 /**
266 * 定金 273 * 定金
267 */ 274 */
@@ -1312,6 +1312,7 @@ class _FeastDetailPageState extends State<FeastDetailPage> { @@ -1312,6 +1312,7 @@ class _FeastDetailPageState extends State<FeastDetailPage> {
1312 child: _callButton( 1312 child: _callButton(
1313 onPress: () async { 1313 onPress: () async {
1314 NavigatorUtil.goFeastCreatePage(context, 1314 NavigatorUtil.goFeastCreatePage(context,
  1315 + rid: widget.rid,
1315 banquetDetail: { 1316 banquetDetail: {
1316 'object': feastModel.banquetDetailMap 1317 'object': feastModel.banquetDetailMap
1317 }); 1318 });
@@ -858,10 +858,10 @@ class NavigatorUtil { @@ -858,10 +858,10 @@ class NavigatorUtil {
858 858
859 ///宴会----新建宴会 859 ///宴会----新建宴会
860 static Future<dynamic> goFeastCreatePage(BuildContext context, 860 static Future<dynamic> goFeastCreatePage(BuildContext context,
861 - {replace = false, bool isCreate = false, Map banquetDetail}) { 861 + {replace = false, bool isCreate = false, Map banquetDetail,String rid}) {
862 if (banquetDetail != null) { 862 if (banquetDetail != null) {
863 return _navigateTo(context, 863 return _navigateTo(context,
864 - "${Routes.feast_create_page}?isCreate=$isCreate&banquetDetail=${FluroConvertUtils.object2string(banquetDetail)}", 864 + "${Routes.feast_create_page}?isCreate=$isCreate&rid=$rid&banquetDetail=${FluroConvertUtils.object2string(banquetDetail)}",
865 replace: replace); 865 replace: replace);
866 } 866 }
867 867
@@ -1390,6 +1390,13 @@ var feastCreatePageHandle = new Handler( @@ -1390,6 +1390,13 @@ var feastCreatePageHandle = new Handler(
1390 // }); 1390 // });
1391 1391
1392 banquetDetail = GetBanquetByIdNewSunModel.fromJson(temp); 1392 banquetDetail = GetBanquetByIdNewSunModel.fromJson(temp);
  1393 +
  1394 +
  1395 +
  1396 + String rid = params["rid"].first;
  1397 + return ChangeNotifierProvider<FeastModel>(
  1398 + create: (_) => FeastModel(),
  1399 + child: FeastCreatePage(banquetDetail: banquetDetail,isCreate:isCreate,rid:rid));
1393 } 1400 }
1394 return ChangeNotifierProvider<FeastModel>( 1401 return ChangeNotifierProvider<FeastModel>(
1395 create: (_) => FeastModel(), 1402 create: (_) => FeastModel(),