21/8/1404

src/views/base/home/index.vue

@@ -101,7 +101,7 @@
                 >
                   <Icon class="text-tertiary" icon="vuesax-linear:money-receive" />
                 </div>
-                <div class="text-primary">خرید</div>
+                <div class="text-primary">خرید و فروش</div>
               </div>
               <div
                   class="text-center w-full flex-flex-col items-center home_appear_fade_in_down"

src/views/base/physicalReceive/components/RequestItem.vue

@@ -1,34 +1,34 @@
 <template>
-  <div class="rounded-lg shadow-md mx-2  bg-gradient-to-l   from-primary rounded-lg p-[2px]  to-transparent ">
+  <div class="rounded-lg shadow-md mx-2 bg-gradient-to-l from-primary rounded-lg p-[2px]  to-transparent ">
     <div class="rounded-lg flex flex-col gap-2  bg-white p-2 ">
       <div class="flex justify-between  ">
         <div class="font-bold">شماره سند: {{ props.item.id }}</div>
-        <div class="font-bold">{{ toJalali(props.item.created_at) }}</div>
+        <div class="font-bold">{{ toJalali(props?.item?.created_at) }}</div>
       </div>
       <div class="flex justify-between">
         <div class="flex flex-col w-full gap-1 ">
           <div class="w-full flex justify-between" v-for="item in props.item.transaction">
-            <div class="flex items-center gap-1  ">
+            <div class="flex items-center gap-1">
               <div class="w-7 h-7 flex justify-center rounded-lg bg-gray-100 ">
                 <img width="30"  class="p-1" :src="item.product.group_type=='گوی'?goyImg:mokaabImg">
               </div>
-              <div>{{ item.title }}</div>
+              <div class="text-xs">{{ item?.title }}</div>
             </div>
-            <div>{{ item.gold * -1 }} عدد</div>
+            <div class="text-xs" style="align-content: center;">{{ item?.gold * -1 }} عدد</div>
           </div>
         </div>
       </div>
       <div class="flex justify-between">
         <div class="font-bold">وضعیت:</div>
         <ATag color="blue" class="!py-1 !px-2 !ml-0">
-          {{ props.item.sts_str }}
+          {{ props?.item?.sts_str }}
         </ATag>
 
       </div>
-      <ADivider class="!m-1"></ADivider>
-      <div class="flex flex-col justify-between">
+      <ADivider v-if="props?.item?.address" class="!m-1"></ADivider>
+      <div v-if="props?.item?.address" class="flex flex-col justify-between">
         <div class="font-bold">آدرس:</div>
-        <div>{{ props.item.address.province }}/{{ props.item.address.city }}/{{ props.item.address.address }}</div>
+        <div>{{ props?.item?.address?.province }}/{{ props?.item?.address?.city }}/{{ props?.item?.address?.address }}</div>
       </div>
     </div>
 

src/views/base/physicalReceive/components/RequestList.vue

@@ -26,7 +26,6 @@ import {onMounted, ref} from "vue";
 import {getPhysicalReceiveList} from "@/api/physicalreceive";
 import type {Physicalreceive} from "@/models/physicalreceive";
 import RequestItem from "@/views/base/physicalReceive/components/RequestItem.vue";
-import BasicIcon from "@/components/BasicPacks/BasicIcon.vue";
 import router from "@/router";
 
 const requestItems = ref<Physicalreceive[]>([])
