|
|
@@ -19,13 +19,13 @@
|
|
|
<div class="info-list">
|
|
|
<div class="info-list-name">开单</div>
|
|
|
<div class="info-list-value">
|
|
|
- {{ $util.numberFormat(data.todayData.visit) || 0 }}
|
|
|
+ {{ $util.numberFormat(data.todayData.order) || 0 }}
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="info-list">
|
|
|
<div class="info-list-name">新客</div>
|
|
|
<div class="info-list-value">
|
|
|
- {{ $util.numberFormat(data.todayData.user) || 0 }}
|
|
|
+ {{ $util.numberFormat(data.todayData.custom) || 0 }}
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="info-list">
|
|
|
@@ -157,6 +157,15 @@ export default {
|
|
|
},
|
|
|
// 订单总览
|
|
|
orderData: [
|
|
|
+ {
|
|
|
+ name: "待付款",
|
|
|
+ url: "/admin/home/order",
|
|
|
+ type: 4,
|
|
|
+ query: {
|
|
|
+ tabIndex: 1
|
|
|
+ },
|
|
|
+ value: 0
|
|
|
+ },
|
|
|
{
|
|
|
name: "待配送",
|
|
|
value: 0,
|
|
|
@@ -174,15 +183,6 @@ export default {
|
|
|
query: {
|
|
|
tabIndex: 3
|
|
|
}
|
|
|
- },
|
|
|
- {
|
|
|
- name: "已完成",
|
|
|
- url: "/admin/home/order",
|
|
|
- type: 4,
|
|
|
- query: {
|
|
|
- tabIndex: 0
|
|
|
- },
|
|
|
- value: 0
|
|
|
}
|
|
|
],
|
|
|
// tab按钮
|
|
|
@@ -264,15 +264,15 @@ export default {
|
|
|
value: 0
|
|
|
},
|
|
|
{
|
|
|
- name: "总收入",
|
|
|
+ name: "总收入(元)",
|
|
|
value: 0.00
|
|
|
},
|
|
|
{
|
|
|
- name: "总支出",
|
|
|
+ name: "总支出(元)",
|
|
|
value: 0.00
|
|
|
},
|
|
|
{
|
|
|
- name: "总采购",
|
|
|
+ name: "总采购(元)",
|
|
|
value: 0.00
|
|
|
}
|
|
|
],
|
|
|
@@ -326,9 +326,9 @@ export default {
|
|
|
const { asset, todayData } = res.data;
|
|
|
if (!this.$util.isEmpty(asset)) {
|
|
|
// 订单总览
|
|
|
- this.orderData[0].value = asset.unSendOrder;
|
|
|
- this.orderData[1].value = asset.sendingOrder;
|
|
|
- this.orderData[2].value = todayData.order;
|
|
|
+ this.orderData[0].value = asset.unPayOrder;
|
|
|
+ this.orderData[1].value = asset.unSendOrder;
|
|
|
+ this.orderData[2].value = asset.sendingOrder;
|
|
|
// 总览数据
|
|
|
this.totalData[0].value = asset.totalUser;
|
|
|
this.totalData[1].value = asset.totalView;
|
shish