|
|
@@ -16,13 +16,15 @@ const subPackComfirm = ref()
|
|
|
const navActiveTab = ref(0)
|
|
|
const scrollViewId = ref()
|
|
|
const orderStatusActive = ref('all')
|
|
|
-const { data: orderList, refresh, isLastPage, page, reload } = usePagination((pageNum, pageSize) => Apis.xsb.orderList({ data: {
|
|
|
- businessType: 'XSB',
|
|
|
- orderStatus: unref(orderStatusActive),
|
|
|
- pageNum,
|
|
|
- pageSize,
|
|
|
-} }), {
|
|
|
- immediate: true,
|
|
|
+const { data: orderList, refresh, isLastPage, page, reload } = usePagination((pageNum, pageSize) => Apis.xsb.orderList({
|
|
|
+ data: {
|
|
|
+ businessType: 'XSB',
|
|
|
+ orderStatus: unref(orderStatusActive),
|
|
|
+ pageNum,
|
|
|
+ pageSize,
|
|
|
+ },
|
|
|
+}), {
|
|
|
+ immediate: false,
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
initialData: [],
|
|
|
@@ -39,6 +41,9 @@ function handleChangeTypeNav(value: number) {
|
|
|
nextTick(() => scrollViewId.value = value)
|
|
|
reload()
|
|
|
}
|
|
|
+onShow(() => {
|
|
|
+ refresh()
|
|
|
+})
|
|
|
function handleChangeStatus(value: string) {
|
|
|
orderStatusActive.value = value
|
|
|
reload()
|
|
|
@@ -54,7 +59,7 @@ onReachBottom(() => {
|
|
|
})
|
|
|
async function handleCancel(order: Api.xsbOrderList) {
|
|
|
await subPackOrder.value.handleCommonCancelOrder(order)
|
|
|
- refresh()
|
|
|
+ reload()
|
|
|
}
|
|
|
async function handlePay(orderNumber: string) {
|
|
|
const res = await subPackComfirm.value.handleCommonPayMent(orderNumber)
|
|
|
@@ -62,23 +67,26 @@ async function handlePay(orderNumber: string) {
|
|
|
await subPackComfirm.value.getWxCommonPayment(res)
|
|
|
}
|
|
|
else {
|
|
|
- refresh()
|
|
|
+ reload()
|
|
|
}
|
|
|
}
|
|
|
async function handleSubmitOrder(order: Api.xsbOrderList) {
|
|
|
await subPackOrder.value.handleCommonOrderReceive(order)
|
|
|
- refresh()
|
|
|
+ reload()
|
|
|
}
|
|
|
</script>
|
|
|
|
|
|
<template>
|
|
|
<view class="page-smqjh">
|
|
|
<view class="nav sticky top-0 z-10 bg-white px24rpx py18rpx">
|
|
|
- <scroll-view scroll-x class="whitespace-nowrap" :scroll-into-view="`id-${scrollViewId}`" :scroll-into-view-offset="-150" scroll-with-animation enable-passive>
|
|
|
+ <scroll-view
|
|
|
+ scroll-x class="whitespace-nowrap" :scroll-into-view="`id-${scrollViewId}`"
|
|
|
+ :scroll-into-view-offset="-150" scroll-with-animation enable-passive
|
|
|
+ >
|
|
|
<view class="flex items-center">
|
|
|
<view
|
|
|
- v-for="item in navTabTypeList"
|
|
|
- :id="`id-${item.value}`" :key="item.value" class="mr64rpx flex flex-col items-center whitespace-nowrap text-32rpx"
|
|
|
+ v-for="item in navTabTypeList" :id="`id-${item.value}`" :key="item.value"
|
|
|
+ class="mr64rpx flex flex-col items-center whitespace-nowrap text-32rpx"
|
|
|
:class="[navActiveTab == item.value ? 'font-semibold ' : 'text-#AAAAAA']"
|
|
|
@click="handleChangeTypeNav(item.value)"
|
|
|
>
|
|
|
@@ -102,7 +110,7 @@ async function handleSubmitOrder(order: Api.xsbOrderList) {
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="px24rpx">
|
|
|
- <view v-for="item in orderList" :key="item.orderNumber" class="mt20rpx rounded-16rpx bg-white p24rpx" @click="handleClick(item.orderNumber as string)">
|
|
|
+ <view v-for="item in orderList" :key="item.orderNumber" class="mt20rpx rounded-16rpx bg-white p24rpx">
|
|
|
<view class="flex items-center justify-between">
|
|
|
<view class="flex items-center">
|
|
|
<image :src="`${StaticUrl}/order-icon.png`" class="h36rpx w36rpx" />
|
|
|
@@ -111,7 +119,14 @@ async function handleSubmitOrder(order: Api.xsbOrderList) {
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="text-24rpx text-#FF4D3A">
|
|
|
- {{ subPackOrder?.handleCommonOrderStatusText(item) }}
|
|
|
+ <template v-if="item.hbOrderStatus !== subPackOrder.OrderStatus.PaddingPay">
|
|
|
+ {{ subPackOrder?.handleCommonOrderStatusText(item) }}
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <view class="flex items-center">
|
|
|
+ 待支付( 还剩 <wd-count-down :time="subPackOrder?.handleCommonOrderStatusText(item)" @finish="refresh" /> )
|
|
|
+ </view>
|
|
|
+ </template>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="my24rpx h2rpx w-full bg-#F0F0F0" />
|
|
|
@@ -130,7 +145,10 @@ async function handleSubmitOrder(order: Api.xsbOrderList) {
|
|
|
2025-03-26 11:56:07
|
|
|
</view>
|
|
|
</view> -->
|
|
|
- <view class="box-border h176rpx w-full flex items-center justify-between rounded-16rpx bg-#F9F9F9">
|
|
|
+ <view
|
|
|
+ class="box-border h176rpx w-full flex items-center justify-between rounded-16rpx bg-#F9F9F9"
|
|
|
+ @click="handleClick(item.orderNumber as string)"
|
|
|
+ >
|
|
|
<view class="box-border h-full w480rpx py28rpx pl20rpx">
|
|
|
<scroll-view scroll-x class="h-full w-full whitespace-nowrap">
|
|
|
<view class="flex items-center">
|
|
|
@@ -151,8 +169,8 @@ async function handleSubmitOrder(order: Api.xsbOrderList) {
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="my24rpx flex items-center justify-end">
|
|
|
- <templpate v-if="item.hbOrderStatus === subPackOrder?.OrderStatus.PaddingPay">
|
|
|
- <wd-button size="small" plain type="info" @click="handleCancel">
|
|
|
+ <template v-if="item.hbOrderStatus === subPackOrder?.OrderStatus.PaddingPay">
|
|
|
+ <wd-button size="small" plain type="info" @click.stop="handleCancel">
|
|
|
取消订单
|
|
|
</wd-button>
|
|
|
<view class="ml20rpx">
|
|
|
@@ -160,7 +178,7 @@ async function handleSubmitOrder(order: Api.xsbOrderList) {
|
|
|
付款
|
|
|
</wd-button>
|
|
|
</view>
|
|
|
- </templpate>
|
|
|
+ </template>
|
|
|
<template v-if="item.hbOrderStatus === subPackOrder?.OrderStatus.OrderArrived">
|
|
|
<wd-button size="small" plain type="info" @click.stop="handleSubmitOrder(item)">
|
|
|
确认收货
|
|
|
@@ -180,9 +198,16 @@ async function handleSubmitOrder(order: Api.xsbOrderList) {
|
|
|
.wd-button.is-plain.is-error {
|
|
|
color: #FF4D3A !important;
|
|
|
}
|
|
|
- .wd-tabs__nav-item-text{
|
|
|
+
|
|
|
+ .wd-tabs__nav-item-text {
|
|
|
font-size: 28rpx !important;
|
|
|
}
|
|
|
+
|
|
|
+ .wd-count-down {
|
|
|
+ color: #FF4D3A;
|
|
|
+ font-size: 700 !important;
|
|
|
+ line-height: unset !important;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.box-shadow {
|