🐞 fix:【ID1000658】:

新版内部商城加入购物车的客户搜索无效,
【ID1000661】:序号2,3,9,10,11,13,14,22,37,38,43
This commit is contained in:
Haiyi
2022-11-08 13:54:23 +08:00
parent 7eb3394cd8
commit 4198b9b548
33 changed files with 538 additions and 369 deletions
@@ -1,11 +1,11 @@
import { ScrollView, View } from '@tarojs/components'
import { ScrollView, View, Image } from '@tarojs/components'
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
import styles from './index.module.scss'
import classnames from 'classnames'
// import BottomBtns from '@/components/BottomBtns'
import { formatPriceDiv } from '@/common/format'
import Taro from '@tarojs/taro'
import LabAndImg from "@/components/LabAndImg"
interface propsObj {
obj: any,
cancle?: (arg: any, obj: any) => void,
@@ -29,6 +29,9 @@ export default memo((props: propsObj) => {
}
const labAndImgObj = useCallback((item) => {
return { lab: item.lab, rgb: item.rgb, texture_url: item.texture_url }
}, [])
return (
@@ -41,7 +44,17 @@ export default memo((props: propsObj) => {
<View className={styles.line}></View>
<View className={styles.contBox}>
<View style={{ minWidth: '24%' }}>
<View className={styles.leftCont} style={{ backgroundColor: `rgb(${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.r} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.g} ${props?.obj?.product_list[0]?.product_colors[0]?.rgb?.b})` }}>
<View className={styles.leftCont} >
{
props?.obj?.product_list[0]?.texture_url === '' &&
<Image className={styles.leftCont} mode={'aspectFill'} src={'https://test.cdn.zzfzyc.com/mall/no_img.png'}></Image>
}
{
props?.obj?.product_list[0]?.texture_url !== '' &&
<>
<LabAndImg value={labAndImgObj(props?.obj?.product_list?.[0])} /></>
}
<View className={styles.leftContNums}>颜色 ({props?.obj?.total_colors})</View>
</View>
</View>
@@ -99,11 +112,10 @@ export default memo((props: propsObj) => {
} 种颜色,共 {props?.obj?.sale_mode === 0 ? props?.obj?.total_number : props?.obj?.total_number / 100} {props?.obj?.sale_mode === 0 ? '条' : 'm'}</View>
</View>
{
(props?.obj.stage == 5 || props?.obj.stage == 6 || props?.obj.stage == 3) && <View className={styles.bottomMsg}>
(props?.obj.stage == 3) && <View className={styles.bottomMsg}>
<View className={styles.msgLeft}>退款金额:</View>
<View className={styles.msgRightOne}>¥{formatPriceDiv(props?.obj?.refund_amount)}</View>
</View>
}
{
+5 -6
View File
@@ -395,13 +395,12 @@ export default () => {
</View>
</View>
<View className={styles.safeBox}></View>
<View className={styles.bottomBox}>
<Button className={styles.resetBox} onClick={() => { handReset() }}> 重置</Button >
<Button className={classnames(isDisabled ? styles.button2 : styles.activeButton)} disabled={isDisabled} onClick={() => handSure()}> 确认</Button >
</View>
</ScrollView>
<View className={styles.bottomBox}>
<Button className={styles.resetBox} onClick={() => { handReset() }}> 重置</Button >
<Button className={classnames(isDisabled ? styles.button2 : styles.activeButton)} disabled={isDisabled} onClick={() => handSure()}> 确认</Button >
</View>
{/* <View className={styles.areaBox}></View> */}
</View>
</Popup>