From 2084e19188a2282cb71a1c05afd26ff23c7fa816 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Thu, 2 Feb 2023 17:22:21 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf(ID1001193=20=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=98=BE=E7=A4=BA=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/constant.ts                          |  4 ++--
 .../components/orderCount/index.module.scss     | 17 +++++++++++++++++
 .../details/components/orderCount/index.tsx     | 17 ++++++++++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/common/constant.ts b/src/common/constant.ts
index 52a5e1f..7633c55 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -1,11 +1,11 @@
-export const BASE_URL = CURRENT_BASE_URL
+// export const BASE_URL = CURRENT_BASE_URL
 // export const BASE_URL = `http://192.168.0.75:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:50001/lymarket`
 // export const BASE_URL = `http://10.0.0.5:50001/lymarket`
 // export const BASE_URL = `http://192.168.0.89:40001/lymarket`
 // export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
 // export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境
-// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
+export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
 // export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
diff --git a/src/pages/details/components/orderCount/index.module.scss b/src/pages/details/components/orderCount/index.module.scss
index 999b6ae..cd5c0c5 100644
--- a/src/pages/details/components/orderCount/index.module.scss
+++ b/src/pages/details/components/orderCount/index.module.scss
@@ -97,6 +97,23 @@
     padding: 20px;
     .title {
       font-size: 26px;
+      display: flex;
+      align-items: center;
+      text {
+        &:nth-child(1) {
+          font-size: 28px;
+          color: #000;
+          font-weight: 500;
+        }
+        &:nth-child(2) {
+          font-size: 22px;
+          display: inline-block;
+          color: red;
+          margin-left: 16px;
+          border: 1px solid red;
+          padding: 2px 5px;
+        }
+      }
     }
     .miconfont {
       font-size: 36px;
diff --git a/src/pages/details/components/orderCount/index.tsx b/src/pages/details/components/orderCount/index.tsx
index 97beefc..c8615f2 100644
--- a/src/pages/details/components/orderCount/index.tsx
+++ b/src/pages/details/components/orderCount/index.tsx
@@ -334,6 +334,18 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first
     if (recommendStatus) { goLink('/pages/details/index', { id: productId }) }
   }
 
+  const unit_text = useMemo(() => {
+    if (selectIndex == 0) {
+      return '大货单位：条'
+    }
+    else if (selectIndex == 1) {
+      return '剪版单位：米'
+    }
+    else {
+      return '散剪单位：米'
+    }
+  }, [selectIndex])
+
   return (
     <View className={styles.shop_cart_main}>
       <Popup showTitle={false} show={showPopup} onClose={() => closePopup()}>
@@ -375,7 +387,10 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first
             </View>
           )}
           <View className={styles.colorNum}>
-            <View className={styles.title}>颜色分类 ({list.length})</View>
+            <View className={styles.title}>
+              <Text>颜色分类 ({list.length})</Text>
+              <Text>{unit_text}</Text>
+            </View>
             {!searchShow && <View className={classnames('iconfont icon-sousuo', styles.miconfont)} onClick={() => changeSearchShow()}></View>}
           </View>