diff --git a/src/components/LayoutSider/index.vue b/src/components/LayoutSider/index.vue
index 11bfe09..6ee88eb 100644
--- a/src/components/LayoutSider/index.vue
+++ b/src/components/LayoutSider/index.vue
@@ -16,7 +16,8 @@ const menuItemClick = (e) => {
-
+
diff --git a/src/components/Pay/PayTask.vue b/src/components/Pay/PayTask.vue
index ba5f83c..9ab1aab 100644
--- a/src/components/Pay/PayTask.vue
+++ b/src/components/Pay/PayTask.vue
@@ -1,10 +1,11 @@
diff --git a/src/pages/merchant/pages/task-center/look-min-task.vue b/src/pages/merchant/pages/task-center/look-min-task.vue
index 44df9b9..a3547c7 100644
--- a/src/pages/merchant/pages/task-center/look-min-task.vue
+++ b/src/pages/merchant/pages/task-center/look-min-task.vue
@@ -7,7 +7,7 @@ import RefuseModal from "./components/RefuseModal.vue";
import openTerminateTask from "../../../../components/TerminateTask/TerminateTask.js";
import BlackjackExpertModal from "../../components/BlackjackExpertModal.vue";
import {useRoute} from "vue-router";
-import {openPage, openUrl} from "../../../../utils/index.js";
+import {copy, openPage} from "../../../../utils/index.js";
import PreviewTaskMaterialModal from "./components/PreviewTaskMaterialModal.vue";
import {Message} from "@arco-design/web-vue";
import EffectManagementModal from "./components/effectManagementModal.vue";
@@ -169,17 +169,16 @@ const passTask = async (id, task_backfill_id) => {
-
+
{{ v }}
-
+
-
diff --git a/src/pinia/SystemStore/index.js b/src/pinia/SystemStore/index.js
index ccc7901..3b1c8d1 100644
--- a/src/pinia/SystemStore/index.js
+++ b/src/pinia/SystemStore/index.js
@@ -10,6 +10,8 @@ export const useSystemStore = defineStore("SystemStore", () => {
const NOW_ROUTER = ref(null);
const NOW_ROUTER_QUERY = reactive({});
const BUILD_MODE = ref(import.meta.env.VITE_BUILD_MODE);
+ const openKeys = ref([]);
+ const selectKeys = ref([]);
const installRoute = async () => {
const routes = generateRouter(RoutesTemp.value);
@@ -88,6 +90,8 @@ export const useSystemStore = defineStore("SystemStore", () => {
clearRouter,
updateRouterTag,
BUILD_MODE,
+ openKeys,
+ selectKeys,
}
}, {
persist: {
@@ -96,6 +100,6 @@ export const useSystemStore = defineStore("SystemStore", () => {
afterHydrate: (val) => {
val.store.installRoute && val.store.installRoute();
},
- pick: ['RoutesTemp', 'NOW_ROUTER', 'NOW_ROUTER_QUERY', 'isRoot'],
+ pick: ['RoutesTemp', 'NOW_ROUTER', 'NOW_ROUTER_QUERY', 'isRoot', 'openKeys', 'selectKeys'],
}
});
diff --git a/src/utils/request.js b/src/utils/request.js
index 70e65c2..bde9eb6 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,6 +8,7 @@ const excludeURL = [
'/admin/admin/menu',
'/index/business/getMenu',
'/admin/login/login',
+ '/index/login/login',
];
export const BASEURL = import.meta.env.MODE === 'development' ? '/baseApi' : import.meta.env.VITE_API_URL;