From 35328d16aa76ab9f5e655bfe1f9434811612cfa6 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: Fri, 21 Oct 2022 16:19:25 +0800
Subject: [PATCH] up

---
 src/views/business/merchantManage.vue | 4 ++--
 src/views/order/orderList.vue         | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/views/business/merchantManage.vue b/src/views/business/merchantManage.vue
index 6856aba..74497ef 100644
--- a/src/views/business/merchantManage.vue
+++ b/src/views/business/merchantManage.vue
@@ -51,7 +51,7 @@ export default {
         {
           prop:'username',
           label:'简称/用户名',
-          width:150,
+          width:190,
           sortable:false,
           align:'left',
           fixed:"left"
@@ -59,7 +59,7 @@ export default {
         {
           prop:'name',
           label:'全名',
-          width: 200,
+          width: 280,
           sortable:false,
           align:'left',
           fixed:"left"
diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue
index a781d41..8da349f 100644
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -163,6 +163,7 @@ export default {
           label:"支付时间",
           width: 200,
           formatter:(cell,data,value,index)=>{
+            if(value)
             return parseTime(new Date(value))
           }
         },
@@ -195,11 +196,7 @@ export default {
                 return (<div style={{display:'flex',alignItems:'center',justifyContent:'center'}}><el-avatar src={row.member?.avatar}></el-avatar></div>)
               }
             },
-            {
-              prop:"wechat_nickname",
-              label:"昵称",
-              width: 160
-            },
+            
             {
               prop:"phone",
               label:"联系电话",