From f730e2461f76cac3c6f5ab6d14c752d44e356513 Mon Sep 17 00:00:00 2001 From: hzj <1304805162@qq.com> Date: Fri, 5 Sep 2025 22:35:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9C=B0=E5=9B=BE):=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E9=A1=B5=E9=9D=A2=E5=8F=8A=E5=85=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/assets/icon/selected.png | Bin 0 -> 1370 bytes src/main.js | 29 +++--- src/router/index.js | 6 ++ src/stores/country.js | 16 +++ src/utils/permissionManager.js | 2 + src/views/Recharge.vue | 1 + src/views/RechargeFreightAgent.vue | 33 +++++-- src/views/map.vue | 151 +++++++++++++++++++++++++++++ 9 files changed, 219 insertions(+), 20 deletions(-) create mode 100644 src/assets/icon/selected.png create mode 100644 src/stores/country.js create mode 100644 src/views/map.vue diff --git a/package.json b/package.json index 631871f..29daa83 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ }, "dependencies": { "airwallex-payment-elements": "^1.131.0", + "pinia": "^3.0.3", "vue": "^3.5.18", "vue-router": "^4.5.1" }, diff --git a/src/assets/icon/selected.png b/src/assets/icon/selected.png new file mode 100644 index 0000000000000000000000000000000000000000..6fd6752179f9c8f212bbccac33259dfe6d4ad396 GIT binary patch literal 1370 zcmV-g1*Q6lP) zU;{#myFis#6jKS@fCVT#7wG6%(m)A9E|f--{$KpL85FQzXkl-urkZ$26efg4Z5L5Rh(-DcfaVw!nR1=^J-ND)jL|LTwZ}SRGgBu>{_}rau;8r;I}V;)iNA|Lr-Ts-2^% z-2}I-!qg$rnpDk8d8#?cx?$&2eYr!8zKA@K8jC6HMnhaqhPiqZ2BGCBPW@bpW-iBqr!9<(Y_z?#z#(s=$neO`ZX{?j+W zod#x}g2H?tLzC$|yKq=s#yp=@cupa6MTgIvcoKLaM$F=I*n$Y01dIFXrFb!Iu;)G^ zZ~`x108YjPs(=3Mw!yX_0>{9iic_-*i~GapunG~_ATCt(X?#H<--A_%z(XX3D(3cg z!2P?h4iUIVR;arDJ*-3o?%_(PG7*8{R;V)ZUSQWkm5J8^yBMlWycO8hP-Wt+z^;ZW z6E6jJIaHZ=C$Q_G%A^R3;Ho=GZRg)qX@C5RvGE~PnOGw*SKfca3 zb)S1H-hO=xRVLO5%r?qxZW3{p?PI7iv8tQILFmVw+^T&6h{U1nNiyoyC#(@IXesHXV8xWkN6=E-lUU{eSH3YZN zXq0QJ+3yGML2wF+Raf~K2~1I%Pn_v430-^UV}j0q?O??!6d%FjOg3><+CC z2KzS*1ePjxgHU6&JoH-sks*%lb-mAT4u@bJJaV;MRcD8hbZyp|&p z8dy{TsxmP0i0Dq^?oA?WpCehU(-)gMT?@QL0I%`V(q89>DwG#LhP=9lmr#Xh`~}>Y cRMcVq2gB6V281l;lK=n!07*qoM6N<$f^V^kLjV8( literal 0 HcmV?d00001 diff --git a/src/main.js b/src/main.js index 657c0c7..c2aed68 100644 --- a/src/main.js +++ b/src/main.js @@ -1,17 +1,17 @@ -import './assets/main.css' -import { logEnvInfo } from './utils/env.js' -import { versionChecker } from './utils/versionChecker.js' - -import { createApp } from 'vue' -import App from './App.vue' -import router from './router' +import "./assets/main.css"; +import { logEnvInfo } from "./utils/env.js"; +import { versionChecker } from "./utils/versionChecker.js"; +import { createPinia } from "pinia"; +import { createApp } from "vue"; +import App from "./App.vue"; +import router from "./router"; // 初始化环境信息 -logEnvInfo() +logEnvInfo(); // 版本检查 if (versionChecker.checkVersion()) { - console.log('检测到新版本，正在更新...') + console.log("检测到新版本，正在更新..."); // 可以选择显示一个更新提示 // if (confirm('检测到新版本，是否立即更新？')) { // versionChecker.forceReload() @@ -19,10 +19,11 @@ if (versionChecker.checkVersion()) { } // 初始化权限系统 -console.debug('🔐 Permission system initialized') +console.debug("🔐 Permission system initialized"); +const pinia = createPinia(); +const app = createApp(App); -const app = createApp(App) +app.use(router); +app.use(pinia); -app.use(router) - -app.mount('#app') +app.mount("#app"); diff --git a/src/router/index.js b/src/router/index.js index 1da9210..05eaee8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -185,6 +185,12 @@ const router = createRouter({ component: () => import("../views/RechargeFreightAgent.vue"), meta: { requiresAuth: true }, }, + { + path: "/map", + name: "map", + component: () => import("../views/map.vue"), + meta: { requiresAuth: true }, + }, { path: "/pay-result", name: "pay-result", diff --git a/src/stores/country.js b/src/stores/country.js new file mode 100644 index 0000000..1a3eb8d --- /dev/null +++ b/src/stores/country.js @@ -0,0 +1,16 @@ +import { defineStore } from "pinia"; + +export const useCountryStore = defineStore("country", { + state: () => ({ + list: [], + selectedCountry: {}, + }), + actions: { + setCountryList(data) { + this.list = data; + }, + setCountry(country) { + this.selectedCountry = country; + }, + }, +}); diff --git a/src/utils/permissionManager.js b/src/utils/permissionManager.js index 470030f..3c1b3b1 100644 --- a/src/utils/permissionManager.js +++ b/src/utils/permissionManager.js @@ -30,6 +30,7 @@ export const PAGES = { ADMIN_CENTER: "/admin-center", RECHARGE_STANDARD: "/recharge-standard", PAY_RESULT: "/pay-result", + MAP: "/map", }; // 🎯 核心改变：基于身份的权限配置 @@ -106,6 +107,7 @@ export const ROLE_PERMISSIONS = { PUBLIC_PAGES: [ PAGES.NOT_APP, // 错误页面 PAGES.PAY_RESULT, // 支付成功页面 + PAGES.MAP, // 地图选择页面 "/recharge", "/recharge-freight-agent", ], diff --git a/src/views/Recharge.vue b/src/views/Recharge.vue index 461fb12..9671a29 100644 --- a/src/views/Recharge.vue +++ b/src/views/Recharge.vue @@ -141,6 +141,7 @@ import MobileHeader from "../components/MobileHeader.vue"; import { onMounted, ref, computed } from "vue"; import { searchUser } from "@/api/userInfo"; // import { getUserIdentity } from "@/api/wallet"; +import { showError, showWarning, showInfo, showSuccess } from "@/utils/toast.js"; import { useRouter } from "vue-router"; const router = useRouter(); diff --git a/src/views/RechargeFreightAgent.vue b/src/views/RechargeFreightAgent.vue index c9a441a..08c63e4 100644 --- a/src/views/RechargeFreightAgent.vue +++ b/src/views/RechargeFreightAgent.vue @@ -1,5 +1,5 @@