29/7/1404

2025-10-21 17:09:16 +03:30
parent ec4baafed9
commit 4b221d0919
52 changed files with 231 additions and 215 deletions
@@ -1,6 +1,6 @@
 {
  "name": "customer",
-  "version": "1.0.8",
+  "version": "1.0.9",
  "private": true,
  "scripts": {
    "dev": "vite",
@@ -46,7 +46,6 @@
        <div class="self-center splash_appear_fade_in">
                    <img :src="logoFull" class="h-[20vh]">
 <!--          <img :src="logo" alt="" class="z-100 bg-primary rounded-full w-full aspect-square self-center h-40" />-->
-
        </div>
        <div class="fixed w-full bottom-5 home_appear_fade_in_up">
          <div class="text-center text-xs">نسخه: {{ pkg.version }}</div>
@@ -133,7 +133,7 @@ body {
    background-color: #fff;
    //display: none;
    outline: none;
-    border: 1px solid #20514b !important;
+    border: 1px solid #521620 !important;
  }
 }

@@ -331,18 +331,18 @@ body {
 }
 .ant-radio-group-solid
 .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled):hover{
-  color: #20514b !important;
+  color: #521620 !important;
 }
 .ant-input-group-addon{
-  background-color: #20514b !important;
+  background-color: #521620 !important;
  color: #e0be7f !important;
 }
 .ant-slider-track{
-  background-color: #20514b !important;
+  background-color: #521620 !important;

 }
 .ant-slider-handle {
-  background-color: #20514b !important;
+  background-color: #521620 !important;

 }

@@ -1,7 +1,7 @@
@prefixCls: 'noname';

-@primary-color: #20514b;
-@secondary-color: #20514b;
+@primary-color: #521620;
+@secondary-color: #521620;
@prefixCls-font-family: 'iran-sans';
@prefixCls-background-color: #fff;

