diff --git a/src/utils/router/index.ts b/src/utils/router/index.ts
index efadc5c..c123ffb 100644
--- a/src/utils/router/index.ts
+++ b/src/utils/router/index.ts
@@ -31,6 +31,11 @@ export const staticRouting : RouteRecordRaw[] = [
// component: () => import('@/views/login/silentlogin.vue'),
meta: { hidden: true },
},
+ {
+ path: '/unconLogin',
+ component: () => import('@/views/login/unconLogin.vue'),
+ meta: { hidden: true },
+ },
{
path: '/login/silentlogin',
component: () => import('@/views/login/silentlogin.vue'),
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f3c1361..0d9ec61 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -37,27 +37,29 @@ const getSignCode = () => {
}
onBeforeMount(() => {
- // xingzhi.value = judgingEnvironment();
- // console.log("==============>",route.query.userkey,route.query.token)
- // if(!userPinia.judgeIsLogin(route.query.userkey,route.query.token)){
+ xingzhi.value = judgingEnvironment();
+ console.log("==============>",route.query.userkey,route.query.token)
+ if(!userPinia.judgeIsLogin(route.query.userkey,route.query.token)){
- // console.log("======1========>",xingzhi.value)
- // if(xingzhi.value == 2 || xingzhi.value == 3){
- // window.location.href="http://wab.hxgk.group/systemapi/wechat/obtaOnePage?systemapp="+import.meta.env.VITE_APP_SYSTEM_APP+"&isagain="+import.meta.env.VITE_APP_AGAIN+"&userid="+route.query.userid+"&call_back_type=login"
- // }else{
- // xingzhi.value = 1
- // getSignCode()
- // }
+ console.log("======1========>",xingzhi.value)
+ if(xingzhi.value == 2 || xingzhi.value == 3){
+ window.location.href="http://wab.hxgk.group/systemapi/wechat/obtaOnePage?systemapp="+import.meta.env.VITE_APP_SYSTEM_APP+"&isagain="+import.meta.env.VITE_APP_AGAIN+"&userid="+route.query.userid+"&call_back_type=login"
+ }else{
+ xingzhi.value = 1
+ getSignCode()
+ }
- // }else{
- // console.log("=======3=======>",route.query.userkey,route.query.token)
- // userPinia.getInfo()
- // router.push('/')
- // }
+ }else{
+ console.log("=======levere=======>",route.query.userkey,route.query.token)
+ userPinia.getInfo()
+ nextTick(() => {
+ router.push('/')
+ })
+ }
- xingzhi.value = 1
- getSignCode()
+ // xingzhi.value = 1
+ // getSignCode()
})
const loginForm = ref(ElForm); //表单实例化
diff --git a/src/views/login/unconLogin.vue b/src/views/login/unconLogin.vue
new file mode 100644
index 0000000..e2a9eba
--- /dev/null
+++ b/src/views/login/unconLogin.vue
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file