diff --git a/package.json b/package.json index 41415e9..366ff78 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "customer", - "version": "1.0.8", + "version": "1.0.9", "private": true, "scripts": { "dev": "vite", diff --git a/public/192-logo.png b/public/192-logo.png index 365e32f..8341252 100644 Binary files a/public/192-logo.png and b/public/192-logo.png differ diff --git a/public/192.png b/public/192.png index 365e32f..2e4b412 100644 Binary files a/public/192.png and b/public/192.png differ diff --git a/public/32.png b/public/32.png index 92445ba..9afabb7 100644 Binary files a/public/32.png and b/public/32.png differ diff --git a/public/36-logo.png b/public/36-logo.png index 41073b6..e8c850c 100644 Binary files a/public/36-logo.png and b/public/36-logo.png differ diff --git a/public/512-logo.png b/public/512-logo.png index 063b047..db6956a 100644 Binary files a/public/512-logo.png and b/public/512-logo.png differ diff --git a/public/512.png b/public/512.png index 6396971..90c62cf 100644 Binary files a/public/512.png and b/public/512.png differ diff --git a/public/favicon.png b/public/favicon.png index b3ff574..335950f 100644 Binary files a/public/favicon.png and b/public/favicon.png differ diff --git a/public/favicon_.png b/public/favicon_.png index 87ada93..2eb597e 100644 Binary files a/public/favicon_.png and b/public/favicon_.png differ diff --git a/public/ghatreLogo.png b/public/ghatreLogo.png new file mode 100644 index 0000000..3baf53a Binary files /dev/null and b/public/ghatreLogo.png differ diff --git a/public/icon-192.png b/public/icon-192.png index 5b4cb8c..2d6eb7d 100644 Binary files a/public/icon-192.png and b/public/icon-192.png differ diff --git a/public/icon-36.png b/public/icon-36.png index ace8d0b..144f618 100644 Binary files a/public/icon-36.png and b/public/icon-36.png differ diff --git a/public/icon-512.png b/public/icon-512.png index b9775a4..7880840 100644 Binary files a/public/icon-512.png and b/public/icon-512.png differ diff --git a/public/icon.png b/public/icon.png index 9b4dfff..b205913 100644 Binary files a/public/icon.png and b/public/icon.png differ diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..23dbac6 Binary files /dev/null and b/public/logo.png differ diff --git a/public/logo_full_.png b/public/logo_full_.png new file mode 100644 index 0000000..ce650e8 Binary files /dev/null and b/public/logo_full_.png differ diff --git a/src/App.vue b/src/App.vue index cbe01b9..20c3e64 100644 --- a/src/App.vue +++ b/src/App.vue @@ -46,7 +46,6 @@
-
نسخه: {{ pkg.version }}
diff --git a/src/assets/css/main.less b/src/assets/css/main.less index 17e7845..3d45e2a 100644 --- a/src/assets/css/main.less +++ b/src/assets/css/main.less @@ -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; } diff --git a/src/assets/css/var.less b/src/assets/css/var.less index 5eb1cb2..c3fad31 100644 --- a/src/assets/css/var.less +++ b/src/assets/css/var.less @@ -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; diff --git a/src/assets/img/banner/1.jpg b/src/assets/img/banner/1.jpg new file mode 100644 index 0000000..8236d83 Binary files /dev/null and b/src/assets/img/banner/1.jpg differ diff --git a/src/assets/img/banner/2.png b/src/assets/img/banner/2.png new file mode 100644 index 0000000..c2b8cf1 Binary files /dev/null and b/src/assets/img/banner/2.png differ diff --git a/src/assets/img/banner/3.jpg b/src/assets/img/banner/3.jpg new file mode 100644 index 0000000..eb33ee4 Binary files /dev/null and b/src/assets/img/banner/3.jpg differ diff --git a/src/assets/img/ghatreLogo.png b/src/assets/img/ghatreLogo.png index 9ad3ff8..3baf53a 100644 Binary files a/src/assets/img/ghatreLogo.png and b/src/assets/img/ghatreLogo.png differ diff --git a/src/assets/img/home_ly2.svg b/src/assets/img/home_ly2.svg index 5152a75..7557c9e 100644 --- a/src/assets/img/home_ly2.svg +++ b/src/assets/img/home_ly2.svg @@ -2,95 +2,95 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/img/icon-192.png b/src/assets/img/icon-192.png new file mode 100644 index 0000000..2d6eb7d Binary files /dev/null and b/src/assets/img/icon-192.png differ diff --git a/src/assets/img/icon-36.png b/src/assets/img/icon-36.png new file mode 100644 index 0000000..144f618 Binary files /dev/null and b/src/assets/img/icon-36.png differ diff --git a/src/assets/img/icon-512.png b/src/assets/img/icon-512.png new file mode 100644 index 0000000..7880840 Binary files /dev/null and b/src/assets/img/icon-512.png differ diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png index 7b8eb71..23dbac6 100644 Binary files a/src/assets/img/logo.png and b/src/assets/img/logo.png differ diff --git a/src/assets/img/logo_full_.png b/src/assets/img/logo_full_.png index 5aef3d6..ce650e8 100644 Binary files a/src/assets/img/logo_full_.png and b/src/assets/img/logo_full_.png differ diff --git a/src/router/index.ts b/src/router/index.ts index d12e27b..feae66b 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -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', diff --git a/src/views/base/earnMoney/index.vue b/src/views/base/earnMoney/index.vue index 7130c28..d1222bc 100644 --- a/src/views/base/earnMoney/index.vue +++ b/src/views/base/earnMoney/index.vue @@ -8,7 +8,7 @@
-
+
@@ -60,10 +60,10 @@
- + - + diff --git a/src/views/base/fund/index.vue b/src/views/base/fund/index.vue index 0117f01..08b2b94 100644 --- a/src/views/base/fund/index.vue +++ b/src/views/base/fund/index.vue @@ -53,7 +53,7 @@
@@ -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/newFund/index.vue b/src/views/base/fund/newFund/index.vue index 1fd8093..183acef 100644 --- a/src/views/base/fund/newFund/index.vue +++ b/src/views/base/fund/newFund/index.vue @@ -40,7 +40,7 @@
{{ item.name }}
diff --git a/src/views/base/gold/index.vue b/src/views/base/gold/index.vue index 089ad4f..f5f2f8c 100644 --- a/src/views/base/gold/index.vue +++ b/src/views/base/gold/index.vue @@ -46,14 +46,14 @@
- - @@ -583,20 +583,8 @@ async function ok() {