From d775cdb875835a3131bbb14d3dc527846657ca65 Mon Sep 17 00:00:00 2001
From: Haiyi <1021441632@qq.com>
Date: Thu, 9 Mar 2023 16:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(ID1000937):=E3=80=90=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E4=B8=8D=E7=94=A8=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=9B=BE=E7=89=87=EF=BC=8C=E5=B0=BD=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=A4=9A=E4=B8=80=E7=82=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../addressDetailBox/index.module.scss        |  2 +-
 src/pages/orderDetails/index.module.scss      | 48 +++++++++++++++++
 src/pages/orderDetails/index.tsx              | 54 ++++++++++++-------
 3 files changed, 84 insertions(+), 20 deletions(-)

diff --git a/src/pages/orderDetails/components/addressDetailBox/index.module.scss b/src/pages/orderDetails/components/addressDetailBox/index.module.scss
index 9fd8924..fd11846 100644
--- a/src/pages/orderDetails/components/addressDetailBox/index.module.scss
+++ b/src/pages/orderDetails/components/addressDetailBox/index.module.scss
@@ -90,7 +90,7 @@
 
     .reatBox {
       position: relative;
-      margin-right: 32px;
+      margin-left: 32px;
 
       .updateBtn {
         width: 200px;
diff --git a/src/pages/orderDetails/index.module.scss b/src/pages/orderDetails/index.module.scss
index 603cc99..7832ddb 100644
--- a/src/pages/orderDetails/index.module.scss
+++ b/src/pages/orderDetails/index.module.scss
@@ -255,6 +255,54 @@ page {
       }
     }
   }
+
+  .product_goods {
+    padding-right: 32px;
+    // width: 100%;
+    margin-top: 32px;
+    display: flex;
+    align-items: center;
+    margin-bottom: 24px;
+    justify-content: space-between;
+    .prodct_name {
+      height: 32px;
+      font-size: 26px;
+      font-weight: 400;
+      color: #3a3a3a;
+      margin-left: 32px;
+      max-width: 224px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+    .product_right {
+      display: flex;
+      align-items: center;
+      .lastBox {
+        min-width: 120px;
+        font-size: 26px;
+        text-decoration: line-through;
+        color: #7f7f7f;
+        margin-right: 24px;
+        text-align: left;
+      }
+      .itemMoney {
+        min-width: 120px;
+        font-size: 28px;
+        margin-right: 10px;
+        color: #757575;
+        margin-right: 40px;
+        text-align: left;
+      }
+      .itemMoneyOne {
+        width: 100px;
+        font-size: 26px;
+        font-weight: 500;
+        color: #4f4f4f;
+        text-align: left;
+      }
+    }
+  }
 }
 
 .goodsBox:last-child {
diff --git a/src/pages/orderDetails/index.tsx b/src/pages/orderDetails/index.tsx
index 283f9bd..50c0aa4 100644
--- a/src/pages/orderDetails/index.tsx
+++ b/src/pages/orderDetails/index.tsx
@@ -95,27 +95,43 @@ const GoodsItem = (porps: PropGoods) => {
               {
                 item.product_colors.map((it, inx) => {
                   return (
-                    <View className={styles.itemGoods} key={inx}>
-                      <View className={styles.itemPic}>
-                        <LabAndImg value={labAndImgObj(it)} />
-                      </View>
-                      {/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */}
-                      <View className={styles.itemRight}>
-                        <View className={styles.item_right_top}>
-                          <View className={styles.itemName}>{formatHashTag(it.code, it.name)}</View>
-                          <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
-                        </View>
-                        <View className={styles.item_right_Bottom}>
-                          <View className={styles.flexBox}>
-                            <View className={styles.itemMoney}>¥{formatPriceDiv(it.sale_price)}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
-                            {
-                              obj?.sale_mode === 0 && it?.sale_price !== it?.standard_sale_price && <View className={styles.lastBox}>¥{it?.standard_sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
-                            }
-                          </View>
-                          <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View>
-                        </View>
+                  // {/* 第一个版本的样式 */}
+
+                  // <View className={styles.itemGoods} key={inx}>
+                  //   <View className={styles.itemPic}>
+                  //     <LabAndImg value={labAndImgObj(it)} />
+                  //   </View>
+                  //   <View className={styles.itemRight}>
+                  //     <View className={styles.item_right_top}>
+                  //       <View className={styles.itemName}>{formatHashTag(it.code, it.name)}</View>
+                  //       <View className={styles.itemNums}>x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
+                  //     </View>
+                  //     <View className={styles.item_right_Bottom}>
+                  //       <View className={styles.flexBox}>
+                  //         <View className={styles.itemMoney}>¥{formatPriceDiv(it.sale_price)}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                  //         {
+                  //           obj?.sale_mode === 0 && it?.sale_price !== it?.standard_sale_price && <View className={styles.lastBox}>¥{it?.standard_sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                  //         }
+                  //       </View>
+                  //       <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View>
+                  //     </View>
+                  //   </View>
+                  // </View>
+
+                  // {/* 第二个版本的样式 */}
+
+                    <View className={styles.product_goods} key={inx}>
+                      <View className={styles.prodct_name}>{formatHashTag(it.code, it.name)} x{obj?.sale_mode === 0 ? it.roll : it.length / 100}{obj?.sale_mode === 0 ? '条' : 'm'}</View>
+                      <View className={styles.product_right}>
+
+                        {
+                          obj?.sale_mode === 0 && it?.sale_price !== it?.standard_sale_price && <View className={styles.lastBox}>¥{it?.standard_sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                        }
+                        <View className={styles.itemMoney}>¥{formatPriceDiv(it.sale_price)}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                        <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.total_sale_price)}</View>
                       </View>
                     </View>
+
                   )
                 })
               }