回滚王鹏代码

回滚王鹏代码

.nuxt/manifest/latest.json

@@ -1 +1 @@
-{"id":"30fc4624-9641-4732-917e-e423d97bab9b","timestamp":1744164622470}
+{"id":"b85b0953-086e-4d2e-bbc5-09a7738116cc","timestamp":1744166568701}

.nuxt/manifest/meta/30fc4624-9641-4732-917e-e423d97bab9b.json

@@ -1 +0,0 @@
-{"id":"30fc4624-9641-4732-917e-e423d97bab9b","timestamp":1744164622470,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/manifest/meta/b85b0953-086e-4d2e-bbc5-09a7738116cc.json

@@ -0,0 +1 @@
+{"id":"b85b0953-086e-4d2e-bbc5-09a7738116cc","timestamp":1744166568701,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/tsconfig.json

@@ -102,7 +102,7 @@
         "./imports"
       ],
       "#app-manifest": [
-        "./manifest/meta/30fc4624-9641-4732-917e-e423d97bab9b.json"
+        "./manifest/meta/b85b0953-086e-4d2e-bbc5-09a7738116cc.json"
       ],
       "#components": [
         "./components"

components/home/pageHead.vue

@@ -126,19 +126,9 @@ let goLogin = () => {
     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');
-    // let tokendata = getToken()
-    // if(tokendata==''||tokendata==null||tokendata==undefined){
-    //     window.open($LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl, '_blank');
-    // }else{
-    //     window.open($LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl + '&admintoken=' + tokendata, '_blank');
-    // }
-    // let url = $LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl + '&admintoken=' + tokendata
-    // console.log("开启外部跳转：",url)
-    
+    //window.open($LoginWebUrl + "/api/goLogin?backurl=" + $CwebUrl, '_blank');
     //开启线上登录模式 end---------------------------------------->
 
     //开启本地登录模式 start---------------------------------------->
@@ -182,9 +172,9 @@ let exit = () => {
     let tokendata = getToken()
     console.log("用户退出登录======token为：", tokendata)
     //王鹏
-    //let url = $BwebUrl + '/auth/logout.php?backurl=' + $CwebUrl + '&admintoken=' + token1;
+    let url = $BwebUrl + '/auth/logout.php?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
     //刘佳伟
-    let url = $LoginWebUrl + '/api/logout?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
+    //let url = $LoginWebUrl + '/api/logout?backurl=' + $CwebUrl + '&admintoken=' + tokendata;
     window.location.href = url;
     removeToken()
     removeTicket()

plugins/globals.js

@@ -1,17 +1,17 @@
 export default defineNuxtPlugin((nuxtApp) => {
   //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')

plugins/request.js

@@ -6,11 +6,11 @@ export default defineNuxtPlugin(nuxtApp => {
 
     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环境
-        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({