Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

.gitignore

@@ -12,6 +12,8 @@ dist
 dist-ssr
 .history
 *.local
+*.zip
+*.rar
 
 # Editor directories and files
 .vscode/*

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 = ''

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'

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',
   },

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') {

new-digital-agriculture-screen/.gitignore

@@ -64,6 +64,8 @@ web_modules/
 
 # Output of 'npm pack'
 *.tgz
+*.zip
+*.rar
 
 # Yarn Integrity file
 .yarn-integrity