新增预约取货功能

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 采购订单提交
   */

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: "订单核销",

src/router/index.js

@@ -30,10 +30,16 @@ const routes = [
         component: () => import('@/views/order/index.vue'),
       },
       {
-        path: '/orderCount',
+        path: '/subOrder',
-        name: 'orderCount',
+        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',

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(() => {

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)">
                 <div class="top">
                     <div class="sn" :class="'cahier'">单号: {{ item.order_id }}</div>
-                    <div class="create-time">{{ item.pay_time }}</div>
+                    <div class="create-time">{{ item.update_time }}</div>
                 </div>
                 <div class="shop">
-                    <div class="left" v-if="item.product_info">
+                    <!-- <div class="left" v-if="item.product_info">
                         <el-image v-for="(shop, imgkey) in item.product_info.slice(0, 5)" :key="imgkey"
                             :src="shop.image" class="shop-img"></el-image>
                         <div v-if="item.product_info.length == 1" class="shop-name">
                             {{ item.product_info[0].store_name }}
                         </div>
+                    </div> -->
+                    <div class="left" >
+                        <el-image 
+                            :src="item.store_name_img" class="shop-img"></el-image>
+                        <div class="shop-name">
+                            {{ item.store_name }}
+                            <br />
+                            <span style=" display: block; font-size: 0.8rem; color: #777;">{{ item.store_info }}</span>
+                        </div>
                     </div>
                     <div class="right">
-                        <div class="money">¥{{ item.pay_price }}</div>
+                        <div class="money">¥{{ item.price }}</div>
-                        <div class="count">共{{ item.total_num }}款商品</div>
+                        <div class="count">共{{ item.nums }}款商品</div>
                     </div>
                 </div>
                 <div class="bottom">