Feat:预计到达时间
This commit is contained in:
+10
-1
@@ -186,4 +186,13 @@ export function aginConfirm(params) {
|
|||||||
*/
|
*/
|
||||||
export function editAddress(params) {
|
export function editAddress(params) {
|
||||||
return request.post('/order/editAddress', params)
|
return request.post('/order/editAddress', params)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单预计到达时间
|
||||||
|
* @param {*} params
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
export function orderExpectedArrivalTime(params) {
|
||||||
|
return request.post('/order/express/estimatedTime', params)
|
||||||
|
}
|
||||||
|
|||||||
@@ -31,11 +31,19 @@
|
|||||||
<!-- <view class="reject-reason" v-if="orderInfo._status._type==-3 && orderInfo.refundRejectReason">驳回原因:{{ orderInfo.refundRejectReason }}</view> -->
|
<!-- <view class="reject-reason" v-if="orderInfo._status._type==-3 && orderInfo.refundRejectReason">驳回原因:{{ orderInfo.refundRejectReason }}</view> -->
|
||||||
<view v-if="orderInfo.deliveryId !== null && (orderInfo._status._type == -1 || orderInfo._status._type == -2 || orderInfo._status._type == 4 || orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1))">
|
<view v-if="orderInfo.deliveryId !== null && (orderInfo._status._type == -1 || orderInfo._status._type == -2 || orderInfo._status._type == 4 || orderInfo._status._type == 3 || (orderInfo._status._type == 2 && orderInfo.isTickets!==1))">
|
||||||
<view v-if="index < 2 || showMoreDeliver" v-for="(delivery, index) in orderInfo.deliveryInfo" :key="index" class="v12-radius-20 v12-white v12-pa-3 v12-mt-4">
|
<view v-if="index < 2 || showMoreDeliver" v-for="(delivery, index) in orderInfo.deliveryInfo" :key="index" class="v12-radius-20 v12-white v12-pa-3 v12-mt-4">
|
||||||
<view>
|
<view class="v12-align-center">
|
||||||
<text class="v12-secondary-dark-text v12-font-28">{{ delivery.deliveryName }}:{{ delivery.deliveryId }}</text>
|
<text class="v12-secondary-dark-text v12-font-28">{{ delivery.deliveryName }}:{{ delivery.deliveryId }}</text>
|
||||||
<text class="v12-font-22 v12-px-2 v12-py-1 v12-ml-1 v12-primary-text v12-primary-border v12-radius-40" @click="copyClipboard(delivery.deliveryId)">
|
<text class="v12-font-22 v12-px-2 v12-py-1 v12-ml-1 v12-primary-text v12-primary-border v12-radius-40" @click="copyClipboard(delivery.deliveryId)">
|
||||||
复制
|
复制
|
||||||
</text>
|
</text>
|
||||||
|
<view
|
||||||
|
class="v12-font-26 time-box"
|
||||||
|
:style="{
|
||||||
|
color: '#297EE0;',
|
||||||
|
}">
|
||||||
|
<image :src="webUrl+'/orderIcon/787.png'" class="time-bg"></image>
|
||||||
|
{{ getDay(orderInfo.orderId, delivery) || '' }} {{ delivery.estimatedTime || '' }}
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="v12-mt-2 v12-justify-between" @click="goLogistics(orderInfo, index)">
|
<view class="v12-mt-2 v12-justify-between" @click="goLogistics(orderInfo, index)">
|
||||||
<view class="v12-align-center">
|
<view class="v12-align-center">
|
||||||
@@ -483,7 +491,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import passkeyborad from '@/components/yzc-paykeyboard/yzc-paykeyboard'
|
import passkeyborad from '@/components/yzc-paykeyboard/yzc-paykeyboard'
|
||||||
import OrderGoods from "@/components/OrderGoods";
|
import OrderGoods from "@/components/OrderGoods";
|
||||||
import {orderDetail, orderDelay, aginConfirm, express, editAddress} from "@/api/order";
|
import {orderDetail, orderDelay, aginConfirm, express, editAddress, orderExpectedArrivalTime} from "@/api/order";
|
||||||
import Payment from "@/components/Payment";
|
import Payment from "@/components/Payment";
|
||||||
import DataFormat from "@/components/DataFormat";
|
import DataFormat from "@/components/DataFormat";
|
||||||
import {copyClipboard} from "@/utils";
|
import {copyClipboard} from "@/utils";
|
||||||
@@ -600,6 +608,19 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
copyClipboard,
|
copyClipboard,
|
||||||
|
getDay(id, delivery) {
|
||||||
|
const params = {
|
||||||
|
orderId: id,
|
||||||
|
deliveryId: delivery.deliveryId,
|
||||||
|
deliverySn: delivery.deliverySn
|
||||||
|
}
|
||||||
|
orderExpectedArrivalTime(params).then(res => {
|
||||||
|
if(res.success) {
|
||||||
|
// this.orderInfo.expectedArrivalTime = res.data
|
||||||
|
delivery.estimatedTime = res.data.deliveryTime || ''
|
||||||
|
}
|
||||||
|
})
|
||||||
|
},
|
||||||
goGoodsCon(item) {
|
goGoodsCon(item) {
|
||||||
this.$yrouter.push({
|
this.$yrouter.push({
|
||||||
path: '/pages/shop/GoodsCon/index',
|
path: '/pages/shop/GoodsCon/index',
|
||||||
@@ -1249,4 +1270,13 @@ export default {
|
|||||||
margin-top: 30rpx;
|
margin-top: 30rpx;
|
||||||
padding: 30rpx;
|
padding: 30rpx;
|
||||||
}
|
}
|
||||||
|
.time-bg{
|
||||||
|
position: absolute;
|
||||||
|
height: 38rpx;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
.time-box{
|
||||||
|
position: relative;
|
||||||
|
margin-left: 10rpx;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user