xt / Flutter-ReserveApp · Commits

Go to a project

Commit ab0354b8f89ae026adff98cbc25eb55fd292ec37

Authored by wdn127929
2 parents 79b3e678 97b8b6ce
build: skipped

收集店铺信息

Inline Side-by-side
Showing 5 changed files with 15 additions and 9 deletions
@@ -519,11 +519,11 @@ @@ -519,11 +519,11 @@
519 CODE_SIGN_IDENTITY = "Apple Development"; 519 CODE_SIGN_IDENTITY = "Apple Development";
520 CODE_SIGN_STYLE = Automatic; 520 CODE_SIGN_STYLE = Automatic;
521 521
522 -  
523 522
524 CURRENT_PROJECT_VERSION = 506; 523 CURRENT_PROJECT_VERSION = 506;
525 524
526 525
  526 +
527 DEVELOPMENT_TEAM = 8J59HM8B82; 527 DEVELOPMENT_TEAM = 8J59HM8B82;
528 ENABLE_BITCODE = NO; 528 ENABLE_BITCODE = NO;
529 FLUTTER_BUILD_MODE = release; 529 FLUTTER_BUILD_MODE = release;
@@ -676,6 +676,7 @@ @@ -676,6 +676,7 @@
676 CURRENT_PROJECT_VERSION = 506; 676 CURRENT_PROJECT_VERSION = 506;
677 677
678 678
  679 +
679 DEVELOPMENT_TEAM = 8J59HM8B82; 680 DEVELOPMENT_TEAM = 8J59HM8B82;
680 ENABLE_BITCODE = NO; 681 ENABLE_BITCODE = NO;
681 FLUTTER_BUILD_MODE = release; 682 FLUTTER_BUILD_MODE = release;
@@ -714,9 +715,11 @@ @@ -714,9 +715,11 @@
714 CODE_SIGN_IDENTITY = "Apple Development"; 715 CODE_SIGN_IDENTITY = "Apple Development";
715 CODE_SIGN_STYLE = Automatic; 716 CODE_SIGN_STYLE = Automatic;
716 717
  718 +
717 CURRENT_PROJECT_VERSION = 506; 719 CURRENT_PROJECT_VERSION = 506;
718 720
719 721
  722 +
720 DEVELOPMENT_TEAM = 8J59HM8B82; 723 DEVELOPMENT_TEAM = 8J59HM8B82;
721 ENABLE_BITCODE = NO; 724 ENABLE_BITCODE = NO;
722 FLUTTER_BUILD_MODE = release; 725 FLUTTER_BUILD_MODE = release;
@@ -148,6 +148,7 @@ class SellerList extends Object { @@ -148,6 +148,7 @@ class SellerList extends Object {
148 } 148 }
149 149
150 SellerList( 150 SellerList(
  151 +
151 this.id, 152 this.id,
152 this.sellerid, 153 this.sellerid,
153 this.createUser, 154 this.createUser,
@@ -162,6 +163,7 @@ class SellerList extends Object { @@ -162,6 +163,7 @@ class SellerList extends Object {
162 this.remainingTime 163 this.remainingTime
163 ); 164 );
164 165
  166 +
165 factory SellerList.fromJson(Map<String, dynamic> srcJson) => 167 factory SellerList.fromJson(Map<String, dynamic> srcJson) =>
166 _$SellerListFromJson(srcJson); 168 _$SellerListFromJson(srcJson);
167 169
@@ -124,7 +124,9 @@ class _CollectStoreInfoPageState extends State<CollectStoreInfoPage> { @@ -124,7 +124,9 @@ class _CollectStoreInfoPageState extends State<CollectStoreInfoPage> {
124 subtitle, 124 subtitle,
125 textAlign: TextAlign.right, 125 textAlign: TextAlign.right,
126 style: TextStyle( 126 style: TextStyle(
127 - color: MyColours.color_66000000, 127 + color: subtitle == '点击设置您的地址' || subtitle == '点击设置您的城市'
  128 + ? MyColours.color_66000000
  129 + : MyColours.color_515151,
128 fontSize: ScreenUtil().setSp(32), 130 fontSize: ScreenUtil().setSp(32),
129 ), 131 ),
130 )), 132 )),
@@ -83,13 +83,15 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> { @@ -83,13 +83,15 @@ class _MessageHasOrderFoodPageState extends State<MessageHasOrderFoodPage> {
83 double sumMemberPrice = 0; 83 double sumMemberPrice = 0;
84 _orderFoodProvider.createdOrderSunModel.cookbooklist.forEach((element) { 84 _orderFoodProvider.createdOrderSunModel.cookbooklist.forEach((element) {
85 sumPrice += 85 sumPrice +=
86 - element.specPrice == null ? 0 : double.parse(element.specPrice);  
87 - sumMemberPrice += double.parse(  
88 - element.specMemberPrice == '0' || element.specMemberPrice == null 86 + (element.specPrice == null ? 0 : double.parse(element.specPrice)) *
  87 + int.parse(element.number);
  88 + sumMemberPrice += double.parse(element.specMemberPrice == '0' ||
  89 + element.specMemberPrice == null
89 ? element.specPrice == null 90 ? element.specPrice == null
90 ? '0' 91 ? '0'
91 : element.specPrice 92 : element.specPrice
92 - : element.specMemberPrice); 93 + : element.specMemberPrice) *
  94 + int.parse(element.number);
93 }); 95 });
94 sumPriceShow = 96 sumPriceShow =
95 (NumUtil.getNumByValueDouble(sumPrice, 2)).toStringAsFixed(2); 97 (NumUtil.getNumByValueDouble(sumPrice, 2)).toStringAsFixed(2);
@@ -149,9 +149,6 @@ class _MyMarketingRecordsPageState extends State<MyMarketingRecordsPage> { @@ -149,9 +149,6 @@ class _MyMarketingRecordsPageState extends State<MyMarketingRecordsPage> {
149 data.remainingTime == null 149 data.remainingTime == null
150 ? '无限制' 150 ? '无限制'
151 : '剩余${data.remainingTime}天', 151 : '剩余${data.remainingTime}天',
152 - // data.edate == null  
153 - // ? '无限制'  
154 - // : '剩余${data.edate}天',  
155 overflow: TextOverflow.ellipsis, 152 overflow: TextOverflow.ellipsis,
156 style: TextStyle( 153 style: TextStyle(
157 color: MyColours.color_333333, 154 color: MyColours.color_333333,