xuan/TestRestructureWechatLymarketDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
czm 2022-06-10 10:34:04 +08:00
parent 8257f23a1d
commit 0454f26cc9
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/constant.js
View File

@ -9,11 +9,7 @@
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 // 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://dev.zzfzyc.com/lymarket` // 开发环境
// export const BASE_URL = `https://www.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` // 王霞 // 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.224:50001/lymarket` // 添
// export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰 // export const BASE_URL = `http://192.168.1.15:50001/lymarket` // 杰

4
src/pages/order/components/addressInfoDetail/index.tsx
View File

@ -75,6 +75,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue =
}, 10) }, 10)
//修改地址 //修改地址
const [addressId, setAddressId] = useState(0)
const {fetchData: addressFetchData} = EditSaleOrderAddressApi() const {fetchData: addressFetchData} = EditSaleOrderAddressApi()
const getAddress = async (value) => { const getAddress = async (value) => {
alert.loading('正在修改') alert.loading('正在修改')
@ -83,6 +84,7 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue =
alert.success('地址修改成功') alert.success('地址修改成功')
onSelect?.(value) onSelect?.(value)
setShowAddressList(() => false) setShowAddressList(() => false)
setAddressId(value.id)
setUserInfo(() => value) setUserInfo(() => value)
} else { } else {
alert.none(res.msg) 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_list}>
<View className={styles.order_address_title}>请选择收货地址</View> <View className={styles.order_address_title}>请选择收货地址</View>
<View className={styles.addressList_con}> <View className={styles.addressList_con}>
<AddressList onSelect={getAddress}/> <AddressList onSelect={getAddress} id={addressId}/>
</View> </View>
</View> </View>
</Popup> </Popup>

1
src/pages/order/index.module.scss
View File

@ -69,7 +69,6 @@
left: 0; left: 0;
justify-content: flex-end; justify-content: flex-end;
width: 100%; width: 100%;
height: 175px;
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;
box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16); box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16);