diff --git a/src/api/store.js b/src/api/store.js index 1dcd657..a6885e7 100644 --- a/src/api/store.js +++ b/src/api/store.js @@ -121,6 +121,13 @@ export function saleOrderListApi(data) { return request.get(`/store_order/StoreOrder/lists`, { params: data }) } +/** + * @description 预约订单列表 + */ +export function userProductStorageListApi(data) { + return request.get(`/user_product_storage_log/UserProductStorageLog/lists`, { params: data }) +} + /** * @description 采购订单提交 */ diff --git a/src/layout/myAside.vue b/src/layout/myAside.vue index 7827f45..5f5df97 100644 --- a/src/layout/myAside.vue +++ b/src/layout/myAside.vue @@ -65,6 +65,12 @@ const list = ref([ ico: "DataAnalysis", count: 0, }, + { + name: "subOrder", + title: "预约取货", + ico: "Clock", + count: 0, + }, { name: "convert", title: "订单核销", diff --git a/src/router/index.js b/src/router/index.js index e0afa66..cdc9aa2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -30,10 +30,16 @@ const routes = [ component: () => import('@/views/order/index.vue'), }, { - path: '/orderCount', - name: 'orderCount', + path: '/subOrder', + name: 'subOrder', meta: { title: '订单统计' }, - component: () => import('@/views/saleOrder/indexCount.vue'), + component: () => import('@/views/subOrder/index.vue'), + }, + { + path: '/order', + name: 'order', + meta: { title: '预约取货' }, + component: () => import('@/views/order/index.vue'), }, { path: '/wallet', diff --git a/src/views/subOrder/component/detail.vue b/src/views/subOrder/component/detail.vue index 0f4b2d4..0147760 100644 --- a/src/views/subOrder/component/detail.vue +++ b/src/views/subOrder/component/detail.vue @@ -111,7 +111,7 @@ const getOrderList = () => { const getDetail = () => { loading.value = true; cashierinfoDetailsApi({ - id: formData.value.id, + id: formData.value.oid, }).then(res => { formData.value = res.data; setTimeout(() => { diff --git a/src/views/subOrder/component/order.vue b/src/views/subOrder/component/order.vue index e0672dd..103ef5c 100644 --- a/src/views/subOrder/component/order.vue +++ b/src/views/subOrder/component/order.vue @@ -5,7 +5,7 @@ import { orderStatusApi, orderLadingApi, cartListApi, - saleOrderListApi, + userProductStorageListApi, } from "@/api/store.js"; import { useUserStore } from "@/store/user.js"; import { ElMessage } from "element-plus"; @@ -56,7 +56,6 @@ const where = ref({ order_id: "", start_time: "", end_time: "", - is_sashier: 1, // 1-收银订单, 2-小程序订单 }); const loading = ref(false); @@ -71,7 +70,7 @@ const getOrderList = (reload = false) => { loading.value = true; if (tabPosition.value == 1) where.value.paid = null; if (tabPosition.value == 2) where.value.paid = 0; - saleOrderListApi(where.value) + userProductStorageListApi(where.value) .then((res) => { if (reload) orderList.value = res.data.lists; else orderList.value = [...orderList.value, ...res.data.lists]; @@ -148,19 +147,28 @@ onUnmounted(() => { :key="index" @click="setForm(item, index)">
单号: {{ item.order_id }}
-
{{ item.pay_time }}
+
{{ item.update_time }}
-
+ +
+ +
+ {{ item.store_name }} +
+ {{ item.store_info }} +
-
¥{{ item.pay_price }}
-
共{{ item.total_num }}款商品
+
¥{{ item.price }}
+
共{{ item.nums }}款商品