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

🐞 fix(ID1001509): 【面料优选】-功能{售后详情}：申请时间半边显示

Browse Source 
【【面料优选】-功能{售后详情}：申请时间半边显示】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001509
This commit is contained in:
xuan 2023-03-13 16:09:31 +08:00
parent 185e0d222d
commit e6e2caa59e
5 changed files with 282 additions and 274 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` // 发

8
src/components/afterOrderBtns/index.module.scss
View File

@ -1,8 +1,5 @@
.submit_order {
display: flex;
position: fixed;
bottom: 0;
left: 0;
justify-content: flex-end;
width: 100%;
height: 175px;
@ -65,7 +62,7 @@
left: 50px;
width: 15px;
height: 15px;
content: " ";
content: ' ';
transform: rotate(45deg);
background: #fff;
box-sizing: border-box;
@ -77,7 +74,7 @@
line-height: 70px;
text-align: center;
&:nth-last-child(n + 2) {
border-bottom: 1PX solid #F0F0F0;
border-bottom: 1px solid #f0f0f0;
}
}
}
@ -115,7 +112,6 @@
border: 2px solid $color_main;
color: $color_main;
}
}
.end_btn {
border: 2px solid $color_main;

29
src/pages/salesAfter/index.module.scss
View File

@ -1,10 +1,22 @@
page {
height: 100vh;
display: flex;
flex-flow: column nowrap;
overflow: hidden;
}
.order_main {
min-height: 100%;
display: flex;
flex-flow: column nowrap;
justify-content: space-between;
background-color: $color_bg_one;
padding: 20px;
padding-bottom: 190px;
box-sizing: border-box;
overflow: hidden;
.content {
flex: 1 1 auto;
overflow-y: scroll;
}
.button_bar {
}
.order_title {
display: flex;
align-items: center;
@ -20,7 +32,7 @@
font-weight: 700;
}
.order_status {
background-color: #F0F0F0;
background-color: #f0f0f0;
width: 148px;
height: 55px;
color: $color_font_three;
@ -47,7 +59,8 @@
font-size: $font_size;
font-weight: 700;
}
.order_desc_text, .order_desc_text_hint{
.order_desc_text,
.order_desc_text_hint {
font-size: $font_size_medium;
color: $color_font_two;
margin-right: 10px;
@ -108,7 +121,6 @@
font-size: $font_size;
font-weight: 700;
margin-bottom: 20px;
}
.order_num {
display: flex;
@ -127,7 +139,6 @@
font-size: $font_size;
word-break: break-all;
}
}
.after_sale_picture_list {
@ -147,9 +158,7 @@
}
}
.weight_memo_con {
margin-bottom: 20px;
}
}

7
src/pages/salesAfter/index.tsx
View File

@ -191,12 +191,16 @@ const SalesAfter = () => {
return (
<MoveBtn showList={['order']} messageTitle={orderDetail?.return_order_no} messagePath={`/pages/salesAfter/index?id=${orderDetail?.id}`} showCart>
<View className={styles.order_main}>
<View className={styles.content} style={{ padding: '20rpx' }}>
<OrderState orderInfo={orderDetail} />
<AddressInfoDetail orderInfo={orderDetail} onLogistics={onShowLogistics} />
<KindList order={formatPreViewOrderMemo} />
<OrderDesWithMemo orderInfo={orderDetail} />
<AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick} />
<AfterSalePrictureWithMemo urls={orderDetail?.fabric_piece_accessory_url} />
</View>
<View className={styles.button_bar}>
<AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick} />
</View>
<ReturnLogistics
onlyRead={logistics}
images={orderDetail?.accessory_url}
@ -208,7 +212,6 @@ const SalesAfter = () => {
/>
<ApplyRecord show={applyRecord} id={orderDetail?.id} onClose={() => setApplyRecord(false)} />
<ReturnPayCheck orderInfo={orderDetail} show={returnCodeShow} onClose={() => setReturnCodeShow(false)} />
<View className="common_safe_area_y"></View>
</View>
</MoveBtn>
)