From 393b44268bd7fcfdc23bf2cd025dcf1cd27b8694 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sun, 12 May 2024 19:19:24 +0800
Subject: [PATCH] up

---
 .env.development          |  4 ++--
 src/router/index.js       | 44 ++++++++++++++++++++++++++-------------
 src/views/order/index.vue | 20 +++++++++++++++---
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/.env.development b/.env.development
index 1df38d5..33f08b9 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = https://yybtest.ali251.langye.net
-#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net
+#VUE_APP_BASE_API = https://yybtest.ali251.langye.net
+VUE_APP_BASE_API = https://yunyubang.ali251.langye.net
diff --git a/src/router/index.js b/src/router/index.js
index 5398ac1..7f97967 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -56,25 +56,39 @@ export const constantRoutes = [{
     hidden: true
   },
 
+  // {
+  //   path: '/',
+  //   component: Layout,
+  //   redirect: '/dashboard',
+  //   children: [{
+  //     path: 'dashboard',
+  //     name: '系统首页',
+  //     component: () => import('@/views/dashboard/index'),
+  //     meta: {
+  //       title: '系统首页',
+  //       icon: 'dashboard'
+  //     }
+  //   }]
+  // },
+  // {
+  //   path: '/order',
+  //   component: Layout,
+  //   children: [{
+  //     path: '',
+  //     name: '订单管理',
+  //     component: () => import('@/views/order/index'),
+  //     meta: {
+  //       title: '订单管理',
+  //       icon: 'el-icon-s-order'
+  //     }
+  //   }]
+  // },
   {
     path: '/',
     component: Layout,
-    redirect: '/dashboard',
+    redirect: '/order',
     children: [{
-      path: 'dashboard',
-      name: '系统首页',
-      component: () => import('@/views/dashboard/index'),
-      meta: {
-        title: '系统首页',
-        icon: 'dashboard'
-      }
-    }]
-  },
-  {
-    path: '/order',
-    component: Layout,
-    children: [{
-      path: '',
+      path: 'order',
       name: '订单管理',
       component: () => import('@/views/order/index'),
       meta: {
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 81638f5..69e5dbe 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -23,7 +23,7 @@
 
               <el-button size="medium" type="primary" @click="getList" style="margin-left: 10px">查询</el-button>
               <el-button size="medium" type="primary" @click="downloadExel" style="margin-left: 10px">导出</el-button>
-              
+
             </div>
           </slot>
         </LxHeader>
@@ -177,6 +177,13 @@ export default {
           prop:'member.area',
           width: 160
         },
+        {
+          label:'地址',
+          sortable:false,
+          prop:'member.address',
+          width: 180,
+          align:'left'
+        },
         {
           label:'预产期',
           sortable:false,
@@ -213,6 +220,13 @@ export default {
           prop:'state_name',
           width:120
         },
+        {
+          label:'备注',
+          sortable:false,
+          prop:'order.remark',
+          width:220,
+          align:'left'
+        },
         {
           label:'操作',
           sortable:false,
@@ -306,7 +320,7 @@ export default {
       this.total = res.total
     },
     downloadExel() {
-    
+
       download(
         '/api/merchant/order/get-list',
         'get', {
@@ -314,7 +328,7 @@ export default {
           ...this.select
         },
         '订单列表.xlsx')
-    
+
     }
   },
   computed: {},