From 8b10d6863b329464c6564ad2bd2444845902a14c Mon Sep 17 00:00:00 2001
From: "2090205686@qq.com" <guoyongchao666>
Date: Fri, 30 May 2025 13:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=BB=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=97=A8=E6=88=B7=E8=B7=B3=E8=BD=AC=E5=90=8E=E5=8F=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=B3=BB=E7=BB=9F=E7=9A=84=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                | 2 ++
 main/.env.pre                             | 1 +
 main/.env.test                            | 1 +
 main/src/micro/app.js                     | 2 +-
 main/src/views/index.vue                  | 1 -
 new-digital-agriculture-screen/.gitignore | 2 ++
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index afc13f6..1635e12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ dist
 dist-ssr
 .history
 *.local
+*.zip
+*.rar
 
 # Editor directories and files
 .vscode/*
diff --git a/main/.env.pre b/main/.env.pre
index 896c31f..a1ff2ac 100644
--- a/main/.env.pre
+++ b/main/.env.pre
@@ -6,6 +6,7 @@ VITE_APP_SUB_OA = '//localhost:8090/sub-operation-admin/'
 VITE_APP_SUB_GAS = '//localhost:8090/sub-government-affairs-service/'
 VITE_APP_SUB_GAA = '//localhost:8090/sub-government-admin/'
 VITE_APP_SUB_GSS = '//localhost:8090/sub-government-screen-service/'
+VITE_APP_VIST_URL = 'http://localhost'
 # 接口
 VITE_APP_BASE_API = '/apis' 
 VITE_APP_BASE_URL = ''
diff --git a/main/.env.test b/main/.env.test
index f22cfe4..bf0f722 100644
--- a/main/.env.test
+++ b/main/.env.test
@@ -12,3 +12,4 @@ VITE_APP_BASE_API = '/apis'
 VITE_APP_BASE_URL = ''
 VITE_APP_UPLOAD_API = '/uploadApis'
 VITE_APP_UPLOAD_URL = ''
+VITE_APP_VIST_URL = 'http://192.168.18.99'
\ No newline at end of file
diff --git a/main/src/micro/app.js b/main/src/micro/app.js
index 068f54f..2ad4af2 100644
--- a/main/src/micro/app.js
+++ b/main/src/micro/app.js
@@ -44,7 +44,7 @@ export const rightApps = [
   {
     name: 'sub-government-admin',
     entry: VITE_APP_SUB_GAS,
-    activeRule: `${VITE_APP_VIST_URL}:82/login`,
+    activeRule: `${VITE_APP_VIST_URL}:81/login`,
     title: '管理后台',
     icon: 'images/platform/icon-admin.png',
   },
diff --git a/main/src/views/index.vue b/main/src/views/index.vue
index da15a38..d2557a2 100644
--- a/main/src/views/index.vue
+++ b/main/src/views/index.vue
@@ -36,7 +36,6 @@ import { getAssetsFile } from '@/utils';
 
 const gotoPage = (row) => {
   // window.history.pushState({}, row.name, row.activeRule);
-  console.log(row.activeRule);
   if (row.name == 'sub-app1') {
     window.location.href = 'https://www.pgyer.com/MXd3uUrO';
   } else if (row.name == 'sub-app2') {
diff --git a/new-digital-agriculture-screen/.gitignore b/new-digital-agriculture-screen/.gitignore
index c199e5e..0b23a9f 100644
--- a/new-digital-agriculture-screen/.gitignore
+++ b/new-digital-agriculture-screen/.gitignore
@@ -64,6 +64,8 @@ web_modules/
 
 # Output of 'npm pack'
 *.tgz
+*.zip
+*.rar
 
 # Yarn Integrity file
 .yarn-integrity