From 4788f2dca2fdedfbe46919235789f59932586f33 Mon Sep 17 00:00:00 2001
From: Haiyi <1021441632@qq.com>
Date: Tue, 20 Dec 2022 16:17:26 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(ID1000835):=E3=80=90=E4=B8=B4?=
 =?UTF-8?q?=E3=80=91=E8=A1=A5=E5=85=85=E5=8E=9F=E5=8D=95=E4=BB=B7=E3=80=81?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E4=BB=B7=E7=9A=84=E4=BB=B7=E6=A0=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project.private.config.json                   |   2 +-
 src/components/goodsItem/index.module.scss    | 249 +++++++++---------
 src/components/goodsItem/index.tsx            |  10 +-
 src/pages/orderDetails/index.module.scss      |  37 ++-
 src/pages/orderDetails/index.tsx              |   7 +-
 .../colorKindItem/index.module.scss           |  10 +-
 .../components/colorKindItem/index.tsx        |   4 +
 src/pages/submitOrder/index.module.scss       |  83 +++---
 src/pages/submitOrder/index.tsx               |   8 +-
 yarn.lock                                     | 104 ++++----
 10 files changed, 294 insertions(+), 220 deletions(-)

diff --git a/project.private.config.json b/project.private.config.json
index 868dbd4..59fe0c7 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -285,5 +285,5 @@
       ]
     }
   },
-  "libVersion": "2.27.3"
+  "libVersion": "2.28.1"
 }
