up

3 years ago · 35328d16aa
parent e08cc9bb4e
commit 35328d16aa
2 changed files with 4 additions and 7 deletions
--- 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"
--- 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:"联系电话",