master
jevononlie 7 months ago
parent 5e181f62ed
commit 61d145f40d

@ -119,15 +119,15 @@ const handleCancleOrder = () => {
<image class="img-url" :src="item.imgUrl"></image>
<view class="name">{{ item.product.name }}</view>
</view>
<view class="recovery-price">实际价格{{ item.actualRecoveryPrice }}</view>
<view class="recovery-weight">实际重量{{ item.productActualWeight }}千克</view>
<view class="recovery-price marginLeft50">实际价格{{ item.actualRecoveryPrice }}</view>
<view class="recovery-weight marginLeft50">实际重量{{ item.productActualWeight }}千克</view>
</view>
</view>
</template>
<view class="predict-weight">下单时间{{ order.creatorTime || '-' }}</view>
<view class="predict-weight" v-if="order.completeTime">{{ order.completeTime || '-' }}</view>
<view class="predict-weight" v-if="order.predictWeight">{{ order.predictWeight?.desc || '-' }}</view>
<view class="predict-weight" v-if="order.orderAmount">{{ order.orderAmount || '-' }}</view>
<view class="predict-weight" v-if="order.orderAmount">{{ order.orderAmount + '' || '-' }}</view>
<view class="predict-weight">备注{{ order.remark || '-' }}</view>
</view>
<template v-if="isOrderTypeSH">
@ -327,7 +327,7 @@ page {
.img-url {
width: 40rpx;
height: 40rpx;
margin-right: 20rpx;
margin-right: 10rpx;
}
.name {
@ -348,12 +348,15 @@ page {
font-size: 28rpx;
color: #3D3D3D;
}
.marginLeft50 {
margin-left: 50rpx;
}
}
}
.predict-weight {
font-size: 28rpx;
margin-top: 40rpx;
margin: 20rpx 0;
color: #3D3D3D;
}

@ -23,7 +23,7 @@ const queryParams: Required<any> = {
}
//
const orderList = ref<OrderItem[]>([])
const orderList = ref([])
//
const isLoading = ref(false)
//
@ -38,14 +38,11 @@ const getData = async () => {
//
isLoading.value = true
//
const data = await getMemberOrderAPI(queryParams)
const res = await getMemberOrderAPI(queryParams)
const data = res.data
//
isLoading.value = false
data.list.forEach((e) => {
const str = e.appointmentTimeStart.slice(0, 10)
const start = e.appointmentTimeStart.slice(11, 16)
const end = e.appointmentTimeEnd.slice(11, 16)
e.appointmentTime = str + ' ' + start + '-' + end
// if (e.orderDetails) {
// e.orderDetails.forEach((q) => {
// const arr = JSON.parse(q.product.photo)
@ -57,9 +54,9 @@ const getData = async () => {
// }
})
//
orderList.value.push(...res.data.list)
orderList.value.push(...data.list)
//
if (queryParams.pageNo < res.data.pages) {
if (queryParams.pageNo < data.pages) {
//
queryParams.pageNo++
} else {
@ -135,49 +132,59 @@ const onRefresherrefresh = async () => {
margin: 20rpx 20rpx;
border-radius: 10rpx;
background-color: #fff;
.hd {
padding: 10rpx;
font-size: 28rpx;
display: flex;
justify-content: space-between;
.statusLabel {
font-size: 24rpx;
color: #FF7D00;
}
}
.md {
padding: 10rpx;
min-height: 100rpx;
font-size: 28rpx;
border-top: 2rpx solid #F2F2F2;
border-bottom: 2rpx solid #F2F2F2;
.order-details {
.detail-item {
margin: 20rpx 0;
display: flex;
align-items: center;
.img-url {
width: 40rpx;
height: 40rpx;
margin-right: 20rpx;
}
.product-name {
//
}
}
}
.predict-weight {
margin: 40rpx 0 20rpx;
}
}
.foot {
margin-top: 16rpx;
padding: 10rpx;
position: relative;
font-size: 24rpx;
.appointment-time {
margin: 10rpx 0;
}
.cancle {
position: absolute;
right: 0;
@ -190,6 +197,7 @@ const onRefresherrefresh = async () => {
border-radius: 40rpx;
}
}
&:last-child {
padding-bottom: 40rpx;
}
@ -231,6 +239,7 @@ const onRefresherrefresh = async () => {
border-radius: 10rpx;
overflow: hidden;
position: relative;
.image {
width: 170rpx;
height: 170rpx;

@ -31,7 +31,6 @@ page {
height: 100%;
display: flex;
flex-direction: column;
background-color: #fff;
}
// swiper
.swiper {

Loading…
Cancel
Save