\ No newline at end of file
diff --git a/src/components/goodsItem/index.module.scss b/src/components/goodsItem/index.module.scss
index 3403373..e5c570e 100644
--- a/src/components/goodsItem/index.module.scss
+++ b/src/components/goodsItem/index.module.scss
@@ -1,133 +1,142 @@
 .goodsBox {
+  display: flex;
+  margin-bottom: 32px;
+
+  // justify-content: space-between;
+  .pic {
+    width: 118px;
+    height: 118px;
+    border-radius: 8px;
+    margin-right: 32px;
+  }
+
+  .rightGoodbox {
+    padding-bottom: 31px;
+    border-bottom: 1px solid #efefef;
     display: flex;
-    margin-bottom: 32px;
+    justify-content: space-between;
+    // margin-right: 32px;
+    width: 538px;
 
-    // justify-content: space-between;
-    .pic {
-        width: 118px;
-        height: 118px;
-        border-radius: 8px;
-        margin-right: 32px;
+    .leftFontsbox {
+      .title {
+        width: 260px;
+        height: 34px;
+        font-size: 28px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #000000;
+        margin-bottom: 8px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        background: 0, 124, 247;
+      }
+
+      .productName {
+        width: 260px;
+        height: 30px;
+        font-size: 24px;
+        font-weight: 400;
+        color: #000000;
+        margin-bottom: 16px;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      .productNums {
+        font-size: 24px;
+        font-weight: 400;
+        color: #000000;
+      }
+
+      .productName {
+        font-size: 24px;
+        font-weight: 400;
+        color: #000000;
+        height: 40px;
+      }
     }
 
-    .rightGoodbox {
-        padding-bottom: 31px;
-        border-bottom: 1px solid #efefef;
+    .rightFontsbox {
+      .moneyFlex {
+        margin-bottom: 14px;
         display: flex;
-        justify-content: space-between;
-        // margin-right: 32px;
-        width: 538px;
+        justify-content: flex-end;
+        .lastBox {
+          font-size: 28px;
+          font-weight: 500;
+          text-decoration: line-through;
+          color: #7f7f7f;
+        }
+        .money {
+          margin-left: 15px;
+          font-size: 28px;
+          font-weight: 500;
+          color: #f41a39;
+        }
+      }
 
-        .leftFontsbox {
-            .title {
-                width: 260px;
-                height: 34px;
-                font-size: 28px;
-                font-family: PingFangSC-Regular, PingFang SC;
-                font-weight: 400;
-                color: #000000;
-                margin-bottom: 8px;
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-                background: 0, 124, 247;
-            }
+      .inputBox {
+        width: 189px;
+        height: 64px;
+        border-radius: 8px;
+        border: 1px solid #979797;
+        display: flex;
 
-            .productName {
-                width: 260px;
-                height: 30px;
-                font-size: 24px;
-                font-weight: 400;
-                color: #000000;
-                margin-bottom: 16px;
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-            }
+        .reduceBox {
+          width: 64px;
+          height: 64px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
 
-            .productNums {
-                font-size: 24px;
-                font-weight: 400;
-                color: #000000;
-            }
-
-            .productName {
-                font-size: 24px;
-                font-weight: 400;
-                color: #000000;
-                height: 40px;
-            }
+          .reduce {
+            width: 20px;
+            height: 3px;
+            background: #000000;
+            border-radius: 1px;
+            opacity: 0.8;
+          }
         }
 
-        .rightFontsbox {
-            .money {
-                display: flex;
-                justify-content: flex-end;
-                font-size: 28px;
-                font-weight: 500;
-                color: #F41A39;
-                margin-bottom: 14px;
-            }
-
-            .inputBox {
-                width: 189px;
-                height: 64px;
-                border-radius: 8px;
-                border: 1px solid #979797;
-                display: flex;
-
-                .reduceBox {
-                    width: 64px;
-                    height: 64px;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-
-                    .reduce {
-                        width: 20px;
-                        height: 3px;
-                        background: #000000;
-                        border-radius: 1px;
-                        opacity: 0.8;
-                    }
-                }
-
-                .numsBox {
-                    width: 61px;
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    font-size: 24px;
-                    font-weight: 400;
-                    color: #000000;
-                    text-align: center;
-                }
-
-                .addBox {
-                    width: 64px;
-                    height: 64px;
-                    display: flex;
-                    line-height: 64px;
-                    align-items: center;
-                    justify-content: center;
-                    flex-direction: column;
-                    color: #000;
-                    font-size: 35px;
-                }
-            }
-
-            .addtine {
-                width: 64px;
-                height: 64px;
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                color: #000;
-                font-size: 35px;
-                border-radius: 8px;
-                border: 1px solid #979797;
-                float: right;
-            }
+        .numsBox {
+          width: 61px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          font-size: 24px;
+          font-weight: 400;
+          color: #000000;
+          text-align: center;
         }
+
+        .addBox {
+          width: 64px;
+          height: 64px;
+          display: flex;
+          line-height: 64px;
+          align-items: center;
+          justify-content: center;
+          flex-direction: column;
+          color: #000;
+          font-size: 35px;
+        }
+      }
+
+      .addtine {
+        width: 64px;
+        height: 64px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #000;
+        font-size: 35px;
+        border-radius: 8px;
+        border: 1px solid #979797;
+        float: right;
+      }
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/src/components/goodsItem/index.tsx b/src/components/goodsItem/index.tsx
index 6e6583c..c7dd541 100644
--- a/src/components/goodsItem/index.tsx
+++ b/src/components/goodsItem/index.tsx
@@ -25,6 +25,9 @@ interface props {
     buyNums?: number | string
     id?: number
     weight_error?: number | string
+    last_bulk_price?: number
+    last_length_cut_price?: number
+    last_weight_cut_price?: number
   }
   goodList?: any[]
   onBlur?: (a: any, c: any) => void
@@ -85,7 +88,12 @@ const GoodsItem = (props: props) => {
           }
         </View>
         <View className={styles.rightFontsbox}>
-          <View className={styles.money}>¥{props?.modeFont === 0 ? Number(props.value?.bulk_price) / 100 : props.modeFont === 1 ? Number(props.value?.length_cut_price) / 100 : Number(props.value?.weight_cut_price) / 100}{props.modeFont != 1 ? '/Kg' : '/m'}</View>
+          <View className={styles.moneyFlex}>
+            {
+              props?.modeFont === 0 && props.value?.last_bulk_price !== props.value?.bulk_price && <View className={styles.lastBox}>¥{props?.modeFont === 0 ? Number(props.value?.last_bulk_price) / 100 : props.modeFont === 1 ? Number(props.value?.last_length_cut_price) / 100 : Number(props.value?.last_weight_cut_price) / 100} {props.modeFont as any != 1 ? '/Kg' : '/m'}</View>
+            }
+            <View className={styles.money}>¥{props?.modeFont === 0 ? Number(props.value?.bulk_price) / 100 : props.modeFont === 1 ? Number(props.value?.length_cut_price) / 100 : Number(props.value?.weight_cut_price) / 100}{props.modeFont != 1 ? '/Kg' : '/m'}</View>
+          </View>
           {
             props.value.showInput && <View className={styles.inputBox}>
               <View className={styles.reduceBox} onClick={() => { props.clickReduce?.(props.value) }}>
diff --git a/src/pages/orderDetails/index.module.scss b/src/pages/orderDetails/index.module.scss
index 334adb8..f81e624 100644
--- a/src/pages/orderDetails/index.module.scss
+++ b/src/pages/orderDetails/index.module.scss
@@ -176,11 +176,20 @@ page {
         display: flex;
         align-items: center;
         justify-content: space-between;
-
-        .itemMoney {
-          font-size: 28px;
-          font-weight: 400;
-          color: #a5a5a5;
+        .flexBox {
+          display: flex;
+          .itemMoney {
+            font-size: 28px;
+            margin-right: 10px;
+            font-weight: 400;
+            color: #000000;
+          }
+          .lastBox {
+            font-size: 28px;
+            font-weight: 400;
+            text-decoration: line-through;
+            color: #7f7f7f;
+          }
         }
 
         .itemMoneyOne {
@@ -234,10 +243,20 @@ page {
         align-items: center;
         justify-content: space-between;
 
-        .itemMoney {
-          font-size: 28px;
-          font-weight: 400;
-          color: #a5a5a5;
+        .flexBox {
+          display: flex;
+          .itemMoney {
+            font-size: 28px;
+            margin-right: 10px;
+            font-weight: 400;
+            color: #000000;
+          }
+          .lastBox {
+            font-size: 28px;
+            font-weight: 400;
+            text-decoration: line-through;
+            color: #7f7f7f;
+          }
         }
 
         .itemMoneyOne {
diff --git a/src/pages/orderDetails/index.tsx b/src/pages/orderDetails/index.tsx
index c2c2e08..abf0bf8 100644
--- a/src/pages/orderDetails/index.tsx
+++ b/src/pages/orderDetails/index.tsx
@@ -104,7 +104,12 @@ const GoodsItem = (porps: PropGoods) => {
                           <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.itemMoney}>¥{formatPriceDiv(it.sale_price)}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                          <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>
diff --git a/src/pages/shopping/components/colorKindItem/index.module.scss b/src/pages/shopping/components/colorKindItem/index.module.scss
index d2e84fd..7beea96 100644
--- a/src/pages/shopping/components/colorKindItem/index.module.scss
+++ b/src/pages/shopping/components/colorKindItem/index.module.scss
@@ -54,13 +54,19 @@
       font-weight: 550;
       font-size: 28px;
     }
+    &--yuanPrice {
+      font-size: 26px;
+      font-weight: 500;
+      text-decoration: line-through;
+      color: #7f7f7f;
+    }
     &--counter {
     }
   }
 }
-.checkbox{
+.checkbox {
   padding: 0 24px;
 }
 .selected {
-  background-color: #F8FAFF;
+  background-color: #f8faff;
 }
diff --git a/src/pages/shopping/components/colorKindItem/index.tsx b/src/pages/shopping/components/colorKindItem/index.tsx
index 2121c87..dbddadd 100644
--- a/src/pages/shopping/components/colorKindItem/index.tsx
+++ b/src/pages/shopping/components/colorKindItem/index.tsx
@@ -132,6 +132,10 @@ const ColorKindItem: FC<PropsType> = (props) => {
       </View>
       <View className={styles.colorKindItem__right}>
         <View className={styles['colorKindItem__right--price']}>￥ {formatPrice(itemData.sale_price)}/{itemData.sale_mode == EnumSaleMode.Plate ? '米' : 'kg'}</View>
+        {
+          itemData.sale_mode === EnumSaleMode.Bulk && itemData?.standard_sale_price !== itemData?.sale_price && <View className={styles['colorKindItem__right--yuanPrice']}>￥ {formatPrice(itemData?.standard_sale_price)}/{itemData.sale_mode == EnumSaleMode.Plate ? '米' : 'kg'}</View>
+
+        }
         <View className={styles['colorKindItem__right--counter']}>
           <Counter
             onBlue={getInputValue}
diff --git a/src/pages/submitOrder/index.module.scss b/src/pages/submitOrder/index.module.scss
index 5f1a11f..ecc4634 100644
--- a/src/pages/submitOrder/index.module.scss
+++ b/src/pages/submitOrder/index.module.scss
@@ -10,7 +10,7 @@ page {
 
     .pussName {
       font-size: 28px;
-      font-family: PingFangSC-Regular, PingFang SC;
+
       font-weight: 400;
       color: #000000;
     }
@@ -18,7 +18,7 @@ page {
     .pussPhone {
       margin-left: 88px;
       font-size: 28px;
-      font-family: PingFangSC-Regular, PingFang SC;
+
       font-weight: 400;
       color: #000000;
     }
@@ -27,7 +27,7 @@ page {
   .total {
     margin-top: 44px;
     font-size: 24px;
-    font-family: PingFangSC-Regular, PingFang SC;
+
     font-weight: 400;
     color: #000000;
     margin-left: 32px;
@@ -56,7 +56,7 @@ page {
           margin-left: 32px;
           margin-right: 8px;
           font-size: 28px;
-          font-family: PingFangSC-Regular, PingFang SC;
+
           font-weight: 400;
           color: #000000;
         }
@@ -68,7 +68,7 @@ page {
 
       .shoudPay {
         font-size: 28px;
-        font-family: PingFangSC-Medium, PingFang SC;
+
         font-weight: 500;
         color: #f64861;
         margin-right: 32px;
@@ -91,14 +91,14 @@ page {
 
     .title {
       font-size: 28px;
-      font-family: PingFangSC-Medium, PingFang SC;
+
       font-weight: 500;
       color: #000000;
     }
 
     .modeName {
       font-size: 28px;
-      font-family: PingFangSC-Medium, PingFang SC;
+
       font-weight: 500;
       color: #337fff;
     }
@@ -120,7 +120,7 @@ page {
 
   .goodsProduct {
     font-size: 28px;
-    font-family: PingFangSC-Medium, PingFang SC;
+
     font-weight: 500;
     color: #000000;
     margin-left: 32px;
@@ -161,14 +161,14 @@ page {
 
         .itemName {
           font-size: 28px;
-          font-family: PingFangSC-Regular, PingFang SC;
+
           font-weight: 400;
           color: #000000;
         }
 
         .itemNums {
           font-size: 28px;
-          font-family: PingFangSC-Regular, PingFang SC;
+
           font-weight: 400;
           color: #000000;
         }
@@ -179,16 +179,25 @@ page {
         align-items: center;
         justify-content: space-between;
 
-        .itemMoney {
-          font-size: 28px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          font-weight: 400;
-          color: #000000;
+        .flexBox {
+          display: flex;
+          .itemMoney {
+            font-size: 28px;
+            margin-right: 10px;
+            font-weight: 400;
+            color: #000000;
+          }
+          .lastBox {
+            font-size: 28px;
+            font-weight: 400;
+            text-decoration: line-through;
+            color: #7f7f7f;
+          }
         }
 
         .itemMoneyOne {
           font-size: 28px;
-          font-family: PingFangSC-Medium, PingFang SC;
+
           font-weight: 500;
           color: #000000;
         }
@@ -222,14 +231,14 @@ page {
 
         .itemName {
           font-size: 28px;
-          font-family: PingFangSC-Regular, PingFang SC;
+
           font-weight: 400;
           color: #000000;
         }
 
         .itemNums {
           font-size: 28px;
-          font-family: PingFangSC-Regular, PingFang SC;
+
           font-weight: 400;
           color: #000000;
         }
@@ -239,17 +248,25 @@ page {
         display: flex;
         align-items: center;
         justify-content: space-between;
-
-        .itemMoney {
-          font-size: 28px;
-          font-family: PingFangSC-Regular, PingFang SC;
-          font-weight: 400;
-          color: #000000;
+        .flexBox {
+          display: flex;
+          .itemMoney {
+            font-size: 28px;
+            margin-right: 10px;
+            font-weight: 400;
+            color: #000000;
+          }
+          .lastBox {
+            font-size: 28px;
+            font-weight: 400;
+            text-decoration: line-through;
+            color: #7f7f7f;
+          }
         }
 
         .itemMoneyOne {
           font-size: 28px;
-          font-family: PingFangSC-Medium, PingFang SC;
+
           font-weight: 500;
           color: #000000;
         }
@@ -274,7 +291,7 @@ page {
 
     .detailRight {
       font-size: 28px;
-      font-family: PingFangSC-Regular, PingFang SC;
+
       font-weight: 400;
       color: #000000;
     }
@@ -286,7 +303,7 @@ page {
       border-radius: 8px;
       border: 1px solid #337fff;
       font-size: 24px;
-      font-family: PingFangSC-Regular, PingFang SC;
+
       font-weight: 400;
       color: #337fff;
       text-align: center;
@@ -296,7 +313,7 @@ page {
 
   .detailFont {
     font-size: 28px;
-    font-family: PingFangSC-Regular, PingFang SC;
+
     font-weight: 400;
     color: #000000;
   }
@@ -305,7 +322,7 @@ page {
 .remarkFont {
   margin-top: 24px;
   font-size: 28px;
-  font-family: PingFangSC-Regular, PingFang SC;
+
   font-weight: 400;
   color: #000000;
 }
@@ -335,7 +352,7 @@ page {
 
       .topFont {
         font-size: 28px;
-        font-family: PingFangSC-Regular, PingFang SC;
+
         font-weight: 400;
         color: #000000;
         margin-right: 10px;
@@ -343,7 +360,7 @@ page {
 
       .topTotal {
         font-size: 24px;
-        font-family: PingFangSC-Medium, PingFang SC;
+
         font-weight: 500;
         color: #f64861;
       }
@@ -352,7 +369,7 @@ page {
     .bottomFlex {
       margin-left: 48px;
       font-size: 24px;
-      font-family: PingFangSC-Regular, PingFang SC;
+
       font-weight: 400;
       color: #000000;
     }
@@ -365,7 +382,7 @@ page {
     background: #4581ff;
     border-radius: 40px;
     font-size: 32px;
-    font-family: PingFangSC-Medium, PingFang SC;
+
     font-weight: 500;
     color: #ffffff;
     text-align: center;
diff --git a/src/pages/submitOrder/index.tsx b/src/pages/submitOrder/index.tsx
index bfca299..0cf63ed 100644
--- a/src/pages/submitOrder/index.tsx
+++ b/src/pages/submitOrder/index.tsx
@@ -88,7 +88,13 @@ const GoodsItem = (porps: PropGoods) => {
                           <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.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                          <View className={styles.flexBox}>
+                            <View className={styles.itemMoney}>¥{it.sale_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                            {
+                              obj?.sale_mode === 0 && it?.sale_price !== it?.standard_price && <View className={styles.lastBox}>¥{it?.standard_price / 100}/{obj?.sale_mode === 1 ? 'm' : 'kg'}</View>
+                            }
+                          </View>
+
                           <View className={styles.itemMoneyOne}>¥{formatPriceDiv(it.estimate_amount)}</View>
                         </View>
                       </View>
diff --git a/yarn.lock b/yarn.lock
index c4f1358..ae852ba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2269,13 +2269,13 @@
     "@types/node" "*"
 
 "@typescript-eslint/eslint-plugin@^5.44.0":
-  version "5.46.1"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.1.tgz#098abb4c9354e19f460d57ab18bff1f676a6cff0"
-  integrity sha512-YpzNv3aayRBwjs4J3oz65eVLXc9xx0PDbIRisHj+dYhvBn02MjYOD96P8YGiWEIFBrojaUjxvkaUpakD82phsA==
+  version "5.47.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.47.0.tgz#dadb79df3b0499699b155839fd6792f16897d910"
+  integrity sha512-AHZtlXAMGkDmyLuLZsRpH3p4G/1iARIwc/T0vIem2YB+xW6pZaXYXzCBnZSF/5fdM97R9QqZWZ+h3iW10XgevQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.46.1"
-    "@typescript-eslint/type-utils" "5.46.1"
-    "@typescript-eslint/utils" "5.46.1"
+    "@typescript-eslint/scope-manager" "5.47.0"
+    "@typescript-eslint/type-utils" "5.47.0"
+    "@typescript-eslint/utils" "5.47.0"
     debug "^4.3.4"
     ignore "^5.2.0"
     natural-compare-lite "^1.4.0"
@@ -2284,71 +2284,71 @@
     tsutils "^3.21.0"
 
 "@typescript-eslint/parser@^5.20.0", "@typescript-eslint/parser@^5.44.0":
-  version "5.46.1"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.46.1.tgz#1fc8e7102c1141eb64276c3b89d70da8c0ba5699"
-  integrity sha512-RelQ5cGypPh4ySAtfIMBzBGyrNerQcmfA1oJvPj5f+H4jI59rl9xxpn4bonC0tQvUKOEN7eGBFWxFLK3Xepneg==
+  version "5.47.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.47.0.tgz#62e83de93499bf4b500528f74bf2e0554e3a6c8d"
+  integrity sha512-udPU4ckK+R1JWCGdQC4Qa27NtBg7w020ffHqGyAK8pAgOVuNw7YaKXGChk+udh+iiGIJf6/E/0xhVXyPAbsczw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.46.1"
-    "@typescript-eslint/types" "5.46.1"
-    "@typescript-eslint/typescript-estree" "5.46.1"
+    "@typescript-eslint/scope-manager" "5.47.0"
+    "@typescript-eslint/types" "5.47.0"
+    "@typescript-eslint/typescript-estree" "5.47.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.46.1":
-  version "5.46.1"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz#70af8425c79bbc1178b5a63fb51102ddf48e104a"
-  integrity sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==
+"@typescript-eslint/scope-manager@5.47.0":
+  version "5.47.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.47.0.tgz#f58144a6b0ff58b996f92172c488813aee9b09df"
+  integrity sha512-dvJab4bFf7JVvjPuh3sfBUWsiD73aiftKBpWSfi3sUkysDQ4W8x+ZcFpNp7Kgv0weldhpmMOZBjx1wKN8uWvAw==
   dependencies:
-    "@typescript-eslint/types" "5.46.1"
-    "@typescript-eslint/visitor-keys" "5.46.1"
+    "@typescript-eslint/types" "5.47.0"
+    "@typescript-eslint/visitor-keys" "5.47.0"
 
-"@typescript-eslint/type-utils@5.46.1":
-  version "5.46.1"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.46.1.tgz#195033e4b30b51b870dfcf2828e88d57b04a11cc"
-  integrity sha512-V/zMyfI+jDmL1ADxfDxjZ0EMbtiVqj8LUGPAGyBkXXStWmCUErMpW873zEHsyguWCuq2iN4BrlWUkmuVj84yng==
+"@typescript-eslint/type-utils@5.47.0":
+  version "5.47.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.47.0.tgz#2b440979c574e317d3473225ae781f292c99e55d"
+  integrity sha512-1J+DFFrYoDUXQE1b7QjrNGARZE6uVhBqIvdaXTe5IN+NmEyD68qXR1qX1g2u4voA+nCaelQyG8w30SAOihhEYg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.46.1"
-    "@typescript-eslint/utils" "5.46.1"
+    "@typescript-eslint/typescript-estree" "5.47.0"
+    "@typescript-eslint/utils" "5.47.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.46.1":
-  version "5.46.1"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.46.1.tgz#4e9db2107b9a88441c4d5ecacde3bb7a5ebbd47e"
-  integrity sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==
+"@typescript-eslint/types@5.47.0":
+  version "5.47.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.47.0.tgz#67490def406eaa023dbbd8da42ee0d0c9b5229d3"
+  integrity sha512-eslFG0Qy8wpGzDdYKu58CEr3WLkjwC5Usa6XbuV89ce/yN5RITLe1O8e+WFEuxnfftHiJImkkOBADj58ahRxSg==
 
-"@typescript-eslint/typescript-estree@5.46.1":
-  version "5.46.1"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz#5358088f98a8f9939355e0996f9c8f41c25eced2"
-  integrity sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==
+"@typescript-eslint/typescript-estree@5.47.0":
+  version "5.47.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.47.0.tgz#ed971a11c5c928646d6ba7fc9dfdd6e997649aca"
+  integrity sha512-LxfKCG4bsRGq60Sqqu+34QT5qT2TEAHvSCCJ321uBWywgE2dS0LKcu5u+3sMGo+Vy9UmLOhdTw5JHzePV/1y4Q==
   dependencies:
-    "@typescript-eslint/types" "5.46.1"
-    "@typescript-eslint/visitor-keys" "5.46.1"
+    "@typescript-eslint/types" "5.47.0"
+    "@typescript-eslint/visitor-keys" "5.47.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.46.1":
-  version "5.46.1"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.46.1.tgz#7da3c934d9fd0eb4002a6bb3429f33298b469b4a"
-  integrity sha512-RBdBAGv3oEpFojaCYT4Ghn4775pdjvwfDOfQ2P6qzNVgQOVrnSPe5/Pb88kv7xzYQjoio0eKHKB9GJ16ieSxvA==
+"@typescript-eslint/utils@5.47.0":
+  version "5.47.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.47.0.tgz#b5005f7d2696769a1fdc1e00897005a25b3a0ec7"
+  integrity sha512-U9xcc0N7xINrCdGVPwABjbAKqx4GK67xuMV87toI+HUqgXj26m6RBp9UshEXcTrgCkdGYFzgKLt8kxu49RilDw==
   dependencies:
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.46.1"
-    "@typescript-eslint/types" "5.46.1"
-    "@typescript-eslint/typescript-estree" "5.46.1"
+    "@typescript-eslint/scope-manager" "5.47.0"
+    "@typescript-eslint/types" "5.47.0"
+    "@typescript-eslint/typescript-estree" "5.47.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.46.1":
-  version "5.46.1"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz#126cc6fe3c0f83608b2b125c5d9daced61394242"
-  integrity sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==
+"@typescript-eslint/visitor-keys@5.47.0":
+  version "5.47.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.47.0.tgz#4aca4efbdf6209c154df1f7599852d571b80bb45"
+  integrity sha512-ByPi5iMa6QqDXe/GmT/hR6MZtVPi0SqMQPDx15FczCBXJo/7M8T88xReOALAfpBLm+zxpPfmhuEvPb577JRAEg==
   dependencies:
-    "@typescript-eslint/types" "5.46.1"
+    "@typescript-eslint/types" "5.47.0"
     eslint-visitor-keys "^3.3.0"
 
 "@webassemblyjs/ast@1.11.1":
@@ -7174,9 +7174,9 @@ ignore@^4.0.3, ignore@^4.0.6:
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.0.5, ignore@^5.1.1, ignore@^5.1.9, ignore@^5.2.0:
-  version "5.2.2"
-  resolved "https://registry.npmmirror.com/ignore/-/ignore-5.2.2.tgz#7e5f30224584b67aeeefe383a24a61dce4cb370d"
-  integrity sha512-m1MJSy4Z2NAcyhoYpxQeBsc1ZdNQwYjN0wGbLBlnVArdJ90Gtr8IhNSfZZcCoR0fM/0E0BJ0mf1KnLNDOCJP4w==
+  version "5.2.4"
+  resolved "https://registry.npmmirror.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
 image-size@~0.5.0:
   version "0.5.5"
@@ -10950,9 +10950,9 @@ sass@1.50.0:
     source-map-js ">=0.6.2 <2.0.0"
 
 sass@^1.23.7:
-  version "1.57.0"
-  resolved "https://registry.npmmirror.com/sass/-/sass-1.57.0.tgz#64c4144ed4e1c0ccb96dc18aef2c424cdbc0c12b"
-  integrity sha512-IZNEJDTK1cF5B1cGA593TPAV/1S0ysUDxq9XHjX/+SMy0QfUny+nfUsq5ZP7wWSl4eEf7wDJcEZ8ABYFmh3m/w==
+  version "1.57.1"
+  resolved "https://registry.npmmirror.com/sass/-/sass-1.57.1.tgz#dfafd46eb3ab94817145e8825208ecf7281119b5"
+  integrity sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"