From 3551b419d810f56ee69a5c8ab2b174d9b835216e Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 5 Jun 2024 17:39:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/parkorder.vue | 24 +++++++++++++-----------
 vue.config.js                 |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/order/parkorder.vue b/src/views/order/parkorder.vue
index ecffd62..c863ef9 100644
--- a/src/views/order/parkorder.vue
+++ b/src/views/order/parkorder.vue
@@ -310,17 +310,19 @@
           page_size: this.paginations.page_size,
           car_park_id: carId,
           ...this.searchFields
-        }).then(res => {
-          for (var m of res.data) {
-            m.orderType = m.visit_order ? "参观预约" : "活动预约";
-            if (m.visit_order) {
-              m.teamunit = m.visit_order.unit ? m.visit_order.unit : "无";
-              m.teamType = m.visit_order.type == 1 ? "团队" : "个人";
-            } else {
-              m.teamunit = m.activity_order.unit ? m.activity_order.unit : "无";
-              m.teamType = m.activity_order.type == 1 ? "团队" : "个人";
-            }
-          }
+        }).then(res => {
+          console.log("this.tableData",res.data)
+          // for (var m of res.data) {
+          //   m.orderType = m.visit_order ? "参观预约" : "活动预约";
+          //   if (m.visit_order) {
+          //     m.teamunit = m.visit_order.unit ? m.visit_order.unit : "无";
+          //     m.teamType = m.visit_order.type == 1 ? "团队" : "个人";
+          //   } else {
+          //     m.teamunit = m.activity_order.unit ? m.activity_order.unit : "无";
+          //     m.teamType = m.activity_order.type == 1 ? "团队" : "个人";
+          //   }
+          // }
+
           this.tableData = res.data;
           this.paginations.total = res.total
         }).catch(error => {
diff --git a/vue.config.js b/vue.config.js
index 9c8ec10..be4875e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/admin/',
-  outputDir: '/Users/liuxiangyu/Work/g-guangdian/app/d-dangxingjiaoyujidi/dangxingjiaoyujidi-service/public/admin',
+  outputDir: '/Users/mac/Documents/朗业/2022/l-乐益预约/service',
   assetsDir: 'static',
   css: {
     loaderOptions: { // 向 CSS 相关的 loader 传递选项