Merge remote-tracking branch 'origin/master'

src/views/index.vue

@@ -12,11 +12,12 @@
 </template>
 
 <script lang="ts" setup>
-import {useRouter} from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import { setToken } from '@/utils/auth';
 import useUserStore from "@/store/modules/user";
 import {getInfo} from "@/api/login"
 import {onMounted, nextTick, ref} from "vue";
+const route = useRoute();
 const router = useRouter();
 const useUser = useUserStore();
 const env = import.meta.env.VITE_APP_ENV;
@@ -63,6 +64,13 @@ const getUserInfo = () => {
     if(!role_is_leader.value && role_is_worker.value) {
       handleJump('WorkerIndex', 'worker');
     }
+    //
+    let redirect_url = decodeURIComponent(route.query.redirect_url as string || "");
+    console.log('redirect_url:', redirect_url);
+    if(redirect_url != "") {
+      useUser.setRoles("worker");
+      router.replace(redirect_url);
+    }
   })
 }
 </script>