From 9552921b827306bc542d340c60f64302133eb0f6 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Wed, 11 Jan 2023 19:06:29 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1001068=E3=80=90=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E8=9E=BA=E7=BA=B9=E3=80=91-=E9=9D=A2=E6=96=99?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A8=E8=8D=90=E8=9E=BA=E7=BA=B9=E4=B8=BA?= =?UTF-8?q?0630=EF=BC=8C=E7=82=B9=E5=87=BB=E5=90=8E=E6=98=BE=E7=A4=BA6001?= =?UTF-8?q?=E9=9D=A2=E6=96=99):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/constant.ts | 4 ++-- src/common/util.ts | 3 ++- src/pages/details/components/orderCount/index.tsx | 5 +++-- src/pages/details/index.tsx | 5 ++++- src/pages/shopCar/components/productItem/index.tsx | 2 +- src/pages/user/index.config.ts | 1 + 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/common/constant.ts b/src/common/constant.ts index 2b10699..52a5e1f 100644 --- a/src/common/constant.ts +++ b/src/common/constant.ts @@ -28,8 +28,8 @@ export const SEARCH_EMPTY_IMAGE = `${IMG_CND_Prefix}/search_empty.png` export const COLLECTION_EMPTY_IMAGE = `${IMG_CND_Prefix}/mall/collection_empty.png` // 在线支付图片baseUrl -// export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_CAP_HTML_TO_IMAGE_BASE_URL -export const CAP_HTML_TO_IMAGE_BASE_URL = 'http://192.168.1.127:8081' +export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_CAP_HTML_TO_IMAGE_BASE_URL +// export const CAP_HTML_TO_IMAGE_BASE_URL = 'http://192.168.1.127:8081' // 获取CND资源 export const getCDNSource = (suffix: string) => { return IMG_CND_Prefix + suffix diff --git a/src/common/util.ts b/src/common/util.ts index 7233f42..9da4f04 100644 --- a/src/common/util.ts +++ b/src/common/util.ts @@ -140,8 +140,9 @@ export const shareShop = () => { ? `/pages/user/index?share=${sortCode.shareShortPage.code}` : `/pages/index/index?share=${sortCode.shareShortPage.code}` title = sortCode.shareShortPage.title - imageUrl = pageInfo.route === 'pages/user/index' ? sortCode.shareShortPage.img : formatImgUrl('/mall/share_img_02.png', '!w400') + imageUrl = pageInfo.route === 'pages/user/index' ? sortCode.shareShortPage.img : formatImgUrl('/mall/share_img_01.png', '!w400') } + console.log('imageUrl:::', imageUrl) return { title, path, diff --git a/src/pages/details/components/orderCount/index.tsx b/src/pages/details/components/orderCount/index.tsx index dbf1e36..da3bed6 100644 --- a/src/pages/details/components/orderCount/index.tsx +++ b/src/pages/details/components/orderCount/index.tsx @@ -28,8 +28,9 @@ interface param { productId?: number is_first_login?: boolean // 是否首次进来需要展示引导 recommendStatus?: boolean + recom_title?: '' } -const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first_login = true, recommendStatus = false }: param) => { +const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first_login = true, recommendStatus = false, recom_title = '' }: param) => { const { adminUserInfo } = useSelector(state => state.userInfo) const [selectList, _] = useState([ @@ -333,7 +334,7 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first - {title} + {recommendStatus ? recom_title : title} {recommendStatus && diff --git a/src/pages/details/index.tsx b/src/pages/details/index.tsx index 19d9d96..dc7ec07 100644 --- a/src/pages/details/index.tsx +++ b/src/pages/details/index.tsx @@ -84,6 +84,9 @@ const Details = (props: Params) => { const productName = useMemo(() => { return formatHashTag(productInfo.code, productInfo.name) }, [productInfo]) + const recommendName = useMemo(() => { + return formatHashTag(productInfo.product_screw_code, productInfo.product_screw_name) + }, [productInfo]) const [showCart, setShowCart] = useState(false) const [showOrderCount, setShowOrderCount] = useState(false) @@ -352,7 +355,7 @@ const Details = (props: Params) => { )} - setShowOrderCount(false)} title={productName} productId={productId} /> + setShowOrderCount(false)} recom_title={recommendName} title={productName} productId={productId} /> setShowCart(false)} /> setshowPopup(false)} productName={productName} productIds={Number(params?.id)}> diff --git a/src/pages/shopCar/components/productItem/index.tsx b/src/pages/shopCar/components/productItem/index.tsx index 3c53a04..bc2faf5 100644 --- a/src/pages/shopCar/components/productItem/index.tsx +++ b/src/pages/shopCar/components/productItem/index.tsx @@ -85,7 +85,7 @@ const Index = memo((props: IndexItemType) => { {colorItem.product_color_code + colorItem.product_color_name} - ¥{formatPriceDiv(colorItem.sale_price)} + {(colorItem.standard_price > colorItem.sale_price) && ¥{formatPriceDiv(colorItem.sale_price)}} ¥{formatPriceDiv(colorItem.standard_price)}/kg diff --git a/src/pages/user/index.config.ts b/src/pages/user/index.config.ts index 49669fc..705a9b0 100644 --- a/src/pages/user/index.config.ts +++ b/src/pages/user/index.config.ts @@ -3,4 +3,5 @@ export default { navigationBarBackgroundColor: '#EFF3FF', backgroundColorTop: '#EFF3FF', enablePullDownRefresh: true, + enableShareAppMessage: true, }