Merge remote-tracking branch 'getorigin/modular' into modular

src/api/wallet.ts

@@ -1,5 +1,5 @@
 import useAxios from '@/utils/useAxios'
-import type { Card, Wallet } from '@/models/wallet'
+import type { Card, Wallet, WithdrawConfirm } from '@/models/wallet'
 import type {Transaction} from '@/models/transaction'
 import type {Address} from "@/models/address";
 

src/models/wallet.ts

@@ -71,6 +71,14 @@ export interface Test {
     percentWallet: number
 }
 
+export interface WithdrawConfirm {
+    account_number?: string
+    bank_name?: string
+    birth_date?: string
+    cart_number?: string
+    shaba_number?: string
+}
+
 export interface Card {
     id?: number
     birth_date: number

src/views/base/wallet/index.vue

@@ -46,6 +46,7 @@
             </a-form-item>
             <Transition mode="out-in" name="fade">
               <div v-if="!isDeposit">
+                <div class="text-red text-xs font-bold mb-2">حداقل برداشت 100 هزار تومان می باشد.</div>
                 <div class="font-bold text-xs">
                   {{
                     `موجودی کیف پول: ${usePriceWithoutType(
@@ -146,30 +147,30 @@
           <div class="mt-4 text-red-600 font-bold">توجه : حتما شماره کارت صاحب حساب نرم افزار وارد شود.</div>
           <div class="pb-20 mt-5">
             <a-form :model="cardForm">
-              <a-form-item
+<!--              <a-form-item
                 :rules="required()"
                 class="w-full gap-2 !flex-col"
                 label="نام بانک"
                 name="bank_name"
               >
                 <BasicInput v-model:value="cardForm.bank_name" />
-              </a-form-item>
+              </a-form-item>-->
-              <!--              <a-form-item
+              <a-form-item
                 :rules="cardNumberValidation()"
                 class="w-full gap-2 !flex-col"
                 label="شماره کارت"
                 name="cart_number"
               >
                 <BasicInput v-model:value="cardForm.cart_number" type="number" />
-                            </a-form-item>-->
+              </a-form-item>
-              <!--              <a-form-item
+                            <a-form-item
                                 v-if="walletStore.walletInfo"
                                 class="w-full gap-2 !flex-col"
                                 label="تاریخ تولد"
                                 name="cart_number"
                             >
                               <BaseDatePicker v-model:value="cardForm.birth_date" class="w-full" inputReadOnly/>
-                            </a-form-item>-->
+                            </a-form-item>
               <!--                            <a-form-item
                                             :rules="required()"
                                             class="w-full gap-2 !flex-col"
@@ -178,14 +179,14 @@
                                           >
                                             <BasicInput v-model:value="cardForm.account_number" type="number" />
                                           </a-form-item>-->
-              <a-form-item
+              <!--              <a-form-item
                                 :rules="required()"
                                 class="w-full gap-2 !flex-col"
                                 label="شماره شبا"
                                 name="shaba_number"
                             >
                               <BasicInput v-model:value="cardForm.shaba_number"/>
-              </a-form-item>
+                            </a-form-item>-->
               <BasicButton
                 :disabled="loading"
                 class="w-full mt-5 md:mt-10"
@@ -380,10 +381,10 @@ import {DotLottieVue} from '@lottiefiles/dotlottie-vue'
 import OtpInput from 'vue3-otp-input'
 import DialogVant from '@/components/DialogVant.vue'
 import SkeletonLoading from './components/SkeletonLoading.vue'
-import BaseDatePicker from "@/components/BasicPacks/BaseDatePicker";
+import BaseDatePicker from '@/components/BasicPacks/BaseDatePicker'
-import img from "@/assets/img/user_ly1.svg";
+import img from '@/assets/img/user_ly1.svg'
-import BasicModal from "@/components/BasicPacks/BasicModal.vue";
+import BasicModal from '@/components/BasicPacks/BasicModal.vue'
-import {useConfigStore} from "@/store/configStore";
+import { useConfigStore } from '@/store/configStore'
 
 const isDeposit = ref<boolean>(true)
 const walletStore = useWalletStore()