🐞 fix(ID1001068【推荐螺纹】-面料详情推荐螺纹为0630,点击后显示6001面料):
This commit is contained in:
parent
b89795e6d0
commit
9552921b82
@ -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`
|
export const COLLECTION_EMPTY_IMAGE = `${IMG_CND_Prefix}/mall/collection_empty.png`
|
||||||
|
|
||||||
// 在线支付图片baseUrl
|
// 在线支付图片baseUrl
|
||||||
// export const CAP_HTML_TO_IMAGE_BASE_URL = CURRENT_CAP_HTML_TO_IMAGE_BASE_URL
|
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 = 'http://192.168.1.127:8081'
|
||||||
// 获取CND资源
|
// 获取CND资源
|
||||||
export const getCDNSource = (suffix: string) => {
|
export const getCDNSource = (suffix: string) => {
|
||||||
return IMG_CND_Prefix + suffix
|
return IMG_CND_Prefix + suffix
|
||||||
|
|||||||
@ -140,8 +140,9 @@ export const shareShop = () => {
|
|||||||
? `/pages/user/index?share=${sortCode.shareShortPage.code}`
|
? `/pages/user/index?share=${sortCode.shareShortPage.code}`
|
||||||
: `/pages/index/index?share=${sortCode.shareShortPage.code}`
|
: `/pages/index/index?share=${sortCode.shareShortPage.code}`
|
||||||
title = sortCode.shareShortPage.title
|
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 {
|
return {
|
||||||
title,
|
title,
|
||||||
path,
|
path,
|
||||||
|
|||||||
@ -28,8 +28,9 @@ interface param {
|
|||||||
productId?: number
|
productId?: number
|
||||||
is_first_login?: boolean // 是否首次进来需要展示引导
|
is_first_login?: boolean // 是否首次进来需要展示引导
|
||||||
recommendStatus?: 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 { adminUserInfo } = useSelector(state => state.userInfo)
|
||||||
|
|
||||||
const [selectList, _] = useState([
|
const [selectList, _] = useState([
|
||||||
@ -333,7 +334,7 @@ const OrderCount = ({ show = false, onClose, title = '', productId = 0, is_first
|
|||||||
<View className={styles.popup_con}>
|
<View className={styles.popup_con}>
|
||||||
<View className={styles.header}>
|
<View className={styles.header}>
|
||||||
<View className={styles.header_title}>
|
<View className={styles.header_title}>
|
||||||
<Text>{title}</Text>
|
<Text>{recommendStatus ? recom_title : title}</Text>
|
||||||
<IconFont name="icon-rukou" color="#000000FF" />
|
<IconFont name="icon-rukou" color="#000000FF" />
|
||||||
</View>
|
</View>
|
||||||
{recommendStatus && <View className={styles.header_label}>
|
{recommendStatus && <View className={styles.header_label}>
|
||||||
|
|||||||
@ -84,6 +84,9 @@ const Details = (props: Params) => {
|
|||||||
const productName = useMemo(() => {
|
const productName = useMemo(() => {
|
||||||
return formatHashTag(productInfo.code, productInfo.name)
|
return formatHashTag(productInfo.code, productInfo.name)
|
||||||
}, [productInfo])
|
}, [productInfo])
|
||||||
|
const recommendName = useMemo(() => {
|
||||||
|
return formatHashTag(productInfo.product_screw_code, productInfo.product_screw_name)
|
||||||
|
}, [productInfo])
|
||||||
|
|
||||||
const [showCart, setShowCart] = useState(false)
|
const [showCart, setShowCart] = useState(false)
|
||||||
const [showOrderCount, setShowOrderCount] = useState(false)
|
const [showOrderCount, setShowOrderCount] = useState(false)
|
||||||
@ -352,7 +355,7 @@ const Details = (props: Params) => {
|
|||||||
</View>
|
</View>
|
||||||
)}
|
)}
|
||||||
</View>
|
</View>
|
||||||
<OrderCount show={showOrderCount} recommendStatus={recommendStatus} is_first_login={productInfo.is_first_login} onClose={() => setShowOrderCount(false)} title={productName} productId={productId} />
|
<OrderCount show={showOrderCount} recommendStatus={recommendStatus} is_first_login={productInfo.is_first_login} onClose={() => setShowOrderCount(false)} recom_title={recommendName} title={productName} productId={productId} />
|
||||||
<ShopCart show={showCart} onClose={() => setShowCart(false)} />
|
<ShopCart show={showCart} onClose={() => setShowCart(false)} />
|
||||||
<AddCollection show={collectionShow} onAdd={onAdd} onClose={closeCollection} />
|
<AddCollection show={collectionShow} onAdd={onAdd} onClose={closeCollection} />
|
||||||
<FeaturePopup showPopup={showPopup} closePopup={() => setshowPopup(false)} productName={productName} productIds={Number(params?.id)}></FeaturePopup>
|
<FeaturePopup showPopup={showPopup} closePopup={() => setshowPopup(false)} productName={productName} productIds={Number(params?.id)}></FeaturePopup>
|
||||||
|
|||||||
@ -85,7 +85,7 @@ const Index = memo((props: IndexItemType) => {
|
|||||||
<View className={styles.name_price}>
|
<View className={styles.name_price}>
|
||||||
<Text>{colorItem.product_color_code + colorItem.product_color_name}</Text>
|
<Text>{colorItem.product_color_code + colorItem.product_color_name}</Text>
|
||||||
<View className={styles.price}>
|
<View className={styles.price}>
|
||||||
<Text>¥{formatPriceDiv(colorItem.sale_price)}</Text>
|
{(colorItem.standard_price > colorItem.sale_price) && <Text>¥{formatPriceDiv(colorItem.sale_price)}</Text>}
|
||||||
<Text>¥{formatPriceDiv(colorItem.standard_price)}/kg</Text>
|
<Text>¥{formatPriceDiv(colorItem.standard_price)}/kg</Text>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
@ -3,4 +3,5 @@ export default {
|
|||||||
navigationBarBackgroundColor: '#EFF3FF',
|
navigationBarBackgroundColor: '#EFF3FF',
|
||||||
backgroundColorTop: '#EFF3FF',
|
backgroundColorTop: '#EFF3FF',
|
||||||
enablePullDownRefresh: true,
|
enablePullDownRefresh: true,
|
||||||
|
enableShareAppMessage: true,
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user