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.75:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89: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://10.0.0.5:50001/lymarket`
// export const BASE_URL = `http://192.168.0.89:40001/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 = `http://192.168.1.165:40001/lymarket` // 王霞
// export const BASE_URL = 'https://test.zzfzyc.com/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:40001/lymarket` // 发
// export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发 // export const BASE_URL = `http://192.168.1.9:50005/lymarket` // 发
// export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发 // export const BASE_URL = `http://192.168.1.30:50001/lymarket` // 发

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

@ -33,7 +33,6 @@
} }
.address_text { .address_text {
word-break: break-all; word-break: break-all;
} }
.address_text_no { .address_text_no {
font-weight: 700; font-weight: 700;
@ -60,7 +59,7 @@
.updateBtn { .updateBtn {
width: 200px; width: 200px;
font-size: $font_size_min; font-size: $font_size_min;
background-color: #F0F0F0; background-color: #f0f0f0;
height: 64px; height: 64px;
border-radius: 24px; border-radius: 24px;
color: $color_font_two; color: $color_font_two;
@ -82,6 +81,11 @@
text-align: center; text-align: center;
line-height: 64px; line-height: 64px;
} }
.updateBtn_item_select_update {
background-color: #007aff;
color: #fff;
border-radius: 24px;
}
.updateBtn_select { .updateBtn_select {
color: #fff; color: #fff;
background-color: $color_main; background-color: $color_main;
@ -92,23 +96,21 @@
z-index: 1; z-index: 1;
transition: all 0.3s ease-in-out; transition: all 0.3s ease-in-out;
} }
} }
.logisticsBtn { .logisticsBtn {
width: 152px; width: 152px;
height: 72px; height: 72px;
background: #ffffff; background: #ffffff;
border: 2px solid #007AFF; border: 2px solid #007aff;
border-radius: 38px; border-radius: 38px;
position: absolute; position: absolute;
bottom: 10px; bottom: 10px;
right: 10px; right: 10px;
z-index: 999; z-index: 999;
font-size: 28px; font-size: 28px;
color: #007AFF; color: #007aff;
text-align: center; text-align: center;
line-height: 72px; line-height: 72px;
} }
.order_address_text_no { .order_address_text_no {
flex: 1; flex: 1;
@ -120,7 +122,6 @@
color: $color_font_three; color: $color_font_three;
font-size: $font_size; font-size: $font_size;
} }
} }
.order_address_list { .order_address_list {
height: 80vh; height: 80vh;

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

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