feat: 添加催一催按钮、应用宝跳转配置

This commit is contained in:
2026-08-12 13:15:50 +08:00
parent 6a1f4f66ac
commit 9a30b0efde
10 changed files with 744 additions and 54 deletions
+113 -1
View File
@@ -116,17 +116,27 @@
:logisticsNo="state.orderInfo.logisticsNo"
:deliveryTime="state.orderInfo.deliveryTime"
:hasLogistics="hasLogistics"
:deliveryType="state.orderInfo.deliveryType"
:payStatus="state.orderInfo.payStatus"
:preparationStatus="state.orderInfo.preparationStatus"
:pickUpVerifyTime="state.orderInfo.pickUpVerifyTime"
:verifyTime="state.orderInfo.verifyTime"
:completedTime="state.orderInfo.completedTime"
:arriveStoreTime="state.orderInfo.arriveStoreTime"
:deliveredTime="state.orderInfo.deliveredTime"
@delay="delayShipment"
@now="nowShipment"
@confirm="confirmReceiveOrder"
@pay="goPay"
@cancel="cancelAiOrder"
@express="goExpressLog"
@remind="handleRemind"
/>
<card_orderBan
v-else
:data="state.orderInfo"
@downData="getOrderDetail"
@remind="handleRemind"
type="2"
></card_orderBan>
</view>
@@ -193,6 +203,7 @@
aiReceiveItem,
} from '@/sheep/api/ai';
import StoreApi from '@/sheep/api/trade/store';
import OrderStoreApi from '@/sheep/api/trade/orderStore';
import card_order from '@/components/orderItem/card_order.vue';
import AiOrderActionBar from '@/components/orderItem/AiOrderActionBar.vue';
import ShipmentPopup from '@/components/orderItem/ShipmentPopup.vue';
@@ -228,6 +239,53 @@
};
const pickUpVerifyRef = ref();
const remindLock = ref(false);
const resolvePickUpStoreIdForRemind = () => {
const data = state.orderInfo || {};
return Number(
data?.pickUpStoreId ||
data?.pickUpStore?.id ||
data?.pickUpStore?.storeId ||
data?.pickUpStoreVO?.id ||
data?.pickUpStoreVO?.storeId ||
data?.store?.id ||
data?.store?.storeId ||
systemStore.value?.id ||
systemStore.value?.storeId ||
data?.storeId ||
0,
);
};
const handleRemind = async () => {
return sheep.$helper.toast('已通知门店备货');
if (remindLock.value) {
sheep.$helper.toast('操作太频繁,请稍后再试');
return;
}
const pickUpStoreId = resolvePickUpStoreIdForRemind();
const orderId = state.orderInfo?.id || state.orderInfo?.orderId;
if (!orderId || !(pickUpStoreId > 0)) {
sheep.$helper.toast('订单信息异常');
return;
}
remindLock.value = true;
try {
const res = await OrderStoreApi.remindStore(pickUpStoreId, orderId);
if (res?.code === 0) {
sheep.$helper.toast(res?.msg || '已通知门店备货');
} else {
sheep.$helper.toast(res?.msg || '催一催失败,请稍后重试');
}
} catch (e) {
sheep.$helper.toast('催一催失败,请稍后重试');
} finally {
setTimeout(() => {
remindLock.value = false;
}, 5000);
}
};
const isAiActionOrder = computed(() => {
const orderType = Number(state.orderInfo?.type ?? state.orderType ?? 0);
@@ -319,6 +377,30 @@
return false;
});
const resolvePickUpStage = () => {
const data = state.orderInfo || {};
const external = Number(data?.preparationStatus);
const rawStatus = Number.isFinite(external) ? external : Number(data?.preparationStatus ?? data?.status ?? 0);
const isVerifyCompleted = Boolean(
data?.pickUpVerifyTime ||
data?.verifyTime ||
data?.completedTime ||
rawStatus === 30 ||
rawStatus === 3,
);
if (isVerifyCompleted) return 'done';
if (rawStatus === 1 || rawStatus === 2) return 'wait';
if (
data?.deliveryTime ||
data?.arriveStoreTime ||
data?.deliveredTime ||
rawStatus === 20
) {
return 'delivered';
}
return 'sorting';
};
const showBottomBar = computed(() => {
if (!isAiActionOrder.value) return true;
const status = Number(state.orderInfo?.status);
@@ -326,7 +408,11 @@
if (hasLogistics.value) return true;
if ([0, 15, 20, 30].includes(status)) return true;
if (!isAiStoreOrder.value) return hasLogistics.value;
if (isPickUpOrder.value) return false;
// AI 店铺自提订单:分拣中/已送达门店时显示底部栏(展示催一催按钮);待取货/已核销后隐藏
if (isPickUpOrder.value) {
const stage = resolvePickUpStage();
return stage === 'sorting' || stage === 'delivered';
}
if (hasDelayedItems.value) return true;
return [10, 15, 50, 70].includes(status);
});
@@ -660,6 +746,32 @@
} else {
systemStore.value = {};
}
// 自提订单:同步备货进度(用于核销区是否展示二维码、门店卡片是否展示、状态 Tag 同步)
if (isPickUp && (state.orderInfo.deliveryType === 2 || pickUpStoreId > 0) && state.orderInfo.payStatus) {
try {
const prepRes = await OrderStoreApi.getPreparationStatus(pickUpStoreId, state.orderInfo.id || state.orderInfo.orderId);
if (prepRes?.code === 0) {
const raw = prepRes.data;
if (raw !== null && typeof raw === 'object') {
const merged = raw?.orderInfo || raw;
state.orderInfo = {
...state.orderInfo,
...(merged || {}),
};
const nextStatus = Number(merged?.preparationStatus ?? merged?.status);
if (Number.isFinite(nextStatus)) {
state.orderInfo.preparationStatus = nextStatus;
}
} else {
const nextStatus = Number(raw);
if (Number.isFinite(nextStatus)) {
state.orderInfo.preparationStatus = nextStatus;
}
}
}
} catch (e) {
}
}
if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
}
+178 -32
View File
@@ -3,34 +3,54 @@
<!-- 自提商品核销 -->
<view v-if="orderInfo.deliveryType === 2 && orderInfo.payStatus" class="writeOff borRadius14">
<view class="title-row">
<view class="title">核销信息</view>
<view class="title-left flex-center">
<view class="title">核销信息</view>
<view class="status-tag" :class="statusTagClass">{{ statusTagText }}</view>
</view>
<view class="progress-btn" @tap.stop="goStockProgress">备货进度</view>
</view>
<view class="grayBg flex-center">
<view class="pictrue">
<image
v-if="!!painterImageUrl"
:src="painterImageUrl"
:style="{ width: `${state.qrcodeSize}px`, height: `${state.qrcodeSize}px` }"
:show-menu-by-longpress="true"
/>
<view v-if="isVerifyCompleted" class="verify-mask">
<view class="verify-mask__icon">
<uni-icons type="checkmarkempty" size="40" color="#ffffff" />
</view>
<view class="verify-mask__text">已核销</view>
<template v-if="isSorting">
<view class="preparation-placeholder">
<view class="preparation-placeholder__emoji">📦</view>
<view class="preparation-placeholder__title">门店正快马加鞭备货中</view>
<view class="preparation-placeholder__desc">
分拣完成后将生成取货码并发送通知,请耐心等待~
</view>
</view>
</view>
<view class="gear">
<image :src="sheep.$url.static('/static/img/shop/writeOff.png')"></image>
</view>
<view v-if="isVerifyCompleted" class="num-wrap">
<view class="num num--done">该商品券已完成核销</view>
</view>
<view v-else class="num-wrap" @tap="copyVerifyCode">
<view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
</view>
<view v-if="isVerifyCompleted" class="num-wrap">
<view class="num num--done">该商品券已完成核销</view>
</view>
<view v-else class="num-wrap">
<view class="num num--pending">— 待备货完成后解锁 —</view>
</view>
</template>
<template v-else>
<view class="grayBg flex-center">
<view class="pictrue">
<image
v-if="!!painterImageUrl"
:src="painterImageUrl"
:style="{ width: `${state.qrcodeSize}px`, height: `${state.qrcodeSize}px` }"
:show-menu-by-longpress="true"
/>
<view v-if="isVerifyCompleted" class="verify-mask">
<view class="verify-mask__icon">
<uni-icons type="checkmarkempty" size="40" color="#ffffff" />
</view>
<view class="verify-mask__text">已核销</view>
</view>
</view>
</view>
<view class="gear">
<image :src="sheep.$url.static('/static/img/shop/writeOff.png')"></image>
</view>
<view v-if="isVerifyCompleted" class="num-wrap">
<view class="num num--done">该商品券已完成核销</view>
</view>
<view v-else class="num-wrap" @tap="copyVerifyCode">
<view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
</view>
</template>
<view class="rules">
<view class="item">
<view class="rulesTitle flex flex-wrap align-center"> 核销时间 </view>
@@ -44,12 +64,12 @@
<text class="iconfont icon-shuoming1"></text>
使用说明
</view>
<view class="info">可将二维码出示给店员扫描或提供数字核销码</view>
<view class="info">{{ isSorting ? '分拣完成后将生成核销码,出示给店员扫描即可' : '可将二维码出示给店员扫描或提供数字核销码' }}</view>
</view>
</view>
</view>
<view
v-if="orderInfo.deliveryType === 2"
v-if="orderInfo.deliveryType === 2 && !isSorting"
class="pickup-card borRadius14"
>
<image v-if="coverImageUrl" class="pickup-cover" :src="coverImageUrl" mode="aspectFill" />
@@ -102,9 +122,6 @@
default: 'order',
},
});
const state = reactive({
qrcodeSize: 145,
});
const resolvePickUpStoreId = () => {
return Number(
@@ -208,6 +225,46 @@
);
});
const resolveStage = () => {
const data = props.orderInfo || {};
const external = Number(data?.preparationStatus);
const rawStatus = Number.isFinite(external) ? external : Number(data?.preparationStatus ?? data?.status ?? 0);
if (isVerifyCompleted.value) return 'done';
if (rawStatus === 1 || rawStatus === 2) return 'wait';
if (
data?.deliveryTime ||
data?.arriveStoreTime ||
data?.deliveredTime ||
rawStatus === 20
) {
return 'delivered';
}
return 'sorting';
};
const isSorting = computed(() => resolveStage() === 'sorting');
const state = reactive({
qrcodeSize: 145,
});
const statusTagText = computed(() => {
const s = resolveStage();
if (s === 'sorting') return '分拣中';
if (s === 'delivered') return '已送达门店';
if (s === 'wait') return '待取货';
if (s === 'done') return isVerifyCompleted.value ? '已核销' : '已完成';
return '';
});
const statusTagClass = computed(() => {
const s = resolveStage();
if (s === 'sorting') return 'status-tag--sorting';
if (s === 'delivered') return 'status-tag--delivered';
if (s === 'wait') return 'status-tag--wait';
return 'status-tag--done';
});
const addressText = computed(() => {
const s = props.systemStore || {};
const province = s.province || '';
@@ -237,19 +294,30 @@
const painterRef = ref(); // 海报画板
const painterImageUrl = ref(); // 海报 url
const showPainter = ref(true);
const lastMarkCodeText = ref('');
// 渲染海报
const renderPoster = async (poster) => {
if (!painterRef.value) return;
await painterRef.value.render(poster);
};
// 获得生成的图片
const setPainterImageUrl = (path) => {
painterImageUrl.value = path;
showPainter.value = false;
};
/**
* 生成核销二维码
*/
const markCode = (text) => {
const markCode = async (text) => {
const code = String(text || '').trim();
if (!code) return;
// 相同取货码无需重复生成,避免重复触发海报组件销毁/重建的空指针
if (lastMarkCodeText.value === code && painterImageUrl.value) return;
lastMarkCodeText.value = code;
// 如果 painterRef 已被销毁(showPainter=false 时 v-if 销毁了组件),先重建组件,等下一个 tick 再渲染
if (!painterRef.value) {
showPainter.value = true;
await new Promise((resolve) => setTimeout(resolve, 0));
}
renderPoster({
css: {
width: `${state.qrcodeSize}px`,
@@ -258,7 +326,7 @@
views: [
{
type: 'qrcode',
text: text,
text: code,
css: {
width: `${state.qrcodeSize}px`,
height: `${state.qrcodeSize}px`,
@@ -284,6 +352,7 @@
border-radius: 10rpx;
margin: 0 20rpx 20rpx 20rpx;
}
.order-details .writeOff {
background-color: #fff;
margin-top: 15rpx;
@@ -303,6 +372,11 @@
box-sizing: border-box;
}
.order-details .writeOff .title-left {
gap: 16rpx;
min-width: 0;
}
.order-details .writeOff .title {
font-size: 30rpx;
color: #282828;
@@ -310,6 +384,36 @@
line-height: 87rpx;
}
.order-details .writeOff .status-tag {
flex-shrink: 0;
height: 44rpx;
line-height: 44rpx;
padding: 0 16rpx;
border-radius: 22rpx;
font-size: 22rpx;
font-weight: 500;
}
.order-details .writeOff .status-tag--sorting {
color: #e8852f;
background: rgba(232, 133, 47, 0.12);
}
.order-details .writeOff .status-tag--delivered {
color: #2556ec;
background: rgba(37, 86, 236, 0.1);
}
.order-details .writeOff .status-tag--wait {
color: #12a06a;
background: rgba(18, 160, 106, 0.1);
}
.order-details .writeOff .status-tag--done {
color: #86909c;
background: rgba(134, 144, 156, 0.12);
}
.order-details .writeOff .progress-btn {
height: 52rpx;
line-height: 52rpx;
@@ -320,6 +424,48 @@
background: rgba(91, 78, 255, 0.12);
}
.preparation-placeholder {
width: 590rpx;
min-height: 384rpx;
margin: 50rpx auto 0 auto;
border-radius: 20rpx 20rpx 0 0;
background: linear-gradient(180deg, #fff7ea 0%, #ffe9c8 100%);
padding: 72rpx 48rpx 56rpx;
box-sizing: border-box;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
&__emoji {
font-size: 84rpx;
line-height: 1;
margin-bottom: 28rpx;
}
&__title {
font-size: 32rpx;
font-weight: 600;
color: #7a4a00;
line-height: 1.5;
margin-bottom: 14rpx;
}
&__desc {
font-size: 24rpx;
color: #a36d1a;
line-height: 1.7;
text-align: center;
}
}
.order-details .writeOff .num .num--pending {
background: #f7f8fa;
color: #98a2b3;
font-size: 26rpx;
letter-spacing: 2rpx;
}
.order-details .writeOff .grayBg {
background-color: #f2f5f7;
width: 590rpx;
+5 -4
View File
@@ -105,10 +105,6 @@
return sheep.$helper.timeFormat(t, 'yyyy-mm-dd hh:MM:ss');
};
const hasVerifyCode = computed(() => {
return Boolean(state.orderInfo?.pickUpVerifyCode) && Boolean(state.orderInfo?.payStatus);
});
const resolvePickUpStoreId = (data = {}) => {
return Number(
data?.pickUpStoreId ||
@@ -145,6 +141,11 @@
return resolveStage(state.orderInfo, state.preparationStatus);
});
const hasVerifyCode = computed(() => {
if (stage.value === 'sorting') return false;
return Boolean(state.orderInfo?.pickUpVerifyCode) && Boolean(state.orderInfo?.payStatus);
});
const steps = computed(() => {
const createTime = formatTime(state.orderInfo?.createTime);
const s = stage.value;
+20 -5
View File
@@ -235,14 +235,29 @@
const getStoreStatusLevel = (status) => STORE_STATUS_LEVEL[Number(status)] || 'closed';
const isStoreOpen = (item) => Number(item?.status) === 1;
const sortStoreList = (list = []) => {
const STATUS_WEIGHT = { 1: 0, 2: 1, 3: 2 };
return [...list].sort((a, b) => {
const wa = STATUS_WEIGHT[Number(a?.status)] ?? 99;
const wb = STATUS_WEIGHT[Number(b?.status)] ?? 99;
if (wa !== wb) return wa - wb;
const da = Number(a?.distance);
const db = Number(b?.distance);
if (da >= 0 && db >= 0) return da - db;
return 0;
});
};
const filteredStoreList = computed(() => {
const list = Array.isArray(state.storeList) ? state.storeList : [];
const kw = String(state.keyword || '').trim();
if (!kw) return list;
return list.filter((item) => {
const s = `${item?.name || ''} ${formatAddress(item)}`.toLowerCase();
return s.includes(kw.toLowerCase());
});
const raw = !kw
? list
: list.filter((item) => {
const s = `${item?.name || ''} ${formatAddress(item)}`.toLowerCase();
return s.includes(kw.toLowerCase());
});
return sortStoreList(raw);
});
const selectedStore = computed(() => {