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

🐞 fix(ID1001366): 【内部小程序】-【领取色卡】--选择客户后，有默认地址的，没有自动带入默认地址

Browse Source 
【【内部小程序】-【领取色卡】--选择客户后，有默认地址的，没有自动带入默认地址】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001366
This commit is contained in:
xuan 2023-02-28 16:49:37 +08:00
parent 118c1ba987
commit 79de81702a
9 changed files with 71 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
project.private.config.json
View File

@ -72,6 +72,13 @@
"query": "",
"launchMode": "default",
"scene": null
},
{
"name": "",
"pathName": "pages/getColorCard/addColorCard/index",
"query": "",
"launchMode": "default",
"scene": null
}
]
}

4
src/common/constant.ts
View File

@ -1,4 +1,4 @@
// export const BASE_URL = CURRENT_BASE_URL
export const BASE_URL = CURRENT_BASE_URL
// export const BASE_URL = `http://192.168.0.75:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:50001/lymarket`
// export const BASE_URL = `http://10.0.0.5:50001/lymarket`
@ -15,7 +15,7 @@
// export const BASE_URL = 'http://192.168.1.7:50002/lymarket' // 添
// export const BASE_URL = 'http://192.168.1.42:50002/lymarket' // 杰
// export const BASE_URL = `http://192.168.1.95:40001/lymarket` // 华
export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
// export const BASE_URL = 'http://192.168.1.28:50002/lymarket' // 婷
// CDN
// 生成密钥

2
src/components/AddressList/index.tsx
View File

@ -65,9 +65,7 @@ const AddressList = (props: Params, AddressListRef) => {
await getData()
setRefreshState(false)
}
const data = Array.from({ length: 15 })
const router = useRouter()
const [addressObj, setAddressObj] = useState<any>({})
// 列表选择
const { fetchData: selectFetch } = MpSaleOrderAddress()
const handleSelect = async(item: any, index: number) => {

2
src/pages/getColorCard/addColorCard/components/colorCardItem/index.module.scss
View File

@ -33,7 +33,7 @@
overflow: hidden;
}
&__right {
width: 30%;
width: 35%;
}
}
}

43
src/pages/getColorCard/addColorCard/index.tsx
View File

