解决冲突

.nuxt/manifest/latest.json

@@ -1 +1,5 @@
-{"id":"661fd28d-1c96-42fc-9d02-02a5a5ffd574","timestamp":1746685860085}
+<<<<<<< HEAD
+{"id":"661fd28d-1c96-42fc-9d02-02a5a5ffd574","timestamp":1746685860085}
+=======
+{"id":"d5beaaec-dd09-44c6-a599-6da3475ed189","timestamp":1745741738825}
+>>>>>>> d826d17ada88ea9210d7dce838ca280aabff2f64

.nuxt/manifest/meta/d5beaaec-dd09-44c6-a599-6da3475ed189.json

@@ -0,0 +1 @@
+{"id":"d5beaaec-dd09-44c6-a599-6da3475ed189","timestamp":1745741738825,"matcher":{"static":{},"wildcard":{},"dynamic":{}},"prerendered":[]}

.nuxt/tsconfig.json

@@ -102,7 +102,11 @@
         "./imports"
       ],
       "#app-manifest": [
+<<<<<<< HEAD
         "./manifest/meta/661fd28d-1c96-42fc-9d02-02a5a5ffd574.json"
+=======
+        "./manifest/meta/d5beaaec-dd09-44c6-a599-6da3475ed189.json"
+>>>>>>> d826d17ada88ea9210d7dce838ca280aabff2f64
       ],
       "#components": [
         "./components"

assets/css/public/footer.less

@@ -61,7 +61,11 @@
 
 .foot_frind_box {
     display: block;
+<<<<<<< HEAD
     margin: 20px auto 20px;
+=======
+    margin: 20px auto;
+>>>>>>> d826d17ada88ea9210d7dce838ca280aabff2f64
     overflow: hidden;
     display: flex;
     width: 100%;
@@ -94,7 +98,6 @@
 .call_us_box {
     display: block;
     width: 100%;
-    margin: 10px auto 0;
     overflow: hidden;
     text-align: center;
     font-size: 0px;

components/home/foot1.vue

@@ -60,8 +60,8 @@ async function getModelDataAll() {
     const mkdata =  await requestDataPromise('/web/getWebsiteFootAll', {
         method: 'GET',
         query: {
-            'link_textnum':8,
-            'link_imgnum':12,
+            'link_textnum':24,
+            'link_imgnum':18,
             'link_footnum':4
         },
     });

components/home/pageHead.vue

@@ -71,7 +71,7 @@
 <script setup>
 //1.加载基本依赖 start ---------------------------------------->
 import { ref, watch, onMounted } from 'vue'
-import { ElDialog } from 'element-plus'
+import { ElDialog,ElMessage } from 'element-plus'
 import { getToken, setToken, removeToken } from '@/store/useCookieStore'
 import { setTicket, removeTicket } from '@/store/useticketStore'
 //网站地址
@@ -277,30 +277,24 @@ onMounted(async () => {
             });
             const result = await responseStatus.json();
             console.log(result)
+            
             if (result.code == 200) {
-                if (result.data.isLogin == true) {
-                    console.log("用户已经登录！");
-                    showToken.value = true;
-
-                } else {
-                    console.log("用户已退出登录！");
-                    showToken.value = false;
-                    //退出登录
-                    isShow.value = false;
-                    removeToken();
-                    removeTicket();
-                    ElMessage.error('您已退出登录！')
-                }
-            } else {
-                console.log("用户已退出登录！");
-                //退出登录
+                console.log("用户已经登录！");
+                showToken.value = true;
+            }
+            if (result.code == -1) {
                 isShow.value = false;
                 showToken.value = false;
                 removeToken();
                 removeTicket();
                 ElMessage.error('您没有权限登录该网站！')
-                //跳转到首页
-                //window.location.href = $CwebUrl;
+            }
+            if (result.code == -2) {
+                isShow.value = false;
+                showToken.value = false;
+                removeToken();
+                removeTicket();
+                ElMessage.error('您已退出登录！')
             }
         }
     }

plugins/globals.ts

@@ -13,4 +13,11 @@ export default defineNuxtPlugin((nuxtApp) => {
   // nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
   // nuxtApp.provide('userUrl', 'http://localhost:3005')
 
+  // 农副产品供销网正式环境
+  // nuxtApp.provide('webUrl', 'https://flzxw.bjzxtw.org.cn')
+  // nuxtApp.provide('CwebUrl', 'http://nw.nfcpgx.org.cn')
+  // nuxtApp.provide('BwebUrl', 'https://admin.bjzxtw.org.cn')
+  // nuxtApp.provide('LoginWebUrl', 'http://admin.bjzxtw.org.cn/adminapi')
+  // nuxtApp.provide('userUrl', 'http://localhost:3005')
+
 })

plugins/request.ts

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