@@ -36,7 +35,7 @@ const openAdd = () => {
 onMounted(async () => {
   let {rows} = await getPhysicalReceiveList()
   requestItems.value = rows
-  console.log(rows)
+  console.log('rows',requestItems.value)
 })
 </script>
 

src/views/base/transactions/components/Item.vue

@@ -37,10 +37,17 @@
       <div class="text-gray-500">وضعیت :</div>
       <div class="text-gray-500 flex gap-1 text-xs items-center">
         <ATag class="!py-1 !px-6 !ml-0" color="blue">
-          {{ item.order?.sts_str ?? item.withdraw?.sts_str }}
+          {{ (item.order?.sts_str ?? item.withdraw?.sts_str )?? item?.title}}
         </ATag>
       </div>
     </div>
+    <div v-if="item.note" class="flex w-full justify-between mt-1">
+      <div class="text-gray-500 flex gap-1 text-xs items-center">
+        <div class="!py-1 !ml-0">
+          {{ item.note }}
+        </div>
+      </div>
+    </div>
     <!--    <div v-else class="h-8"></div>-->
     <a-divider class="!my-3" />
     <BasicActionSheet v-model:show="infoVisible">

src/views/base/transactions/index.vue

@@ -16,7 +16,7 @@
     >
       <!--      <div v-for="item in items">ss</div>-->
       <list-anim v-if="!loading">
-        <Item v-for="item in items.filter(i => i.type_str != 'خرید طلا')" :key="item.id" :item="item" />
+        <Item v-for="item in items" :key="item.id" :item="item" />
         <TransactionSkeleton v-if="loadingMore" class="mt-1 mb-8" />
       </list-anim>
       <TransactionSkeleton v-for="i in 13" v-else :key="i" class="mt-1" />

src/views/base/transfer/components/Item.vue

@@ -3,7 +3,7 @@
 
     <div class="flex justify-between">
       <div>
-<!--        <div class="font-bold text-base mb-2">{{usePrice(item.target_price) }}</div>-->
+        <div class="font-bold text-base mb-2">{{usePrice(item.target_price) }}</div>
       </div>
       <div class="flex gap-2 ">
         <BasicIcon color="red" icon="vuesax-linear:trash" @click.stop="deleteConfirmVisible = true" class="p-1"/>
@@ -22,7 +22,7 @@
       <template v-slot:title>
         <div class="flex flex-col items-center">
           <div class="p-5 text-sm">
-            آیا از حذف هشدار اطمینان دارید؟
+            آیا از حذف سند اطمینان دارید؟
           </div>
         </div>
       </template>
@@ -48,6 +48,7 @@ import { onMounted, ref } from 'vue'
 import BasicIcon from '@/components/BasicPacks/BasicIcon.vue'
 import type { Transfer } from '@/models/physicalreceive'
 import DialogVant from '@/components/DialogVant.vue'
+import { usePrice } from '../../../../utils/usePrice'
 
 const infoVisible = ref<boolean>(false)
 

src/views/base/transfer/index.vue

@@ -10,7 +10,7 @@
     <div ref="el" :class="loading? 'h-screen': ''" class="px-3 pt-16  pb-2 overflow-y-scroll"
          style="max-height: calc(100vh - 50px)">
       <list-anim v-if="!loading" class="pb-12vh">
-        <Item v-for="item in items" :key="item.id" :item="item" @refresh="initItems" />
+<!--        <Item v-for="item in items" :key="item.id" :item="item" @refresh="initItems" />-->
         <!--        <TransactionSkeleton v-if="loadingMore" class="mt-1 mb-8" />-->
       </list-anim>
       <div v-if="loading">

src/views/base/wallet/index.vue

@@ -183,7 +183,7 @@
                               label="شماره شبا"
                               name="shaba_number"
                             >
-                              <BasicInput v-model:value="cardForm.shaba_number" />
+                              <BasicInput addon-before="IR" v-model:value="cardForm.shaba_number" />
                             </a-form-item>
               <BasicButton
                   :disabled="loading"
@@ -370,9 +370,9 @@ const form = ref<Transaction>({
 const infoVisible = ref<boolean>(false)
 const cardForm = ref<Card>({
   birth_date: 0,
-  account_number: '',
-  bank_name: '',
-  cart_number: '',
+  // account_number: '',
+  // bank_name: '',
+  // cart_number: '',
   shaba_number: ''
 })