From 354c5376b81c4d4cb1298443363d5cef98115352 Mon Sep 17 00:00:00 2001 From: MojtabaSoumi Date: Thu, 5 Feb 2026 11:22:48 +0330 Subject: [PATCH 1/6] 1404/11/16-change support link --- src/assets/img/rubika.webp | Bin 0 -> 7102 bytes src/views/base/about/index.vue | 8 ++++---- src/views/base/rules/index.vue | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 src/assets/img/rubika.webp diff --git a/src/assets/img/rubika.webp b/src/assets/img/rubika.webp new file mode 100644 index 0000000000000000000000000000000000000000..744caa6a66640ae165a514e913c763d3c61f7655 GIT binary patch literal 7102 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 Pb%v=DeA?On{?7RyRC^^H literal 0 HcmV?d00001 diff --git a/src/views/base/about/index.vue b/src/views/base/about/index.vue index 6e7fa45..11c2c2d 100644 --- a/src/views/base/about/index.vue +++ b/src/views/base/about/index.vue @@ -66,12 +66,12 @@ -
- +
+ تماس با پشتیبانی - - + +
diff --git a/src/views/base/rules/index.vue b/src/views/base/rules/index.vue index 6f86462..57fdf4b 100644 --- a/src/views/base/rules/index.vue +++ b/src/views/base/rules/index.vue @@ -154,15 +154,15 @@ -
- +
+ تماس با پشتیبانی - - + +
From 2ffcee9f3a516b717d387c96a770e7970aa66429 Mon Sep 17 00:00:00 2001 From: MojtabaSoumi Date: Sat, 7 Feb 2026 12:13:25 +0330 Subject: [PATCH 2/6] 1404/11/18-delete required rule in referral code --- index.html | 6 +++--- src/views/login/components/Register.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index bf027e0..f5c5132 100644 --- a/index.html +++ b/index.html @@ -17,7 +17,7 @@ right: 20px; width: 60px; height: 60px; - background-color: #25D366; + background-color: #ffffff; border-radius: 50%; display: flex; justify-content: center; @@ -42,8 +42,8 @@
- - + + diff --git a/src/views/login/components/Register.vue b/src/views/login/components/Register.vue index eea8160..8ecd6e7 100644 --- a/src/views/login/components/Register.vue +++ b/src/views/login/components/Register.vue @@ -18,7 +18,7 @@ - +
-
- -
صفحه اصلی
+ + + + +
+ +
فروشگاه
diff --git a/src/views/base/user/index.vue b/src/views/base/user/index.vue index 19083df..951406b 100644 --- a/src/views/base/user/index.vue +++ b/src/views/base/user/index.vue @@ -163,10 +163,49 @@
کسب درآمد
+ +
+ +
خروج از حساب کاربری
+
+
+ + + + + +
ویرایش اطلاعات
@@ -257,7 +296,7 @@ import { onMounted, reactive, ref, computed } from 'vue' import img from '@/assets/img/user_ly1.svg' import gr_bottom from './assets/img/gr_bottom_white.svg' -import { loading } from '@/utils' +import {loading, removeToken} from '@/utils' import BasicButton from '@/components/BasicPacks/BasicButton.vue' import BasicActionSheet from '@/components/BasicPacks/BasicActionSheet.vue' import { @@ -277,6 +316,11 @@ import { message } from 'ant-design-vue' import { updateMe, updatePass } from '@/api/me' import { useUserStore } from '@/store/userStore' import BaseDatePicker from '@/components/BasicPacks/BaseDatePicker' +import {DotLottieVue} from "@lottiefiles/dotlottie-vue"; +import DialogVant from "@/components/DialogVant.vue"; +import {useWalletStore} from "@/store/walletStore"; +import Icon from "@/components/BasicPacks/BasicIcon.vue"; +import {useWindowScroll} from "@vueuse/core/index"; const userFormState = ref({ fname: '', lname: '', @@ -291,11 +335,29 @@ const userPassForm = ref({ const formRef = ref() const formPassRef = ref() const userStore = useUserStore() +const showLogoutConfirm = ref() +const walletStore=useWalletStore() +const logoutLoading = ref(false) +const { x, y } = useWindowScroll() // const editPassVisible = ref(false) const editPassVisible = ref(false) const editPasswordVisible = ref(false) +async function logout() { + logoutLoading.value = true + // baseConfirm('آیا از حساب کاربری خارج می شوید؟',async () => { + userStore.userInfo = undefined + walletStore.walletInfo = undefined + /* userStore.$reset() + walletStore.$reset()*/ + removeToken() + await router.push({ name: 'login' }) + logoutLoading.value = true + window.location.reload() + // console.log('salam') + // }) +} function setForm() { userFormState.value = userStore.userInfo } diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue index cbd8ae5..cc72b85 100644 --- a/src/views/login/components/Login.vue +++ b/src/views/login/components/Login.vue @@ -203,7 +203,7 @@ async function enterFingerPrint() { const fingerPrint = await authenticateWithFingerprint() if (fingerPrint) { setTruth() - await router.push({ name: 'home' }) + await router.push({ name: 'buyProduct' }) } else { message.error('خطا در اعتبارسنجی') } @@ -234,7 +234,7 @@ async function login(accessToken: string | undefined) { /* if (userStore.userInfo?.type === (URLUserType() === 'customer' ? 1 : 2)) {*/ await walletStore.getMyWallet() setTruth() - await router.push({ name: 'home' }) + await router.push({ name: 'buyProduct' }) /* } else { removeToken() userStore.removeInformation() diff --git a/src/views/login/components/PhoneVerify.vue b/src/views/login/components/PhoneVerify.vue index d2ab182..0914a2d 100644 --- a/src/views/login/components/PhoneVerify.vue +++ b/src/views/login/components/PhoneVerify.vue @@ -43,7 +43,7 @@ const userFormState = ref({ }) function phoneVerification() { - router.push({name: 'home' }) + router.push({name: 'buyProduct' }) } From c6c76350414ad1b2b0410c1dd3ffb2d6b5f63371 Mon Sep 17 00:00:00 2001 From: MojtabaSoumi Date: Sat, 7 Feb 2026 17:25:59 +0330 Subject: [PATCH 4/6] 1404/11/18-delete required rule in referral code & hidden home page --- src/views/base/index.vue | 42 +++++++++++----------- src/views/base/products/product/[id].vue | 18 ++++++++++ src/views/base/user/index.vue | 44 ++++++++++++------------ src/views/base/wallet/index.vue | 2 +- 4 files changed, 62 insertions(+), 44 deletions(-) diff --git a/src/views/base/index.vue b/src/views/base/index.vue index ee80b52..fa6378a 100644 --- a/src/views/base/index.vue +++ b/src/views/base/index.vue @@ -22,27 +22,27 @@
حساب کاربری
- -
- -
هشدار قیمت
-
- - -
- -
انتقال قطره
-
- - -
- -
دریافت طلای فیزیکی
-
- + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/views/base/products/product/[id].vue b/src/views/base/products/product/[id].vue index 9006a11..14d2c66 100644 --- a/src/views/base/products/product/[id].vue +++ b/src/views/base/products/product/[id].vue @@ -172,6 +172,24 @@ async function loadProduct() { loading.value = false } } +watch(lastPrice, async () => { + // console.log(items); + if (lastPrice.value && product.value.similar) { + product.value.similar.forEach((val) => { + // console.log(lastPrice.value) + if (val.group_type == 'آبشده') { + val.price = lastPrice.value?.price_last + val.sellPrice = lastPrice.value?.sell + } else { + val.price = parseInt(val.amount * lastPrice.value?.price_last) + val.sellPrice = parseInt(val.amount * lastPrice.value?.sell) + + // console.log(lastPrice.value?.price_last + "*" + val.amount + ' ' + val.price) + } + }) + + } +}, { deep: true }) async function initPrice() { try { diff --git a/src/views/base/user/index.vue b/src/views/base/user/index.vue index 951406b..8ad47c7 100644 --- a/src/views/base/user/index.vue +++ b/src/views/base/user/index.vue @@ -93,16 +93,16 @@
آدرس ها
--> - -
- -
هشدار قیمت
-
- + + + + + + + + + + مجوز ها --> - -
- -
کسب درآمد
-
- + + + + + + + + + + + + جهت شارژ حساب کاربری خود، کلمه "شماره حساب" را برای پشتیبانی ارسال نمایید. - + پیام به پشتیبانی From 71312d809dd52f80e3110689fd6b75dccc3a8cbb Mon Sep 17 00:00:00 2001 From: MojtabaSoumi Date: Sun, 8 Feb 2026 13:37:10 +0330 Subject: [PATCH 5/6] 1404/11/19-change rule in input buy product --- src/utils/inputRules.ts | 44 +++++++++++++++++++ src/views/base/cart/index.vue | 10 ++--- .../base/products/components/DealProduct.vue | 18 ++++---- src/views/base/products/product/[id].vue | 2 +- 4 files changed, 59 insertions(+), 15 deletions(-) diff --git a/src/utils/inputRules.ts b/src/utils/inputRules.ts index 90abd41..19e1bdd 100644 --- a/src/utils/inputRules.ts +++ b/src/utils/inputRules.ts @@ -169,6 +169,39 @@ const checkNumber = async (_rule: Rule, value: number) => { return Promise.resolve() } +} +const checkNumber2 = async (_rule: Rule, value: number) => { + + + if (!value) { + return Promise.reject('تعداد محصول را مشخص کنید') + } + if (value % 1 !== 0) { + return Promise.reject('استفاده از اعداد اعشاری مجاز نمی باشد') + } + if (isBuyP) { + // Skip wallet balance check if gateway is enabled + if (!gatewayP && isToken()) { + // if (!walletCash?.walletInfo?.cash && methodP == 'cash') { + // return Promise.reject('موجودی کیف پول ناکافی است') + // } + // if (!walletCash?.walletInfo?.gold && methodP == 'gold') { + // return Promise.reject('موجودی کیف طلا ناکافی است') + // } + // if (priceP * value > walletCash?.walletInfo?.cash && methodP == 'cash') + // return Promise.reject('موجودی کیف پول ناکافی است') + // if (amountP * value > walletCash?.walletInfo?.gold && methodP == 'gold') + // return Promise.reject('موجودی کیف طلا ناکافی است') + } + return Promise.resolve() + } else { + if (value > NumP) + + return Promise.reject('موجودی محصول ناکافی است') + else + return Promise.resolve() + } + } export const justNumber2 = (price: number, method?: string, amount?: number, isBuy?: boolean, gateway?: boolean) => { priceP = price @@ -193,6 +226,17 @@ export const justNumber3 = (price: number, Num?: number, isBuy?: boolean) => { trigger: 'change' } +} +export const justNumber4 = (price: number, Num?: number, isBuy?: boolean) => { + priceP = price + NumP = Num + isBuyP = isBuy + return { + required: true, + validator: checkNumber2, + trigger: 'change' + } + } export const ruleNumber = () => { diff --git a/src/views/base/cart/index.vue b/src/views/base/cart/index.vue index 6d84edb..7d6042c 100644 --- a/src/views/base/cart/index.vue +++ b/src/views/base/cart/index.vue @@ -34,7 +34,7 @@ >
-
+
{ // Update item price and total price item.price = newPrice + (product.cash_fee_buy ?? 0) - item.totalPrice = item.price * item.quantity + item.totalPrice = parseInt(item.price * item.quantity) }) // Save updated prices to storage @@ -162,7 +162,7 @@ watch(lastPrice, () => { // Computed total price that updates with price changes const totalPrice = computed(() => { - return cartStore.cartItems.reduce((sum, item) => sum + item.totalPrice, 0) + return parseInt(cartStore.cartItems.reduce((sum, item) => sum + item.totalPrice, 0)) }) function getProductImage(product: any) { @@ -255,7 +255,7 @@ async function handleCheckout() { // Check wallet balance for cash method items (without gateway) const cashItemsTotal = cartStore.cartItems .filter(item => item.method === 'cash' && !item.gateway) - .reduce((sum, item) => sum + item.totalPrice, 0) + .reduce((sum, item) => parseInt(sum + item.totalPrice), 0) if (cashItemsTotal > 0) { // Ensure wallet info is loaded @@ -374,7 +374,7 @@ async function initPrice() { // Update item price and total price item.price = newPrice + (product.cash_fee_buy ?? 0) - item.totalPrice = item.price * item.quantity + item.totalPrice =parseInt(item.price * item.quantity) }) // Save updated prices to storage diff --git a/src/views/base/products/components/DealProduct.vue b/src/views/base/products/components/DealProduct.vue index 1779a8d..b57a7a9 100644 --- a/src/views/base/products/components/DealProduct.vue +++ b/src/views/base/products/components/DealProduct.vue @@ -60,7 +60,7 @@ + :rules="[justNumber4(props?.ProductItem?.price , form.method , props?.ProductItem?.amount, true, form.gateway)]"> { function calculateCash(val: number) { priceErrorVisible.value = false - // console.log(val) + console.log("val",val,props?.ProductItem) if (price.value) { - form.value.goldVazn = parseFloat((val * (( props?.ProductItem?.price) + (props?.ProductItem?.cash_fee_buy)))/lastPrice.value?.buy).toFixed(1) + form.value.goldVazn = parseFloat((val * props?.ProductItem?.amount).toFixed(3)) console.log(val,props?.ProductItem?.price,props?.ProductItem?.cash_fee_buy,lastPrice.value?.buy) if (isBuy.value) { if (val){ @@ -579,7 +579,7 @@ console.log(val,props?.ProductItem?.price,props?.ProductItem?.cash_fee_buy,lastP form.value.goldVazn = 0 } } - console.log(form.value.goldVazn) + console.log('goldVazn',form.value.goldVazn) } } diff --git a/src/views/base/products/product/[id].vue b/src/views/base/products/product/[id].vue index 14d2c66..7c5a375 100644 --- a/src/views/base/products/product/[id].vue +++ b/src/views/base/products/product/[id].vue @@ -6,7 +6,7 @@
-
+
From 8919374055fd72491f2d2ec465f8406b24a143ee Mon Sep 17 00:00:00 2001 From: MojtabaSoumi Date: Mon, 9 Feb 2026 13:43:02 +0330 Subject: [PATCH 6/6] 1404/11/19-add inventory for product --- index.html | 2 +- src/models/products.ts | 1 + src/views/base/about/index.vue | 4 +- src/views/base/cart/index.vue | 2 +- .../base/products/components/ProductItem.vue | 2 +- .../components/ProductItemVertical.vue | 2 +- src/views/base/products/index.vue | 7 +- src/views/base/products/product/[id].vue | 72 +++++++++++-------- src/views/base/rules/index.vue | 4 +- src/views/base/wallet/index.vue | 2 +- 10 files changed, 55 insertions(+), 43 deletions(-) diff --git a/index.html b/index.html index f5c5132..795e642 100644 --- a/index.html +++ b/index.html @@ -42,7 +42,7 @@
- + diff --git a/src/models/products.ts b/src/models/products.ts index a39b04c..dd237fc 100644 --- a/src/models/products.ts +++ b/src/models/products.ts @@ -26,6 +26,7 @@ export interface Product { description: string wallet: Wallet similar?:Product[] + inventory:number } export interface PInventory { diff --git a/src/views/base/about/index.vue b/src/views/base/about/index.vue index 11c2c2d..300d6e4 100644 --- a/src/views/base/about/index.vue +++ b/src/views/base/about/index.vue @@ -67,10 +67,10 @@
- + تماس با پشتیبانی - +
diff --git a/src/views/base/cart/index.vue b/src/views/base/cart/index.vue index 7d6042c..d52c89a 100644 --- a/src/views/base/cart/index.vue +++ b/src/views/base/cart/index.vue @@ -308,7 +308,7 @@ async function handleCheckout() { return { direction: 1, // 1 for buy (cart items are always buy orders) price: productPrice, - amount: item.quantity, + amount: product.amount, gateway: item.gateway, product_id: product.id, method: item.method, diff --git a/src/views/base/products/components/ProductItem.vue b/src/views/base/products/components/ProductItem.vue index b7bca38..44a4eec 100644 --- a/src/views/base/products/components/ProductItem.vue +++ b/src/views/base/products/components/ProductItem.vue @@ -95,7 +95,7 @@
ناموجود diff --git a/src/views/base/products/components/ProductItemVertical.vue b/src/views/base/products/components/ProductItemVertical.vue index b5468dd..b8fd897 100644 --- a/src/views/base/products/components/ProductItemVertical.vue +++ b/src/views/base/products/components/ProductItemVertical.vue @@ -30,7 +30,7 @@
ناموجود diff --git a/src/views/base/products/index.vue b/src/views/base/products/index.vue index 4448788..199eafb 100644 --- a/src/views/base/products/index.vue +++ b/src/views/base/products/index.vue @@ -18,11 +18,10 @@
-
- - +
+ +
-
diff --git a/src/views/base/products/product/[id].vue b/src/views/base/products/product/[id].vue index 7c5a375..3a20fbd 100644 --- a/src/views/base/products/product/[id].vue +++ b/src/views/base/products/product/[id].vue @@ -1,13 +1,13 @@