diff --git a/src/pages/statement/components/list1.vue b/src/pages/statement/components/list1.vue index 290c2ae..4c20fd3 100644 --- a/src/pages/statement/components/list1.vue +++ b/src/pages/statement/components/list1.vue @@ -24,7 +24,7 @@ {{ item.store.title }} {{ - item.expenditure + item.new_customers }} {{ item.sales diff --git a/src/pages/statement/index.vue b/src/pages/statement/index.vue index 46cb6c1..4e92319 100644 --- a/src/pages/statement/index.vue +++ b/src/pages/statement/index.vue @@ -4,7 +4,7 @@ - + - + 支出金额 兑奖金额 - {{ ledger.expenditure }} + {{ + ledger.expenditure + }} @@ -219,7 +224,7 @@ function generateTimeArrayWithLastPeriod() { .toDate(), endDate: dayjs(timeRange.current.endDate) .subtract(1, 'month') - .endOf('month') + .endOf('month'), } break default: @@ -261,12 +266,19 @@ const tabChange1 = (e) => { const getList = async () => { const url = tabIndex1.value == 0 ? '/statistics/sales' : '/statistics/stores' - const resData = await http.get(url, { - params: { - start_at: currentC.value.start, - end_at: currentC.value.end, + let params = { + start_at: currentC.value.start, + end_at: currentC.value.end + } + if (tabIndex1.value == 0) { + params = { + ...params, ...shoreInfo.value, - }, + } + } + + const resData = await http.get(url, { + params: params, }) list.value = resData }