Merge branch 'main' of https://gitea.hmily.club/pdkj/store-manage-app
commit
fd226c260b
|
|
@ -24,7 +24,7 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="flex-1">{{ item.store.title }}</view>
|
<view class="flex-1">{{ item.store.title }}</view>
|
||||||
<view class="flex-1" v-if="checkPermission(['admin'])">{{
|
<view class="flex-1" v-if="checkPermission(['admin'])">{{
|
||||||
item.expenditure
|
item.new_customers
|
||||||
}}</view>
|
}}</view>
|
||||||
<view class="flex-1" v-if="checkPermission(['admin'])">{{
|
<view class="flex-1" v-if="checkPermission(['admin'])">{{
|
||||||
item.sales
|
item.sales
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
<uv-sticky bgColor="#fff" v-if="checkPermission(['admin'])">
|
<uv-sticky bgColor="#fff" v-if="checkPermission(['admin'])">
|
||||||
<StoreDown color="#333333" @change="storeChange"></StoreDown>
|
<StoreDown color="#333333" @change="storeChange"></StoreDown>
|
||||||
</uv-sticky>
|
</uv-sticky>
|
||||||
|
|
||||||
<view class="card">
|
<view class="card">
|
||||||
<uv-tabs
|
<uv-tabs
|
||||||
:lineColor="'#ee2c37'"
|
:lineColor="'#ee2c37'"
|
||||||
|
|
@ -27,11 +27,16 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="text-center flex-1 tr">
|
<view class="text-center flex-1 tr">
|
||||||
<view class="flex-center h-80rpx" v-if="!isLotteryStore || checkPermission(['admin'])">
|
<view
|
||||||
|
class="flex-center h-80rpx"
|
||||||
|
v-if="!isLotteryStore || checkPermission(['admin'])"
|
||||||
|
>
|
||||||
<view>支出金额</view>
|
<view>支出金额</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="flex-center h-80rpx" v-else>兑奖金额</view>
|
<view class="flex-center h-80rpx" v-else>兑奖金额</view>
|
||||||
<view class="font-600 flex-center h-80rpx">{{ ledger.expenditure }}</view>
|
<view class="font-600 flex-center h-80rpx">{{
|
||||||
|
ledger.expenditure
|
||||||
|
}}</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="text-center flex-1 tr">
|
<view class="text-center flex-1 tr">
|
||||||
|
|
@ -219,7 +224,7 @@ function generateTimeArrayWithLastPeriod() {
|
||||||
.toDate(),
|
.toDate(),
|
||||||
endDate: dayjs(timeRange.current.endDate)
|
endDate: dayjs(timeRange.current.endDate)
|
||||||
.subtract(1, 'month')
|
.subtract(1, 'month')
|
||||||
.endOf('month')
|
.endOf('month'),
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
default:
|
default:
|
||||||
|
|
@ -261,12 +266,19 @@ const tabChange1 = (e) => {
|
||||||
|
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
const url = tabIndex1.value == 0 ? '/statistics/sales' : '/statistics/stores'
|
const url = tabIndex1.value == 0 ? '/statistics/sales' : '/statistics/stores'
|
||||||
const resData = await http.get(url, {
|
let params = {
|
||||||
params: {
|
start_at: currentC.value.start,
|
||||||
start_at: currentC.value.start,
|
end_at: currentC.value.end
|
||||||
end_at: currentC.value.end,
|
}
|
||||||
|
if (tabIndex1.value == 0) {
|
||||||
|
params = {
|
||||||
|
...params,
|
||||||
...shoreInfo.value,
|
...shoreInfo.value,
|
||||||
},
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const resData = await http.get(url, {
|
||||||
|
params: params,
|
||||||
})
|
})
|
||||||
list.value = resData
|
list.value = resData
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue