From c76d6f644803a56ab64842978cd8eff125b6bbb2 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Tue, 7 Jun 2022 19:33:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=94=AE=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/orderBtns/index.module.scss        |  2 +-
 .../components/applyAfterSales/index.module.scss  | 15 ++++++++++++++-
 .../order/components/applyAfterSales/index.tsx    |  9 ++++++++-
 src/pages/order/index.tsx                         |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/components/orderBtns/index.module.scss b/src/components/orderBtns/index.module.scss
index 28023d0..a8f7963 100644
--- a/src/components/orderBtns/index.module.scss
+++ b/src/components/orderBtns/index.module.scss
@@ -1,7 +1,7 @@
 .btns_list{
     display: flex;
     justify-content: flex-end;
-    margin-top: 30px;
+    // margin-top: 30px;
     .btns_item{
         width: 152px;
         height: 72px;
diff --git a/src/pages/order/components/applyAfterSales/index.module.scss b/src/pages/order/components/applyAfterSales/index.module.scss
index 594b36e..3c9be20 100644
--- a/src/pages/order/components/applyAfterSales/index.module.scss
+++ b/src/pages/order/components/applyAfterSales/index.module.scss
@@ -44,6 +44,7 @@
             .color_item{
                 display: flex;
                 align-items: center;
+                margin: 20px 0;
             }
             .image{
                 width: 70px;
@@ -55,7 +56,19 @@
                 }
             }
             .name_and_number{
-                
+                padding-left: 30px;
+                flex:1;
+                text{
+                    &:nth-child(1) {
+                        font-weight: 700;
+                        font-size: $font_size;
+                    }
+                    &:nth-child(2) {
+                        color: $color_font_two;
+                        font-size: $font_size;
+                        margin-left: 20px;
+                    }
+                }
             }
         }
     }
diff --git a/src/pages/order/components/applyAfterSales/index.tsx b/src/pages/order/components/applyAfterSales/index.tsx
index 1c6e31a..6edef79 100644
--- a/src/pages/order/components/applyAfterSales/index.tsx
+++ b/src/pages/order/components/applyAfterSales/index.tsx
@@ -22,7 +22,14 @@ export default memo(() => {
                         <View className={styles.color_item}>
                             <View className={styles.image}><Image src={formatImgUrl('')}/></View>
                             <View className={styles.name_and_number}><Text>1# 薄荷绿</Text><Text>x1</Text></View>
-                            <View className={styles.name_and_number}>
+                            <View className={styles.count}>
+                                <Counter/>
+                            </View>
+                        </View>
+                        <View className={styles.color_item}>
+                            <View className={styles.image}><Image src={formatImgUrl('')}/></View>
+                            <View className={styles.name_and_number}><Text>1# 薄荷绿</Text><Text>x1</Text></View>
+                            <View className={styles.count}>
                                 <Counter/>
                             </View>
                         </View>
diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx
index 060dc54..3c0304f 100644
--- a/src/pages/order/index.tsx
+++ b/src/pages/order/index.tsx
@@ -226,7 +226,7 @@ import styles  from './index.module.scss'
                 <Remark onSave={(e) => getRemark(e)}/>
             </Popup>
             <Payment onSubmitSuccess={onPaySuccess} show={payMentShow} onClose={closePayShow} orderInfo={payOrderInfo} />
-            <ApplyAfterSales/>
+            {/* <ApplyAfterSales/> */}
             <View className="common_safe_area_y"></View>
         </View>
     )