feat:添加店铺订单详情api
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<view class="card_order bg24 size34" @click="
|
<view class="card_order bg24 size34" @click="
|
||||||
utils.go('/pages/order/detail', { id: props.index != 5 ? props.data.id : props.data.orderId, type: props.data.type })
|
utils.go('/pages/order/detail', { id: props.index != 5 ? props.data.id : props.data.orderId, type: props.data.type, source: props.data.__source })
|
||||||
">
|
">
|
||||||
<view class="flex-center ju-between createTime">
|
<view class="flex-center ju-between createTime">
|
||||||
<view class="flex-center shrink">
|
<view class="flex-center shrink">
|
||||||
@@ -64,15 +64,9 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
<script setup lang="ts">
|
<script setup>
|
||||||
import {
|
import {
|
||||||
ref,
|
|
||||||
reactive,
|
|
||||||
onMounted,
|
|
||||||
onUnmounted,
|
|
||||||
getCurrentInstance,
|
getCurrentInstance,
|
||||||
watch,
|
|
||||||
nextTick,
|
|
||||||
defineProps,
|
defineProps,
|
||||||
defineEmits,
|
defineEmits,
|
||||||
} from 'vue';
|
} from 'vue';
|
||||||
@@ -80,13 +74,11 @@
|
|||||||
fen2yuan,
|
fen2yuan,
|
||||||
formatOrderColor,
|
formatOrderColor,
|
||||||
formatOrderStatus,
|
formatOrderStatus,
|
||||||
handleOrderButtons,
|
|
||||||
formatAfterSaleStatus,
|
formatAfterSaleStatus,
|
||||||
} from '@/sheep/hooks/useGoods';
|
} from '@/sheep/hooks/useGoods';
|
||||||
import card_order from './card_order.vue';
|
import card_order from './card_order.vue';
|
||||||
import card_orderBan from '@/components/card_orderBan/card_orderBan.vue';
|
import card_orderBan from '@/components/card_orderBan/card_orderBan.vue';
|
||||||
import AfterSaleApi from '@/sheep/api/trade/afterSale';
|
import AfterSaleApi from '@/sheep/api/trade/afterSale';
|
||||||
import sheep from '@/sheep/index';
|
|
||||||
let emit = defineEmits(['downData']);
|
let emit = defineEmits(['downData']);
|
||||||
let { proxy } = getCurrentInstance();
|
let { proxy } = getCurrentInstance();
|
||||||
let props = defineProps({
|
let props = defineProps({
|
||||||
@@ -101,17 +93,6 @@
|
|||||||
default: 0,
|
default: 0,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
let data = reactive({});
|
|
||||||
watch(
|
|
||||||
() => props.data,
|
|
||||||
(val) => {
|
|
||||||
data = val;
|
|
||||||
},
|
|
||||||
{
|
|
||||||
deep: true,
|
|
||||||
immediate: true,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
const downData = () => {
|
const downData = () => {
|
||||||
emit('downData');
|
emit('downData');
|
||||||
};
|
};
|
||||||
@@ -146,8 +127,6 @@
|
|||||||
border-radius: 8rpx;
|
border-radius: 8rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.stateText {}
|
|
||||||
|
|
||||||
.createTime {
|
.createTime {
|
||||||
margin-bottom: 32rpx;
|
margin-bottom: 32rpx;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,14 +25,13 @@
|
|||||||
|
|
||||||
<view class="record-meta">
|
<view class="record-meta">
|
||||||
<view class="meta-row flex-row-end">
|
<view class="meta-row flex-row-end">
|
||||||
<view class="record-qty">数量 {{ item.qty }}</view>
|
<view class="record-total-inline">
|
||||||
|
<!-- <view class="total-price">¥{{ formatMoney(item.total) }}</view> -->
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="meta-row flex-between">
|
<view class="meta-row flex-between">
|
||||||
<view class="record-time">下单时间:{{ item.time }}</view>
|
<view class="record-time">下单时间:{{ item.time }}</view>
|
||||||
<view class="record-total-inline">
|
<view class="record-qty">数量 {{ item.qty }}</view>
|
||||||
<view class="total-label">总计</view>
|
|
||||||
<view class="total-price">¥{{ formatMoney(item.total) }}</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@@ -289,11 +288,6 @@
|
|||||||
gap: 10rpx;
|
gap: 10rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.total-label {
|
|
||||||
font-size: 24rpx;
|
|
||||||
color: #111111;
|
|
||||||
}
|
|
||||||
|
|
||||||
.total-price {
|
.total-price {
|
||||||
font-size: 34rpx;
|
font-size: 34rpx;
|
||||||
font-weight: 800;
|
font-weight: 800;
|
||||||
|
|||||||
@@ -100,7 +100,7 @@
|
|||||||
handleOrderButtons,
|
handleOrderButtons,
|
||||||
} from '@/sheep/hooks/useGoods';
|
} from '@/sheep/hooks/useGoods';
|
||||||
import OrderApi from '@/sheep/api/trade/order';
|
import OrderApi from '@/sheep/api/trade/order';
|
||||||
import { getOpenOrderDetail } from '@/sheep/api/ai';
|
import { getOrderDetail as getAiOrderDetail, getOpenOrderDetail } from '@/sheep/api/ai';
|
||||||
import DeliveryApi from '@/sheep/api/trade/delivery';
|
import DeliveryApi from '@/sheep/api/trade/delivery';
|
||||||
import card_order from '@/components/orderItem/card_order.vue';
|
import card_order from '@/components/orderItem/card_order.vue';
|
||||||
import truckLine from '@/components/truckLine/truckLine.vue'
|
import truckLine from '@/components/truckLine/truckLine.vue'
|
||||||
@@ -112,6 +112,7 @@
|
|||||||
merchantTradeNo: '', // 商户订单号
|
merchantTradeNo: '', // 商户订单号
|
||||||
comeinType: '', // 进入订单详情的来源类型
|
comeinType: '', // 进入订单详情的来源类型
|
||||||
orderType: '',
|
orderType: '',
|
||||||
|
source: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
// ========== 门店自提(核销) ==========
|
// ========== 门店自提(核销) ==========
|
||||||
@@ -134,7 +135,9 @@
|
|||||||
merchant_trade_no: state.merchantTradeNo,
|
merchant_trade_no: state.merchantTradeNo,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
if (String(state.orderType) === '5') {
|
if (String(state.source) === 'aishop') {
|
||||||
|
res = await getAiOrderDetail({ id });
|
||||||
|
} else if (String(state.orderType) === '5') {
|
||||||
res = await getOpenOrderDetail({ id });
|
res = await getOpenOrderDetail({ id });
|
||||||
} else {
|
} else {
|
||||||
res = await OrderApi.getOrderDetail(id);
|
res = await OrderApi.getOrderDetail(id);
|
||||||
@@ -174,6 +177,9 @@
|
|||||||
if (options.type !== undefined) {
|
if (options.type !== undefined) {
|
||||||
state.orderType = options.type;
|
state.orderType = options.type;
|
||||||
}
|
}
|
||||||
|
if (options.source !== undefined) {
|
||||||
|
state.source = options.source;
|
||||||
|
}
|
||||||
state.orderInfo.id = id;
|
state.orderInfo.id = id;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -169,11 +169,12 @@
|
|||||||
}
|
}
|
||||||
const pageData = dataList.value?.[mescroll.dataObj.i] || {};
|
const pageData = dataList.value?.[mescroll.dataObj.i] || {};
|
||||||
const list = Array.isArray(pageData?.list) ? pageData.list : Array.isArray(pageData) ? pageData : [];
|
const list = Array.isArray(pageData?.list) ? pageData.list : Array.isArray(pageData) ? pageData : [];
|
||||||
list.forEach((order) => handleOrderButtons(order));
|
const nextList = state.currentType === 1 ? list.map((o) => ({ ...o, __source: 'aishop' })) : list;
|
||||||
|
nextList.forEach((order) => handleOrderButtons(order));
|
||||||
if (mescroll.num == 1) state.list[mescroll.dataObj.i] = [];
|
if (mescroll.num == 1) state.list[mescroll.dataObj.i] = [];
|
||||||
state.list[mescroll.dataObj.i] = state.list[mescroll.dataObj.i].concat(list);
|
state.list[mescroll.dataObj.i] = state.list[mescroll.dataObj.i].concat(nextList);
|
||||||
if (cardPages.value) {
|
if (cardPages.value) {
|
||||||
cardPages.value.getState(true, list.length);
|
cardPages.value.getState(true, nextList.length);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -198,6 +199,7 @@
|
|||||||
const navChangeType = (i) => {
|
const navChangeType = (i) => {
|
||||||
state.currentType = i;
|
state.currentType = i;
|
||||||
state.currentTab = 0;
|
state.currentTab = 0;
|
||||||
|
state.list = {};
|
||||||
downCallback(state.currentTab);
|
downCallback(state.currentTab);
|
||||||
};
|
};
|
||||||
const downCallback = () => {
|
const downCallback = () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user