Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/EShop into 订单售后v2

This commit is contained in:
czm 2022-06-08 19:43:53 +08:00
commit 8ee5f4d41a
2 changed files with 6 additions and 7 deletions

View File

@ -6,10 +6,9 @@
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
} }
scroll-view>view{ .address-scroll-view-content{
display: flex;flex-direction: column; padding-bottom: 300px;
} }
.address-list{ .address-list{
width: 704px; width: 704px;
height: 156px; height: 156px;
@ -69,7 +68,7 @@
width: 100%; width: 100%;
} }
.address-list-info view{ .address-list-info view{
width: 50%; max-width: 60%;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden;white-space: nowrap; overflow: hidden;white-space: nowrap;
} }

View File

@ -81,14 +81,14 @@ const AddressList = memo((props:Params)=>{
return ( return (
<View className="address-scroll-view"> <View className="address-scroll-view">
<ScrollView scrollY refresherEnabled={props.refresherEnabled} enhanced refresherTriggered={refreshState} onRefresherRefresh={handleRefresh}> <ScrollView scrollY refresherEnabled={props.refresherEnabled} enhanced refresherTriggered={refreshState} onRefresherRefresh={handleRefresh}>
<View> <View className="address-scroll-view-content">
{ {
state?.data?.list?.length>0? state?.data?.list?.length>0?
state?.data?.list?.map((item,index)=>{ state?.data?.list?.map((item,index)=>{
// data.length>0? // data.length>0?
// data.map((item,index)=>{ // data.map((item,index)=>{
return( return(
<View onLongPress={()=>handleDelete(item)} onClick={()=>handleSelect(item,index)} className={`address-list ${index+1==state?.data?.list?.length&&'address-list-last'} ${focusId==item.id&&'address-active'}`}> <View onLongPress={()=>handleDelete(item)} onClick={()=>handleSelect(item,index)} className={`address-list ${focusId==item.id&&'address-active'}`}>
<View className="address-user"> <View className="address-user">
{item.name} {item.name}
{ {
@ -105,7 +105,7 @@ const AddressList = memo((props:Params)=>{
item.is_default&&<Text className="address-list-phone">{item.phone.replace(item.phone.substring(4,7), "****")}</Text> item.is_default&&<Text className="address-list-phone">{item.phone.replace(item.phone.substring(4,7), "****")}</Text>
} }
</View> </View>
<Navigator url={`/pages/addressAdd/index?type=edit&id=${item.id}`} hoverClass="none" className="address-edit"> <Navigator onClick={e=>e.stopPropagation()} url={`/pages/addressAdd/index?type=edit&id=${item.id}`} hoverClass="none" className="address-edit">
<Text className="iconfont icon-bianji"></Text> <Text className="iconfont icon-bianji"></Text>
</Navigator> </Navigator>
</View> </View>