Merge branch 'qin_18'

src/api/common/type.ts

@@ -2,6 +2,8 @@
  * 统一返回格式
  */
  export interface returnFormat{
+    picPath: string;
+    captchaid: string | undefined;
     code?: number;
     msg?: string;
     data?: any;

src/utils/pinia/stores/modules/userOrders.ts

@@ -74,16 +74,16 @@ export const userStror = defineStore("user",() => {
     @ 时间: 2024-10-23 13:43:25
     @ 功能: 判断是否已经登录
     */
-    function judgeIsLogin(userKey?:string,token?:string){
+    function judgeIsLogin(userKey?:string|any,token?:string|any){
-        console.log("判断是否已经登录:",userKey,"------1------->",token);
+        // console.log("判断是否已经登录:",userKey,"------1------->",token);
-        console.log("判断是否已经登录:",userKeying.value,"------2------>",userToken.value);
+        // 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);
+                // console.log("判断是否已经登录:",userKeying.value,"-------3------>",userToken.value,"-------3------>",tokenIng);
                 // resolve();
                 return true
             }else{

src/views/login/index.vue

@@ -4,11 +4,12 @@
 @ 备注: 登录页面
 -->
 <script lang='ts' setup>
-import { useRoute,useRouter } from 'vue-router'
+import { LocationQuery, LocationQueryValue, useRoute,useRouter } from 'vue-router'
 import { userStror } from "@/utils/pinia/stores/modules/userOrders";
 import { loginStruct } from '@/api/login/type'
 import { getTimeUnix } from '@/api/common/index'
 import { getVerifyCode } from '@/api/login/index'
+import { ElForm } from 'element-plus';
 const router = useRouter()
 const route = useRoute()
 const userPinia = userStror();
@@ -38,25 +39,28 @@ const getSignCode = () => {
 }
 onBeforeMount(() => {
     xingzhi.value = judgingEnvironment();
-    console.log("==============>",route.query.userkey,route.query.token)
+    // console.log("==============>",route.query.userkey,route.query.token)
+    // console.log("======34343========>",xingzhi.value)
     if(!userPinia.judgeIsLogin(route.query.userkey,route.query.token)){
        
-        console.log("======1========>",xingzhi.value)
+        // 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"
+            // console.log("======1====2====>",xingzhi.value)
+            // 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
+            // console.log("======1====4====>",xingzhi.value)
             getSignCode()
         }
     }else{
-        console.log("=======3=======>",route.query.userkey,route.query.token)
+        // console.log("=======3=======>",route.query.userkey,route.query.token)
         userPinia.getInfo()
         router.push('/')
      }
     
 
-    xingzhi.value = 1
+    // xingzhi.value = 1
-    getSignCode()
+    // getSignCode()
 })
 const loginForm = ref(ElForm);  //表单实例化