From e0ce4f5b569497d97e848d530670d0fe0488083a Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Fri, 13 Jan 2023 21:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(ID1001148=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=EF=BC=8C=E9=80=89=E6=8B=A9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=9C=B0=E5=9D=80=E7=9A=84=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=94=99=E4=BD=8D=EF=BC=8C?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=8D=A2=E8=A1=8C):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AddressList/index.scss | 20 ++++++++++++++------
 src/components/AddressList/index.tsx  | 11 +++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/components/AddressList/index.scss b/src/components/AddressList/index.scss
index d2b9ee4..534bd40 100644
--- a/src/components/AddressList/index.scss
+++ b/src/components/AddressList/index.scss
@@ -11,7 +11,7 @@
   }
   .address-list {
     width: 704px;
-    height: 156px;
+    // height: 156px;
     background: #ffffff;
     border-radius: 20px;
     box-shadow: 2px 4px 12px 0px rgba(0, 0, 0, 0.16);
@@ -20,6 +20,7 @@
     margin: 18px auto 0;
     border: 1px solid #ffffff;
     border: 1px solid rgba(0, 0, 0, 0.16);
+    position: relative;
   }
   .address-active {
     border: 1px solid #68b4ff;
@@ -59,6 +60,13 @@
   }
   .address-edit {
     padding: 10px;
+    position: absolute;
+    margin: auto;
+    top: 0;
+    right: 20px;
+    bottom: 0;
+    display: flex;
+    align-items: center;
   }
   .address-edit .icon-bianji {
     font-size: 40px;
@@ -69,13 +77,13 @@
     font-weight: 400;
     color: #3c3c3c;
     display: flex;
-    width: 100%;
+    width: 80%;
   }
   .address-list-info view {
-    max-width: 60%;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
+    // max-width: 60%;
+    // text-overflow: ellipsis;
+    // overflow: hidden;
+    // white-space: nowrap;
   }
   .address-list-bottom {
     display: flex;
diff --git a/src/components/AddressList/index.tsx b/src/components/AddressList/index.tsx
index 5be6c9b..a53d2a2 100644
--- a/src/components/AddressList/index.tsx
+++ b/src/components/AddressList/index.tsx
@@ -94,20 +94,19 @@ const AddressList = (props: Params) => {
                   <View key={item.id} onLongPress={() => handleDelete(item)} onClick={() => handleSelect(item, index)} className={`address-list ${focusId == item.id && 'address-active'}`}>
                     <View className="address-user">
                       {item.name}
+                      <Text className="address-list-phone">{item.phone.replace(item.phone.substring(3, 7), '****')}</Text>
                       {
-                        item.is_default
-                          ? <Text className="address-list-default">默认</Text>
-                          : <Text className="address-list-phone">{item.phone.replace(item.phone.substring(3, 7), '****')}</Text>
+                        item.is_default && <Text className="address-list-default">默认</Text>
                       }
                     </View>
                     <View className="address-list-bottom">
                       <View className="address-list-info">
-                        <View>{item.province_name + item.city_name + item.district_name}
+                        <View className="address-list-info_title">{item.province_name + item.city_name + item.district_name}
                           {/* {item.address_detail} */}
                         </View>
-                        {
+                        {/* {
                           item.is_default && <Text className="address-list-phone">{item.phone.replace(item.phone.substring(3, 7), '****')}</Text>
-                        }
+                        } */}
                       </View>
                       <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>