🐞 fix:【ID1000658】:
新版内部商城加入购物车的客户搜索无效, 【ID1000661】：序号2,3,9,10,11,13,14,22,37,38,43
This commit is contained in:
Haiyi
@@ -40,7 +40,7 @@
|
||||
margin-right: 42px;
|
||||
width: 108px;
|
||||
height: 108px;
|
||||
background: #322F2F;
|
||||
// background: #322F2F;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@
|
||||
margin-right: 42px;
|
||||
width: 108px;
|
||||
height: 108px;
|
||||
background: #322F2F;
|
||||
// background: #322F2F;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
@@ -432,6 +432,7 @@
|
||||
}
|
||||
|
||||
.popupBox {
|
||||
height: 500px;
|
||||
padding-bottom: env(safe-area-inset-bottom);
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { View, Input, Button, Image, Text, Textarea } from '@tarojs/components'
|
||||
import { View, Input, Button, Image, Text, Textarea, ScrollView } from '@tarojs/components'
|
||||
import { useCallback, useEffect, useMemo, useRef, useState, ReactNode, memo } from 'react'
|
||||
import styles from "./index.module.scss"
|
||||
import classnames from "classnames";
|
||||
@@ -17,9 +17,9 @@ import UploadImage from '@/components/uploadImage'
|
||||
export default () => {
|
||||
|
||||
const router = useRouter()
|
||||
useDidShow(() => {
|
||||
useEffect(() => {
|
||||
getDetail()
|
||||
})
|
||||
}, [])
|
||||
const { fetchData: infoFetch } = mpsaleOrder()
|
||||
const [infoObj, setInfoObj] = useState<any>({})
|
||||
const [ListArr, setListArr] = useState<any[]>([])
|
||||
@@ -77,8 +77,8 @@ export default () => {
|
||||
ListArr.forEach(item => {
|
||||
item.av_product_color.map(it => {
|
||||
if (it.sale_order_detail_id === val.sale_order_detail_id) {
|
||||
if (val.nums === 1) {
|
||||
// it.isTui = false
|
||||
if (val.nums == 1) {
|
||||
it.isTui = false
|
||||
it.nums = 1
|
||||
} else {
|
||||
it.nums--
|
||||
@@ -389,6 +389,14 @@ export default () => {
|
||||
//确认退货
|
||||
const { fetchData: sureFetch } = mpreturnApplyOrder()
|
||||
const handSure = () => {
|
||||
if (Query.reasonNameTwo == '其他问题' && TextareaValue == '') {
|
||||
Taro.showToast({
|
||||
title: '请填写其他说明',
|
||||
icon: 'error',
|
||||
duration: 3000
|
||||
})
|
||||
return false
|
||||
}
|
||||
const arr: any = [];
|
||||
ListArr.forEach((item) => {
|
||||
item.av_product_color.forEach((it) => {
|
||||
@@ -507,72 +515,75 @@ export default () => {
|
||||
value={TextareaValue}
|
||||
// style='background:#f6f6f6;height:210px;padding:15rpx 24rpx 24rpx 24rpx;border-radius: 8rpx;'
|
||||
placeholderStyle='font-size: 28rpx;font-weight: 400;'
|
||||
placeholder={'选填/退货说明中选择时（其他问题）必填'}
|
||||
placeholder={'选填/退货原因中选择时（其他问题）必填'}
|
||||
></Textarea>
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.safeBox}>
|
||||
<View className={styles.bottomBox}>
|
||||
|
||||
<Button className={styles.resetBox} onClick={() => { handCancl() }}> 取消</Button >
|
||||
<Button className={classnames(isDisabled ? styles.button : styles.activeButton)} disabled={isDisabled} onClick={() => handSure()}> 确认退货</Button >
|
||||
</View>
|
||||
</View>
|
||||
<Popup title={'筛选情况'} show={showPopup} onClose={() => { setshowPopup?.(false) }}>
|
||||
<View className={styles.popupBox}>
|
||||
<View className={styles.thirdBox}>
|
||||
<View className={styles.thirdTopfont}>退货原因</View>
|
||||
<View className={styles.flexModebox}>
|
||||
{
|
||||
ReasonList.map((item, index) => {
|
||||
return (
|
||||
<View onClick={() => { handReasonOne(item) }} className={classnames(item.default ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
|
||||
)
|
||||
})
|
||||
}
|
||||
<ScrollView scrollY >
|
||||
<View className={styles.popupBox}>
|
||||
<View className={styles.thirdBox}>
|
||||
<View className={styles.thirdTopfont}>退货原因</View>
|
||||
<View className={styles.flexModebox}>
|
||||
{
|
||||
ReasonList.map((item, index) => {
|
||||
return (
|
||||
<View onClick={() => { handReasonOne(item) }} className={classnames(item.default ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
|
||||
)
|
||||
})
|
||||
}
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.thirdBox}>
|
||||
<View className={styles.thirdTopfont}>退货理由</View>
|
||||
<View className={styles.flexModebox}>
|
||||
{
|
||||
ReasonListTwo.map((item, index) => {
|
||||
return (
|
||||
<View onClick={() => { handReasonTwo(item) }} className={classnames(item.default ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
|
||||
)
|
||||
})
|
||||
}
|
||||
<View className={styles.thirdBox}>
|
||||
<View className={styles.thirdTopfont}>退货理由</View>
|
||||
<View className={styles.flexModebox}>
|
||||
{
|
||||
ReasonListTwo.map((item, index) => {
|
||||
return (
|
||||
<View onClick={() => { handReasonTwo(item) }} className={classnames(item.default ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
|
||||
)
|
||||
})
|
||||
}
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
<View style={{ height: '100rpx' }}></View>
|
||||
<View className={styles.bottomBox1}>
|
||||
<View style={{ height: '100rpx' }}></View>
|
||||
<View className={styles.bottomBox1}>
|
||||
|
||||
<Button className={styles.resetBox1} onClick={() => { handReset() }}> 重置</Button >
|
||||
<Button className={classnames(selectIsDisabled ? styles.button1 : styles.activeButton1)} disabled={selectIsDisabled} onClick={() => handSlect()}> 确认</Button >
|
||||
<Button className={styles.resetBox1} onClick={() => { handReset() }}> 重置</Button >
|
||||
<Button className={classnames(selectIsDisabled ? styles.button1 : styles.activeButton1)} disabled={selectIsDisabled} onClick={() => handSlect()}> 确认</Button >
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
</ScrollView>
|
||||
</Popup>
|
||||
<Popup title={'筛选说明'} show={DescPopup} onClose={() => { setDescPopup?.(false) }}>
|
||||
<View className={styles.popupBox}>
|
||||
<View className={styles.thirdBox}>
|
||||
<View className={styles.thirdTopfont}>货物情况</View>
|
||||
<View className={styles.flexModebox}>
|
||||
{
|
||||
GoodStatusList.map((item, index) => {
|
||||
return (
|
||||
<View onClick={() => { handStatus(item) }} className={classnames(item.default ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
|
||||
)
|
||||
})
|
||||
}
|
||||
<ScrollView scrollY >
|
||||
<View className={styles.popupBox}>
|
||||
<View className={styles.thirdBox}>
|
||||
<View className={styles.thirdTopfont}>货物情况</View>
|
||||
<View className={styles.flexModebox}>
|
||||
{
|
||||
GoodStatusList.map((item, index) => {
|
||||
return (
|
||||
<View onClick={() => { handStatus(item) }} className={classnames(item.default ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
|
||||
)
|
||||
})
|
||||
}
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.safeBoxs} ></View>
|
||||
<View className={styles.bottomBox1}>
|
||||
|
||||
<Button className={styles.resetBox1} onClick={() => { handResetStatus() }}> 重置</Button >
|
||||
<Button className={classnames(StatusIsDisabled ? styles.button1 : styles.activeButton1)} disabled={StatusIsDisabled} onClick={() => handSlectStatus()}> 确认</Button >
|
||||
</View>
|
||||
</View>
|
||||
<View className={styles.safeBoxs} ></View>
|
||||
<View className={styles.bottomBox1}>
|
||||
|
||||
<Button className={styles.resetBox1} onClick={() => { handResetStatus() }}> 重置</Button >
|
||||
<Button className={classnames(StatusIsDisabled ? styles.button1 : styles.activeButton1)} disabled={StatusIsDisabled} onClick={() => handSlectStatus()}> 确认</Button >
|
||||
</View>
|
||||
</View>
|
||||
</ScrollView>
|
||||
</Popup>
|
||||
</View>
|
||||
)
|
||||
@@ -620,7 +631,8 @@ const GoodsItem = memo((porps: PropGoods) => {
|
||||
item.av_product_color.map((it, inx) => {
|
||||
return (
|
||||
<View className={styles.itemGoods} key={inx}>
|
||||
<View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View>
|
||||
<Image className={styles.itemPic} mode={'aspectFill'} src={'https://test.cdn.zzfzyc.com/mall/no_img.png'}></Image>
|
||||
{/* <View className={styles.itemPic} style={{ backgroundColor: `rgb(${it?.rgb?.r} ${it?.rgb?.g} ${it?.rgb?.b})` }}></View> */}
|
||||
<View className={styles.itemRight}>
|
||||
<View className={styles.item_right_top}>
|
||||
<View className={styles.itemName}>{it.product_color_code} {it.product_color_name}</View>
|
||||
|
||||
Reference in New Issue
Block a user