feat: 提货清单时间排序

This commit is contained in:
2026-08-11 11:34:17 +08:00
parent 95a614e6ca
commit 5de2935c7d
+131 -6
View File
@@ -42,6 +42,19 @@
/> />
</view> </view>
</view> </view>
<view class="sort-row flex-center ju-between">
<view class="sort-label c_999 size24">下单时间排序</view>
<view class="sort-switch" @tap="toggleSort">
<view
class="sort-triangle sort-triangle--up"
:class="{ 'sort-triangle--active': sortAsc }"
></view>
<view
class="sort-triangle sort-triangle--down"
:class="{ 'sort-triangle--active': !sortAsc }"
></view>
</view>
</view>
</view> </view>
<view class="list"> <view class="list">
@@ -150,7 +163,11 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="displayList.length === 0" class="empty c_999">暂无数据</view> <view v-if="displayList.length === 0 && !loading.value" class="empty c_999">暂无数据</view>
<view v-if="displayList.length > 0" class="load-more">
<view v-if="loadingMore" class="load-more__text c_999">加载中...</view>
<view v-else-if="finished" class="load-more__text c_999">没有更多了</view>
</view>
</view> </view>
</view> </view>
</s-layout> </s-layout>
@@ -158,7 +175,7 @@
<script setup> <script setup>
import { computed, ref, watch } from 'vue'; import { computed, ref, watch } from 'vue';
import { onPullDownRefresh, onShow } from '@dcloudio/uni-app'; import { onPullDownRefresh, onReachBottom, onShow } from '@dcloudio/uni-app';
import modeSwitch from '@/components/mode_switch/mode_switch.vue'; import modeSwitch from '@/components/mode_switch/mode_switch.vue';
import sheep from '@/sheep'; import sheep from '@/sheep';
import OrderStoreApi from '@/sheep/api/trade/orderStore'; import OrderStoreApi from '@/sheep/api/trade/orderStore';
@@ -172,9 +189,16 @@
const currentTab = ref('all'); const currentTab = ref('all');
const keyword = ref(''); const keyword = ref('');
const sortAsc = ref(false);
const list = ref([]); const list = ref([]);
const loading = ref(false); const loading = ref(false);
const loadingMore = ref(false);
const finished = ref(false);
const pageNo = ref(1);
const pageSize = ref(10);
const total = ref(0);
const sum = ref(0);
const expandedMap = ref({}); const expandedMap = ref({});
const userStore = sheep.$store('user'); const userStore = sheep.$store('user');
const storeList = ref([]); const storeList = ref([]);
@@ -271,9 +295,20 @@
return Number(selectedStoreId.value || 0); return Number(selectedStoreId.value || 0);
}; };
const resetPagination = () => {
pageNo.value = 1;
list.value = [];
finished.value = false;
total.value = 0;
sum.value = 0;
};
const buildParams = (storeId) => { const buildParams = (storeId) => {
const params = { const params = {
pickUpStoreId: storeId, pickUpStoreId: storeId,
pageNo: pageNo.value,
pageSize: pageSize.value,
sortAsc: sortAsc.value,
}; };
if (currentTab.value !== 'all') params.status = currentTab.value; if (currentTab.value !== 'all') params.status = currentTab.value;
const k = String(keyword.value || '').trim(); const k = String(keyword.value || '').trim();
@@ -281,21 +316,52 @@
return params; return params;
}; };
const getList = async (force = false) => { const toggleSort = () => {
while (force && loading.value) { sortAsc.value = !sortAsc.value;
resetPagination();
getList();
};
const getList = async (force = false, isLoadMore = false) => {
while (force && (loading.value || loadingMore.value)) {
await new Promise((resolve) => setTimeout(resolve, 50)); await new Promise((resolve) => setTimeout(resolve, 50));
} }
if (loading.value) return; if (!isLoadMore && loading.value) return;
if (isLoadMore && (loadingMore.value || finished.value)) return;
const storeId = await ensurePickUpStoreId(); const storeId = await ensurePickUpStoreId();
if (!(storeId > 0)) { if (!(storeId > 0)) {
uni.showToast({ title: '缺少网点信息', icon: 'none' }); uni.showToast({ title: '缺少网点信息', icon: 'none' });
return; return;
} }
if (isLoadMore) {
loadingMore.value = true;
} else {
loading.value = true; loading.value = true;
}
const { data, code } = await OrderStoreApi.getStaffList(buildParams(storeId)); const { data, code } = await OrderStoreApi.getStaffList(buildParams(storeId));
if (isLoadMore) {
loadingMore.value = false;
} else {
loading.value = false; loading.value = false;
}
if (code !== 0) return; if (code !== 0) return;
list.value = Array.isArray(data) ? data : []; const resList = Array.isArray(data?.list) ? data.list : [];
total.value = Number(data?.total || 0);
sum.value = Number(data?.sum || 0);
if (isLoadMore) {
list.value = [...list.value, ...resList];
} else {
list.value = resList;
}
if (list.value.length >= total.value || resList.length < pageSize.value) {
finished.value = true;
}
};
const loadMore = async () => {
if (finished.value || loadingMore.value || loading.value) return;
pageNo.value += 1;
await getList(false, true);
}; };
const openStoreSheet = () => { const openStoreSheet = () => {
@@ -318,12 +384,14 @@
await ensureStoreList(); await ensureStoreList();
const current = Number(selectedStoreId.value || 0); const current = Number(selectedStoreId.value || 0);
if (current > 0) uni.setStorageSync(STORE_SELECTED_KEY, current); if (current > 0) uni.setStorageSync(STORE_SELECTED_KEY, current);
resetPagination();
await getList(); await getList();
}); });
onPullDownRefresh(async () => { onPullDownRefresh(async () => {
try { try {
expandedMap.value = {}; expandedMap.value = {};
resetPagination();
await ensureStoreList(true); await ensureStoreList(true);
const current = Number(selectedStoreId.value || 0); const current = Number(selectedStoreId.value || 0);
if (current > 0) uni.setStorageSync(STORE_SELECTED_KEY, current); if (current > 0) uni.setStorageSync(STORE_SELECTED_KEY, current);
@@ -333,12 +401,17 @@
} }
}); });
onReachBottom(() => {
loadMore();
});
let searchTimer = null; let searchTimer = null;
watch( watch(
[currentTab, keyword, selectedStoreId], [currentTab, keyword, selectedStoreId],
() => { () => {
if (searchTimer) clearTimeout(searchTimer); if (searchTimer) clearTimeout(searchTimer);
searchTimer = setTimeout(() => { searchTimer = setTimeout(() => {
resetPagination();
getList(); getList();
}, 300); }, 300);
}, },
@@ -459,6 +532,7 @@
try { try {
const { code } = await OrderStoreApi.markSorted(ids); const { code } = await OrderStoreApi.markSorted(ids);
if (code !== 0) return; if (code !== 0) return;
resetPagination();
await getList(); await getList();
} catch (error) { } catch (error) {
uni.showToast({ title: '标记失败,请稍后重试', icon: 'none' }); uni.showToast({ title: '标记失败,请稍后重试', icon: 'none' });
@@ -543,6 +617,48 @@
background: transparent !important; background: transparent !important;
} }
.sort-row {
margin-top: 14rpx;
padding-top: 14rpx;
border-top: 2rpx solid #f1f2f6;
}
.sort-switch {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 6rpx;
min-width: 80rpx;
padding: 14rpx 24rpx;
border-radius: 16rpx;
background: #f6f7fb;
box-sizing: border-box;
}
.sort-triangle {
width: 0;
height: 0;
border-left: 12rpx solid transparent;
border-right: 12rpx solid transparent;
}
.sort-triangle--up {
border-bottom: 14rpx solid #c5cad4;
}
.sort-triangle--up.sort-triangle--active {
border-bottom-color: #2556ec;
}
.sort-triangle--down {
border-top: 14rpx solid #c5cad4;
}
.sort-triangle--down.sort-triangle--active {
border-top-color: #2556ec;
}
.list { .list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -844,4 +960,13 @@
text-align: center; text-align: center;
padding: 80rpx 0; padding: 80rpx 0;
} }
.load-more {
padding: 30rpx 0 10rpx;
text-align: center;
}
.load-more__text {
font-size: 24rpx;
}
</style> </style>