Browse Source

修改登录

修改登录
dangyunlong 1 week ago
parent
commit
b4680abf0f

+ 1 - 1
.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"1c9070ca-851e-4eae-89a0-0736150ff416","timestamp":1744879326982}
+{"id":"cb5f8e64-7162-49dc-abf3-64edc96072ea","timestamp":1745394015576}

+ 0 - 1
.nuxt/manifest/meta/1c9070ca-851e-4eae-89a0-0736150ff416.json

@@ -1 +0,0 @@
-{"id":"1c9070ca-851e-4eae-89a0-0736150ff416","timestamp":1744879326982,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 0
.nuxt/manifest/meta/cb5f8e64-7162-49dc-abf3-64edc96072ea.json

@@ -0,0 +1 @@
+{"id":"cb5f8e64-7162-49dc-abf3-64edc96072ea","timestamp":1745394015576,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

+ 1 - 1
.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
         "./imports"
       ],
       ],
       "#app-manifest": [
       "#app-manifest": [
-        "./manifest/meta/1c9070ca-851e-4eae-89a0-0736150ff416.json"
+        "./manifest/meta/cb5f8e64-7162-49dc-abf3-64edc96072ea.json"
       ],
       ],
       "#components": [
       "#components": [
         "./components"
         "./components"

+ 8 - 6
components/home/pageHead.vue

@@ -122,11 +122,12 @@ let goLogin = () => {
     //开启线上登录模式 start---------------------------------------->
     //开启线上登录模式 start---------------------------------------->
     isDel.value = 0
     isDel.value = 0
     token1.value = getToken()
     token1.value = getToken()
-
     //王鹏
     //王鹏
-    window.open($BwebUrl + "/auth/login.php?backurl=" + $CwebUrl, '_blank');
+    //window.open($BwebUrl + "/auth/login.php?backurl=" + $CwebUrl, '_blank');
     //刘佳伟
     //刘佳伟
-    // window.open($LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl, '_blank');
+    //window.open($LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl, '_blank');
+    //党云龙
+    window.open($BwebUrl + "/#/login?backurl=" + $CwebUrl, '_blank');
     //开启线上登录模式 end---------------------------------------->
     //开启线上登录模式 end---------------------------------------->
 
 
     //开启本地登录模式 start---------------------------------------->
     //开启本地登录模式 start---------------------------------------->
@@ -185,10 +186,11 @@ let exit = () => {
     let tokendata = getToken()
     let tokendata = getToken()
   
   
     //王鹏
     //王鹏
-    let url = $BwebUrl + '/auth/logout.php?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
-      console.log("用户退出登录======token为:", tokendata,url)
+    // let url = $BwebUrl + '/auth/logout.php?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
+    // console.log("用户退出登录======token为:", tokendata,url)
     //刘佳伟
     //刘佳伟
-    // let url = $LoginWebUrl + '/api/logout?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
+    let url = $LoginWebUrl + '/api/logout?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
+
     window.location.href = url;
     window.location.href = url;
     removeToken()
     removeToken()
     removeTicket()
     removeTicket()

+ 10 - 10
plugins/globals.js

@@ -1,17 +1,17 @@
 export default defineNuxtPlugin((nuxtApp) => {
 export default defineNuxtPlugin((nuxtApp) => {
   //Pre环境
   //Pre环境
-//   nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
-//   nuxtApp.provide('CwebUrl', 'http://nwpre.bjzxtw.org.cn')
-//   nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
-//   nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
-//   nuxtApp.provide('userUrl', 'http://localhost:3000')
+  nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
+  nuxtApp.provide('CwebUrl', 'http://nwpre.bjzxtw.org.cn')
+  nuxtApp.provide('BwebUrl', 'http://adminpre.bjzxtw.org.cn')
+  nuxtApp.provide('LoginWebUrl', 'http://adminpre.bjzxtw.org.cn/adminapi')
+  nuxtApp.provide('userUrl', 'http://localhost:3000')
 
 
   //正式环境
   //正式环境
-  nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
-  nuxtApp.provide('CwebUrl', 'http://nw.bjzxtw.org.cn')
-  nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
-  nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
-  nuxtApp.provide('userUrl', 'http://localhost:3000')
+//   nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
+//   nuxtApp.provide('CwebUrl', 'http://nw.bjzxtw.org.cn')
+//   nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
+//   nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
+//   nuxtApp.provide('userUrl', 'http://localhost:3000')
   
   
   //乡村网
   //乡村网
   // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')
   // nuxtApp.provide('webUrl', 'http://apipre1.bjzxtw.org.cn:29501')

+ 4 - 4
plugins/request.js

@@ -6,11 +6,11 @@ export default defineNuxtPlugin(nuxtApp => {
 
 
     let Url = {
     let Url = {
         //正式环境
         //正式环境
-        webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
-        CwebUrl: 'nw.bjzxtw.org.cn' //页面地址
+        // webUrl: 'https://flzxw.bjzxtw.org.cn', //接口地址
+        // CwebUrl: 'nw.bjzxtw.org.cn' //页面地址
         //pre环境
         //pre环境
-        // webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
-        // CwebUrl: 'nwpre.bjzxtw.org.cn' //页面地址
+        webUrl: 'http://apipre1.bjzxtw.org.cn:29501', //pre接口地址
+        CwebUrl: 'nwpre.bjzxtw.org.cn' //页面地址
     }
     }
 
 
     const service = axios.create({
     const service = axios.create({