✨ feat(ID1000873领取剪样和ID1000868领取色卡):
This commit is contained in:
@@ -70,6 +70,7 @@ const CounterDisplayName = (props: params) => {
|
||||
if (!isInteger(num_res)) {
|
||||
num_res = Math.trunc(num_res)
|
||||
}
|
||||
if (num_res > maxNum) { onMax?.() }
|
||||
num_res = num_res >= maxNum ? maxNum : num_res
|
||||
setValue({ ...value, count: num_res })
|
||||
onChange?.(parseFloat(num_res))
|
||||
|
||||
@@ -5,7 +5,7 @@ import LoadingCard from '../loadingCard'
|
||||
import style from './index.module.scss'
|
||||
import DotLoading from '@/components/dotLoading'
|
||||
import Empty from '@/components/empty'
|
||||
import { SEARCH_EMPTY_IMAGE } from '@/common/constant'
|
||||
import { IMG_CND_Prefix, SEARCH_EMPTY_IMAGE } from '@/common/constant'
|
||||
|
||||
export type StatusParam = 0 | 1 | 2 | 3
|
||||
|
||||
@@ -32,6 +32,8 @@ interface Params {
|
||||
moreText?: string
|
||||
loadingText?: string
|
||||
noMoreText?: string
|
||||
defaultUrl?: string
|
||||
defaultText?: string
|
||||
}
|
||||
const InfiniteScroll = ({
|
||||
styleObj,
|
||||
@@ -53,6 +55,8 @@ const InfiniteScroll = ({
|
||||
statusMore = 0,
|
||||
enableBackToTop = true,
|
||||
emptySlot,
|
||||
defaultUrl = '',
|
||||
defaultText = '',
|
||||
}: Params) => {
|
||||
const scrollToLower = () => {
|
||||
selfonScrollToLower?.()
|
||||
@@ -113,7 +117,7 @@ const InfiniteScroll = ({
|
||||
</View>
|
||||
)}
|
||||
{statusMore == 0 && <LoadingCard />}
|
||||
{statusMore == 1 && (emptySlot || <Empty picUrl={SEARCH_EMPTY_IMAGE} text="暂无数据" />)}
|
||||
{statusMore == 1 && (emptySlot || <Empty picUrl={defaultUrl ? `${IMG_CND_Prefix}${defaultUrl}` : SEARCH_EMPTY_IMAGE} text={defaultText || '暂无数据'} />)}
|
||||
</>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ const MoveBtn = ({ orderObj = {}, children = null, onShopClick, showList = [], m
|
||||
x="630rpx"
|
||||
y={`${screenHeight.customer}rpx`}
|
||||
>
|
||||
<Image mode="aspectFit" src={formatImgUrl('/mall/float_button_customer_service.png')} />
|
||||
<Image mode="aspectFit" src={formatImgUrl('/color_card/businessManager.png')} />
|
||||
</MovableView>}
|
||||
{showCode && <CodeSelect orderObj={orderObj} y={screenHeight.code as number} />}
|
||||
<Customer messageTitle={messageTitle} messagePath={messageTitle} show={customer_service_show} showCard={showCart} onClose={customerClose} />
|
||||
|
||||
@@ -93,8 +93,6 @@ export default memo((props: Param) => {
|
||||
if (item.status) { data.push({ ...item, count: 1 }) }
|
||||
})
|
||||
onSelected?.(data)
|
||||
// Taro.setStorageSync('cutSample', JSON.stringify(data))
|
||||
// goLink('/pages/cutSampleListOrder/index')
|
||||
}
|
||||
return <View className={styles.main}>
|
||||
<Popup show={show} showTitle={false} onClose={onClose}>
|
||||
@@ -125,7 +123,6 @@ interface ColorItemCom {
|
||||
}
|
||||
const ColorSelectItem = memo((props: ColorItemCom) => {
|
||||
const { item, onSelect } = props
|
||||
console.log('abcedef', item)
|
||||
return <View key={item.id} className={styles.item} onClick={() => onSelect?.(item)}>
|
||||
<View className={classNames(styles.item_color, item.status && styles.select_color)}>
|
||||
<LabAndImg
|
||||
|
||||
Reference in New Issue
Block a user