@@ -66,6 +66,16 @@ const router = createRouter({
                    component: () => import('@/views/base/address/index.vue')
                },
                {
+                    path: 'physicalReceive',
+                    name: 'physicalReceive',
+                    component: () => import('@/views/base/physicalReceive/index.vue'),
+                },
+                {
+                    path: 'list',
+                    name: 'list',
+                    component: () => import('@/views/base/physicalReceive/components/RequestList.vue'),
+                },
+              /*  {
                    path: 'physicalReceive',
                    name: 'physicalReceive',
                    redirect:{name: 'list'},
@@ -82,7 +92,7 @@ const router = createRouter({
                            component: () => import('@/views/base/physicalReceive/components/NewRequest.vue')
                        },
                    ]
-                },
+                },*/
                {
                    path: 'rules',
                    name: 'rules',
@@ -8,7 +8,7 @@
    </div>
  </div>
  <div class="p-4">
-    <div class="text-center p-3 border-solid  border-1 rounded-[8px] border-[#20514b] ">
+    <div class="text-center p-3 border-solid  border-1 rounded-[8px] border-[#521620] ">
      <div class="flex  items-center">
        <div class=" bg-[#DBEAFE] h-10 w-10 rounded-100% flex justify-center items-center">
          <img :src="coin" />
@@ -60,10 +60,10 @@
    </div>
 <!--    //**************************************-->
 <!--    <div class="flex mt-6">-->
-<!--      <div class="bg-[#20514b] p-2 rounded-[8px] w-full">-->
+<!--      <div class="bg-[#521620] p-2 rounded-[8px] w-full">-->
 <!--        <div class="text-white text-center">فهرست زیرمجموعه</div>-->
 <!--      </div>-->
-<!--      <div class="bg-[#20514b] p-2 rounded-[8px] w-full mr-2">-->
+<!--      <div class="bg-[#521620] p-2 rounded-[8px] w-full mr-2">-->
 <!--        <div class="text-white text-center">پاداش ها</div>-->
 <!--      </div>-->
 <!--    </div>-->
@@ -53,7 +53,7 @@
      </div>
    </div>
 <!--    <div class="fixed w-full flex justify-center bottom-23 z-200 md:right-0">
-      <div class="rounded-3xl bg-[#20514b] text-white px-5 py-2" @click="router.push({name: 'fund_add'})">افزودن گنج
+      <div class="rounded-3xl bg-[#521620] text-white px-5 py-2" @click="router.push({name: 'fund_add'})">افزودن گنج
      </div>
    </div>-->
  </div>
@@ -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";
@@ -40,7 +40,7 @@
          <div v-for="item in types"
               class="border-1 px-3 py-2 flex-nowrap rounded text-xs color-transition background-color-transition"
               :key="item.name"
-               :class="item.name === name? 'bg-[#20514b] text-white':'bg-gray-200 text-gray-600'"
+               :class="item.name === name? 'bg-[#521620] text-white':'bg-gray-200 text-gray-600'"
               @click="name = item.name">
            {{ item.name }}
          </div>
@@ -46,14 +46,14 @@
          <bg_main />
          <div class="z-100 relative">
            <a-form-item>
-              <BasicInput v-model:value="form.goldCash" addon-before="ریال" addon-bg-color="#20514b"
+              <BasicInput v-model:value="form.goldCash" addon-before="ریال" addon-bg-color="#521620"
                          addon-text-color="white"
                          place-holder="ارزش کل"
                          size="large"
                          type="price" @onchange="calculateGold" />
            </a-form-item>
            <a-form-item :rules="[justNumber()]">
-              <BasicInput v-model:value="form.goldValue" addon-before="گرم" addon-bg-color="#20514b"
+              <BasicInput v-model:value="form.goldValue" addon-before="گرم" addon-bg-color="#521620"
                          addon-text-color="white"
                          place-holder="مقدار طلا"
                          size="large" type="text" inputmode="decimal" @onchange="calculateCash" />
@@ -583,20 +583,8 @@ async function ok() {
 </script>

 <style lang="less">
-/*.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.5s ease;
-}
-
-.fade-enter-from,
-.fade-leave-to {
-  opacity: 0;
-}*/
-/*.completeButtonStyle{
-  background: blue;
-}*/
 .completeButtonStyle .van-dialog__confirm .van-button__content {
-  background: #20514b;
+  background-color: #521620;
  color: white;
 }

@@ -3,19 +3,19 @@
    <div class="flex flex-col gap-7 rounded-lg p-4 w-56  bg-white ">
      <div class="flex justify-between items-center font-medium text-sm">
        <div class="text-primary">موجودی {{ props.ProductItem.title }}</div>
-        <BasicIcon v-if="props.ProductItem.group_type=='گوی'"  stroke-width="1"  size="50" color="#20514b" class="rotate-310" icon="vuesax-linear:grammerly"/>
-        <BasicIcon v-else-if="props.ProductItem.group_type=='سکه'"  stroke-width="1"  size="50" color="#20514b" class="rotate-310" icon="vuesax-linear:coin"/>
-        <BasicIcon v-else-if="props.ProductItem.group_type=='شمش'"  stroke-width="1"  size="50" color="#20514b" class="rotate-310" icon="vuesax-linear:slider-vertical"/>
-        <BasicIcon v-else-if="props.ProductItem.group_type=='مکعب'"  stroke-width="1"  size="50" color="#20514b" class="rotate-310" icon="vuesax-linear:keyboard"/>
-        <BasicIcon v-else-if="props.ProductItem.group_type=='آبشده'"  stroke-width="1"  size="50" color="#20514b" class="rotate-310" icon="vuesax-linear:slider-vertical"/>
-        <BasicIcon v-else  stroke-width="1"  size="50" color="#20514b" class="rotate-310" icon="vuesax-linear:slider-vertical"/>
+        <BasicIcon v-if="props.ProductItem.group_type=='گوی'"  stroke-width="1"  size="50" color="#521620" class="rotate-310" icon="vuesax-linear:grammerly"/>
+        <BasicIcon v-else-if="props.ProductItem.group_type=='سکه'"  stroke-width="1"  size="50" color="#521620" class="rotate-310" icon="vuesax-linear:coin"/>
+        <BasicIcon v-else-if="props.ProductItem.group_type=='شمش'"  stroke-width="1"  size="50" color="#521620" class="rotate-310" icon="vuesax-linear:slider-vertical"/>
+        <BasicIcon v-else-if="props.ProductItem.group_type=='مکعب'"  stroke-width="1"  size="50" color="#521620" class="rotate-310" icon="vuesax-linear:keyboard"/>
+        <BasicIcon v-else-if="props.ProductItem.group_type=='آبشده'"  stroke-width="1"  size="50" color="#521620" class="rotate-310" icon="vuesax-linear:slider-vertical"/>
+        <BasicIcon v-else  stroke-width="1"  size="50" color="#521620" class="rotate-310" icon="vuesax-linear:slider-vertical"/>
      </div>
      <div class="flex justify-between px-2 items-center ">
-        <BasicIcon v-if="props.ProductItem.group_type=='گوی'"  stroke-width="1"  size="26" color="#20514b" class="rotate-310" icon="vuesax-linear:grammerly"/>
-        <BasicIcon v-else-if="props.ProductItem.group_type=='سکه'"  stroke-width="1"  size="26" color="#20514b" class="rotate-310" icon="vuesax-linear:coin"/>
-        <BasicIcon v-else-if="props.ProductItem.group_type=='شمش'"  stroke-width="1"  size="26" color="#20514b" class="rotate-310" icon="vuesax-linear:slider-vertical"/>
-        <BasicIcon v-else-if="props.ProductItem.group_type=='مکعب'"  stroke-width="1"  size="26" color="#20514b" class="rotate-310" icon="vuesax-linear:keyboard"/>
-        <BasicIcon v-else  stroke-width="1"  size="26" color="#20514b" class="rotate-310" icon="vuesax-linear:slider-vertical"/>        <div class="flex justify-between gap-2 items-center">
+        <BasicIcon v-if="props.ProductItem.group_type=='گوی'"  stroke-width="1"  size="26" color="#521620" class="rotate-310" icon="vuesax-linear:grammerly"/>
+        <BasicIcon v-else-if="props.ProductItem.group_type=='سکه'"  stroke-width="1"  size="26" color="#521620" class="rotate-310" icon="vuesax-linear:coin"/>
+        <BasicIcon v-else-if="props.ProductItem.group_type=='شمش'"  stroke-width="1"  size="26" color="#521620" class="rotate-310" icon="vuesax-linear:slider-vertical"/>
+        <BasicIcon v-else-if="props.ProductItem.group_type=='مکعب'"  stroke-width="1"  size="26" color="#521620" class="rotate-310" icon="vuesax-linear:keyboard"/>
+        <BasicIcon v-else  stroke-width="1"  size="26" color="#521620" class="rotate-310" icon="vuesax-linear:slider-vertical"/>        <div class="flex justify-between gap-2 items-center">
          <span v-if="props.ProductItem.group_type=='آبشده'" class="font-bold text-secondary">{{userWallet.walletInfo?.gold??0}}</span>
        <span v-else class="font-bold text-secondary">{{props?.ProductItem.wallet?.gold??0}}</span>
          <span class="text-gray-400">{{props?.ProductItem?.unit}}</span>
@@ -1,7 +1,7 @@
 <template>
  <div class="">
    <!--    <div class="bg-primary h-30 mt-[-3rem] z-100000000000"></div>-->
-    <div class="fixed h-[60vh] bg-[#20514b] w-screen">
+    <div class="fixed h-[60vh] bg-primary w-screen">
      <div class="flex w-full justify-around mt-18">
        <div class="text-center">
          <div class="text-[#E5D7CE] text-xs ">موجودی کیف طلا</div>
@@ -1,8 +1,8 @@
 <template>
  <div class=" mt-20">
-    <div class="flex gap-7 overflow-x-scroll px-5">
+<!--    <div class="flex gap-7 overflow-x-scroll px-5">
      <ProductInventory v-for="item in productInventorys" :ProductItem="item" class="shadow-lg my-5" :key="item.id"></ProductInventory>
-    </div>
+    </div>-->
    <div>
      <div
          v-if="userStore.userInfo && !loading"
@@ -17,18 +17,50 @@
          {{ usePriceWithoutType(limitedPrice.value as number ?? 0) }} ریال می باشد.
        </div>

-        <div class="px-2 py-4 rounded-lg border-1 text-center border-tertiary">
-          <div>{{ userStore?.userInfo?.virtual_card_number ?? 'کارتی موجود نمی باشد' }}</div>
-          <div class="flex mt-4 justify-center">
-            <div>دارایی طلایی :</div>
-            <div>{{ (userStore?.userInfo?.wallet?.count_gold ?? 0).toFixed(3)}} گرم</div>
+        <div
+          class="px-5 py-5 shadow-lg rounded-2xl text-white relative overflow-hidden shadow-lg"
+          style=" background: linear-gradient(145deg, #521620 0%, #7a2a1e 40%, #521620 100%); "
+        >
+          <div
+            class="absolute inset-0 opacity-20"
+            style=" background: radial-gradient(circle at 30% 20%, rgba(255,255,255,0.5), transparent 70%); ">
+
          </div>
-          <div class="flex justify-center">
-            <div>دارایی ریالی :</div>
-            <div>{{ (userStore?.userInfo?.wallet?.count_gold ?? 0).toFixed(3)}} ریال</div>
+
+
+          <div class="relative z-10">
+            <div class="flex font-bold text-lg items-center gap-2 mb-3">
+              <img src='@/assets/img/logo.png' alt='' class='h-8 drop-shadow-md' />
+              <div class="tracking-wide">قطره گلد</div>
+            </div>
+
+            <div class="flex justify-between items-end mb-3">
+              <div class="text-sm "></div>
+              <div class="">
+                <div class="text-xs opacity-75" style="justify-self: end;">شناسه شما در قطره</div>
+                <div class="font-semibold text-base">
+                  {{ userStore?.userInfo?.virtual_card_number ?? '---' }}
+                </div>
+              </div>
+            </div>
+
+            <div class="flex justify-between items-center font-semibold text-base">
+              <div>
+                <div class="text-xs opacity-75 mb-1">موجودی</div>
+                <div>{{ (userStore?.userInfo?.wallet?.count_gold ?? 0).toFixed(3) }} گرم</div>
+              </div>
+              <div class="w-px h-6 bg-white/30 mx-3"></div>
+              <div>
+                <div class="text-xs opacity-75 mb-1" style="justify-self: end;">معادل ریالی</div>
+                <div>{{ (userStore?.userInfo?.wallet?.count_gold ?? 0).toFixed(3) }} ریال</div>
+              </div>
+
+            </div>
          </div>
        </div>

+
+
        <!--        <div class="bg-white">
          <MySlider v-if="cardItems.length > 0" :items="cardItems" class=" pb-[20vh] "
                    style="touch-action: none" />
@@ -44,7 +76,7 @@
              >
                <div
                    class="rounded-full w-[42px] h-[42px] bg-primary flex items-center justify-center"
-                    style="border: solid 1px #20514b"
+                    style="border: solid 1px #521620"

                >
                  <Icon class="text-tertiary" icon="vuesax-linear:money-send" />
@@ -58,7 +90,7 @@
              >
                <div
                    class="rounded-full w-[50px] h-[50px] bg-primary flex items-center justify-center"
-                    style="border: solid 1px #20514b"
+                    style="border: solid 1px #521620"

                >
                  <Icon class="text-tertiary" icon="vuesax-linear:money-receive" />
@@ -72,7 +104,7 @@
              >
                <div
                    class="rounded-full w-[50px] h-[50px] bg-primary flex items-center justify-center"
-                    style="border: solid 1px #20514b"
+                    style="border: solid 1px #521620"

                >
                  <Icon class="text-tertiary" icon="vuesax-linear:card-add" />
@@ -86,7 +118,7 @@
              >
                <div
                    class="rounded-full w-[50px] h-[50px] bg-primary flex items-center justify-center "
-                    style="border: solid 1px #20514b"
+                    style="border: solid 1px #521620"
                >
                  <Icon class="text-tertiary" icon="vuesax-linear:receipt-item" />
                </div>
@@ -99,7 +131,7 @@
              >
                <div
                    class="rounded-full w-[50px] h-[50px] bg-primary flex items-center justify-center"
-                    style=" border: solid 1px #20514b"
+                    style=" border: solid 1px #521620"

                >
                  <Icon class="text-tertiary font-bold" icon="vuesax-linear:dollar-circle" />
@@ -196,7 +228,7 @@
                      </div>-->
        </div>
        <div
-            class="w-full relative mt-5 border-gray-200 border-1 rounded-lg h-[88px] flex flex-col justify-center home_appear_fade_in"
+            class="w-full relative mt-5 mb-5 border-gray-200 border-1 rounded-lg h-[88px] flex flex-col justify-center home_appear_fade_in"
        >

          <div class="w-full items-center flex flex-col">
@@ -227,11 +259,11 @@
        </div>

        <swiper
-          :slides-per-view="1.5"
+          :slides-per-view="1"
          :space-between="5"
        >
-          <swiper-slide><img class="p-2 img rounded-lg" :src="img" /></swiper-slide>
-          <swiper-slide><img class="p-2 img rounded-lg" :src="img" /></swiper-slide>
+          <swiper-slide><img class="img rounded-lg" :src="img2" /></swiper-slide>
+          <swiper-slide><img class="img rounded-lg" :src="img2" /></swiper-slide>
        </swiper>


@@ -308,9 +340,9 @@
      <!--          <img :src="image">-->
      <!--        </div>-->
      <!--        <div class="bg-primary pb-30"-->
-      <!--        style="background: linear-gradient(to bottom, #fff,#fff, #20514b, #20514b);"-->
+      <!--        style="background: linear-gradient(to bottom, #fff,#fff, #521620, #521620);"-->
      <!--        >-->
-      <!--          <div class=" text-tertiary text-2xl pt-6 pr-5 pl-50" style="font-size: 26px;font-weight: 600; color: #20514b" >ارسال کالا بعد از ثبت سفارش</div>-->
+      <!--          <div class=" text-tertiary text-2xl pt-6 pr-5 pl-50" style="font-size: 26px;font-weight: 600; color: #521620" >ارسال کالا بعد از ثبت سفارش</div>-->
      <!--          <div class="pr-5 pl-8 pt-10  text-tertiary ">میتوانید با خرید محصولات بعد از ثبت سفارش درخواست ارسال را-->
      <!--            ثبت کرده و زیر 24 ساعت خرید خود را دریافت کنید-->
      <!--          </div>-->
@@ -326,16 +358,16 @@
          <!--          <img :src="testimg" alt="" class="w-[24px] h-[24px]">-->
          <div
              class="z-100000 rounded-full border-1"
-              :class="y > 50 ? 'text-primary border-primary' : 'text-primary border-primary'"
+              :class="y > 50 ? '' : 'border-black'"
          >
            <Icon icon="vuesax-linear:user" size="20" />
          </div>
-          <div :class="y > 50 ? 'text-primary' : 'text-primary'" class="color-transition font-bold">
+          <div :class="y > 50 ? '' : ''" class="color-transition font-bold">
            {{ userStore.userInfo?.name }}
          </div>
        </div>
        <Icon
-            :color="y > 50 ? '#20514b' : '#20514b'"
+            :color="y > 50 ? '' : ''"
            class="color-transition"
            icon="vuesax-linear:logout"
            @click="showLogoutConfirm = true"
@@ -454,7 +486,7 @@
 <script lang="tsx" setup>
 import { Swiper, SwiperSlide } from 'swiper/vue';
 import 'swiper/swiper-bundle.css';
-import img from '@/assets/img/ghatreLogo.png'
+import img2 from '@/assets/img/banner/2.png'
 import Icon from '@/components/BasicPacks/BasicIcon.vue'
 import { usePrice, usePriceWithoutType, useTowDecimal } from '../../../utils/usePrice'
 import {computed, createVNode, onMounted, onUnmounted, ref, watch} from 'vue'
@@ -481,8 +513,6 @@ import {
 import { DotLottieVue } from '@lottiefiles/dotlottie-vue'
 import BasicActionSheet from '@/components/BasicPacks/BasicActionSheet.vue'
 import BasicInfoItem from '@/components/BasicPacks/BasicInfoItem.vue'
-import banner1 from '@/assets/img/banner/banner1.png'
-import banner2 from '@/assets/img/banner/banner2.png'
 import ProductInventory from '@/views/base/home/components/ProductInventory.vue'
 import type { PInventory, Product } from '@/models/products'
 import type { Fund } from '@/models/fund'
@@ -500,7 +530,6 @@ const wholeBalanceVisible = ref<boolean>(false)
 const { x, y } = useWindowScroll()
 const series = ref<Chart[]>([{ data: [] }])
 const key = ref<number>(0)
-const cardItems = [banner1, banner2]
 const main = ref(null)
 const logoutLoading = ref(false)
 const productInventorys = ref<PInventory[] | undefined>()
@@ -699,7 +728,7 @@ const priceChartOptions = ref({
      show: false
    }
  },
-  colors: ['#20514b'],
+  colors: ['#521620'],
  fill: {
    type: 'gradient',
    gradient: {
@@ -901,7 +930,6 @@ async function openRialModal() {

 .odometer {
  font-size: 60px;
-  //margin: 200px 0;
  text-align: center;
  width: 100%;
  animation-duration: 3s;
@@ -1,7 +1,7 @@
 <template>
  <div class="">
    <!--    <div class="bg-primary h-30 mt-[-3rem] z-100000000000"></div>-->
-    <div class="fixed h-[60vh] bg-[#20514b] w-screen">
+    <div class="fixed h-[60vh] bg-[#521620] w-screen">
      <div class="flex w-full justify-around mt-18">
        <div class="text-center">
          <div class="text-[#E5D7CE] text-xs ">موجودی کیف طلا</div>
@@ -1,7 +1,7 @@
 <template>
  <div class="h-35rem overflow-y-auto">
    <!--    <div class="bg-primary h-30 mt-[-3rem] z-100000000000"></div>-->
-    <div class="h-[60vh] bg-[#20514b] wrap-fix">
+    <div class="h-[60vh] bg-primary wrap-fix">
      <div class="w-full justify-around mt-18">
        <div class="flex flex-col w-full justify-center items-center">
          <div class="text-center">
@@ -484,7 +484,7 @@ const isHidden = ref<boolean>(false)

 const { stop } = useIntersectionObserver(target, ([{ isIntersecting }], observerElement) => {
  targetIsVisible.value = isIntersecting
-  console.log('saaaaa', targetIsVisible.value)
+  // console.log('saaaaa', targetIsVisible.value)
 })

 watch(main, (n) => {
@@ -620,7 +620,7 @@ const priceChartOptions = ref({
      show: false
    }
  },
-  colors: ['#20514b'],
+  colors: ['#521620'],
  fill: {
    type: 'gradient',
    gradient: {
@@ -839,7 +839,6 @@ async function logout() {

 .odometer {
  font-size: 60px;
-  //margin: 200px 0;
  text-align: center;
  width: 100%;
  animation-duration: 3s;
@@ -50,6 +50,13 @@
                <div>قوانین و مقررات</div>
              </div>
            </BasicButton>
+            <BasicButton icon-size="16" class="!font-bold w-15rem"
+                         @click="openReceivesList(); popVisible = false">
+              <div class="flex gap-2 items-center">
+                <BasicIcon icon="vuesax-linear:direct-inbox" size="16" class="absolute right-2" />
+                <div>لیست دریافتی ها</div>
+              </div>
+            </BasicButton>
 <!--            <BasicButton icon-size="16" class="!font-bold w-50vw md:w-full"
                         @click="$router.push({name: 'permissions'}); popVisible = false">
              <div class="flex gap-2 items-center">
@@ -112,12 +119,8 @@
          <div class="text-xs mt-1 font-bold">دریافت فیزیکی</div>
        </div>
      </div>
-      <!--      <div class="w-[80px] h-[80px] border-1">
-
-            </div>-->
      <div class="main">
        <div class="circle">
-
        </div>
      </div>
    </div>
@@ -132,17 +135,6 @@ import BasicButton from '@/components/BasicPacks/BasicButton.vue'
 import type { Transaction } from '@/models/transaction'
 import BasicIcon from '@/components/BasicPacks/BasicIcon.vue'

-/*onMounted(async () => {
-  const c = await document.getElementById("canvas1");
-  const ctx = c.getContext("2d");
-  console.log(ctx)
-  ctx.beginPath();
-  ctx.moveTo(0,20);
-  ctx.lineTo(165,20)
-  ctx.arc(200, 50, 45, 3.9, 5.5, false);
-  ctx.lineTo(400,20)
-  ctx.stroke();
-})*/
 const currentRoute = computed(() => router.currentRoute.value.name)

 const popVisible = ref(false)
@@ -160,6 +152,10 @@ function setRoute(val: string) {
  router.push({ name: val })
 }

+function openReceivesList() {
+  router.push({ name: 'list' })
+}
+
 </script>


@@ -217,7 +213,7 @@ function setRoute(val: string) {
        justify-content: center;
        align-content: center;
        flex-wrap: wrap;
-        background-color: #20514b;
+        background-color: #521620;



@@ -61,14 +61,14 @@

            <a-form-item v-if="isBuy" name="goldValue"
                         :rules="[justNumber2(props?.ProductItem?.price , form.method , props?.ProductItem?.amount, true)]">
-              <BasicInput v-model:value="form.goldValue" addon-before="تعداد" addon-bg-color="#20514b"
+              <BasicInput v-model:value="form.goldValue" addon-before="تعداد" addon-bg-color="#521620"
                          addon-text-color="white"
                          place-holder="تعداد"
                          size="large" type="number" inputmode="number" @onchange="calculateCash" />
            </a-form-item>
            <a-form-item v-else name="goldValue"
                         :rules="[justNumber3(props?.ProductItem?.sellPrice, productNum ,false)]">
-              <BasicInput v-model:value="form.goldValue" addon-before="تعداد" addon-bg-color="#20514b"
+              <BasicInput v-model:value="form.goldValue" addon-before="تعداد" addon-bg-color="#521620"
                          addon-text-color="white"
                          place-holder="تعداد"
                          size="large" type="number" inputmode="number" @onchange="calculateCash" />
@@ -648,8 +648,8 @@ async function ok() {
      number: form.value.goldValue ?? 0
    })
    await physicalReceiveApi({
-        address_id: props.ProductItem.id,
-        wallets: form.value.goldValue ?? 0
+        product_id: props.ProductItem.id,
+        value: form.value.goldValue ?? 0
      }
    )
    await walletStore.getMyWallet()
@@ -688,7 +688,7 @@ async function ok() {
  background: blue;
 }*/
 .completeButtonStyle .van-dialog__confirm .van-button__content {
-  background: #20514b;
+  background: #521620;
  color: white;
 }

@@ -6,7 +6,6 @@
        <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  ">
@@ -14,13 +13,9 @@
                <img width="30"  class="p-1" :src="item.product.group_type=='گوی'?goyImg:mokaabImg">
              </div>
              <div>{{ item.title }}</div>
-
-
-
            </div>
            <div>{{ item.gold * -1 }} عدد</div>
          </div>
-
        </div>
      </div>
      <div class="flex justify-between">
@@ -1,9 +1,15 @@
 <template>
  <div>
+    <div class="absolute inset-0 bg-cover bg-center opacity-60" :style="{ backgroundImage: `url(${img})` }"></div>
+    <div
+      class="bg-white w-full transaction-list py-3 px-3 font-bold drop-shadow flex justify-between z-10"
+    >
+      <div>لیست دریافت فیزیکی</div>
+    </div>
    <div class="flex flex-col gap-4 pt-13 pb-35 px-2">
      <RequestItem v-for="item in requestItems" :item="item"></RequestItem>
    </div>
-    <Transition mode="out-in" name="fade">
+<!--    <Transition mode="out-in" name="fade">
      <div
          class="wrap-fix bottom-0 h-[19vh] bg-[#FBFBFC] shadow-lg  rounded-3xl flex justify-center pt-3 z-200"
          style="box-shadow: rgba(0, 0, 0, 0.1) 0px 1px 26px 11px"
@@ -11,7 +17,7 @@
        <BasicIcon icon="vuesax-linear:add" />
        <div class="cursor-pointer">افزودن درخواست جدید</div>
      </div>
-    </Transition>
+    </Transition>-->
  </div>
 </template>

@@ -20,7 +20,6 @@
          <ProductItem :ProductItem="item" @click="clickProduct(item)"></ProductItem>
        </div>
      </div>
-
    </div>
  </a-spin>
  <!--  <BasicActionSheet v-model:show="showFilter">-->
@@ -61,14 +61,14 @@

            <a-form-item v-if="isBuy" name="goldValue"
                         :rules="[justNumber2(props?.ProductItem?.price , form.method , props?.ProductItem?.amount, true)]">
-              <BasicInput v-model:value="form.goldValue" addon-before="تعداد" addon-bg-color="#20514b"
+              <BasicInput v-model:value="form.goldValue" addon-before="تعداد" addon-bg-color="#521620"
                          addon-text-color="white"
                          place-holder="تعداد"
                          size="large" type="number" inputmode="number" @onchange="calculateCash" />
            </a-form-item>
            <a-form-item v-else name="goldValue"
                         :rules="[justNumber3(props?.ProductItem?.sellPrice, productNum ,false)]">
-              <BasicInput v-model:value="form.goldValue" addon-before="تعداد" addon-bg-color="#20514b"
+              <BasicInput v-model:value="form.goldValue" addon-before="تعداد" addon-bg-color="#521620"
                          addon-text-color="white"
                          place-holder="تعداد"
                          size="large" type="number" inputmode="number" @onchange="calculateCash" />
@@ -682,7 +682,7 @@ async function ok() {
  background: blue;
 }*/
 .completeButtonStyle .van-dialog__confirm .van-button__content {
-  background: #20514b;
+  background: #521620;
  color: white;
 }

@@ -2,7 +2,7 @@
  <div>
    <div class="absolute inset-0 bg-cover bg-center opacity-60" :style="{ backgroundImage: `url(${img})` }"></div>
    <div
-      class="bg-white w-full transaction-list py-3 px-3 text-primary font-bold drop-shadow flex justify-between z-10"
+      class="bg-white w-full transaction-list py-3 px-3 font-bold drop-shadow flex justify-between z-10"
    >
      <div>لیست تراکنش ها</div>
      <BasicIcon icon="vuesax-linear:filter" @click="showFilter = true" />
@@ -4,27 +4,27 @@
      <!--        <img :src="gr_bottom" alt="" class="absolute bottom-20">-->
      <img :src="img" alt="" class="mt-2 w-full absolute bottom-0" />
    </div>
-    <div class="bg-white w-full py-3 px-3 text-primary font-bold drop-shadow flex">
+    <div class="bg-white w-full py-3 px-3 font-bold drop-shadow flex">
      <div @click="router.back()" class="cursor-pointer">
        <BasicIcon icon="vuesax-linear:arrow-right-1" />
      </div>
-      <div class="mr-2 mt-2">اطلاعات حساب کاربری</div>
+      <div class="mr-2 items-center">اطلاعات حساب کاربری</div>
    </div>
    <div class="pt-16 pb-8 z-30 relative">
      <div
        class="border-gray-200 border-1 rounded-xl p-5 trans flex flex-col items-center mx-5 z-1000 relative bg-white shadow-lg"
      >
-        <div class="text-primary font-bold w-full text-center flex justify-between">
+        <div class="font-bold w-full text-center flex justify-between">
          نام و نام خانوادگی:
          <div class="mr-2">{{ userStore.userInfo?.name }}</div>
        </div>
-        <div class="text-primary font-bold w-full text-center flex justify-between">
+        <div class="font-bold w-full text-center flex justify-between">
          شماره تلفن همراه:
          <div class="mr-2">{{ userStore.userInfo?.mobile }}</div>
        </div>
        <div
          v-if="userStore.userInfo?.referral_id"
-          class="text-primary font-bold w-full text-center flex justify-between gap-2 items-center"
+          class="font-bold w-full text-center flex justify-between gap-2 items-center"
        >
          کد معرف:
          <div class="flex gap-2">
@@ -1,7 +1,7 @@
 <template>
  <div>
    <div class="absolute inset-0 bg-cover bg-center opacity-60" :style="{ backgroundImage: `url(${img})` }"></div>
-    <div class="bg-white py-3 px-3 text-primary font-bold drop-shadow z-[1999] wrap-fix">کیف پول</div>
+    <div class="bg-white py-3 px-3 font-bold drop-shadow z-[1999] wrap-fix">کیف پول</div>
    <div
      class="bg-white wrap-fix py-3 top-11 px-3 text-primary font-bold flex justify-evenly z-[1999]"
    >
@@ -37,7 +37,7 @@
              <BasicInput
                v-model:value="form.value"
                addon-before="ریال"
-                addon-bg-color="#20514b"
+                addon-bg-color="#521620"
                addon-text-color="white"
                place-holder="مبلغ"
                size="large"
@@ -118,7 +118,7 @@
          </div>
        </BasicButton>
        <div class="flex gap-1 justify-center mt-5 text-xs" @click="$emit('register',true)">اگر حساب کاربری ندارید
-          <div class="font-bold text-[#20514b]">از این قسمت</div>
+          <div class="font-bold text-primary">از این قسمت</div>
          ثبت نام کنید.
        </div>
      </a-form-item>
@@ -151,7 +151,7 @@ import { loginCustomer, verifyToken } from '@/api/login'
 import router from '@/router'
 import { useUserStore } from '@/store/userStore'
 import { useWalletStore } from '@/store/walletStore'
-import logo from '@/assets/img/logo.png'
+import logo from '@/assets/img/logo_full_.png'
 import { fingerPosition, setTruth } from '@/main'

 const { time, onFinish, reset } = useCountdownTimer('00:02:00', 'mm:ss')
@@ -435,7 +435,7 @@ const getcode=()=>{
          </div>
        </BasicButton>
        <div class="flex gap-1 justify-center mt-5 text-xs" @click="$emit('register',true)">اگر حساب کاربری ندارید
-          <div class="font-bold text-[#20514b]">از این قسمت</div>
+          <div class="font-bold text-[#521620]">از این قسمت</div>
          ثبت نام کنید.
        </div>
      </a-form-item>
@@ -26,7 +26,6 @@
              <BasicInput v-model:value="userFormState.shop_name" place-holder="نام فروشگاه"/>
            </a-form-item>-->
      <a-form-item>
-
        <BasicButton
          :disabled="loading"
          class=" w-full py-2 mt-4"
@@ -39,7 +38,7 @@
          </div>
        </BasicButton>
        <div class="flex gap-1 justify-center mt-5 text-xs" @click="$emit('register',false)">اگر حساب کاربری دارید
-          <div class="font-bold text-[#20514b]">از این قسمت</div>
+          <div class="font-bold text-primary">از این قسمت</div>
          وارد شوید.
        </div>
      </a-form-item>
@@ -127,7 +126,7 @@ import registerDelayImage from '@/assets/img/registerDelay.svg'
 import DialogVantOneButton from '@/components/DialogVantOneButton.vue'
 import { registerCustomer } from '@/api/login'
 import router from '@/router'
-import logo from "@/assets/img/logo.png";
+import logo from "@/assets/img/logo_full_.png";


 // const stepTwoVerify = ref<boolean>(false)
@@ -10,7 +10,7 @@ export default defineConfig({
    ],
    theme: {
        colors: {
-            "primary": "#20514b",
+            "primary": "#521620",
            "secondary": "#ffffff",
            "tertiary": "#e0be7f"
        }
@@ -36,7 +36,7 @@ export default defineConfig({
                short_name: 'ghatreh',
                start_url: '/',
                display: 'standalone',
-                theme_color: '#20514b',
+                theme_color: '#521620',
                orientation: "portrait-primary",
                background_color: 'white',
                icons: [