diff --git a/src/assets/img/mesImg.jpg b/src/assets/img/mesImg.jpg new file mode 100644 index 0000000..807bf84 Binary files /dev/null and b/src/assets/img/mesImg.jpg differ diff --git a/src/assets/img/noghrehImg.webp b/src/assets/img/noghrehImg.webp new file mode 100644 index 0000000..a1d8981 Binary files /dev/null and b/src/assets/img/noghrehImg.webp differ diff --git a/src/utils/inputRules.ts b/src/utils/inputRules.ts index 3ae00a3..07b9400 100644 --- a/src/utils/inputRules.ts +++ b/src/utils/inputRules.ts @@ -162,9 +162,9 @@ if (isBuyP){ return Promise.reject('موجودی محصول ناکافی است') else return Promise.resolve(); + } } -} export const justNumber2 = (price: number, method?: string , amount?:number ,isBuy?:boolean) => { priceP = price methodP = method @@ -175,8 +175,8 @@ export const justNumber2 = (price: number, method?: string , amount?:number ,isB validator: checkNumber, trigger: 'change' } - } + export const justNumber3 = (price: number, Num?:number ,isBuy?:boolean) => { priceP = price NumP=Num @@ -186,7 +186,6 @@ export const justNumber3 = (price: number, Num?:number ,isBuy?:boolean) => { validator: checkNumber, trigger: 'change' } - } export const ruleNumber = () => { @@ -196,13 +195,13 @@ export const ruleNumber = () => { message: 'لطفا نحوه خرید', trigger: 'change' } - } export const guideTypePassword = ref<{}>({ text: '', color: '' }) + export const passwordRules = () => { return [ { @@ -243,3 +242,18 @@ export const passwordRules = () => { } ] } + +export const englishNumberRule = () => { + return { + validator: (_: any, value: string) => { + if (!value) return Promise.resolve() + const hasPersianDigits = /[۰-۹]/.test(value) + if (hasPersianDigits) { + return Promise.reject('لطفاً فقط از اعداد انگلیسی استفاده کنید') + } + return Promise.resolve() + }, + trigger: 'change', + } +} + diff --git a/src/views/base/fund/components/Item.vue b/src/views/base/fund/components/Item.vue index a5a5e9c..ab6e1a6 100644 --- a/src/views/base/fund/components/Item.vue +++ b/src/views/base/fund/components/Item.vue @@ -4,6 +4,8 @@ + +
{{props.item?.title?? '-'}}
@@ -26,6 +28,8 @@ import goyImg from "@/assets/img/goyImg.svg" import mokaabImg from "@/assets/img/mokaabImg.svg" import sekkeImg from "@/assets/img/sekkeImg.svg" import type { Product } from '@/models/products' +import mesImg from "@/assets/img/mesImg.jpg"; +import noghrehImg from "@/assets/img/noghrehImg.webp"; /*function itemImg() { }*/ diff --git a/src/views/base/fund/index.vue b/src/views/base/fund/index.vue index 8af6f8b..497df8e 100644 --- a/src/views/base/fund/index.vue +++ b/src/views/base/fund/index.vue @@ -72,9 +72,6 @@ import {loading} from "@/utils"; import type {TableOutput} from "@/models/table"; import type {Fund} from "@/models/fund"; import {useFundUserStore} from "@/store/fundStore"; -import goyImg from '@/assets/img/goyImg.svg' -import mokaabImg from '@/assets/img/mokaabImg.svg' -import defaultImg from '@/assets/img/defaultAbshodeh.svg' import { getMe } from '@/api/me' import type { User } from '@/models/login' import {usePriceWithoutType} from "../../../utils/usePrice"; diff --git a/src/views/base/fund/info/index.vue b/src/views/base/fund/info/index.vue index d9a5ffd..a67621b 100644 --- a/src/views/base/fund/info/index.vue +++ b/src/views/base/fund/info/index.vue @@ -18,6 +18,8 @@ + + @@ -152,6 +154,8 @@ import { getOneProductWallet } from '@/api/products' import goyImg from '@/assets/img/goyImg.svg' import mokaabImg from '@/assets/img/mokaabImg.svg' import sekkeImg from "@/assets/img/sekkeImg.svg" +import mesImg from "@/assets/img/mesImg.jpg" +import noghrehImg from "@/assets/img/noghrehImg.webp" import defaultImg from '@/assets/img/defaultAbshodeh.svg' import type { Product } from '@/models/products' diff --git a/src/views/base/physicalReceive/components/NewRequest.vue b/src/views/base/physicalReceive/components/NewRequest.vue index 42ad0bd..f06d83e 100644 --- a/src/views/base/physicalReceive/components/NewRequest.vue +++ b/src/views/base/physicalReceive/components/NewRequest.vue @@ -1,5 +1,5 @@