feat: 提货清单隐藏取货码
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
<uni-easyinput
|
||||
class="search-input flex1"
|
||||
v-model="keyword"
|
||||
placeholder="搜索订单号/取货码/商品名称"
|
||||
placeholder="搜索订单号/商品名称"
|
||||
:inputBorder="false"
|
||||
:styles="{ fontSize: '28rpx' }"
|
||||
/>
|
||||
@@ -76,7 +76,6 @@
|
||||
</view>
|
||||
<view class="meta c_999 size24 m-t-8">数量:x{{ getMainItem(item)?.count || 0 }}</view>
|
||||
<view class="meta c_999 size24 m-t-10">订单号:{{ item.orderNo }}</view>
|
||||
<view class="meta c_999 size24 m-t-6">取货码:{{ getPickUpCode(item) || '--' }}</view>
|
||||
</view>
|
||||
<view class="actions">
|
||||
<view v-if="Number(item.status) === 0" class="btn btnPrimary" @tap="markPicked(item)">
|
||||
@@ -162,6 +161,7 @@
|
||||
const storeIdsKey = ref('');
|
||||
const selectedStoreId = ref(0);
|
||||
const storeLoading = ref(false);
|
||||
const STORE_SELECTED_KEY = 'merchant.pickup.selectedStoreId';
|
||||
|
||||
const displayList = computed(() => list.value);
|
||||
|
||||
@@ -290,7 +290,11 @@
|
||||
};
|
||||
|
||||
onShow(async () => {
|
||||
const saved = Number(uni.getStorageSync(STORE_SELECTED_KEY) || 0);
|
||||
if (saved > 0 && saved !== selectedStoreId.value) selectedStoreId.value = saved;
|
||||
await ensureStoreList();
|
||||
const current = Number(selectedStoreId.value || 0);
|
||||
if (current > 0) uni.setStorageSync(STORE_SELECTED_KEY, current);
|
||||
await getList();
|
||||
});
|
||||
|
||||
@@ -306,6 +310,15 @@
|
||||
{ deep: false },
|
||||
);
|
||||
|
||||
watch(
|
||||
selectedStoreId,
|
||||
(v) => {
|
||||
const n = Number(v || 0);
|
||||
if (n > 0) uni.setStorageSync(STORE_SELECTED_KEY, n);
|
||||
},
|
||||
{ deep: false },
|
||||
);
|
||||
|
||||
const goScan = () => {
|
||||
uni.reLaunch({ url: '/pages/merchant/scanVerify' });
|
||||
};
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
<view class="records bg24">
|
||||
<view class="records-hd flex-center ju-between">
|
||||
<view class="records-title">近期核销记录</view>
|
||||
<view class="records-link" @tap="clear">清空</view>
|
||||
<view class="records-link" @tap="refreshRecords">刷新</view>
|
||||
</view>
|
||||
<view v-for="row in records" :key="row.id" class="record flex-center ju-between">
|
||||
<view class="record-left">
|
||||
@@ -66,6 +66,7 @@
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { onShow } from '@dcloudio/uni-app';
|
||||
import modeSwitch from '@/components/mode_switch/mode_switch.vue';
|
||||
import sheep from '@/sheep';
|
||||
import OrderStoreApi from '@/sheep/api/trade/orderStore';
|
||||
@@ -75,55 +76,62 @@
|
||||
const verifying = ref(false);
|
||||
const userStore = sheep.$store('user');
|
||||
|
||||
const STORAGE_KEY = 'merchant.verify.records';
|
||||
const records = ref(uni.getStorageSync(STORAGE_KEY) || []);
|
||||
const STORE_SELECTED_KEY = 'merchant.pickup.selectedStoreId';
|
||||
const days = ref(7);
|
||||
const records = ref([]);
|
||||
|
||||
const pushRecord = (code) => {
|
||||
const next = [
|
||||
{
|
||||
id: `${Date.now()}-${Math.random()}`,
|
||||
code,
|
||||
time: new Date().toLocaleString(),
|
||||
operator: '当前账号',
|
||||
},
|
||||
...records.value,
|
||||
].slice(0, 20);
|
||||
records.value = next;
|
||||
uni.setStorageSync(STORAGE_KEY, next);
|
||||
};
|
||||
|
||||
const toStoreIdsString = (raw) => {
|
||||
if (raw === null || raw === undefined) return '';
|
||||
if (Array.isArray(raw)) {
|
||||
return raw.map((v) => String(v).trim()).filter(Boolean).join(',');
|
||||
const formatRecordTime = (value) => {
|
||||
if (value === null || value === undefined) return '';
|
||||
if (typeof value === 'string') {
|
||||
const s = value.trim();
|
||||
if (!s) return '';
|
||||
const n = Number(s);
|
||||
if (Number.isFinite(n)) return new Date(n).toLocaleString();
|
||||
const d = new Date(s);
|
||||
if (!Number.isNaN(d.getTime())) return d.toLocaleString();
|
||||
return s;
|
||||
}
|
||||
const s = String(raw).trim();
|
||||
if (!s) return '';
|
||||
if (s.includes(',')) return s.replace(/\s+/g, '');
|
||||
const n = Number(s);
|
||||
if (Number.isFinite(n) && n > 0) return String(n);
|
||||
return s.replace(/\s+/g, '');
|
||||
const n = Number(value);
|
||||
if (Number.isFinite(n)) return new Date(n).toLocaleString();
|
||||
const d = new Date(value);
|
||||
if (!Number.isNaN(d.getTime())) return d.toLocaleString();
|
||||
return String(value);
|
||||
};
|
||||
|
||||
const getVerifyIds = async () => {
|
||||
const local = userStore?.userInfo || {};
|
||||
const fromLocal =
|
||||
local.storeIds ??
|
||||
local.storeIdList ??
|
||||
local.pickUpStoreIds ??
|
||||
local.pickUpStoreIdList ??
|
||||
local.storeId;
|
||||
let storeIds = toStoreIdsString(fromLocal);
|
||||
if (storeIds) return storeIds;
|
||||
const mapRecentRow = (row, index) => {
|
||||
const raw = row || {};
|
||||
const code = String(raw.pickUpVerifyCode || raw.pickUpCode || raw.code || '').trim();
|
||||
const time = formatRecordTime(raw.completeTime || raw.completedTime || raw.verifyTime || raw.updateTime);
|
||||
const operator = String(raw.operatorName || raw.staffName || raw.operator || raw.creator || '').trim();
|
||||
const id = String(raw.id || raw.orderId || code || `${Date.now()}-${index}`);
|
||||
return { id, code, time, operator };
|
||||
};
|
||||
|
||||
const getPickUpStoreId = async () => {
|
||||
const stored = Number(uni.getStorageSync(STORE_SELECTED_KEY) || 0);
|
||||
if (stored > 0) return stored;
|
||||
const local = Number(userStore?.userInfo?.storeId || 0);
|
||||
if (local > 0) return local;
|
||||
const fetched = await userStore.getInfo();
|
||||
const fromFetched =
|
||||
fetched?.storeIds ??
|
||||
fetched?.storeIdList ??
|
||||
fetched?.pickUpStoreIds ??
|
||||
fetched?.pickUpStoreIdList ??
|
||||
fetched?.storeId;
|
||||
storeIds = toStoreIdsString(fromFetched);
|
||||
return storeIds;
|
||||
return Number(fetched?.storeId || 0);
|
||||
};
|
||||
|
||||
const loadRecentRecords = async () => {
|
||||
const storeId = await getPickUpStoreId();
|
||||
if (!(storeId > 0)) {
|
||||
records.value = [];
|
||||
return;
|
||||
}
|
||||
const { code, data } = await OrderStoreApi.getRecentCompleted(storeId, days.value);
|
||||
if (code !== 0) return;
|
||||
const list = Array.isArray(data)
|
||||
? data
|
||||
: Array.isArray(data?.list)
|
||||
? data.list
|
||||
: Array.isArray(data?.records)
|
||||
? data.records
|
||||
: [];
|
||||
records.value = list.map(mapRecentRow).filter((v) => v.code);
|
||||
};
|
||||
|
||||
const verifyCode = async (code) => {
|
||||
@@ -133,16 +141,11 @@
|
||||
return false;
|
||||
}
|
||||
if (verifying.value) return false;
|
||||
const ids = await getVerifyIds();
|
||||
if (!ids) {
|
||||
uni.showToast({ title: '缺少门店ID', icon: 'none' });
|
||||
return false;
|
||||
}
|
||||
verifying.value = true;
|
||||
try {
|
||||
const { code: resCode } = await OrderStoreApi.verify(ids, pickUpVerifyCode);
|
||||
const { code: resCode } = await OrderStoreApi.verify(pickUpVerifyCode);
|
||||
if (resCode !== 0) return false;
|
||||
pushRecord(pickUpVerifyCode);
|
||||
await loadRecentRecords();
|
||||
return true;
|
||||
} catch (error) {
|
||||
uni.showToast({ title: '核销失败,请稍后重试', icon: 'none' });
|
||||
@@ -182,10 +185,13 @@
|
||||
}
|
||||
};
|
||||
|
||||
const clear = () => {
|
||||
records.value = [];
|
||||
uni.setStorageSync(STORAGE_KEY, []);
|
||||
const refreshRecords = async () => {
|
||||
await loadRecentRecords();
|
||||
};
|
||||
|
||||
onShow(async () => {
|
||||
await loadRecentRecords();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
||||
Reference in New Issue
Block a user