diff --git a/pages.json b/pages.json index 79e944a..90e6e3b 100644 --- a/pages.json +++ b/pages.json @@ -233,6 +233,17 @@ "title": "订单详情" } }, + { + "path": "stockProgress", + "style": { + "navigationBarTitleText": "备货进度", + "navigationStyle": "custom" + }, + "meta": { + "auth": true, + "title": "备货进度" + } + }, { "path": "confirm", "style": { diff --git a/pages/merchant/pickupList.vue b/pages/merchant/pickupList.vue index 77d0171..a6ed2d2 100644 --- a/pages/merchant/pickupList.vue +++ b/pages/merchant/pickupList.vue @@ -38,23 +38,25 @@ - - {{ item.statusText }} + + {{ item.statusName }} + + + 下单时间:{{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM') }} - {{ item.time }} - + - {{ item.name }} + {{ item.spuName }} 订单号:{{ item.orderNo }} - 取货码:{{ item.pickupCode }} + 取货码:{{ item.pickUpCode }} - + 标记已分拣 - + 去核销 @@ -68,7 +70,10 @@ diff --git a/pages/order/detail.vue b/pages/order/detail.vue index eddf8a0..962b9d7 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -31,6 +31,13 @@ @getOrderDetail="getOrderDetail" > + + @@ -120,6 +127,7 @@ import card_order from '@/components/orderItem/card_order.vue'; import AiOrderActionBar from '@/components/orderItem/AiOrderActionBar.vue'; import truckLine from '@/components/truckLine/truckLine.vue' + import PickUpVerify from '@/pages/order/pickUpVerify.vue'; const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png'); diff --git a/pages/order/pickUpVerify.vue b/pages/order/pickUpVerify.vue index 6c36578..b802815 100644 --- a/pages/order/pickUpVerify.vue +++ b/pages/order/pickUpVerify.vue @@ -2,7 +2,10 @@ - 核销信息 + + 核销信息 + 备货进度 + { + const id = props.orderInfo?.id || props.orderInfo?.orderId; + if (!id) return; + uni.navigateTo({ + url: `/pages/order/stockProgress?id=${id}`, + }); + }; + /** * 打开地图 */ @@ -155,13 +166,34 @@ padding-bottom: 50rpx; } - .order-details .writeOff .title { + .order-details .writeOff .title-row { + display: flex; + align-items: center; + justify-content: space-between; font-size: 30rpx; color: #282828; height: 87rpx; border-bottom: 1px solid #f0f0f0; padding: 0 24rpx; line-height: 87rpx; + box-sizing: border-box; + } + + .order-details .writeOff .title { + font-size: 30rpx; + color: #282828; + height: 87rpx; + line-height: 87rpx; + } + + .order-details .writeOff .progress-btn { + height: 52rpx; + line-height: 52rpx; + padding: 0 16rpx; + border-radius: 26rpx; + font-size: 24rpx; + color: #5b4eff; + background: rgba(91, 78, 255, 0.12); } .order-details .writeOff .grayBg { diff --git a/pages/order/stockProgress.vue b/pages/order/stockProgress.vue new file mode 100644 index 0000000..d9f5c5a --- /dev/null +++ b/pages/order/stockProgress.vue @@ -0,0 +1,397 @@ + + + + + diff --git a/sheep/api/trade/orderStore.js b/sheep/api/trade/orderStore.js new file mode 100644 index 0000000..fd52c37 --- /dev/null +++ b/sheep/api/trade/orderStore.js @@ -0,0 +1,17 @@ +import request from '@/sheep/request'; + +const OrderStoreApi = { + getPendingList: (params = {}) => { + return request({ + url: '/trade/order-store/pending', + method: 'GET', + params, + custom: { + showLoading: false, + }, + }); + }, +}; + +export default OrderStoreApi; +