From 2fd4f393b1ed4e82aee7fe2d3657f6c536bae52f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Mon, 9 Dec 2019 19:43:46 +0800
Subject: [PATCH] fix(AddressList): incorrect tel when isDefault is 0 (#5232)

---
 src/address-list/Item.tsx | 40 ++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/address-list/Item.tsx b/src/address-list/Item.tsx
index 1ac884c32..018fe455c 100644
--- a/src/address-list/Item.tsx
+++ b/src/address-list/Item.tsx
@@ -60,28 +60,36 @@ function AddressItem(
     />
   );
 
-  const genContent = () => {
+  function genTag() {
+    if (props.data.isDefault && props.defaultTagText) {
+      return (
+        <Tag type="danger" round class={bem('tag')}>
+          {props.defaultTagText}
+        </Tag>
+      );
+    }
+  }
+
+  function genContent() {
     const { data } = props;
     const Info = [
       <div class={bem('name')}>
         {`${data.name} ${data.tel}`}
-        {data.isDefault && props.defaultTagText && (
-          <Tag type="danger" round class={bem('tag')}>
-            {props.defaultTagText}
-          </Tag>
-        )}
+        {genTag()}
       </div>,
       <div class={bem('address')}>{data.address}</div>
     ];
 
-    return switchable && !disabled ? (
-      <Radio name={data.id} iconSize={16}>
-        {Info}
-      </Radio>
-    ) : (
-      Info
-    );
-  };
+    if (switchable && !disabled) {
+      return (
+        <Radio name={data.id} iconSize={16}>
+          {Info}
+        </Radio>
+      );
+    }
+
+    return Info;
+  }
 
   return (
     <Cell
@@ -106,4 +114,6 @@ AddressItem.props = {
   defaultTagText: String
 };
 
-export default createComponent<AddressItemProps, AddressItemEvents>(AddressItem);
+export default createComponent<AddressItemProps, AddressItemEvents>(
+  AddressItem
+);