From 1f98fc64004cc1261ccf5cb16fe22ccc9ec80f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Tue, 31 Jan 2023 10:15:30 +0800
Subject: [PATCH 1/3] up

---
 src/components/LxHeader/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/LxHeader/index.vue b/src/components/LxHeader/index.vue
index cfe9f45..46bfda3 100644
--- a/src/components/LxHeader/index.vue
+++ b/src/components/LxHeader/index.vue
@@ -40,9 +40,9 @@ export default {
     // padding-top: 10px;
     font-weight: bold;
     font-size: 15px;
-    color: #006756;
+    color: #071e34;
     white-space: nowrap;
-    border-bottom: 2px solid #006756;
+    border-bottom: 2px solid #071e34;
     > span {
       position: relative;
       

From aedfbae19cbf538d846e4de615cb76d70dcbe7a5 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 31 Jan 2023 10:58:18 +0800
Subject: [PATCH 2/3] 1

---
 src/components/XyTable/index.vue |  1 +
 src/router/index.js              |  4 +-
 src/views/order/index.vue        | 82 +++++++++++++++++++++++++++++---
 3 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 885acdd..b463226 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -245,6 +245,7 @@ export default {
                       header-align={item.headerAlign ?? 'center'}
                       label={item.label}
                       prop={item.prop}
+                      fixed={item.fixed || false}
                       scopedSlots={{
                         default(scope) {
                           return item.customFn(scope.row,scope)
diff --git a/src/router/index.js b/src/router/index.js
index b4d2891..6f8c5c0 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -57,11 +57,11 @@ export const constantRoutes = [{
   },
 
   {
-    path: '/dashboard',
+    path: '/',
     component: Layout,
     redirect: '/dashboard',
     children: [{
-      path: '',
+      path: 'dashboard',
       name: '系统首页',
       component: () => import('@/views/dashboard/index'),
       meta: {
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index dad07fb..0c4915b 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -8,9 +8,20 @@
             <div style="display: flex;align-items: center;">
               <div style="margin-right: 10px;">是否包含历史记录</div>
 
-              <el-switch v-model="select.show_history" :active-value="1" :inactive-value="0"></el-switch>
+              <el-switch v-model="select.show_history" :active-value="1" :inactive-value="0" style="margin-right: 10px;"></el-switch>
 
-              <Button type="primary" @click="getList" style="margin-left: 10px">查询</Button>
+              <div style="margin-right: 10px;">订单状态</div>
+
+              <el-select size="mini" placeholder="请选择状态" v-model="select.state" style="width: 140px;margin-right: 10px;">
+                <el-option v-for="(item,index) in status" :key="index" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+
+              <div style="margin-right: 10px;">关键词</div>
+
+              <el-input size="mini" placeholder="请输入关键词" v-model="select.keyword" style="width: 160px;margin-right: 10px;"></el-input>
+
+              <el-button size="medium" type="primary" @click="getList" style="margin-left: 10px">查询</el-button>
             </div>
           </slot>
         </LxHeader>
@@ -58,8 +69,48 @@ export default {
       select:{
         page:1,
         rows:10,
-        show_history:0
+        show_history:0,
+        state:'',
+        keyword:''
       },
+      status:[
+        {
+          label:'待处理',
+          value:'pending'
+        },
+        {
+          label:'已分发',
+          value:'assigned'
+        },
+        {
+          label:'已退回',
+          value:'returned'
+        },
+        {
+          label:'已接收',
+          value:'accepted'
+        },
+        {
+          label:'确认有效',
+          value:'confirmed'
+        },
+        {
+          label:'用户申请取消',
+          value:'canceled_by_user'
+        },
+        {
+          label:'商家标注无效单',
+          value:'canceled_by_merchant'
+        },
+        {
+          label:'已完成',
+          value:'finished'
+        },
+        {
+          label:'已取消',
+          value:'canceled'
+        },
+      ],
       total:0,
       data:[],
       logs:[],
@@ -93,25 +144,37 @@ export default {
           label:'客户姓名',
           sortable:false,
           prop:'member_name',
-          width:160
+          width:140
         },
         {
           label:'客户电话',
           sortable:false,
           prop:'member_phone',
-          width: 200
+          width: 180
         },
         {
           label:'预产期',
           sortable:false,
           prop:'member_due_date',
-          width: 180
+          width: 160
         },
         {
           label:'产品类型',
           sortable:false,
           prop:'product_type.name',
-          width: 180
+          width: 140
+        },
+        {
+          prop:'order.serial',
+          label:'订单编号',
+          width:180,
+          sortable:false,
+        },
+        {
+          prop:'order.created_at',
+          label:'订单创建时间',
+          width:180,
+          sortable:false,
         },
         {
           label:'状态',
@@ -123,6 +186,8 @@ export default {
           label:'操作',
           sortable:false,
           align:'left',
+          fixed:'right',
+          minWidth:200,
           customFn:row => {
             const _this = this
             let map = new Map([
@@ -218,4 +283,7 @@ export default {
 //::v-deep .el-button + .el-button{
 //  margin-left: 0 !important;
 //}
+::v-deep .el-button{
+  padding: 5px 8px !important;
+}
 </style>

From 349865dda55e3344f0b55cfcdf24f936f6569ed2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Tue, 14 Feb 2023 14:27:26 +0800
Subject: [PATCH 3/3] up

---
 vue.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue.config.js b/vue.config.js
index 3ff6a77..35f1170 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,7 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: '/admin/',
+  publicPath: '/merchant/',
   outputDir: '/Users/liuxiangyu/Work/yunyubang/yunyubang-service/public/merchant',
   assetsDir: 'static',
   css: {