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 0000000..6fd6752 Binary files /dev/null and b/src/assets/icon/selected.png differ 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 @@