合并解决冲突

src/enums/cacheEnums.js

@@ -4,5 +4,5 @@ export const AGREEWELCOME_KEY="agreewelcome";
 // clientId 默认写2 
 export const CLIENT_ID="2";
 // #区分内外网 //1-内网，2-外网
-export const NETWORK_ENV=2;
+export const NETWORK_ENV=1;
 

src/main.js

@@ -1,5 +1,6 @@
 import { createSSRApp } from "vue";
 import App from "./App.vue";
+
 import { CLIENT_ID,NETWORK_ENV } from '@/enums/cacheEnums';
 import '@/static/font/iconfont.css'
 
@@ -11,10 +12,13 @@ import { createPinia } from 'pinia'
 const pinia = createPinia()
 
 
+
+
 export function createApp() {
 
 	const app = createSSRApp(App);
 
+
 	// 全局变量
 	app.config.globalProperties.$CLIENT_ID = CLIENT_ID;
 	app.config.globalProperties.$NETWORK_ENV = NETWORK_ENV;