🐞 fix(ID1001509): 【面料优选】-功能{售后详情}：申请时间半边显示
【【面料优选】-功能{售后详情}：申请时间半边显示】 https://www.tapd.cn/53459131/bugtrace/bugs/view/1153459131001001509
This commit is contained in:
xuan
parent
185e0d222d
commit
e6e2caa59e
@ -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` // 发
|
||||||
|
|||||||
@ -1,124 +1,120 @@
|
|||||||
.submit_order{
|
.submit_order {
|
||||||
|
display: flex;
|
||||||
|
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);
|
||||||
|
padding: 20px 20px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
padding-bottom: constant(safe-area-inset-bottom);
|
||||||
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
|
.order_btn {
|
||||||
|
width: 152px;
|
||||||
|
height: 72px;
|
||||||
|
border: 2px solid #dddddd;
|
||||||
|
border-radius: 46px;
|
||||||
display: flex;
|
display: flex;
|
||||||
position: fixed;
|
justify-content: center;
|
||||||
bottom: 0;
|
|
||||||
left: 0;
|
|
||||||
justify-content: flex-end;
|
|
||||||
width: 100%;
|
|
||||||
height: 175px;
|
|
||||||
align-items: center;
|
align-items: center;
|
||||||
background-color: #fff;
|
color: $color_font_three;
|
||||||
box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16);
|
&:nth-child(n + 2) {
|
||||||
padding: 20px 20px;
|
margin-left: 34px;
|
||||||
box-sizing: border-box;
|
|
||||||
padding-bottom: constant(safe-area-inset-bottom);
|
|
||||||
padding-bottom: env(safe-area-inset-bottom);
|
|
||||||
.order_btn {
|
|
||||||
width: 152px;
|
|
||||||
height: 72px;
|
|
||||||
border: 2px solid #dddddd;
|
|
||||||
border-radius: 46px;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
color: $color_font_three;
|
|
||||||
&:nth-child(n+2) {
|
|
||||||
margin-left: 34px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.order_btn_select{
|
|
||||||
color: $color_main;
|
|
||||||
border: 2px solid $color_main;
|
|
||||||
}
|
|
||||||
.order_number_desc{
|
|
||||||
font-size: $font_size_medium;
|
|
||||||
color: $color_font_two;
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
.order_btn_select {
|
||||||
|
color: $color_main;
|
||||||
|
border: 2px solid $color_main;
|
||||||
|
}
|
||||||
|
.order_number_desc {
|
||||||
|
font-size: $font_size_medium;
|
||||||
|
color: $color_font_two;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.btns_list{
|
.btns_list {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
// margin-top: 30px;
|
// margin-top: 30px;
|
||||||
|
display: flex;
|
||||||
|
align-content: center;
|
||||||
|
.more {
|
||||||
|
font-size: 28px;
|
||||||
|
width: 143px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-content: center;
|
align-items: center;
|
||||||
.more{
|
color: $color_font_two;
|
||||||
|
padding-left: 20px;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
.more_list {
|
||||||
|
position: absolute;
|
||||||
|
background-color: #fff;
|
||||||
|
width: 226px;
|
||||||
|
box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.06);
|
||||||
|
border-radius: 10px;
|
||||||
|
padding: 0 20px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
z-index: 999;
|
||||||
|
&::before {
|
||||||
|
z-index: 1;
|
||||||
|
position: absolute;
|
||||||
|
bottom: -7px;
|
||||||
|
left: 50px;
|
||||||
|
width: 15px;
|
||||||
|
height: 15px;
|
||||||
|
content: ' ';
|
||||||
|
transform: rotate(45deg);
|
||||||
|
background: #fff;
|
||||||
|
box-sizing: border-box;
|
||||||
|
box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.1);
|
||||||
|
}
|
||||||
|
.more_item {
|
||||||
font-size: 28px;
|
font-size: 28px;
|
||||||
width: 143px;
|
height: 70px;
|
||||||
display: flex;
|
line-height: 70px;
|
||||||
align-items: center;
|
|
||||||
color: $color_font_two;
|
|
||||||
padding-left: 20px;
|
|
||||||
position: relative;
|
|
||||||
|
|
||||||
.more_list{
|
|
||||||
position: absolute;
|
|
||||||
background-color: #fff;
|
|
||||||
width: 226px;
|
|
||||||
box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.06);
|
|
||||||
border-radius: 10px;
|
|
||||||
padding: 0 20px;
|
|
||||||
box-sizing: border-box;
|
|
||||||
z-index:999;
|
|
||||||
&::before{
|
|
||||||
z-index: 1;
|
|
||||||
position: absolute;
|
|
||||||
bottom: -7px;
|
|
||||||
left: 50px;
|
|
||||||
width: 15px;
|
|
||||||
height: 15px;
|
|
||||||
content: " ";
|
|
||||||
transform: rotate(45deg);
|
|
||||||
background: #fff;
|
|
||||||
box-sizing: border-box;
|
|
||||||
box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.1);
|
|
||||||
}
|
|
||||||
.more_item{
|
|
||||||
font-size: 28px;
|
|
||||||
height: 70px;
|
|
||||||
line-height: 70px;
|
|
||||||
text-align: center;
|
|
||||||
&:nth-last-child(n+2) {
|
|
||||||
border-bottom: 1PX solid #F0F0F0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.more_bg{
|
|
||||||
position:fixed;
|
|
||||||
width: 100vw;
|
|
||||||
height: 100vh;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.scroll{
|
|
||||||
white-space: nowrap;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
.list_scroll{
|
|
||||||
white-space: nowrap;
|
|
||||||
width: 100%;
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
.btns_item{
|
|
||||||
padding: 0 15px;
|
|
||||||
width: 130px;
|
|
||||||
border: 2px solid #dddddd;
|
|
||||||
border-radius: 38px;
|
|
||||||
text-align: center;
|
text-align: center;
|
||||||
line-height: 60px;
|
&:nth-last-child(n + 2) {
|
||||||
font-size: $font_size;
|
border-bottom: 1px solid #f0f0f0;
|
||||||
color: $color_font_three;
|
|
||||||
display:inline-block;
|
|
||||||
&:nth-child(n+2) {
|
|
||||||
margin-left: 32px;
|
|
||||||
}
|
}
|
||||||
&:nth-last-child(1) {
|
}
|
||||||
border: 2px solid $color_main;
|
|
||||||
color: $color_main;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
.end_btn{
|
.more_bg {
|
||||||
border: 2px solid $color_main;
|
position: fixed;
|
||||||
color: $color_main;
|
width: 100vw;
|
||||||
|
height: 100vh;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
.scroll {
|
||||||
|
white-space: nowrap;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
.list_scroll {
|
||||||
|
white-space: nowrap;
|
||||||
|
width: 100%;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
.btns_item {
|
||||||
|
padding: 0 15px;
|
||||||
|
width: 130px;
|
||||||
|
border: 2px solid #dddddd;
|
||||||
|
border-radius: 38px;
|
||||||
|
text-align: center;
|
||||||
|
line-height: 60px;
|
||||||
|
font-size: $font_size;
|
||||||
|
color: $color_font_three;
|
||||||
|
display: inline-block;
|
||||||
|
&:nth-child(n + 2) {
|
||||||
|
margin-left: 32px;
|
||||||
|
}
|
||||||
|
&:nth-last-child(1) {
|
||||||
|
border: 2px solid $color_main;
|
||||||
|
color: $color_main;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.end_btn {
|
||||||
|
border: 2px solid $color_main;
|
||||||
|
color: $color_main;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,155 +1,164 @@
|
|||||||
.order_main{
|
page {
|
||||||
min-height: 100%;
|
height: 100vh;
|
||||||
background-color:$color_bg_one;
|
display: flex;
|
||||||
padding: 20px;
|
flex-flow: column nowrap;
|
||||||
padding-bottom: 190px;
|
overflow: hidden;
|
||||||
box-sizing: border-box;
|
}
|
||||||
|
.order_main {
|
||||||
.order_title{
|
display: flex;
|
||||||
display: flex;
|
flex-flow: column nowrap;
|
||||||
align-items: center;
|
justify-content: space-between;
|
||||||
padding: 20px 30px;
|
background-color: $color_bg_one;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
background-color: #fff;
|
overflow: hidden;
|
||||||
height: 116px;
|
.content {
|
||||||
border-radius: 20px;
|
flex: 1 1 auto;
|
||||||
margin-top: 20px;
|
overflow-y: scroll;
|
||||||
text{
|
}
|
||||||
flex:1;
|
.button_bar {
|
||||||
font-size: $font_size;
|
}
|
||||||
font-weight: 700;
|
.order_title {
|
||||||
}
|
display: flex;
|
||||||
.order_status{
|
align-items: center;
|
||||||
background-color: #F0F0F0;
|
padding: 20px 30px;
|
||||||
width: 148px;
|
box-sizing: border-box;
|
||||||
height: 55px;
|
background-color: #fff;
|
||||||
color: $color_font_three;
|
height: 116px;
|
||||||
text-align: center;
|
border-radius: 20px;
|
||||||
line-height: 55px;
|
margin-top: 20px;
|
||||||
font-size: $font_size_medium;
|
text {
|
||||||
border-radius: 30px;
|
flex: 1;
|
||||||
&:nth-last-child(1) {
|
font-size: $font_size;
|
||||||
margin-left: 20px;
|
font-weight: 700;
|
||||||
}
|
}
|
||||||
}
|
.order_status {
|
||||||
}
|
background-color: #f0f0f0;
|
||||||
.order_desc{
|
width: 148px;
|
||||||
display: flex;
|
height: 55px;
|
||||||
align-items: center;
|
color: $color_font_three;
|
||||||
background-color: #fff;
|
text-align: center;
|
||||||
padding: 20px;
|
line-height: 55px;
|
||||||
min-height: 116px;
|
font-size: $font_size_medium;
|
||||||
border-radius: 20px;
|
border-radius: 30px;
|
||||||
margin-top: 20px;
|
&:nth-last-child(1) {
|
||||||
box-sizing: border-box;
|
margin-left: 20px;
|
||||||
.order_desc_con{
|
}
|
||||||
width: 150px;
|
}
|
||||||
font-size: $font_size;
|
}
|
||||||
font-weight: 700;
|
.order_desc {
|
||||||
}
|
display: flex;
|
||||||
.order_desc_text, .order_desc_text_hint{
|
align-items: center;
|
||||||
font-size: $font_size_medium;
|
background-color: #fff;
|
||||||
color: $color_font_two;
|
padding: 20px;
|
||||||
margin-right: 10px;
|
min-height: 116px;
|
||||||
flex:1;
|
border-radius: 20px;
|
||||||
word-break:break-all;
|
margin-top: 20px;
|
||||||
}
|
box-sizing: border-box;
|
||||||
.order_desc_text_hint{
|
.order_desc_con {
|
||||||
text-align: right;
|
width: 150px;
|
||||||
}
|
font-size: $font_size;
|
||||||
.miconfont{
|
font-weight: 700;
|
||||||
font-size: 20px;
|
}
|
||||||
color: $color_font_two;
|
.order_desc_text,
|
||||||
}
|
.order_desc_text_hint {
|
||||||
}
|
font-size: $font_size_medium;
|
||||||
.submit_order{
|
color: $color_font_two;
|
||||||
display: flex;
|
margin-right: 10px;
|
||||||
position: fixed;
|
flex: 1;
|
||||||
bottom: 0;
|
word-break: break-all;
|
||||||
left: 0;
|
}
|
||||||
justify-content: flex-end;
|
.order_desc_text_hint {
|
||||||
width: 100%;
|
text-align: right;
|
||||||
height: 175px;
|
}
|
||||||
align-items: center;
|
.miconfont {
|
||||||
background-color: #fff;
|
font-size: 20px;
|
||||||
box-shadow: 6px 0px 12px 0px rgba(0,0,0,0.16);
|
color: $color_font_two;
|
||||||
padding: 20px 20px;
|
}
|
||||||
box-sizing: border-box;
|
}
|
||||||
padding-bottom: constant(safe-area-inset-bottom);
|
.submit_order {
|
||||||
padding-bottom: env(safe-area-inset-bottom);
|
display: flex;
|
||||||
.order_btn {
|
position: fixed;
|
||||||
width: 152px;
|
bottom: 0;
|
||||||
height: 72px;
|
left: 0;
|
||||||
border: 2px solid #dddddd;
|
justify-content: flex-end;
|
||||||
border-radius: 46px;
|
width: 100%;
|
||||||
display: flex;
|
height: 175px;
|
||||||
justify-content: center;
|
align-items: center;
|
||||||
align-items: center;
|
background-color: #fff;
|
||||||
color: $color_font_three;
|
box-shadow: 6px 0px 12px 0px rgba(0, 0, 0, 0.16);
|
||||||
&:nth-child(n+2) {
|
padding: 20px 20px;
|
||||||
margin-left: 34px;
|
box-sizing: border-box;
|
||||||
}
|
padding-bottom: constant(safe-area-inset-bottom);
|
||||||
}
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
.order_btn_select{
|
.order_btn {
|
||||||
color: $color_main;
|
width: 152px;
|
||||||
border: 2px solid $color_main;
|
height: 72px;
|
||||||
}
|
border: 2px solid #dddddd;
|
||||||
.order_number_desc{
|
border-radius: 46px;
|
||||||
font-size: $font_size_medium;
|
display: flex;
|
||||||
color: $color_font_two;
|
justify-content: center;
|
||||||
}
|
align-items: center;
|
||||||
}
|
color: $color_font_three;
|
||||||
.order_info{
|
&:nth-child(n + 2) {
|
||||||
background-color: #fff;
|
margin-left: 34px;
|
||||||
margin-top: 20px;
|
}
|
||||||
border-radius: 20px;
|
}
|
||||||
padding: 20px;
|
.order_btn_select {
|
||||||
.order_info_title{
|
color: $color_main;
|
||||||
font-size: $font_size;
|
border: 2px solid $color_main;
|
||||||
font-weight: 700;
|
}
|
||||||
margin-bottom: 20px;
|
.order_number_desc {
|
||||||
|
font-size: $font_size_medium;
|
||||||
}
|
color: $color_font_two;
|
||||||
.order_num{
|
}
|
||||||
display: flex;
|
}
|
||||||
width: 100%;
|
.order_info {
|
||||||
justify-content: space-between;
|
background-color: #fff;
|
||||||
align-items: center;
|
margin-top: 20px;
|
||||||
.order_num_btn{
|
border-radius: 20px;
|
||||||
font-size: $font_size_medium;
|
padding: 20px;
|
||||||
padding: 5px;
|
.order_info_title {
|
||||||
border: 2px solid #007cf7;
|
font-size: $font_size;
|
||||||
border-radius: 10px;
|
font-weight: 700;
|
||||||
color: $color_main;
|
margin-bottom: 20px;
|
||||||
}
|
}
|
||||||
}
|
.order_num {
|
||||||
text{
|
display: flex;
|
||||||
font-size: $font_size;
|
width: 100%;
|
||||||
word-break: break-all;
|
justify-content: space-between;
|
||||||
}
|
align-items: center;
|
||||||
|
.order_num_btn {
|
||||||
}
|
font-size: $font_size_medium;
|
||||||
|
padding: 5px;
|
||||||
.after_sale_picture_list{
|
border: 2px solid #007cf7;
|
||||||
display: grid;
|
border-radius: 10px;
|
||||||
grid-template-columns: repeat(5, 102px);
|
color: $color_main;
|
||||||
justify-items: center;
|
}
|
||||||
grid-row-gap:20px;
|
}
|
||||||
grid-column-gap: calc((100% - 102px*5)/4);
|
text {
|
||||||
.after_sale_picture_item{
|
font-size: $font_size;
|
||||||
width: 102px;
|
word-break: break-all;
|
||||||
height: 102px;
|
}
|
||||||
image{
|
}
|
||||||
width:100%;
|
|
||||||
height: 100%;
|
.after_sale_picture_list {
|
||||||
border-radius: 10px;
|
display: grid;
|
||||||
}
|
grid-template-columns: repeat(5, 102px);
|
||||||
}
|
justify-items: center;
|
||||||
}
|
grid-row-gap: 20px;
|
||||||
|
grid-column-gap: calc((100% - 102px * 5) / 4);
|
||||||
|
.after_sale_picture_item {
|
||||||
.weight_memo_con{
|
width: 102px;
|
||||||
margin-bottom: 20px;
|
height: 102px;
|
||||||
}
|
image {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
border-radius: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.weight_memo_con {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -191,12 +191,16 @@ const SalesAfter = () => {
|
|||||||
return (
|
return (
|
||||||
<MoveBtn showList={['order']} messageTitle={orderDetail?.return_order_no} messagePath={`/pages/salesAfter/index?id=${orderDetail?.id}`} showCart>
|
<MoveBtn showList={['order']} messageTitle={orderDetail?.return_order_no} messagePath={`/pages/salesAfter/index?id=${orderDetail?.id}`} showCart>
|
||||||
<View className={styles.order_main}>
|
<View className={styles.order_main}>
|
||||||
<OrderState orderInfo={orderDetail} />
|
<View className={styles.content} style={{ padding: '20rpx' }}>
|
||||||
<AddressInfoDetail orderInfo={orderDetail} onLogistics={onShowLogistics} />
|
<OrderState orderInfo={orderDetail} />
|
||||||
<KindList order={formatPreViewOrderMemo} />
|
<AddressInfoDetail orderInfo={orderDetail} onLogistics={onShowLogistics} />
|
||||||
<OrderDesWithMemo orderInfo={orderDetail} />
|
<KindList order={formatPreViewOrderMemo} />
|
||||||
<AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick} />
|
<OrderDesWithMemo orderInfo={orderDetail} />
|
||||||
<AfterSalePrictureWithMemo urls={orderDetail?.fabric_piece_accessory_url} />
|
<AfterSalePrictureWithMemo urls={orderDetail?.fabric_piece_accessory_url} />
|
||||||
|
</View>
|
||||||
|
<View className={styles.button_bar}>
|
||||||
|
<AfterOrderBtns orderInfo={orderInfo} onClick={orderStateClick} />
|
||||||
|
</View>
|
||||||
<ReturnLogistics
|
<ReturnLogistics
|
||||||
onlyRead={logistics}
|
onlyRead={logistics}
|
||||||
images={orderDetail?.accessory_url}
|
images={orderDetail?.accessory_url}
|
||||||
@ -208,7 +212,6 @@ const SalesAfter = () => {
|
|||||||
/>
|
/>
|
||||||
<ApplyRecord show={applyRecord} id={orderDetail?.id} onClose={() => setApplyRecord(false)} />
|
<ApplyRecord show={applyRecord} id={orderDetail?.id} onClose={() => setApplyRecord(false)} />
|
||||||
<ReturnPayCheck orderInfo={orderDetail} show={returnCodeShow} onClose={() => setReturnCodeShow(false)} />
|
<ReturnPayCheck orderInfo={orderDetail} show={returnCodeShow} onClose={() => setReturnCodeShow(false)} />
|
||||||
<View className="common_safe_area_y"></View>
|
|
||||||
</View>
|
</View>
|
||||||
</MoveBtn>
|
</MoveBtn>
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user