code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2025-12-21 02:15:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并ma分支解决冲突

Browse Source
This commit is contained in:
lemon橪
2021-06-03 11:51:39 +08:00
parent 837f01e8a1 65cb7787a6
commit 3eee6b35e8
142 changed files with 6024 additions and 6336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manager/src/views/statistics/order.vue
View File

@@ -52,7 +52,7 @@
</div>
<div class="card-item">
<div class="card-item-label">付款笔数</div>
<div class="card-item-value">{{overViewList.paymentsNum || 0}}</div>
<div class="card-item-value">{{overViewList.paymentOrderNum || 0}}</div>
</div>
<div class="card-item">
<div class="card-item-label">付款金额</div>
@@ -305,7 +305,7 @@ export default {
},
{
title: "商家名称",
key: "sellerName",
key: "storeName",
},
{
title: "售后单类型",

2
manager/src/views/statistics/order/refundOrder.vue
View File

@@ -38,7 +38,7 @@
</div>
<div class="label-item">
<span>店铺名称</span>
<span>{{res.sellerName}}</span>
<span>{{res.storeName}}</span>
</div>
<div class="label-item">
<span>创建时间</span>