Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app

lib/settlement/settlement_view/settlement_order_commodity.dart

@@ -125,8 +125,8 @@ class _SettlementOrderCommodity extends State<SettlementOrderCommodity> {
         children: [
           MImage(
             productList.skuImg,
-            width: 44,
+            width: 55,
-            height: 44,
+            height: 55,
             fit: BoxFit.cover,
             radius: BorderRadius.circular(4),
             errorSrc: "assets/image/default_1.webp",
@@ -136,68 +136,70 @@ class _SettlementOrderCommodity extends State<SettlementOrderCommodity> {
             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(
+                  Text(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    productList.productName,
-                    crossAxisAlignment: CrossAxisAlignment.center,
+                    maxLines: 1,
-                    children: [
+                    overflow: TextOverflow.ellipsis,
-                      Expanded(child: Text(
+                    style: TextStyle(
-                        productList.productName,
+                      fontWeight: FontWeight.bold,
-                        maxLines: 1,
+                      fontSize: 14.sp,
-                        overflow: TextOverflow.ellipsis,
+                      color: Color(0xFF353535),
-                        style: TextStyle(
+                    ),
-                          fontWeight: FontWeight.bold,
+                  ),
-                          fontSize: 14.sp,
+                  SizedBox(height: 4.h,),
-                          color: Color(0xFF353535),
+                  Text(
-                        ),
+                    productList.skuNameStr != null
-                      ),),
+                        ? "${productList.skuNameStr ?? ""}"
-
+                        : "",
-                      Text(
+                    overflow: TextOverflow.ellipsis,
-                        "x${productList.buyNum}",
+                    style: TextStyle(
-                        style: TextStyle(
+                      fontSize: 10.sp,
-                          fontSize: 12.sp,
+                      color: Color(0xFFA29E9E),
-                          color: Color(0xFF727272),
+                    ),
-                        ),
-                      ),
-                    ],
                   ),
-                  Row(
+                  Text(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    "x${productList.buyNum}",
-                    crossAxisAlignment: CrossAxisAlignment.center,
+                    style: TextStyle(
-                    children: [
+                      fontSize: 12.sp,
-                      Expanded(
+                      color: Color(0xFF727272),
-                        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),
-                        ),
-                      )
-                    ],
                   ),
+
                 ],
               ),
             ),
           ),
+          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<SettlementOrderCommodity> {
   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}";
   }
 }

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"