xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐞 fix:【ID1000658】:

Browse Source 
新版内部商城加入购物车的客户搜索无效,
【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
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/applyMoney/index.module.scss
+3 -2
View File
@@ -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;
}
@@ -413,6 +413,7 @@
}
.popupBox {
height: 500px;
padding-bottom: env(safe-area-inset-bottom);
src/pages/applyMoney/index.tsx
+32 -23
View File
@@ -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";
@@ -78,7 +78,7 @@ export default () => {
item.av_product_color.map(it => {
if (it.sale_order_detail_id === val.sale_order_detail_id) {
if (val.nums === 1) {
// it.isTui = false
it.isTui = false
it.nums = 1
} else {
it.nums--
@@ -263,6 +263,14 @@ export default () => {
//确认退款
const { fetchData: sureFetch } = mpreturnApplyOrder()
const handSure = () => {
if (queryRef.current.reasonName == '其他问题' && TextareaValue == '') {
Taro.showToast({
title: '请填写其他说明',
icon: 'error',
duration: 3000
})
return false
}
let arr: any = [];
if (infoObj.sale_mode == 0 && infoObj.status == 9) {
ListArr.forEach((item) => {
@@ -386,8 +394,7 @@ export default () => {
value={TextareaValue}
// style='background:#f6f6f6;height:210px;padding:15rpx 24rpx 24rpx 24rpx;border-radius: 8rpx;'
placeholderStyle='font-size: 28rpx;font-weight: 400;'
autoFocus
placeholder={'选填/退货说明中选择时（其他问题）必填'}
placeholder={'选填/退款说明中选择（其他问题）必填'}
></Textarea>
</View>
</View>
@@ -406,27 +413,28 @@ export default () => {
</View>
</View>
<Popup title={'筛选情况'} show={showPopup} onClose={() => { setshowPopup?.(false) }}>
<ScrollView scrollY>
<View className={styles.popupBox}>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>退款原因</View>
<View className={styles.flexModebox}>
{
List.map((item, index) => {
return (
<View onClick={() => { handReasonOne(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}>
<View className={styles.popupBox}>
<View className={styles.thirdBox}>
<View className={styles.thirdTopfont}>退款原因</View>
<View className={styles.flexModebox}>
{
List.map((item, index) => {
return (
<View onClick={() => { handReasonOne(item) }} className={classnames(item.default ? styles.activemodeBox : styles.modeBox)} key={index}>{item.name}</View>
)
})
}
<Button className={styles.resetBox1} onClick={() => { handReset() }}> 重置</Button >
<Button className={classnames(isDisabled ? styles.button1 : styles.activeButton1)} disabled={isDisabled} onClick={() => handSlect()}> 确认</Button >
</View>
</View>
<View className={styles.safeBoxs} ></View>
<View className={styles.bottomBox1}>
<Button className={styles.resetBox1} onClick={() => { handReset() }}> 重置</Button >
<Button className={classnames(isDisabled ? styles.button1 : styles.activeButton1)} disabled={isDisabled} onClick={() => handSlect()}> 确认</Button >
</View>
</View>
</ScrollView>
</Popup>
</View>
)
@@ -471,7 +479,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>