diff --git a/lib/model/mine/rose_data.dart b/lib/model/mine/rose_data.dart index a7fee3a..59c3a78 100644 --- a/lib/model/mine/rose_data.dart +++ b/lib/model/mine/rose_data.dart @@ -11,6 +11,7 @@ class RoseData { String? purchaseTimeValue; String? validityPeriodDays; String? liveDurationHours; + String? unitSellingPriceStr; RoseData( {this.productId, @@ -24,7 +25,8 @@ class RoseData { this.unitSellingPrice, this.purchaseTimeValue, this.validityPeriodDays, - this.liveDurationHours + this.liveDurationHours, + this.unitSellingPriceStr, }); RoseData.fromJson(Map json) { @@ -40,6 +42,7 @@ class RoseData { purchaseTimeValue = json['purchaseTimeValue']; validityPeriodDays = json['validityPeriodDays']; liveDurationHours = json['liveDurationHours']; + unitSellingPriceStr = json['unitSellingPriceStr']; } Map toJson() { @@ -56,6 +59,7 @@ class RoseData { data['purchaseTimeValue'] = this.purchaseTimeValue; data['validityPeriodDays'] = this.validityPeriodDays; data['liveDurationHours'] = this.liveDurationHours; + data['unitSellingPriceStr'] = this.unitSellingPriceStr; return data; } } diff --git a/lib/pages/mine/rose_page.dart b/lib/pages/mine/rose_page.dart index de0713f..0ac7ea7 100644 --- a/lib/pages/mine/rose_page.dart +++ b/lib/pages/mine/rose_page.dart @@ -289,7 +289,7 @@ class _PayItemState extends State { ), ), Text( - "${widget.item.unitSellingPrice!.toStringAsFixed(2)}元", + "${widget.item.unitSellingPriceStr}元", style: TextStyle( fontSize: 11.w, color: const Color.fromRGBO(144, 144, 144, 144), diff --git a/lib/widget/live/live_recharge_popup.dart b/lib/widget/live/live_recharge_popup.dart index 71f4c2e..582cdc1 100644 --- a/lib/widget/live/live_recharge_popup.dart +++ b/lib/widget/live/live_recharge_popup.dart @@ -109,7 +109,7 @@ class LiveRechargePopup extends StatelessWidget { final payList = roseList.map((rose) { return { 'num': rose.purchaseTimeValue ?? 0, - 'price': rose.unitSellingPrice ?? 0, + 'price': rose.unitSellingPriceStr ?? "0", 'hasTag': rose.detailDesc != null && rose.detailDesc!.isNotEmpty, 'tagText': rose.detailDesc ?? '', }; diff --git a/lib/widget/live/live_room_pay_item.dart b/lib/widget/live/live_room_pay_item.dart index 02eca9f..b8ca6a5 100644 --- a/lib/widget/live/live_room_pay_item.dart +++ b/lib/widget/live/live_room_pay_item.dart @@ -70,7 +70,7 @@ class _LiveRoomPayItemState extends State { ), ), Text( - "${(widget.item["price"])?.toStringAsFixed(2) ?? '0.00'}元", + "${(widget.item["price"])}元", style: TextStyle( fontSize: 11.w, color: const Color.fromRGBO(144, 144, 144, 1),