From 3be0f9f17c7b5c6dc6c73f880f67f63fe9db376b Mon Sep 17 00:00:00 2001
From: Haiyi <1021441632@qq.com>
Date: Wed, 28 Dec 2022 15:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(ID1000803):=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=AE=B5=E4=B8=8B=E5=8D=95=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/comfirm.module.scss | 35 ++++++++++++++++++++++++++++-
 src/pages/order/comfirm.tsx         |  8 +++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/pages/order/comfirm.module.scss b/src/pages/order/comfirm.module.scss
index 8ac6bfb..e700e7d 100644
--- a/src/pages/order/comfirm.module.scss
+++ b/src/pages/order/comfirm.module.scss
@@ -4,7 +4,40 @@
   padding: 20px;
   padding-bottom: 190px;
   box-sizing: border-box;
-
+  .topBox {
+    background: #fffbe7;
+    width: 100%;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+    .flexBox {
+      display: flex;
+      .gan {
+        margin-top: 6px;
+        min-width: 24px;
+        margin-left: 30px;
+        border-radius: 50%;
+        width: 24px;
+        height: 24px;
+        color: #fff;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background-color: #ffac00;
+        font-size: 20px;
+        margin-right: 10px;
+      }
+      .ganFont {
+        margin-right: 30px;
+        color: #f6ab3f;
+        font-size: 28px;
+      }
+    }
+  }
   .order_title {
     display: flex;
     align-items: center;
diff --git a/src/pages/order/comfirm.tsx b/src/pages/order/comfirm.tsx
index 099eebb..f525c5f 100644
--- a/src/pages/order/comfirm.tsx
+++ b/src/pages/order/comfirm.tsx
@@ -185,6 +185,14 @@ const Comfirm = () => {
   return (
     <MoveBtn showList={['customer']}>
       <View className={styles.order_main}>
+        {
+          preViewOrder?.notice !== '' && <View className={styles.topBox}>
+            <View className={styles.flexBox}>
+              <View className={styles.gan}>!</View>
+              <View className={styles.ganFont}>{preViewOrder?.notice}</View>
+            </View>
+          </View>
+        }
         <AddressInfoDetail orderInfo={defaultAddress} onSelect={getAddress} onChangeShipmentMode={selectShipmentMode} status={1} />
         <KindList order={formatPreViewOrderMemo} comfirm />
         <View className={styles.order_desc} onClick={() => setShowDesc(true)}>