From f3e4b684485f7c43bd3471aca8da2112cc9c4375 Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Thu, 12 May 2022 11:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=BB=84=E4=BB=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/address/index.module.scss | 3 ++-
 src/components/address/index.tsx         | 5 +++--
 src/pages/addressAdd/index.tsx           | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/address/index.module.scss b/src/components/address/index.module.scss
index ce7e7c7..767d401 100644
--- a/src/components/address/index.module.scss
+++ b/src/components/address/index.module.scss
@@ -26,7 +26,7 @@
             width: 100px;
             height: 2px;
             border-radius: 50px;
-            background-color:$color_font_two;
+            background-color:$color_main;
             position: absolute;
             bottom: 0;
             left: 0;
@@ -48,6 +48,7 @@
                 }
                 .address_iconfont{
                     font-size: 30px !important;
+                    color: $color_main;
                 }
             }
         }
diff --git a/src/components/address/index.tsx b/src/components/address/index.tsx
index 6916c65..3de4487 100644
--- a/src/components/address/index.tsx
+++ b/src/components/address/index.tsx
@@ -5,6 +5,7 @@ import styles from "./index.module.scss"
 import classnames from "classnames";
 import Taro from "@tarojs/taro";
 import { GetAddressListApi } from "@/api/addressList";
+import { alert } from "@/common/common";
 
 
 type DefaultValueParm = {name?: string, id?:string|number}
@@ -153,7 +154,7 @@ export default memo(({
                 addressOnClose?.()
                 addressOnSelect?.(selectArr)
             } else {
-                Taro.showToast({title:'请选择完整地址',icon:'none'})
+                alert.error("请选择完整地址");
             }
         } else {
             addressOnClose?.()
@@ -208,7 +209,7 @@ export default memo(({
                                     return (
                                         <View onClick={() => selectItem(item)} className={classnames(styles.address_list_item, {[styles.addresst_select]:(selectId == item.id)})}>
                                             <View className={styles.address_list_item_name}>{item.name}</View>
-                                            {(selectId == item.id)&&<View className={`iconfont icon-a-tick1 ${styles.address_iconfont}` }></View>}
+                                            {(selectArr[selectIndex]?.id == item.id)&&<View className={`iconfont icon-tick ${styles.address_iconfont}` }></View>}
                                         </View>
                                     )
                                 })}
diff --git a/src/pages/addressAdd/index.tsx b/src/pages/addressAdd/index.tsx
index 3070ba7..7951d1c 100644
--- a/src/pages/addressAdd/index.tsx
+++ b/src/pages/addressAdd/index.tsx
@@ -123,7 +123,7 @@ export default ()=>{
       <Button style={{"background": hozon?'#007aff':''}} hoverClass="none" className={`add-address-save`} onClick={handleSave}>
         保存
       </Button>
-      <Address addressOnSelect={handleSetSite} defaultValue={formData.siteArray} addressOnClose={()=>setShowSiteModal(false)} show={showSiteModal}/>
+      <Address addressOnSelect={handleSetSite}  defaultValue={[ {name: "广东省", id: 193}, {name: "佛山市", id: 202}, {name: "高明区", id: 204}]} addressOnClose={()=>setShowSiteModal(false)} show={showSiteModal}/>
     </View>
   )
 }