xt / Flutter-ReserveApp · Commits

Go to a project

Commit 9b68d35350a29e19dd75fecf4549baeae664d515

Authored by wdn127929
1 parent 327989c4
build: skipped

发版5.1.2

Inline Side-by-side
Showing 11 changed files with 197 additions and 124 deletions
@@ -14,23 +14,8 @@ if (flutterRoot == null) { @@ -14,23 +14,8 @@ if (flutterRoot == null) {
14 14
15 15
16 16
17 -// def flutterVersionCode = "100"  
18 -// if (flutterVersionCode == null) {  
19 -// flutterVersionCode = '100'  
20 17
21 18
22 -// }  
23 -  
24 -  
25 -  
26 -  
27 -  
28 -// def flutterVersionName = "1.0.0"  
29 -// if (flutterVersionName == null) {  
30 -// flutterVersionName = '1.0.0'  
31 -  
32 -// }  
33 -  
34 19
35 20
36 def flutterVersionCode = "512" 21 def flutterVersionCode = "512"
@@ -42,11 +27,6 @@ if (flutterVersionCode == null) { @@ -42,11 +27,6 @@ if (flutterVersionCode == null) {
42 } 27 }
43 28
44 29
45 -  
46 -  
47 -  
48 -  
49 -  
50 def flutterVersionName = "5.1.2" 30 def flutterVersionName = "5.1.2"
51 31
52 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 46; 6 + objectVersion = 50;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -518,7 +518,7 @@ @@ -518,7 +518,7 @@
518 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 518 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
519 CODE_SIGN_IDENTITY = "Apple Development"; 519 CODE_SIGN_IDENTITY = "Apple Development";
520 CODE_SIGN_STYLE = Automatic; 520 CODE_SIGN_STYLE = Automatic;
521 - CURRENT_PROJECT_VERSION = 51100; 521 + CURRENT_PROJECT_VERSION = 512;
522 DEVELOPMENT_TEAM = 8J59HM8B82; 522 DEVELOPMENT_TEAM = 8J59HM8B82;
523 ENABLE_BITCODE = NO; 523 ENABLE_BITCODE = NO;
524 FLUTTER_BUILD_MODE = release; 524 FLUTTER_BUILD_MODE = release;
@@ -533,7 +533,7 @@ @@ -533,7 +533,7 @@
533 "$(inherited)", 533 "$(inherited)",
534 "$(PROJECT_DIR)/Flutter", 534 "$(PROJECT_DIR)/Flutter",
535 ); 535 );
536 - MARKETING_VERSION = 5.1.1; 536 + MARKETING_VERSION = 5.1.2;
537 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 537 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
538 PRODUCT_NAME = Runner; 538 PRODUCT_NAME = Runner;
539 PROVISIONING_PROFILE_SPECIFIER = ""; 539 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -664,7 +664,7 @@ @@ -664,7 +664,7 @@
664 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 664 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
665 CODE_SIGN_IDENTITY = "Apple Development"; 665 CODE_SIGN_IDENTITY = "Apple Development";
666 CODE_SIGN_STYLE = Automatic; 666 CODE_SIGN_STYLE = Automatic;
667 - CURRENT_PROJECT_VERSION = 51100; 667 + CURRENT_PROJECT_VERSION = 512;
668 DEVELOPMENT_TEAM = 8J59HM8B82; 668 DEVELOPMENT_TEAM = 8J59HM8B82;
669 ENABLE_BITCODE = NO; 669 ENABLE_BITCODE = NO;
670 FLUTTER_BUILD_MODE = release; 670 FLUTTER_BUILD_MODE = release;
@@ -679,7 +679,7 @@ @@ -679,7 +679,7 @@
679 "$(inherited)", 679 "$(inherited)",
680 "$(PROJECT_DIR)/Flutter", 680 "$(PROJECT_DIR)/Flutter",
681 ); 681 );
682 - MARKETING_VERSION = 5.1.1; 682 + MARKETING_VERSION = 5.1.2;
683 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 683 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
684 PRODUCT_NAME = Runner; 684 PRODUCT_NAME = Runner;
685 PROVISIONING_PROFILE_SPECIFIER = ""; 685 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -700,7 +700,7 @@ @@ -700,7 +700,7 @@
700 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 700 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
701 CODE_SIGN_IDENTITY = "Apple Development"; 701 CODE_SIGN_IDENTITY = "Apple Development";
702 CODE_SIGN_STYLE = Automatic; 702 CODE_SIGN_STYLE = Automatic;
703 - CURRENT_PROJECT_VERSION = 51100; 703 + CURRENT_PROJECT_VERSION = 512;
704 DEVELOPMENT_TEAM = 8J59HM8B82; 704 DEVELOPMENT_TEAM = 8J59HM8B82;
705 ENABLE_BITCODE = NO; 705 ENABLE_BITCODE = NO;
706 FLUTTER_BUILD_MODE = release; 706 FLUTTER_BUILD_MODE = release;
@@ -715,7 +715,7 @@ @@ -715,7 +715,7 @@
715 "$(inherited)", 715 "$(inherited)",
716 "$(PROJECT_DIR)/Flutter", 716 "$(PROJECT_DIR)/Flutter",
717 ); 717 );
718 - MARKETING_VERSION = 5.1.1; 718 + MARKETING_VERSION = 5.1.2;
719 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 719 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
720 PRODUCT_NAME = Runner; 720 PRODUCT_NAME = Runner;
721 PROVISIONING_PROFILE_SPECIFIER = ""; 721 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3,10 +3,10 @@ import 'package:fluwx/fluwx.dart'; @@ -3,10 +3,10 @@ import 'package:fluwx/fluwx.dart';
3 3
4 class Constant { 4 class Constant {
5 static const int status_success = 200; //服务器返回成功 5 static const int status_success = 200; //服务器返回成功
6 - // static const WXMiniProgramType wxMiniProgramType =  
7 - // WXMiniProgramType.RELEASE; //正式版  
8 static const WXMiniProgramType wxMiniProgramType = 6 static const WXMiniProgramType wxMiniProgramType =
9 - WXMiniProgramType.PREVIEW; //体验版 7 + WXMiniProgramType.RELEASE; //正式版
  8 + // static const WXMiniProgramType wxMiniProgramType =
  9 + // WXMiniProgramType.PREVIEW; //体验版
10 // static const WXMiniProgramType wxMiniProgramType = 10 // static const WXMiniProgramType wxMiniProgramType =
11 // WXMiniProgramType.TEST; //开发版 11 // WXMiniProgramType.TEST; //开发版
12 12
@@ -235,7 +235,8 @@ class CommentsImageModel { @@ -235,7 +235,8 @@ class CommentsImageModel {
235 ? new ImageAve.fromJson(json['imageAve']) 235 ? new ImageAve.fromJson(json['imageAve'])
236 : null; 236 : null;
237 url = json['url']; 237 url = json['url'];
238 - avinfo =json['avinfo'] == null ? null : jsonEncode(json['avinfo']); 238 + avinfo = json['avinfo'] == null ? null : jsonEncode(json['avinfo']);
  239 + print(avinfo);
239 } 240 }
240 241
241 Map<String, dynamic> toJson() { 242 Map<String, dynamic> toJson() {
@@ -55,7 +55,6 @@ class _CouponSettingPageState extends State<CouponSettingPage> { @@ -55,7 +55,6 @@ class _CouponSettingPageState extends State<CouponSettingPage> {
55 void initState() { 55 void initState() {
56 super.initState(); 56 super.initState();
57 WidgetsBinding.instance.addPostFrameCallback((_) async { 57 WidgetsBinding.instance.addPostFrameCallback((_) async {
58 - _couponNetworkData();  
59 getSellerTemplateConf(); 58 getSellerTemplateConf();
60 }); 59 });
61 } 60 }
@@ -113,6 +112,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> { @@ -113,6 +112,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> {
113 welcome = marketingCenterProvider.markDataModel.marketing.wecomle; 112 welcome = marketingCenterProvider.markDataModel.marketing.wecomle;
114 113
115 setState(() {}); 114 setState(() {});
  115 + _couponNetworkData();
116 } 116 }
117 } 117 }
118 118
@@ -425,7 +425,7 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> { @@ -425,7 +425,7 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
425 mainAxisAlignment: MainAxisAlignment.spaceBetween, 425 mainAxisAlignment: MainAxisAlignment.spaceBetween,
426 children: [ 426 children: [
427 Text( 427 Text(
428 - '${data.rname} 跟单经理：${data.nickName ?? data.account}', 428 + '${data.rname} 跟单经理：${data.nickName ?? data.account ?? ''}',
429 style: TextStyle( 429 style: TextStyle(
430 fontWeight: FontWeight.bold, 430 fontWeight: FontWeight.bold,
431 color: MyColours.color_000000, 431 color: MyColours.color_000000,
@@ -858,7 +858,8 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> { @@ -858,7 +858,8 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
858 return InkWell( 858 return InkWell(
859 onTap: () { 859 onTap: () {
860 //点击进入宴会详情 860 //点击进入宴会详情
861 - NavigatorUtil.goFeastDetailPage(context, data.id,needChange: false); 861 + NavigatorUtil.goFeastDetailPage(context, data.id,
  862 + needChange: false);
862 }, 863 },
863 child: buildFeastTypeItem(data)); 864 child: buildFeastTypeItem(data));
864 // '剑南春52度500ml', '1150元/份 不可议价' 865 // '剑南春52度500ml', '1150元/份 不可议价'
@@ -110,6 +110,11 @@ class _BookInfoPageState extends State<BookInfoPage> { @@ -110,6 +110,11 @@ class _BookInfoPageState extends State<BookInfoPage> {
110 marketingCenterProvider.markDataModel.home.isFirstImage == '1' 110 marketingCenterProvider.markDataModel.home.isFirstImage == '1'
111 ? true 111 ? true
112 : false; 112 : false;
  113 + if (_uploadImageProvider.firstImage.qiniuUrl != null &&
  114 + marketingCenterProvider.markDataModel.home.isFirstImage == null) {
  115 + //
  116 + addFirstImage = true;
  117 + }
113 } 118 }
114 119
115 if (marketingCenterProvider.markDataModel.reserve != null) { 120 if (marketingCenterProvider.markDataModel.reserve != null) {
@@ -142,6 +147,11 @@ class _BookInfoPageState extends State<BookInfoPage> { @@ -142,6 +147,11 @@ class _BookInfoPageState extends State<BookInfoPage> {
142 marketingCenterProvider.markDataModel.marketing.logo != '' 147 marketingCenterProvider.markDataModel.marketing.logo != ''
143 ? 1 148 ? 1
144 : 0; 149 : 0;
  150 + if (_uploadImageProvider.logo.qiniuUrl != null &&
  151 + marketingCenterProvider.markDataModel.marketing.isLogo == null) {
  152 + //
  153 + addLogo = true;
  154 + }
145 } 155 }
146 156
147 marketingCenterProvider.pageStateBookInfo = PageState.Success; 157 marketingCenterProvider.pageStateBookInfo = PageState.Success;
@@ -997,13 +997,13 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> { @@ -997,13 +997,13 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
997 isTranspond = !isTranspond; 997 isTranspond = !isTranspond;
998 }); 998 });
999 }, select: isTranspond), 999 }, select: isTranspond),
1000 - _storeItemWidget('向被邀请客人开放“确认到店”功能。',  
1001 - '被邀客人点击确认到店后，方便请客人了解被邀客人是否确认，同时，被邀客人的信息会加入到餐厅客户池中，方便餐厅维护客户。',  
1002 - onTap: () {  
1003 - setState(() {  
1004 - isArrival = !isArrival;  
1005 - });  
1006 - }, select: isArrival), 1000 + // _storeItemWidget('向被邀请客人开放“确认到店”功能。',
  1001 + // '被邀客人点击确认到店后，方便请客人了解被邀客人是否确认，同时，被邀客人的信息会加入到餐厅客户池中，方便餐厅维护客户。',
  1002 + // onTap: () {
  1003 + // setState(() {
  1004 + // isArrival = !isArrival;
  1005 + // });
  1006 + // }, select: isArrival),
1007 _storeItemWidget('向客人开放“在线预订”功能。', 1007 _storeItemWidget('向客人开放“在线预订”功能。',
1008 '客人和被邀客人可以通过邀请函，直接点击在线预订，向商家提交预订需求，无需通过电话，经理可以详细了解客户需求并安排预订。', 1008 '客人和被邀客人可以通过邀请函，直接点击在线预订，向商家提交预订需求，无需通过电话，经理可以详细了解客户需求并安排预订。',
1009 onTap: () { 1009 onTap: () {
@@ -205,6 +205,75 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> { @@ -205,6 +205,75 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> {
205 Utils.setBarStatus(true, color: Colors.white); 205 Utils.setBarStatus(true, color: Colors.white);
206 } 206 }
207 207
  208 + List<Widget> imagesWidgets() {
  209 + List<Widget> images = [];
  210 + for (int i = 0; i < marketingCenterProvider.templeteDatas.length; i++) {
  211 + SellerTemplateColorListSunModel themeSunModel =
  212 + marketingCenterProvider.templeteDatas[i];
  213 + images.add(InkWell(
  214 + onTap: () {
  215 + // _selectTheme(themeDatas[themeColor].urls[index].id);
  216 + //跳转到下一页
  217 + NavigatorUtil.goInvitationThemeHomePreviewPage(
  218 + context, themeSunModel);
  219 + },
  220 + child: Container(
  221 + width: (ScreenUtil().screenWidth - w(32) - w(15)) / 2,
  222 + // height: w(390),
  223 + margin: EdgeInsets.only(right: i % 2 == 0 ? w(15) : 0),
  224 + decoration: BoxDecoration(
  225 + borderRadius: BorderRadius.circular(r(10)),
  226 + border: Border.all(
  227 + color: themeType == themeSunModel.id
  228 + ? MyColours.color_005AA7
  229 + : MyColours.color_DBDBDB,
  230 + width: themeType == themeSunModel.id ? w(2) : w(1))),
  231 + child: Column(
  232 + children: [
  233 + // VEmptyView(10),
  234 + ClipRRect(
  235 + borderRadius: BorderRadius.only(
  236 + topLeft: Radius.circular(r(8)),
  237 + topRight: Radius.circular(r(8))),
  238 + child: CachedNetworkImage(
  239 + imageUrl: themeSunModel.colors == null ||
  240 + themeSunModel.colors.length == 0
  241 + ? themeSunModel.url
  242 + : themeSunModel
  243 + .colors[themeColor == null
  244 + ? 0
  245 + : themeSunModel.colors.indexWhere((element) =>
  246 + element.colorName ==
  247 + themeSunModel.themeColorDefault)]
  248 + .url,
  249 + width: (ScreenUtil().screenWidth - w(32) - w(15)) / 2,
  250 + height: w(348),
  251 + fit: BoxFit.fitWidth,
  252 + alignment: Alignment.topCenter,
  253 + ),
  254 + ),
  255 + VEmptyView(20),
  256 + Container(
  257 + padding:
  258 + EdgeInsets.symmetric(vertical: w(7), horizontal: w(3)),
  259 + width: double.infinity,
  260 + child: Text(
  261 + themeSunModel.templateName,
  262 + maxLines: 1,
  263 + overflow: TextOverflow.ellipsis,
  264 + textAlign: TextAlign.left,
  265 + style: TextStyle(
  266 + color: MyColours.color_000000, fontSize: font(14)),
  267 + ),
  268 + )
  269 + ],
  270 + ),
  271 + )));
  272 + }
  273 + marketingCenterProvider.templeteDatas.forEach((themeSunModel) {});
  274 + return images;
  275 + }
  276 +
208 @override 277 @override
209 Widget build(BuildContext context) { 278 Widget build(BuildContext context) {
210 marketingCenterProvider = 279 marketingCenterProvider =
@@ -229,84 +298,94 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> { @@ -229,84 +298,94 @@ class _InvitationThemeHomePageState extends State<InvitationThemeHomePage> {
229 child: Column( 298 child: Column(
230 children: [ 299 children: [
231 VEmptyView(24), 300 VEmptyView(24),
232 - GridView.builder( 301 + Padding(
233 padding: EdgeInsets.symmetric(horizontal: w(16)), 302 padding: EdgeInsets.symmetric(horizontal: w(16)),
234 - controller: controller,  
235 - // padding: EdgeInsets.only(top: ScreenUtil().getAdapterSize(10)),  
236 - shrinkWrap: true,  
237 - itemCount: marketingCenterProvider.templeteDatas.length,  
238 - //SliverGridDelegateWithFixedCrossAxisCount 构建一个横轴固定数量Widget  
239 - gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(  
240 - //横轴元素个数  
241 - crossAxisCount: 2,  
242 - //纵轴间距  
243 - mainAxisSpacing: w(15),  
244 - //横轴间距  
245 - crossAxisSpacing: w(15),  
246 - //子组件宽高长度比例  
247 - childAspectRatio:  
248 - (ScreenUtil().screenWidth - w(62)) / 2 / 370),  
249 - itemBuilder: (BuildContext context, int index) {  
250 - SellerTemplateColorListSunModel themeSunModel =  
251 - marketingCenterProvider.templeteDatas[index];  
252 - return InkWell(  
253 - onTap: () {  
254 - // _selectTheme(themeDatas[themeColor].urls[index].id);  
255 - //跳转到下一页  
256 - NavigatorUtil.goInvitationThemeHomePreviewPage(  
257 - context, themeSunModel);  
258 - },  
259 - child: Container(  
260 - decoration: BoxDecoration(  
261 - borderRadius: BorderRadius.circular(r(10)),  
262 - border: Border.all(  
263 - color: themeType == themeSunModel.id  
264 - ? MyColours.color_005AA7  
265 - : MyColours.color_DBDBDB,  
266 - width: themeType == themeSunModel.id  
267 - ? w(2)  
268 - : w(1))),  
269 - child: Column(  
270 - children: [  
271 - VEmptyView(10),  
272 - CachedNetworkImage(  
273 - imageUrl: themeSunModel.colors == null ||  
274 - themeSunModel.colors.length == 0  
275 - ? themeSunModel.url  
276 - : themeSunModel  
277 - .colors[themeColor == null  
278 - ? 0  
279 - : themeSunModel.colors  
280 - .indexWhere((element) =>  
281 - element.colorName ==  
282 - themeSunModel  
283 - .themeColorDefault)]  
284 - .url,  
285 - width:  
286 - (ScreenUtil().screenWidth - w(62)) / 2,  
287 - height: w(348),  
288 - fit: BoxFit.fitWidth,  
289 - alignment: Alignment.topCenter,  
290 - ),  
291 - VEmptyView(20),  
292 - Container(  
293 - padding: EdgeInsets.symmetric(  
294 - vertical: w(6), horizontal: w(2)),  
295 - width: double.infinity,  
296 - child: Text(  
297 - themeSunModel.templateName,  
298 - maxLines: 1,  
299 - overflow: TextOverflow.ellipsis,  
300 - textAlign: TextAlign.left,  
301 - style: TextStyle(  
302 - color: MyColours.color_000000,  
303 - fontSize: font(14)),  
304 - ),  
305 - )  
306 - ],  
307 - ),  
308 - ));  
309 - }), 303 + child: Wrap(
  304 + runSpacing: w(15),
  305 + // spacing: w(15),
  306 + children: imagesWidgets(),
  307 + )),
  308 + VEmptyView(24),
  309 + // GridView.builder(
  310 + // padding: EdgeInsets.symmetric(horizontal: w(16)),
  311 + // controller: controller,
  312 + // // padding: EdgeInsets.only(top: ScreenUtil().getAdapterSize(10)),
  313 + // shrinkWrap: true,
  314 + // itemCount: marketingCenterProvider.templeteDatas.length,
  315 + // //SliverGridDelegateWithFixedCrossAxisCount 构建一个横轴固定数量Widget
  316 + // gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
  317 + // //横轴元素个数
  318 + // crossAxisCount: 2,
  319 + // //纵轴间距
  320 + // mainAxisSpacing: w(15),
  321 + // //横轴间距
  322 + // crossAxisSpacing: w(15),
  323 + // //子组件宽高长度比例
  324 + // // childAspectRatio:
  325 + // // (ScreenUtil().screenWidth - w(62)) / 2 / 370
  326 + // ),
  327 + // itemBuilder: (BuildContext context, int index) {
  328 + // SellerTemplateColorListSunModel themeSunModel =
  329 + // marketingCenterProvider.templeteDatas[index];
  330 + // return InkWell(
  331 + // onTap: () {
  332 + // // _selectTheme(themeDatas[themeColor].urls[index].id);
  333 + // //跳转到下一页
  334 + // NavigatorUtil.goInvitationThemeHomePreviewPage(
  335 + // context, themeSunModel);
  336 + // },
  337 + // child: Container(
  338 + // height: w(385),
  339 + // decoration: BoxDecoration(
  340 + // borderRadius: BorderRadius.circular(r(10)),
  341 + // border: Border.all(
  342 + // color: themeType == themeSunModel.id
  343 + // ? MyColours.color_005AA7
  344 + // : MyColours.color_DBDBDB,
  345 + // width: themeType == themeSunModel.id
  346 + // ? w(2)
  347 + // : w(1))),
  348 + // child: Column(
  349 + // children: [
  350 + // VEmptyView(10),
  351 + // CachedNetworkImage(
  352 + // imageUrl: themeSunModel.colors == null ||
  353 + // themeSunModel.colors.length == 0
  354 + // ? themeSunModel.url
  355 + // : themeSunModel
  356 + // .colors[themeColor == null
  357 + // ? 0
  358 + // : themeSunModel.colors
  359 + // .indexWhere((element) =>
  360 + // element.colorName ==
  361 + // themeSunModel
  362 + // .themeColorDefault)]
  363 + // .url,
  364 + // width:
  365 + // (ScreenUtil().screenWidth - w(62)) / 2,
  366 + // height: w(348),
  367 + // fit: BoxFit.fitWidth,
  368 + // alignment: Alignment.topCenter,
  369 + // ),
  370 + // VEmptyView(20),
  371 + // Container(
  372 + // padding: EdgeInsets.symmetric(
  373 + // vertical: w(6), horizontal: w(2)),
  374 + // width: double.infinity,
  375 + // child: Text(
  376 + // themeSunModel.templateName,
  377 + // maxLines: 1,
  378 + // overflow: TextOverflow.ellipsis,
  379 + // textAlign: TextAlign.left,
  380 + // style: TextStyle(
  381 + // color: MyColours.color_000000,
  382 + // fontSize: font(14)),
  383 + // ),
  384 + // )
  385 + // ],
  386 + // ),
  387 + // ));
  388 + // }),
310 ], 389 ],
311 ))) 390 )))
312 ], 391 ],
@@ -272,11 +272,13 @@ class _InvitationThemeHomePreviewPageState @@ -272,11 +272,13 @@ class _InvitationThemeHomePreviewPageState
272 .user 272 .user
273 .sellerid, 273 .sellerid,
274 'type': themeType, 274 'type': themeType,
275 - 'lite_class': widget  
276 - .themeSunModel  
277 - .colors[widget.themeSunModel.colors.indexWhere(  
278 - (element) => element.colorName == themeColor)]  
279 - .liteClass 275 + 'lite_class': themeColor == null
  276 + ? null
  277 + : widget
  278 + .themeSunModel
  279 + .colors[widget.themeSunModel.colors.indexWhere(
  280 + (element) => element.colorName == themeColor)]
  281 + .liteClass
280 }; 282 };
281 283
282 bool success = await marketingCenterProvider 284 bool success = await marketingCenterProvider
@@ -55,7 +55,6 @@ class _RechargeSettingPageState extends State<RechargeSettingPage> { @@ -55,7 +55,6 @@ class _RechargeSettingPageState extends State<RechargeSettingPage> {
55 void initState() { 55 void initState() {
56 super.initState(); 56 super.initState();
57 WidgetsBinding.instance.addPostFrameCallback((_) async { 57 WidgetsBinding.instance.addPostFrameCallback((_) async {
58 - _getNewRechargeList();  
59 getSellerTemplateConf(); 58 getSellerTemplateConf();
60 }); 59 });
61 } 60 }
@@ -114,6 +113,7 @@ class _RechargeSettingPageState extends State<RechargeSettingPage> { @@ -114,6 +113,7 @@ class _RechargeSettingPageState extends State<RechargeSettingPage> {
114 welcome = marketingCenterProvider.markDataModel.marketing.wecomle; 113 welcome = marketingCenterProvider.markDataModel.marketing.wecomle;
115 114
116 setState(() {}); 115 setState(() {});
  116 + _getNewRechargeList();
117 } 117 }
118 } 118 }
119 119