|
|
@ -134,7 +134,7 @@ |
|
|
|
</a-table> |
|
|
|
</a-table> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
<a-tabs defaultActiveKey="1"> |
|
|
|
<!--<a-tabs defaultActiveKey="1"> |
|
|
|
<a-tab-pane tab="地址表" key="1"> |
|
|
|
<a-tab-pane tab="地址表" key="1"> |
|
|
|
<ZyMallAddressList :mainId="selectedMainId" /> |
|
|
|
<ZyMallAddressList :mainId="selectedMainId" /> |
|
|
|
</a-tab-pane> |
|
|
|
</a-tab-pane> |
|
|
@ -153,7 +153,7 @@ |
|
|
|
<a-tab-pane tab="退货订单" key="6" forceRender> |
|
|
|
<a-tab-pane tab="退货订单" key="6" forceRender> |
|
|
|
<ZyMallReturnOrderList :mainId="selectedMainId" /> |
|
|
|
<ZyMallReturnOrderList :mainId="selectedMainId" /> |
|
|
|
</a-tab-pane> |
|
|
|
</a-tab-pane> |
|
|
|
</a-tabs> |
|
|
|
</a-tabs>--> |
|
|
|
|
|
|
|
|
|
|
|
<zyMallUser-modal ref="modalForm" @ok="modalFormOk"></zyMallUser-modal> |
|
|
|
<zyMallUser-modal ref="modalForm" @ok="modalFormOk"></zyMallUser-modal> |
|
|
|
</a-card> |
|
|
|
</a-card> |
|
|
@ -190,36 +190,36 @@ export default { |
|
|
|
// 表头 |
|
|
|
// 表头 |
|
|
|
columns: [ |
|
|
|
columns: [ |
|
|
|
{ |
|
|
|
{ |
|
|
|
title: '账户', |
|
|
|
title: '账户c', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'account' |
|
|
|
dataIndex: 'username' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
title: '昵称', |
|
|
|
title: '昵称', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'name' |
|
|
|
dataIndex: 'realname' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
/* { |
|
|
|
title: '密码', |
|
|
|
title: '密码', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'password' |
|
|
|
dataIndex: 'password' |
|
|
|
}, |
|
|
|
},*/ |
|
|
|
{ |
|
|
|
{ |
|
|
|
title: '电话', |
|
|
|
title: '电话', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'phone' |
|
|
|
dataIndex: 'phone' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
/* { |
|
|
|
title: '状态', |
|
|
|
title: '状态', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'state_dictText' |
|
|
|
dataIndex: 'state_dictText' |
|
|
|
}, |
|
|
|
},*/ |
|
|
|
{ |
|
|
|
{ |
|
|
|
title: '性别', |
|
|
|
title: '性别', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'sex_dictText' |
|
|
|
dataIndex: 'sex_dictText' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
/* { |
|
|
|
title: '个性签名', |
|
|
|
title: '个性签名', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'sign' |
|
|
|
dataIndex: 'sign' |
|
|
@ -229,8 +229,8 @@ export default { |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'picture', |
|
|
|
dataIndex: 'picture', |
|
|
|
scopedSlots: { customRender: 'imgSlot' } |
|
|
|
scopedSlots: { customRender: 'imgSlot' } |
|
|
|
}, |
|
|
|
},*/ |
|
|
|
{ |
|
|
|
/* { |
|
|
|
title: '店铺id', |
|
|
|
title: '店铺id', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'shopId_dictText' |
|
|
|
dataIndex: 'shopId_dictText' |
|
|
@ -249,7 +249,7 @@ export default { |
|
|
|
title: '身份', |
|
|
|
title: '身份', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|
dataIndex: 'userIdentity_dictText' |
|
|
|
dataIndex: 'userIdentity_dictText' |
|
|
|
}, |
|
|
|
},*/ |
|
|
|
{ |
|
|
|
{ |
|
|
|
title: '生日', |
|
|
|
title: '生日', |
|
|
|
align: 'center', |
|
|
|
align: 'center', |
|
|
|