diff --git a/lib/settlement/settlement_view/settlement_order_commodity.dart b/lib/settlement/settlement_view/settlement_order_commodity.dart index 68845e7c..6daff4cc 100644 --- a/lib/settlement/settlement_view/settlement_order_commodity.dart +++ b/lib/settlement/settlement_view/settlement_order_commodity.dart @@ -125,8 +125,8 @@ class _SettlementOrderCommodity extends State { children: [ MImage( productList.skuImg, - width: 44, - height: 44, + width: 55, + height: 55, fit: BoxFit.cover, radius: BorderRadius.circular(4), errorSrc: "assets/image/default_1.webp", @@ -136,68 +136,70 @@ class _SettlementOrderCommodity extends State { flex: 1, child: Container( margin: EdgeInsets.only( - left: 16.w, + left:8.w, ), // height: 44.h, child: Column( mainAxisAlignment: MainAxisAlignment.spaceAround, crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Expanded(child: Text( - productList.productName, - maxLines: 1, - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.sp, - color: Color(0xFF353535), - ), - ),), - - Text( - "x${productList.buyNum}", - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF727272), - ), - ), - ], + Text( + productList.productName, + maxLines: 1, + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.sp, + color: Color(0xFF353535), + ), + ), + SizedBox(height: 4.h,), + Text( + productList.skuNameStr != null + ? "${productList.skuNameStr ?? ""}" + : "", + overflow: TextOverflow.ellipsis, + style: TextStyle( + fontSize: 10.sp, + color: Color(0xFFA29E9E), + ), ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Expanded( - flex: 1, - child: Text( - productList.skuNameStr != null - ? "${productList.skuNameStr ?? ""}" - : "", - overflow: TextOverflow.ellipsis, - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFFA29E9E), - ), - ), - ), - Text( - S.of(context).yuan_(productList.sellPrice), - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 12.sp, - color: Color(0xFF4C4C4C), - ), - ) - ], + Text( + "x${productList.buyNum}", + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFF727272), + ), ), + ], ), ), ), + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Text( + S.of(context).yuan_(AppUtils.calculateDouble(double.tryParse(productList.sellPrice ?? "0") - double.tryParse(productList.discountAmount ?? "0"))), + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.sp, + color: Color(0xFF4C4C4C), + ), + ), + if(productList.discountAmount != null) + Text( + S.of(context).yuan_(productList.sellPrice), + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + decoration: TextDecoration.lineThrough, + color: Color(0xFFA29E9E), + ), + ) + ], + ) ], ), ); @@ -409,9 +411,9 @@ class _SettlementOrderCommodity extends State { String totalPrice() { if (widget.minOrderInfo != null && widget.minOrderInfo.orderProductVOList != null) { - return "${widget.minOrderInfo.finalPayPrice}"; + return "¥${widget.minOrderInfo.finalPayPrice}"; } if (widget.settleOrderInfo.orderProductList == null) return ""; - return "${widget.settleOrderInfo.price}"; + return "¥${widget.settleOrderInfo.price}"; } } diff --git a/pubspec.yaml b/pubspec.yaml index 9182de4e..20ab8aa7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: 一心回乡. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 2.0.34+22 +version: 2.0.35+23 environment: sdk: ">=2.7.0 <3.0.0"