@ -7,18 +7,14 @@ import LayoutBlock from '@/components/layoutBlock'
import NormalButton from '@/components/normalButton'
import Divider from '@/components/divider'
import IconFont from '@/components/iconfont/iconfont'
import LabAndImg from '@/components/LabAndImg'
import Counter from '@/components/counter'
import Tag from '@/components/tag'
import { alert, goLink } from '@/common/common'
import { ClientListApi } from '@/api/order'
import AddressDetailBox from '@/pages/orderDetails/components/addressDetailBox'
import Popup from '@/components/popup'
import Remark from '@/pages/orderDetails/components/remark'
import { formatRemoveHashTag } from '@/common/format'
import { SubmitColorCardOrder } from '@/api/colorCard'
import MoveBtn from '@/components/moveBtn'
import NavBar from '@/pages/order/components/NavBar'
import { MpPurchaserAddressList } from '@/api/addressList'
const AddColorCard = () => {
// 获取选择的客户
@ -95,20 +91,10 @@ const AddColorCard = () => {
// 提交订单
const handleSubmitOrder = async() => {
if (!addressInfo.address_id) {
Taro.showToast({
title: '请选择地址',
icon: 'none',
duration: 2000,
})
return
return alert.none('请选择地址')
}
if (!clientInfo.clientId) {
Taro.showToast({
title: '请选择客户',
icon: 'none',
duration: 2000,
})
return
return alert.none('请选择客户')
}
if (order.length === 0) { return alert.none('请选择色卡') }
// 请求数据
@ -131,10 +117,6 @@ const AddColorCard = () => {
}
}
const labAndImgObj = useCallback((item) => {
return { lab: item?.lab, rgb: item?.rgb, texture_url: item?.texture_url }
}, [])
const deleteColorCard = (id) => {
setOrder((prev) => {
return prev.filter(item => item.id !== id)
@ -184,6 +166,7 @@ const AddColorCard = () => {
clientName: currPage.data?.clientName,
clientPhone: currPage.data?.clientPhone,
})
getAddressList(currPage.data?.clientId)
}
// 默认客户
if (currPage.data?.clientId == null) {
@ -274,6 +257,24 @@ const AddColorCard = () => {
})
}
const { fetchData: addressListApi } = MpPurchaserAddressList()
const getAddressList = async(purchaser_id: number) => {
const res = await addressListApi({ purchaser_id })
if (res.success) {
const { list } = res.data
setAddressInfo(val => ({
...val,
province_name: list?.[0]?.province_name || '',
address_id: list?.[0]?.id || '',
city_name: list?.[0]?.city_name || '',
address_detail: list?.[0]?.address_detail || '',
district_name: list?.[0]?.district_name || '',
target_user_name: list?.[0]?.name || '',
purchaser_phone: list?.[0]?.phone || '',
}))
}
}
return <View className={styles.main}>
<NavBar hasLeft leftSlot={
<View onClick={onClickBack}>

5
src/pages/orderDetails/components/addressDetailBox/index.module.scss
View File

@ -74,22 +74,17 @@
display: flex;
align-items: center;
.name {
line-height: 34px;
width: 84px;
height: 34px;
@include common_ellipsis();
font-size: 28px;
font-weight: 400;
color: #343434;
margin-right: 16px;
}
.phone {
height: 34px;
font-size: 28px;
font-weight: 400;
color: #343434;
// margin-right: 70px;
}
}

26
src/pages/orderDetails/components/addressDetailBox/index.tsx
View File

@ -67,22 +67,22 @@ const AddressDetailBox = (props: propsObj) => {
<View className={styles.leftbottom}>
<View className={styles.name}>{receivingStatus === 1 ? '谭先生' : obj.target_user_name}</View>
<View className={styles.phone}>{receivingStatus === 1 ? 13242128982 : obj.purchaser_phone}</View>
</View>
{
showBtn && <View className={styles.reatBox}>
<View className={styles.updateBtn}>
<View className={styles.updateBtn_list}>
<View className={classnames(styles.updateBtn_item, receivingStatus == 1 && styles.updateBtn_item_select)} onClick={e => onReceivingStatus?.(e, 1)}>
自提
</View>
<View className={classnames(styles.updateBtn_item, receivingStatus == 2 && styles.updateBtn_item_select)} onClick={e => onReceivingStatus?.(e, 2)}>
物流
{
showBtn && <View className={styles.reatBox}>
<View className={styles.updateBtn}>
<View className={styles.updateBtn_list}>
<View className={classnames(styles.updateBtn_item, receivingStatus == 1 && styles.updateBtn_item_select)} onClick={e => onReceivingStatus?.(e, 1)}>
自提
</View>
<View className={classnames(styles.updateBtn_item, receivingStatus == 2 && styles.updateBtn_item_select)} onClick={e => onReceivingStatus?.(e, 2)}>
物流
</View>
</View>
<View style={{ transform: receivingStatus == 1 ? 'translateX(0)' : 'translateX(100%)' }} className={classnames(styles.updateBtn_select)}></View>
</View>
<View style={{ transform: receivingStatus == 1 ? 'translateX(0)' : 'translateX(100%)' }} className={classnames(styles.updateBtn_select)}></View>
</View>
</View>
}
}
</View>
{
!showBtn && <View className={styles.reatName}>{showWhatFont}</View>
}

20
src/pages/sampleCutting/addSampleCutting/index.tsx
View File

@ -17,6 +17,7 @@ import Remark from '@/pages/orderDetails/components/remark'
import { formatRemoveHashTag } from '@/common/format'
import { SubmitCutSampleOrder } from '@/api/sampleCutting'
import NavBar from '@/pages/order/components/NavBar'
import { MpPurchaserAddressList } from '@/api/addressList'
const AddColorCard = () => {
// 获取选择的客户
@ -217,6 +218,7 @@ const AddColorCard = () => {
clientName: currPage.data?.clientName,
clientPhone: currPage.data?.clientPhone,
})
getAddressList(currPage.data?.clientId)
}
// 默认客户
if (currPage.data?.clientId == null) {
@ -321,6 +323,24 @@ const AddColorCard = () => {
})
}
const { fetchData: addressListApi } = MpPurchaserAddressList()
const getAddressList = async(purchaser_id: number) => {
const res = await addressListApi({ purchaser_id })
if (res.success) {
const { list } = res.data
setAddressInfo(val => ({
...val,
province_name: list?.[0]?.province_name || '',
address_id: list?.[0]?.id || '',
city_name: list?.[0]?.city_name || '',
address_detail: list?.[0]?.address_detail || '',
district_name: list?.[0]?.district_name || '',
target_user_name: list?.[0]?.name || '',
purchaser_phone: list?.[0]?.phone || '',
}))
}
}
return <View className={styles.main}>
<NavBar hasLeft leftSlot={
<View onClick={onClickBack}>

7
src/pages/sampleCutting/sampleCuttingList/index.tsx
View File

@ -172,7 +172,12 @@ const SampleCuttingList = () => {
const index = multipleSelection.current.findIndex(mul => mul.product_id === currentSelect.current.id)
if (index !== -1) {
multipleSelection.current[index].multipleSelection = productMultipleSelection
// 检查是否有数据
if (multipleSelection.current[index].multipleSelection.length === 0) {
multipleSelection.current.splice(index, 1)
}
}
console.log('multipleSelection==>', multipleSelection.current)
setShow(false)
setProductMultipleSelection([])
}
@ -265,7 +270,7 @@ const SampleCuttingList = () => {
onClick={() => handleClickAddButton(item)}
>
{
isAdd?.includes(item.id) || multipleSelection.current.find(mul => mul.product_id === item.id)?.multipleSelection.length ? '继续添加' : '添加'
multipleSelection.current.find(mul => mul.product_id === item.id)?.multipleSelection.length ? '继续添加' : '添加'
}
</NormalButton>
</View>