|
@@ -17,36 +17,36 @@
|
|
<p class="text-red-300">{{ timer.seconds }}s后刷新</p>
|
|
<p class="text-red-300">{{ timer.seconds }}s后刷新</p>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
- <div class="money-wrapper">¥{{ todayChargeData.pay_money || '-' }}</div>
|
|
|
|
|
|
+ <div class="money-wrapper">¥{{ todayChargeData.pay_money ?? '-' }}</div>
|
|
<div class="flex items-center justify-between">
|
|
<div class="flex items-center justify-between">
|
|
<div>
|
|
<div>
|
|
<p class="text-lg font-bold">普通充值</p>
|
|
<p class="text-lg font-bold">普通充值</p>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">已支付:</span>
|
|
<span class="text-sm">已支付:</span>
|
|
- <span class="text-base">{{ todayChargeData.common_pay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ todayChargeData.common_pay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">未支付:</span>
|
|
<span class="text-sm">未支付:</span>
|
|
- <span class="text-base">{{ todayChargeData.common_unpay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ todayChargeData.common_unpay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">支付率:</span>
|
|
<span class="text-sm">支付率:</span>
|
|
- <span class="text-base">{{ todayChargeData.company_pay_rate || '-' }}</span>
|
|
|
|
|
|
+ <span class="text-base">{{ todayChargeData.company_pay_rate ?? '-' }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<p class="text-lg font-bold">会员充值</p>
|
|
<p class="text-lg font-bold">会员充值</p>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">已支付:</span>
|
|
<span class="text-sm">已支付:</span>
|
|
- <span class="text-base">{{ todayChargeData.vip_pay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ todayChargeData.vip_pay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">未支付:</span>
|
|
<span class="text-sm">未支付:</span>
|
|
- <span class="text-base">{{ todayChargeData.vip_unpay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ todayChargeData.vip_unpay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">支付率:</span>
|
|
<span class="text-sm">支付率:</span>
|
|
- <span class="text-base">{{ todayChargeData.vip_pay_rate || '-' }}</span>
|
|
|
|
|
|
+ <span class="text-base">{{ todayChargeData.vip_pay_rate ?? '-' }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -68,36 +68,36 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
- <div class="money-wrapper">¥{{ currentMonthChargeData.pay_money || '-' }}</div>
|
|
|
|
|
|
+ <div class="money-wrapper">¥{{ currentMonthChargeData.pay_money ?? '-' }}</div>
|
|
<div class="flex items-center justify-between">
|
|
<div class="flex items-center justify-between">
|
|
<div>
|
|
<div>
|
|
<p class="text-lg font-bold">普通充值</p>
|
|
<p class="text-lg font-bold">普通充值</p>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">已支付:</span>
|
|
<span class="text-sm">已支付:</span>
|
|
- <span class="text-base">{{ currentMonthChargeData.common_pay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ currentMonthChargeData.common_pay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">未支付:</span>
|
|
<span class="text-sm">未支付:</span>
|
|
- <span class="text-base">{{ currentMonthChargeData.common_unpay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ currentMonthChargeData.common_unpay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">支付率:</span>
|
|
<span class="text-sm">支付率:</span>
|
|
- <span class="text-base">{{ currentMonthChargeData.company_pay_rate || '-' }}</span>
|
|
|
|
|
|
+ <span class="text-base">{{ currentMonthChargeData.company_pay_rate ?? '-' }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<p class="text-lg font-bold">会员充值</p>
|
|
<p class="text-lg font-bold">会员充值</p>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">已支付:</span>
|
|
<span class="text-sm">已支付:</span>
|
|
- <span class="text-base">{{ currentMonthChargeData.vip_pay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ currentMonthChargeData.vip_pay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">未支付:</span>
|
|
<span class="text-sm">未支付:</span>
|
|
- <span class="text-base">{{ currentMonthChargeData.vip_unpay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ currentMonthChargeData.vip_unpay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">支付率:</span>
|
|
<span class="text-sm">支付率:</span>
|
|
- <span class="text-base">{{ currentMonthChargeData.vip_pay_rate || '-' }}</span>
|
|
|
|
|
|
+ <span class="text-base">{{ currentMonthChargeData.vip_pay_rate ?? '-' }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -118,36 +118,36 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
- <div class="money-wrapper">¥{{ lastMonthChargeData.pay_money || '-' }}</div>
|
|
|
|
|
|
+ <div class="money-wrapper">¥{{ lastMonthChargeData.pay_money ?? '-' }}</div>
|
|
<div class="flex items-center justify-between">
|
|
<div class="flex items-center justify-between">
|
|
<div>
|
|
<div>
|
|
<p class="text-lg font-bold">普通充值</p>
|
|
<p class="text-lg font-bold">普通充值</p>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">已支付:</span>
|
|
<span class="text-sm">已支付:</span>
|
|
- <span class="text-base">{{ lastMonthChargeData.common_pay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ lastMonthChargeData.common_pay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">未支付:</span>
|
|
<span class="text-sm">未支付:</span>
|
|
- <span class="text-base">{{ lastMonthChargeData.common_unpay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ lastMonthChargeData.common_unpay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">支付率:</span>
|
|
<span class="text-sm">支付率:</span>
|
|
- <span class="text-base">{{ lastMonthChargeData.company_pay_rate || '-' }}</span>
|
|
|
|
|
|
+ <span class="text-base">{{ lastMonthChargeData.company_pay_rate ?? '-' }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<p class="text-lg font-bold">会员充值</p>
|
|
<p class="text-lg font-bold">会员充值</p>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">已支付:</span>
|
|
<span class="text-sm">已支付:</span>
|
|
- <span class="text-base">{{ lastMonthChargeData.vip_pay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ lastMonthChargeData.vip_pay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">未支付:</span>
|
|
<span class="text-sm">未支付:</span>
|
|
- <span class="text-base">{{ lastMonthChargeData.vip_unpay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ lastMonthChargeData.vip_unpay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">支付率:</span>
|
|
<span class="text-sm">支付率:</span>
|
|
- <span class="text-base">{{ lastMonthChargeData.vip_pay_rate || '-' }}</span>
|
|
|
|
|
|
+ <span class="text-base">{{ lastMonthChargeData.vip_pay_rate ?? '-' }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -169,36 +169,36 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
- <div class="money-wrapper">¥{{ totalChargeData.pay_money || '-' }}</div>
|
|
|
|
|
|
+ <div class="money-wrapper">¥{{ totalChargeData.pay_money ?? '-' }}</div>
|
|
<div class="flex items-center justify-between">
|
|
<div class="flex items-center justify-between">
|
|
<div>
|
|
<div>
|
|
<p class="text-lg font-bold">普通充值</p>
|
|
<p class="text-lg font-bold">普通充值</p>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">已支付:</span>
|
|
<span class="text-sm">已支付:</span>
|
|
- <span class="text-base">{{ totalChargeData.common_pay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ totalChargeData.common_pay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">未支付:</span>
|
|
<span class="text-sm">未支付:</span>
|
|
- <span class="text-base">{{ totalChargeData.common_unpay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ totalChargeData.common_unpay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">支付率:</span>
|
|
<span class="text-sm">支付率:</span>
|
|
- <span class="text-base">{{ totalChargeData.company_pay_rate || '-' }}</span>
|
|
|
|
|
|
+ <span class="text-base">{{ totalChargeData.company_pay_rate ?? '-' }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<p class="text-lg font-bold">会员充值</p>
|
|
<p class="text-lg font-bold">会员充值</p>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">已支付:</span>
|
|
<span class="text-sm">已支付:</span>
|
|
- <span class="text-base">{{ totalChargeData.vip_pay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ totalChargeData.vip_pay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">未支付:</span>
|
|
<span class="text-sm">未支付:</span>
|
|
- <span class="text-base">{{ totalChargeData.vip_unpay_count || '-' }}单</span>
|
|
|
|
|
|
+ <span class="text-base">{{ totalChargeData.vip_unpay_count ?? '-' }}单</span>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
<span class="text-sm">支付率:</span>
|
|
<span class="text-sm">支付率:</span>
|
|
- <span class="text-base">{{ totalChargeData.vip_pay_rate || '-' }}</span>
|
|
|
|
|
|
+ <span class="text-base">{{ totalChargeData.vip_pay_rate ?? '-' }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -210,6 +210,7 @@
|
|
import { checkPermission } from '@/directives/permission';
|
|
import { checkPermission } from '@/directives/permission';
|
|
import { InfoFilled } from '@element-plus/icons-vue';
|
|
import { InfoFilled } from '@element-plus/icons-vue';
|
|
import { useCountdownTimer } from '@/utils/timerUtils';
|
|
import { useCountdownTimer } from '@/utils/timerUtils';
|
|
|
|
+import Cache from '@/support/cache'
|
|
import {
|
|
import {
|
|
statisticChargeTodayCharge,
|
|
statisticChargeTodayCharge,
|
|
statisticChargeCurrentMonthCharge,
|
|
statisticChargeCurrentMonthCharge,
|
|
@@ -222,6 +223,7 @@ const currentMonthChargeData = ref({})
|
|
const lastMonthChargeData = ref({})
|
|
const lastMonthChargeData = ref({})
|
|
const totalChargeData = ref({})
|
|
const totalChargeData = ref({})
|
|
const rolesIdentify = inject('rolesIdentify')
|
|
const rolesIdentify = inject('rolesIdentify')
|
|
|
|
+const miniprogram_idJ = ref('')
|
|
const refreshInterface = (): void => {
|
|
const refreshInterface = (): void => {
|
|
initTodayCharge()
|
|
initTodayCharge()
|
|
};
|
|
};
|
|
@@ -229,31 +231,38 @@ const timer = useCountdownTimer(60, refreshInterface);
|
|
|
|
|
|
const initTodayCharge = () => {
|
|
const initTodayCharge = () => {
|
|
if (!checkPermission('statistic.chargeTJ.todayCharge')) return;
|
|
if (!checkPermission('statistic.chargeTJ.todayCharge')) return;
|
|
- statisticChargeTodayCharge().then(res => {
|
|
|
|
|
|
+ statisticChargeTodayCharge({ miniprogram_id: miniprogram_idJ.value }).then(res => {
|
|
todayChargeData.value = res.data
|
|
todayChargeData.value = res.data
|
|
})
|
|
})
|
|
}
|
|
}
|
|
const init = () => {
|
|
const init = () => {
|
|
|
|
+ const miniprogram_id = miniprogram_idJ.value
|
|
if (checkPermission('statistic.chargeTJ.currentMonthCharge')) {
|
|
if (checkPermission('statistic.chargeTJ.currentMonthCharge')) {
|
|
- statisticChargeCurrentMonthCharge().then(res => {
|
|
|
|
|
|
+ statisticChargeCurrentMonthCharge({ miniprogram_id }).then(res => {
|
|
currentMonthChargeData.value = res.data;
|
|
currentMonthChargeData.value = res.data;
|
|
})
|
|
})
|
|
}
|
|
}
|
|
if (checkPermission('statistic.chargeTJ.lastMonthCharge')) {
|
|
if (checkPermission('statistic.chargeTJ.lastMonthCharge')) {
|
|
- statisticChargeLastMonthCharge().then(res => {
|
|
|
|
|
|
+ statisticChargeLastMonthCharge({ miniprogram_id }).then(res => {
|
|
lastMonthChargeData.value = res.data;
|
|
lastMonthChargeData.value = res.data;
|
|
})
|
|
})
|
|
}
|
|
}
|
|
if (checkPermission('statistic.chargeTJ.totalCharge')) {
|
|
if (checkPermission('statistic.chargeTJ.totalCharge')) {
|
|
- statisticChargeTotalCharge().then(res => {
|
|
|
|
|
|
+ statisticChargeTotalCharge({ miniprogram_id }).then(res => {
|
|
totalChargeData.value = res.data;
|
|
totalChargeData.value = res.data;
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
onMounted(() => {
|
|
onMounted(() => {
|
|
|
|
+ if (JSON.parse(Cache.get('nav_data'))?.app.id) {
|
|
|
|
+ miniprogram_idJ.value = JSON.parse(Cache.get('nav_data'))?.app.id
|
|
|
|
+ console.log(miniprogram_idJ.value, 'miniprogram_idJ.value');
|
|
|
|
+ }
|
|
init()
|
|
init()
|
|
initTodayCharge()
|
|
initTodayCharge()
|
|
|
|
+ console.log(JSON.parse(Cache.get('nav_data'))?.app.id, 'Cache.getCache.getCache.get');
|
|
|
|
+
|
|
});
|
|
});
|
|
|
|
|
|
</script>
|
|
</script>
|