1

src/components/AddressList/index.scss

@@ -22,6 +22,9 @@
     border: 1px solid #68b4ff;
     box-shadow: 0px 0px 10px 0px rgba(0,122,255,0.27); 
   }
+  .address-list:first-child{
+    margin-top: 0;
+  }
   .address-list:last-child{
     margin-bottom: 300px;
   }

src/components/AddressList/index.tsx

@@ -2,34 +2,81 @@
 import { Button, Navigator, ScrollView, Text, View } from "@tarojs/components"
 import { memo, useEffect, useState } from "react"
 import "./index.scss"
-import {addressListApi} from "@/api/addressManager"
-import { useDidShow } from "@tarojs/taro"
+import {addressListApi,addressDeleteApi} from "@/api/addressManager"
+import { alert } from "@/common/common"
+import Taro, { showModal } from "@tarojs/taro"
 
 interface Params{
   refresherEnabled?: boolean,//是否开启刷新
   onSelect?: (item:any,index:number)=>void,//列表选择
-
+  addButtonEnabled?: boolean, //是否显示添加按钮
+  focusBorderEnabled?: boolean, //焦点显示蓝色边框
+  id?: number, //默认选择值
 }
 
 // 地址列表
 const AddressList = memo((props:Params)=>{
+  const {addButtonEnabled=true,focusBorderEnabled=false} = props;
   const {fetchData, state} = addressListApi()
   // 获取数据
-  const getData = ()=>{
-    fetchData();
+  const getData = async ()=>{
+    const result = await fetchData();
+    if(props.id){
+      setFocusId(props.id as any);
+    }else{
+      result.data.list?.every(item=>{
+        if(item.is_default){
+          setFocusId(item.id);
+          return false;
+        }
+        return true;
+      })
+    }
   }
   useEffect(()=>{
     getData();
+    // 监听刷新
+    Taro.eventCenter.on("addressList:refresh", getData);
+    return ()=>{
+      Taro.eventCenter.off("addressList:refresh", getData);
+    }
   },[])
-
   // 处理刷新
   const [refreshState, setRefreshState] = useState(false);
   const handleRefresh = async ()=>{
     setRefreshState(true);
-    await fetchData();
+    await getData();
     setRefreshState(false);
   }
   const data = Array.from({length:15});
+  // 焦点
+  const [focusId, setFocusId] = useState();
+  // 列表选择
+  const handleSelect = (item: any, index: number)=>{
+    props.onSelect&&props.onSelect(item,index);
+    if(focusBorderEnabled){
+      setFocusId(item?.id);
+    }
+  }
+  // 删除地址
+  const {fetchData: deleteFetch} = addressDeleteApi()
+  const handleDelete = (item:any)=>{
+    showModal(({
+      title: "提示",
+      content: "是否删除地址？",
+      async success(ev){
+        if(ev.confirm){
+          const result = await deleteFetch({id:item.id});
+          if(result.success){
+            alert.success("删除成功");
+            getData();
+          }else{
+            alert.success(result.msg);
+          }
+        }
+      }
+    }))
+  }
 
   return (
     <View className="address-scroll-view">
@@ -40,7 +87,7 @@ const AddressList = memo((props:Params)=>{
           // data.length>0?
           // data.map((item,index)=>{
             return(
-              <View onClick={()=>props.onSelect&&props.onSelect(item,index)} className={`address-list ${item.is_default&&'address-active'}`}>
+              <View onLongPress={()=>handleDelete(item)} onClick={()=>handleSelect(item,index)} className={`address-list ${focusId==item.id&&'address-active'}`}>
                 <View className="address-user">
                   {item.name}
                   {
@@ -53,7 +100,7 @@ const AddressList = memo((props:Params)=>{
                     {/* **省**市**区**街道****仓库 */}
                     {item.province_name+item.city_name+item.district_name} {item.address_detail}
                     {
-                      item.is_default&&<Text className="address-list-phone">{item.phone}</Text>
+                      item.is_default&&<Text className="address-list-phone">{item.phone.replace(item.phone.substring(3,7), "****")}</Text>
                     }
                   </View>
                   <Navigator url={`/pages/addressAdd/index?type=edit&id=${item.id}`} hoverClass="none" className="address-edit">
@@ -63,7 +110,7 @@ const AddressList = memo((props:Params)=>{
               </View>
             );
           }):
-          <View className="address-no-data">暂未添加地址</View>
+          addButtonEnabled&&<View className="address-no-data">暂未添加地址</View>
         }
       </ScrollView>
       <Navigator url="/pages/addressAdd/index?type=add" hoverClass="none" className="add-address">添加收货地址</Navigator>

src/components/searchInput/index.tsx

@@ -33,7 +33,6 @@ export default memo((props: Params) => {
         }
         return {}
     }, [showBorder])
-    console.log('searchInput::')
     return (
         <View className={styles.searchInput_main} style={stylen}>
             {showTitle&&<View className={styles.searchInput_title}>{title}</View>}