From 613add40a01d74885dd1d0e8b9fbf9d0b40e6d9f Mon Sep 17 00:00:00 2001
From: hreenshan112 <hreenshan112@noreply.gitcode.com>
Date: Tue, 25 Feb 2025 15:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=97=A0=E6=84=9F=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/pinia/stores/modules/userOrders.ts | 6 +++++-
 src/views/login/index.vue                    | 9 +++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/utils/pinia/stores/modules/userOrders.ts b/src/utils/pinia/stores/modules/userOrders.ts
index 18ed3f3..fdb95ed 100644
--- a/src/utils/pinia/stores/modules/userOrders.ts
+++ b/src/utils/pinia/stores/modules/userOrders.ts
@@ -75,12 +75,16 @@ export const userStror = defineStore("user",() => {
     @ 功能: 判断是否已经登录
     */
     function judgeIsLogin(userKey?:string,token?:string){
-        // console.log("判断是否已经登录:",userKeying.value,"------------->",userToken);
+        console.log("判断是否已经登录:",userKey,"------1------->",token);
+        console.log("判断是否已经登录:",userKeying.value,"------2------>",userToken.value);
+        
         if(userKeying.value == "" || userKeying.value == "" || userKeying.value ==""){
             if(userKey != null && userKey != "" && token != null && token != ""){
                 userKeying.value = userKey
                 userToken.value = token
                 tokenIng.value = token
+                console.log("判断是否已经登录:",userKeying.value,"-------3------>",userToken.value,"-------3------>",tokenIng);
+                // resolve();
                 return true
             }else{
                 return false
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 469b027..6f43306 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -37,11 +37,12 @@ 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("======1========>",xingzhi.value)
-        if(xingzhi.value == 3){
+        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
@@ -144,9 +145,9 @@ const judgingEnvironment = () => {
     return 3;
 }
 </script>
-<template>{{xingzhi}}
+<template>
     <div class="appBodyBeiJing appBody contentCenter">
-        <el-card v-if="xingzhi==1"  v-loading="true" element-loading-text="身份验证中！请耐心等待！..." style="max-width: 90%; min-width:80%; height:250px; background-color: rgba(255,255,255,0.1); border:  rgba(255,255,255,0.1);" element-loading-background="rgba(255,255,255,0.6)"> 
+        <el-card v-if="xingzhi==3"  v-loading="true" element-loading-text="身份验证中！请耐心等待！..." style="max-width: 90%; min-width:80%; height:250px; background-color: rgba(255,255,255,0.1); border:  rgba(255,255,255,0.1);" element-loading-background="rgba(255,255,255,0.6)"> 
         </el-card>
         <el-card v-else style="max-width: 90%; background-color: rgba(255,255,255,0.6); border:  rgba(255,255,255,0.6);">
             <template #header>