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 {formatHashTag(item.code, item.name)} {/* {selectIndex == 0 && 空差:{formatWeightDiv(item.weight_error)}kg} */} - {(selectIndex === 0 && item.bulk_price !== item.last_bulk_price) && {formatOriginalPrice(item)}} + {/* {(selectIndex === 0 && item.bulk_price !== item.last_bulk_price) && {formatOriginalPrice(item)}} */} {formatPrice(item)} 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 && {`待退${colorItem?.apply_return_roll}条`}} - { + {/* { order?.sale_mode === 0 && colorItem?.standard_sale_price > colorItem.sale_price && ¥{standardPrice(colorItem.standard_sale_price)} - } + } */} <> ¥{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) => { {colorItem.product_color_code + colorItem.product_color_name} - {colorItem.standard_price > colorItem.sale_price && `¥${formatPriceDiv(colorItem.standard_price)}`} + {/* {colorItem.standard_price > colorItem.sale_price && `¥${formatPriceDiv(colorItem.standard_price)}`} */} + ¥{formatPriceDiv(colorItem.sale_price)}/kg