diff --git a/pages/merchant/pickupList.vue b/pages/merchant/pickupList.vue index 3b133ea..c8688aa 100644 --- a/pages/merchant/pickupList.vue +++ b/pages/merchant/pickupList.vue @@ -59,6 +59,14 @@ 下单时间:{{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM') }} + + + {{ getReceiverName(item) }} + + {{ getMaskedReceiverMobile(item) }} + + + 数量:x{{ getMainItem(item)?.count || 0 }} - 订单号:{{ item.orderNo }} + + 订单号:{{ item.orderNo || '--' }} + + + + - - - 标记已分拣 - - - 去核销 - + + + + + 拨打电话 + + + 标记已分拣 + + + 去核销 { + return String(item?.receiverName || item?.userName || item?.nickname || '').trim(); + }; + + const maskMobile = (mobile) => { + const digits = String(mobile || '').replace(/\D/g, ''); + if (digits.length < 7) return String(mobile || '').trim(); + if (digits.length === 11) return `${digits.slice(0, 3)}****${digits.slice(7)}`; + return `${digits.slice(0, 3)}**${digits.slice(-4)}`; + }; + + const getMaskedReceiverMobile = (item) => { + const mobile = String(item?.receiverMobile || item?.receiverPhone || item?.mobile || '').trim(); + return mobile ? maskMobile(mobile) : ''; + }; + + const getReceiverMobileDigits = (item) => { + return String(item?.receiverMobile || item?.receiverPhone || item?.mobile || '').replace(/\D/g, ''); + }; + + const callReceiver = (item) => { + const phoneNumber = getReceiverMobileDigits(item); + if (!phoneNumber) { + uni.showToast({ title: '暂无手机号', icon: 'none' }); + return; + } + uni.makePhoneCall({ + phoneNumber, + fail: () => { + uni.showToast({ title: '拨打失败', icon: 'none' }); + }, + }); + }; + + const copyOrderNo = (orderNo) => { + const text = String(orderNo || '').trim(); + if (!text) { + uni.showToast({ title: '暂无订单号', icon: 'none' }); + return; + } + sheep.$helper.copyText(text); + }; + const getExpandKey = (item) => { return String(item?.orderId || item?.id || ''); }; @@ -481,6 +544,38 @@ margin-bottom: 14rpx; } + .buyer-top { + display: flex; + align-items: center; + gap: 12rpx; + padding: 10rpx 12rpx; + border-radius: 16rpx; + background: #f7f8fc; + margin-bottom: 14rpx; + } + + .buyer-top__left { + display: flex; + align-items: center; + flex-wrap: wrap; + gap: 12rpx; + min-width: 0; + flex: 1; + } + + .buyer-top__name { + font-size: 24rpx; + line-height: 34rpx; + color: #222; + font-weight: 600; + } + + .buyer-top__mobile { + font-size: 24rpx; + line-height: 34rpx; + color: #7b8494; + } + .status-wrap { display: flex; align-items: center; @@ -542,20 +637,56 @@ font-weight: 600; } + .order-no-row { + display: flex; + align-items: center; + gap: 10rpx; + min-width: 0; + } + + .order-no-row__text { + min-width: 0; + flex: 0 1 auto; + } + + .order-no-row__copy { + width: 24rpx; + height: 24rpx; + display: inline-flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + } + + .order-no-row__copy-icon { + width: 100%; + height: 100%; + display: block; + } + .actions { display: flex; - flex-direction: column; - align-items: flex-end; - gap: 12rpx; - flex-shrink: 0; - margin-left: 14rpx; + align-items: center; + justify-content: flex-end; + gap: 16rpx; + margin-top: 16rpx; + padding-top: 16rpx; + border-top: 2rpx solid #f1f3f7; } .btn { - padding: 14rpx 20rpx; + min-width: 176rpx; + height: 64rpx; + padding: 0 26rpx; border-radius: 18rpx; font-size: 24rpx; line-height: 1; + display: inline-flex; + align-items: center; + justify-content: center; + box-sizing: border-box; + font-weight: 600; + gap: 8rpx; } .btnPrimary { @@ -568,6 +699,14 @@ color: #2556ec; } + .btnGhost { + min-width: 0; + padding: 0 20rpx; + border: 2rpx solid #dbe3f2; + color: #2556ec; + background: #f7faff; + } + .fold-box { margin-top: 16rpx; border-radius: 18rpx; diff --git a/pages/merchant/storeManage.vue b/pages/merchant/storeManage.vue index c117167..9425433 100644 --- a/pages/merchant/storeManage.vue +++ b/pages/merchant/storeManage.vue @@ -35,10 +35,23 @@ :styles="{ fontSize: '28rpx' }" /> - + 新增网店 + + + {{ statusOptions[statusIndex].label }} + + + + - + #{{ index + 1 }} @@ -61,7 +74,7 @@ 编号:{{ row.code || '--' }} 联系电话:{{ row.phone || '--' }} {{ row.address || '--' }} - + - 编辑 + 编辑 { if (raw === null || raw === undefined) return ''; @@ -251,10 +273,24 @@ return { total, open, - todayOrders: 0, + todayOrders: todayOrders.value, }; }); + const updateTodayOrders = async (storeIds = '') => { + const pickUpStoreId = toStoreIdsString(storeIds); + if (!pickUpStoreId) { + todayOrders.value = 0; + return; + } + try { + const { code, data } = await OrderStoreApi.getTodayNewCount(pickUpStoreId); + todayOrders.value = code === 0 ? Math.max(0, Number(data) || 0) : 0; + } catch (error) { + todayOrders.value = 0; + } + }; + const getList = async () => { if (loading.value) return; loading.value = true; @@ -262,12 +298,19 @@ const storeIds = await getUserStoreIds(); if (!storeIds) { list.value = []; + todayOrders.value = 0; + return; + } + const status = statusOptions[statusIndex.value]?.value; + const params = status === '' ? {} : { status }; + const { code, data } = await StoreApi.getStoreListByStoreIds(storeIds, params); + if (code !== 0) { + todayOrders.value = 0; return; } - const { code, data } = await StoreApi.getStoreListByStoreIds(storeIds); - if (code !== 0) return; const rows = Array.isArray(data) ? data : []; list.value = rows.map(normalizeRow).filter((r) => r.id > 0); + await updateTodayOrders(storeIds); } finally { loading.value = false; } @@ -277,6 +320,11 @@ uni.showToast({ title: '功能开发中', icon: 'none' }); }; + const bindStatusChange = (e) => { + statusIndex.value = Number(e?.detail?.value || 0); + getList(); + }; + const edit = () => { uni.showToast({ title: '功能开发中', icon: 'none' }); }; @@ -366,6 +414,29 @@ background: transparent !important; } + .status-picker { + flex-shrink: 0; + min-width: 180rpx; + border-radius: 18rpx; + background: #f6f7fb; + padding: 0 18rpx; + box-sizing: border-box; + } + + .status-picker__inner { + height: 72rpx; + display: flex; + align-items: center; + justify-content: space-between; + gap: 10rpx; + } + + .status-picker__text { + font-size: 24rpx; + color: #333; + white-space: nowrap; + } + .btnAdd { padding: 14rpx 18rpx; border-radius: 18rpx; @@ -376,14 +447,22 @@ } .table { - border-radius: 24rpx; - padding: 16rpx; + padding: 0; box-sizing: border-box; + background: transparent; } .tr { - padding: 18rpx 0; - border-bottom: 2rpx solid #f6f7fb; + margin-bottom: 18rpx; + padding: 18rpx 18rpx 20rpx; + border-radius: 24rpx; + background: #fff; + box-shadow: 0 8rpx 24rpx rgba(15, 23, 42, 0.05); + box-sizing: border-box; + } + + .tr:last-child { + margin-bottom: 0; } .store-rank { @@ -537,18 +616,36 @@ .op { font-size: 24rpx; + min-width: 120rpx; + height: 50rpx; + padding: 0 24rpx; + border-radius: 16rpx; + display: inline-flex; + align-items: center; + justify-content: center; + box-sizing: border-box; + font-weight: 600; + border: 2rpx solid #e5e7eb; + background: #fff; + flex-shrink: 0; } .opPrimary { color: #2556ec; + border-color: rgba(37, 86, 236, 0.2); + background: rgba(37, 86, 236, 0.06); } .opDanger { color: #ff4d4f; + border-color: rgba(255, 77, 79, 0.28); + background: #fff5f5; } .opSuccess { color: #14a44d; + border-color: rgba(20, 164, 77, 0.28); + background: #f2fbf5; } .opDisabled { diff --git a/pages/order/stockProgress.vue b/pages/order/stockProgress.vue index 7fbd4cf..d4e5f7a 100644 --- a/pages/order/stockProgress.vue +++ b/pages/order/stockProgress.vue @@ -75,6 +75,7 @@ const state = reactive({ orderId: 0, pickUpStoreId: 0, + preparationStatus: null, orderInfo: {}, loading: false, }); @@ -105,11 +106,13 @@ ); }; - const resolveStage = (data = {}) => { - const rawStatus = Number(data?.preparationStatus ?? data?.status ?? 0); + const resolveStage = (data = {}, preparationStatus) => { + const external = Number(preparationStatus); + const rawStatus = Number.isFinite(external) ? external : Number(data?.preparationStatus ?? data?.status ?? 0); if (data?.pickUpVerifyTime || data?.verifyTime || data?.completedTime || rawStatus === 30 || rawStatus === 3) { return 'done'; } + if (rawStatus === 1) return 'wait'; if ( data?.deliveryTime || data?.arriveStoreTime || @@ -123,7 +126,7 @@ }; const stage = computed(() => { - return resolveStage(state.orderInfo); + return resolveStage(state.orderInfo, state.preparationStatus); }); const steps = computed(() => { @@ -131,7 +134,7 @@ const s = stage.value; const sortingState = s === 'sorting' ? 'active' : 'done'; const deliveredState = s === 'delivered' ? 'active' : s === 'sorting' ? 'todo' : 'done'; - const waitState = s === 'done' ? 'done' : 'todo'; + const waitState = s === 'wait' ? 'active' : s === 'done' ? 'done' : 'todo'; return [ { key: 'created', @@ -190,9 +193,10 @@ const getDetail = async () => { if (!state.orderId || state.loading) return; - if (!(state.pickUpStoreId > 0)) { + if (!state.orderInfo || !Object.keys(state.orderInfo).length || !(state.pickUpStoreId > 0)) { const detailRes = await OrderApi.getOrderDetail(state.orderId); if (detailRes?.code === 0) { + state.orderInfo = detailRes.data || {}; state.pickUpStoreId = resolvePickUpStoreId(detailRes.data); } } @@ -207,11 +211,20 @@ const res = await OrderStoreApi.getPreparationStatus(state.pickUpStoreId, state.orderId); state.loading = false; if (res?.code !== 0) return; - const data = res.data || {}; - state.orderInfo = data?.orderInfo || data; - if (!(state.pickUpStoreId > 0)) { - state.pickUpStoreId = resolvePickUpStoreId(state.orderInfo); + const data = res.data; + if (data !== null && typeof data === 'object') { + const merged = data?.orderInfo || data; + state.orderInfo = { + ...(state.orderInfo || {}), + ...(merged || {}), + }; + const next = Number(merged?.preparationStatus ?? merged?.status); + if (Number.isFinite(next)) state.preparationStatus = next; + } else { + const next = Number(data); + if (Number.isFinite(next)) state.preparationStatus = next; } + if (!(state.pickUpStoreId > 0)) state.pickUpStoreId = resolvePickUpStoreId(state.orderInfo); }; const notifyStore = () => { diff --git a/sheep/api/trade/orderStore.js b/sheep/api/trade/orderStore.js index cdeb3d5..60b7edf 100644 --- a/sheep/api/trade/orderStore.js +++ b/sheep/api/trade/orderStore.js @@ -34,6 +34,18 @@ const OrderStoreApi = { }, }); }, + getTodayNewCount: (pickUpStoreId) => { + return request({ + url: '/trade/order-store/staff/today-new-count', + method: 'GET', + params: { + pickUpStoreId, + }, + custom: { + showLoading: false, + }, + }); + }, getPreparationStatus: (pickUpStoreId, orderId) => { return request({ url: '/trade/order-store/preparation-status', diff --git a/sheep/api/trade/store.js b/sheep/api/trade/store.js index 3676896..7803f85 100644 --- a/sheep/api/trade/store.js +++ b/sheep/api/trade/store.js @@ -29,12 +29,13 @@ const StoreApi = { } return res; }, - getStoreListByStoreIds: async (storeIds) => { + getStoreListByStoreIds: async (storeIds, params = {}) => { const res = await request({ url: '/trade/store/list-by-store-ids', method: 'GET', params: { storeIds, + ...params, }, custom: { showLoading: false,