From 0454f26cc94562d7c50b1f3709e9ab4fa863edfb Mon Sep 17 00:00:00 2001
From: czm <2192718639@qq.com>
Date: Fri, 10 Jun 2022 10:34:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/constant.js                                 | 4 ----
 src/pages/order/components/addressInfoDetail/index.tsx | 4 +++-
 src/pages/order/index.module.scss                      | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/common/constant.js b/src/common/constant.js
index 72b9c51..c1e0354 100644
--- a/src/common/constant.js
+++ b/src/common/constant.js
@@ -9,11 +9,7 @@
 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发
 // export const BASE_URL = `https://dev.zzfzyc.com/lymarket`  // 开发环境
 // export const BASE_URL = `https://www.zzfzyc.com/lymarket`  // 正式环境
-<<<<<<< HEAD
-// export const BASE_URL = `http://192.168.1.4:40001/lymarket` // 王霞
-=======
 // export const BASE_URL = `http://192.168.1.5:40001/lymarket` // 王霞
->>>>>>> 订单售后v2
 export const BASE_URL = `http://192.168.1.224:50001/lymarket` // 添
 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰
 
diff --git a/src/pages/order/components/addressInfoDetail/index.tsx b/src/pages/order/components/addressInfoDetail/index.tsx
index 305805d..bc915ed 100644
--- a/src/pages/order/components/addressInfoDetail/index.tsx
+++ b/src/pages/order/components/addressInfoDetail/index.tsx
@@ -75,6 +75,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue =
     }, 10)
 
     //修改地址
+    const [addressId, setAddressId] = useState(0)
     const {fetchData: addressFetchData} = EditSaleOrderAddressApi()
     const getAddress = async (value) => {
         alert.loading('正在修改')
@@ -83,6 +84,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue =
             alert.success('地址修改成功')
             onSelect?.(value)
             setShowAddressList(() => false)
+            setAddressId(value.id)
             setUserInfo(() => value)
         } else {
             alert.none(res.msg)
@@ -115,7 +117,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue =
                 <View className={styles.order_address_list}>
                     <View className={styles.order_address_title}>请选择收货地址</View>
                     <View className={styles.addressList_con}>
-                        <AddressList onSelect={getAddress}/>
+                        <AddressList onSelect={getAddress} id={addressId}/>
                     </View>
                 </View>
             </Popup>
diff --git a/src/pages/order/index.module.scss b/src/pages/order/index.module.scss
index a032fbe..87ea5e5 100644
--- a/src/pages/order/index.module.scss
+++ b/src/pages/order/index.module.scss
@@ -69,7 +69,6 @@
         left: 0;
         justify-content: flex-end;
         width: 100%;
-        height: 175px;
         align-items: center;
         background-color: #fff;
         box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16);