From 95516ee2d8f2660d063f418fd99a16fad1d2daa8 Mon Sep 17 00:00:00 2001 From: adonis Date: Mon, 8 Jun 2026 12:34:10 +0330 Subject: [PATCH] change some bug --- src/views/base/fund/index.vue | 23 +- .../base/home/components/AssetsSection.vue | 5 +- .../base/home/components/BalanceSheet.vue | 16 +- .../base/home/components/CurrentPrice.vue | 2 +- src/views/base/home/components/PriceStats.vue | 4 +- yarn.lock | 345 ++++++++---------- 6 files changed, 188 insertions(+), 207 deletions(-) diff --git a/src/views/base/fund/index.vue b/src/views/base/fund/index.vue index 17ddea4..f22ed17 100644 --- a/src/views/base/fund/index.vue +++ b/src/views/base/fund/index.vue @@ -22,7 +22,11 @@ دارایی مس:
{{ walletStore.walletInfo?.count_copper ?? 0}}گرم
-
+
+ مجموع موجودی: +
{{ inventory }} عدد
+
+
{{ metalAssetLabel }}:
{{ walletStore.walletInfo?.count_gold ?? 0 }}{{ getWeightUnit() }}
@@ -71,7 +75,7 @@ import BasicModal from "@/components/BasicPacks/BasicModal.vue"; import img from '@/assets/img/user_ly1.svg' import empty from '@/assets/img/cash_empty.svg' import Item from './components/Item.vue' -import {onMounted, ref, computed} from "vue"; +import { onMounted, ref, computed } from "vue"; import {loading} from "@/utils"; import type {TableOutput} from "@/models/table"; import type {Fund} from "@/models/fund"; @@ -88,12 +92,18 @@ const metalAssetLabel = computed(() => getMetalAssetLabel()) const items = ref([]) const tableOutput = ref | null>(null) -const inventory = ref(0) const fundStore = useFundUserStore() const walletStore = useWalletStore() const userInfo = ref() const weight = ref(0) const total = ref(0) + +const inventory = computed(() => + items.value + .filter(x => x.title !== 'آبشده نقدی') + .reduce((sum, x) => sum + (x?.wallet?.gold ?? 0), 0) +) + onMounted(() => { initTable() }) @@ -106,15 +116,10 @@ async function initTable() { console.log(tableOutput.value) items.value.push(...tableOutput.value?.rows ?? []) items.value.forEach(x => { - console.log(x.wallet) - if (x.title !== 'آبشده نقدی') - inventory.value += x?.wallet?.gold ?? 0 total.value += ((x?.wallet?.gold) ?? 0) * ((x?.price) ?? 0) if (x.title !== 'آبشده نقدی' && x.title !== 'سکه') - weight.value += ((x?.wallet?.gold) ?? 0) * ((x?.amount) ?? 0) - // console.log(inventory.value) + weight.value += ((x?.wallet?.gold) ?? 0) * ((x?.amount) ?? 0) }) - // console.log(tableOutput.value) } catch (e) { console.log(e) } finally { diff --git a/src/views/base/home/components/AssetsSection.vue b/src/views/base/home/components/AssetsSection.vue index 2994dea..b08e411 100644 --- a/src/views/base/home/components/AssetsSection.vue +++ b/src/views/base/home/components/AssetsSection.vue @@ -6,7 +6,7 @@
{{ metalAssetLabel }}: -
{{ (userStore?.userInfo?.wallet?.count_gold ?? 0).toFixed(3) }} گرم
+
{{ (userStore?.userInfo?.wallet?.count_gold ?? 0).toFixed(3) }} {{ weightUnit }}
@@ -23,10 +23,11 @@ import { useUserStore } from '@/store/userStore' import BasicIcon from '@/components/BasicPacks/BasicIcon.vue' import {usePriceWithoutType} from "../../../../utils/usePrice"; import { isBoursecuProject } from '@/utils/config' -import { getMetalAssetLabel } from '@/utils/productDealMethod' +import { getMetalAssetLabel, getWeightUnit } from '@/utils/productDealMethod' const userStore = useUserStore() const metalAssetLabel = computed(() => getMetalAssetLabel()) +const weightUnit = computed(() => getWeightUnit()) defineEmits<{ openGoldModal: [] diff --git a/src/views/base/home/components/BalanceSheet.vue b/src/views/base/home/components/BalanceSheet.vue index c804b2a..aafc43d 100644 --- a/src/views/base/home/components/BalanceSheet.vue +++ b/src/views/base/home/components/BalanceSheet.vue @@ -7,11 +7,11 @@
getWeightUnit()) const visible = computed({ get: () => props.show, diff --git a/src/views/base/home/components/CurrentPrice.vue b/src/views/base/home/components/CurrentPrice.vue index 65e303f..a9c6ac2 100644 --- a/src/views/base/home/components/CurrentPrice.vue +++ b/src/views/base/home/components/CurrentPrice.vue @@ -1,7 +1,7 @@