|
|
@ -38,7 +38,7 @@ |
|
|
|
@timeup="onTimeup" |
|
|
|
/> |
|
|
|
</view> |
|
|
|
<view class="button">去支付</view> |
|
|
|
<view class="button" @tap="onOrderPay">去支付</view> |
|
|
|
</template> |
|
|
|
<!-- 其他订单状态:展示再次购买按钮 --> |
|
|
|
<template v-else> |
|
|
@ -160,7 +160,13 @@ |
|
|
|
再次购买 |
|
|
|
</navigator> |
|
|
|
<!-- 待收货状态: 展示确认收货 --> |
|
|
|
<view class="button primary"> 确认收货 </view> |
|
|
|
<view |
|
|
|
v-if="order.orderState === OrderState.DaiShouHuo" |
|
|
|
@tap="onOrderConfirm" |
|
|
|
class="button primary" |
|
|
|
> |
|
|
|
确认收货 |
|
|
|
</view> |
|
|
|
<!-- 待评价状态: 展示去评价 --> |
|
|
|
<view class="button"> 去评价 </view> |
|
|
|
<!-- 待评价/已完成/已取消 状态: 展示删除订单 --> |
|
|
@ -198,7 +204,11 @@ import { onLoad, onReady } from '@dcloudio/uni-app' |
|
|
|
import { useGuessList } from '@/composables' |
|
|
|
import { ref } from 'vue' |
|
|
|
import { OrderState, orderStateList } from '@/services/constants' |
|
|
|
import { getMemberOrderByIdAPI, getMemberOrderConsignmentByIdAPI } from '@/services/order' |
|
|
|
import { |
|
|
|
getMemberOrderByIdAPI, |
|
|
|
getMemberOrderConsignmentByIdAPI, |
|
|
|
putMemberOrderReceiptByIdAPI, |
|
|
|
} from '@/services/order' |
|
|
|
import { getPayMockAPI, getPayWxPayMiniPayAPI } from '@/services/pay' |
|
|
|
|
|
|
|
// 获取屏幕边界到安全区域距离 |
|
|
@ -307,6 +317,21 @@ const onOrderSend = async () => { |
|
|
|
order.value!.orderState = OrderState.DaiShouHuo |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 确认收货 |
|
|
|
const onOrderConfirm = () => { |
|
|
|
// 二次确认弹窗 |
|
|
|
uni.showModal({ |
|
|
|
content: '为保障您的权益,请收到货并确认无误后,再确认收货', |
|
|
|
success: async (success) => { |
|
|
|
if (success.confirm) { |
|
|
|
const res = await putMemberOrderReceiptByIdAPI(query.id) |
|
|
|
// 更新订单状态 |
|
|
|
order.value = res.result |
|
|
|
} |
|
|
|
}, |
|
|
|
}) |
|
|
|
} |
|
|
|
</script> |
|
|
|
|
|
|
|
<style lang="scss"> |
|
|
|