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

🎈 perf(ID1000927隐藏自提):

Browse Source
This commit is contained in:
czm 2023-02-24 10:15:51 +08:00
parent 039c96b920
commit 11dbf5d460
3 changed files with 145 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/constant.ts
View File

@ -1,11 +1,11 @@
export const BASE_URL = CURRENT_BASE_URL
// export const BASE_URL = CURRENT_BASE_URL
// export const BASE_URL = `http://192.168.0.75:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:50001/lymarket`
// export const BASE_URL = `http://10.0.0.5:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:40001/lymarket`
// export const BASE_URL = `http://192.168.1.165:40001/lymarket` // 王霞
// export const BASE_URL = 'https://test.zzfzyc.com/lymarket' // 测试环境
// export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
export const BASE_URL = 'https://pre.zzfzyc.com/lymarket' // 预发布
// export const BASE_URL = `http://192.168.1.9:40001/lymarket` // 发
// export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发

63
src/pages/order/components/addressInfoDetail/index.module.scss
View File

@ -1,4 +1,4 @@
.order_address{
.order_address {
background: #ffffff;
border-radius: 20px;
display: flex;
@ -7,43 +7,42 @@
box-sizing: border-box;
margin-top: 20px;
position: relative;
.order_address_icon{
.order_address_icon {
font-size: 50px;
color: $color_main;
position: absolute;
top: 35px;
left: 20px;
}
.order_address_text_con{
flex:1;
.order_address_text_con {
flex: 1;
padding-left: 50px;
box-sizing: border-box;
height: 100%;
display: flex;
flex-direction: column;
justify-content: space-between;
.order_address_text_title{
.order_address_text_title {
font-size: $font_size_medium;
margin-top: 10px;
display: flex;
justify-content: space-between;
.moreIconfont{
.moreIconfont {
font-size: 20px;
padding-top: 10px;
}
.address_text{
word-break:break-all;
.address_text {
word-break: break-all;
}
.address_text_no{
.address_text_no {
font-weight: 700;
padding-left: 20px;
}
}
.order_address_text_name{
.order_address_text_name {
margin-top: 30px;
align-items: center;
text{
text {
&:nth-child(1) {
color: #000;
font-weight: 700;
@ -57,10 +56,10 @@
}
}
}
.updateBtn{
width:200px;
.updateBtn {
width: 200px;
font-size: $font_size_min;
background-color: #F0F0F0;
background-color: #f0f0f0;
height: 64px;
border-radius: 24px;
color: $color_font_two;
@ -68,21 +67,26 @@
bottom: 10px;
right: 10px;
z-index: 999;
.updateBtn_list{
.updateBtn_list {
position: absolute;
display: flex;
z-index: 5;
width: 100%;
.updateBtn_item_select{
.updateBtn_item_select {
color: #fff;
}
}
.updateBtn_item{
flex:1;
.updateBtn_item {
flex: 1;
text-align: center;
line-height: 64px;
}
.updateBtn_select{
.updateBtn_item_select_update {
background-color: #007aff;
color: #fff;
border-radius: 24px;
}
.updateBtn_select {
color: #fff;
background-color: $color_main;
border-radius: 24px;
@ -92,39 +96,36 @@
z-index: 1;
transition: all 0.3s ease-in-out;
}
}
.logisticsBtn{
.logisticsBtn {
width: 152px;
height: 72px;
background: #ffffff;
border: 2px solid #007AFF;
border: 2px solid #007aff;
border-radius: 38px;
position: absolute;
bottom: 10px;
right: 10px;
z-index: 999;
font-size: 28px;
color: #007AFF;
color: #007aff;
text-align: center;
line-height: 72px;
}
.order_address_text_no{
.order_address_text_no {
flex: 1;
font-size: $font_size;
font-weight: 700;
margin-left: 30px;
}
.order_address_more_icon{
.order_address_more_icon {
color: $color_font_three;
font-size: $font_size;
}
}
.order_address_list {
height:80vh;
.order_address_title{
height: 80vh;
.order_address_title {
font-size: $font_size;
font-weight: 700;
width: 100%;
@ -132,7 +133,7 @@
padding: 20px 0 30px 0;
height: 100px;
}
.addressList_con{
.addressList_con {
padding-bottom: 20px;
height: calc(100% - 160px);
}

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

@ -196,7 +196,13 @@ const AddressInfoDetail = ({ onSelect, onChangeShipmentMode, orderInfo, status =
</View>
{(!logisticsShow && (
<View className={styles.updateBtn}>
<View className={styles.updateBtn_list}>
<View
className={classnames(styles.updateBtn_item, styles.updateBtn_item_select_update)}
onClick={e => onReceivingStatus(2, e)}
>
物流
</View>
{/* <View className={styles.updateBtn_list}>
<View
className={classnames(styles.updateBtn_item, receivingStatus == 1 && styles.updateBtn_item_select)}
onClick={e => onReceivingStatus(1, e)}
@ -209,8 +215,8 @@ const AddressInfoDetail = ({ onSelect, onChangeShipmentMode, orderInfo, status =
>
物流
</View>
</View>
<View style={{ transform: receivingStatus == 1 ? 'translateX(0)' : 'translateX(100%)' }} className={classnames(styles.updateBtn_select)}></View>
</View> */}
{/* <View style={{ transform: receivingStatus == 1 ? 'translateX(0)' : 'translateX(100%)' }} className={classnames(styles.updateBtn_select)}></View> */}
</View>
))
|| (orderInfo?.status != SaleOrderStatusRefund.value && (