diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 6806e47..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/components/townDetail/bottomRight.vue b/src/components/townDetail/bottomRight.vue index e901a0c..833cc33 100644 --- a/src/components/townDetail/bottomRight.vue +++ b/src/components/townDetail/bottomRight.vue @@ -42,11 +42,8 @@ const aa = (cig, data) => { `
${item.store_name || item.mer_name}
`, `
`, `
${item.total_sales} - +
`, - - - ]) }) diff --git a/src/view/finance.vue b/src/view/finance.vue index 516e0eb..aca4899 100644 --- a/src/view/finance.vue +++ b/src/view/finance.vue @@ -1,819 +1,867 @@ +
+ +
+ +
+ + + +
+ + +
+ + +
+
+ 日账单 + {{ detailData.date }} + + 关闭 +
+ +
+ 订单收入总金额: + {{ detailData.income.number }} + {{ detailData.income.count }} +
+
+
+ {{ item[0] }} + {{ + item[1].slice(0, -1) + }} + {{ item[2] }} +
+
+
+ 充值金额: + {{ detailData.bill.number }} + {{ detailData.bill.count }} +
+
+ 支出总金额: + {{ detailData.expend.number }} + {{ detailData.expend.count }} +
+ +
+
+ 应付商户金额 + {{ + detailData.expend.data[0][1].slice(0, -1) + }} + {{ detailData.expend.data[0][2] }} +
+
+ 佣金 + {{ + detailData.expend.data[1][1].slice(0, -1) + }} + {{ detailData.expend.data[1][2] }} +
+
+ 返回手续费 + {{ + detailData.expend.data[2][1].slice(0, -1) + }} + {{ detailData.expend.data[2][2] }} +
+
+ +
+
+ 优惠券补贴 + {{ + detailData.expend.data[3][1].slice(0, -1) + }} + {{ detailData.expend.data[3][2] }} +
+
+ 会员优惠券补贴 + {{ + detailData.expend.data[4][1].slice(0, -1) + }} + {{ detailData.expend.data[4][2] }} +
+
+ 返回手续费 + 16.6 + 2笔 +
+
+
+ 平台手续费收入总金额: + {{ detailData.charge.number }} 元 +
+
+
+
+ + + + - \ No newline at end of file + diff --git a/src/view/townDetail.vue b/src/view/townDetail.vue index cf1bc5d..880d5d5 100644 --- a/src/view/townDetail.vue +++ b/src/view/townDetail.vue @@ -3,9 +3,7 @@ Loading... -
-
@@ -16,12 +14,9 @@
- -
-
@@ -29,45 +24,37 @@
-
- \ No newline at end of file +