From 5b28db86f68af46630added275153705209adf6f Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Tue, 28 Feb 2023 19:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(ID1000932=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E9=A1=B5=E9=9D=A2=E3=80=81=E9=9D=A2=E6=96=99=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E7=82=B9=E5=87=BB=E9=80=89=E8=B4=AD=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E3=80=81=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BA=E5=8E=9F=E4=BB=B7):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/constant.ts                             | 4 ++--
 src/pages/details/components/orderCount/index.tsx  | 2 +-
 src/pages/order/components/kindList/index.tsx      | 4 ++--
 src/pages/shopCar/components/productItem/index.tsx | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/common/constant.ts b/src/common/constant.ts
index 4083328..3f4895b 100644
--- a/src/common/constant.ts
+++ b/src/common/constant.ts
@@ -5,14 +5,14 @@
 // 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` // 发
 // export const BASE_URL = 'https://dev.zzfzyc.com/lymarket' // 开发环境
 // export const BASE_URL = 'https://www.zzfzyc.com/lymarket' // 正式环境
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
-export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
+// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
 // export const BASE_URL = 'http://192.168.1.28:50001/lymarket' // 婷
 // export const BASE_URL = 'http://192.168.1.42:50002/lymarket' //  杰
 
diff --git a/src/pages/details/components/orderCount/index.tsx b/src/pages/details/components/orderCount/index.tsx
index e81be22..7c3a2b0 100644
--- a/src/pages/details/components/orderCount/index.tsx
+++ b/src/pages/details/components/orderCount/index.tsx
@@ -325,7 +325,7 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first
               <View className={styles.title}>{formatHashTag(item.code, item.name)}</View>
               {/* {selectIndex == 0 && <View className={styles.weight_error}>空差：{formatWeightDiv(item.weight_error)}kg</View>} */}
               <View className={styles.flexBox}>
-                {(selectIndex === 0 && item.bulk_price !== item.last_bulk_price) && <View className={styles.numone}>{formatOriginalPrice(item)}</View>}
+                {/* {(selectIndex === 0 && item.bulk_price !== item.last_bulk_price) && <View className={styles.numone}>{formatOriginalPrice(item)}</View>} */}
                 <View className={styles.num}>{formatPrice(item)}</View>
               </View>
 
diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx
index b21ebb7..f0e716c 100644
--- a/src/pages/order/components/kindList/index.tsx
+++ b/src/pages/order/components/kindList/index.tsx
@@ -214,9 +214,9 @@ const KindList = ({ order, comfirm = false }: Param) => {
                             {colorItem?.apply_return_roll > 0 && <Text>{`待退${colorItem?.apply_return_roll}条`}</Text>}
                           </View>
                           <View className={styles.order_list_item_price}>
-                            {
+                            {/* {
                               order?.sale_mode === 0 && colorItem?.standard_sale_price > colorItem.sale_price && <View className={styles.lastPrice}>¥{standardPrice(colorItem.standard_sale_price)}</View>
-                            }
+                            } */}
                             <>
                             ¥{standardPrice(colorItem.sale_price)}
                               {aboutWeight(colorItem.estimate_weight)}
diff --git a/src/pages/shopCar/components/productItem/index.tsx b/src/pages/shopCar/components/productItem/index.tsx
index ce092cd..6379d1e 100644
--- a/src/pages/shopCar/components/productItem/index.tsx
+++ b/src/pages/shopCar/components/productItem/index.tsx
@@ -106,7 +106,8 @@ const Index = memo((props: IndexItemType) => {
             <View className={styles.name_price}>
               <Text>{colorItem.product_color_code + colorItem.product_color_name}</Text>
               <View className={styles.price}>
-                <Text>{colorItem.standard_price > colorItem.sale_price && `¥${formatPriceDiv(colorItem.standard_price)}`}</Text>
+                {/* <Text>{colorItem.standard_price > colorItem.sale_price && `¥${formatPriceDiv(colorItem.standard_price)}`}</Text> */}
+                <Text></Text>
                 <Text>¥{formatPriceDiv(colorItem.sale_price)}/kg</Text>
               </View>
             </View>