|
@@ -101,33 +101,27 @@ export default defineComponent({
|
|
|
vanButton: Button,
|
|
|
},
|
|
|
beforeRouteEnter(to, from, next) {
|
|
|
- try {
|
|
|
- let mac: any = getCookieMac();
|
|
|
- if (mac && mac != "null") {
|
|
|
- if (to.query.type !== "logoOut") {
|
|
|
- next((e: any) => {
|
|
|
- console.log(e);
|
|
|
- e.queryWorkSpace();
|
|
|
- });
|
|
|
- } else {
|
|
|
- next((e: any) => {
|
|
|
- e.showLogin = true;
|
|
|
- let mac: any = getCookieMac();
|
|
|
- console.log(mac);
|
|
|
- // to.query = { mac: mac};
|
|
|
- console.log(to);
|
|
|
- // console.log( e.showLogin )
|
|
|
- // router.push({ name: "home", query: { mac: mac } });
|
|
|
- });
|
|
|
- }
|
|
|
+ let mac: any = getCookieMac();
|
|
|
+ if (mac && mac != "null") {
|
|
|
+ if (to.query.type !== "logoOut") {
|
|
|
+ next((e: any) => {
|
|
|
+ console.log(e);
|
|
|
+ e.queryWorkSpace();
|
|
|
+ });
|
|
|
} else {
|
|
|
- next("/error");
|
|
|
+ next((e: any) => {
|
|
|
+ e.showLogin = true;
|
|
|
+ let mac: any = getCookieMac();
|
|
|
+ console.log(mac);
|
|
|
+ // to.query = { mac: mac};
|
|
|
+ console.log(to);
|
|
|
+ // console.log( e.showLogin )
|
|
|
+ // router.push({ name: "home", query: { mac: mac } });
|
|
|
+ });
|
|
|
}
|
|
|
- } catch (e: any) {
|
|
|
+ } else {
|
|
|
next("/error");
|
|
|
}
|
|
|
-
|
|
|
- // next()
|
|
|
},
|
|
|
setup(props) {
|
|
|
let router: any = useRouter();
|